Skip to content

revert tabels operations changes, optimize imports #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

revert tabels operations changes, optimize imports #40

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
691479d
fix Table items creation with insert results in None id
Sep 7, 2024
bb6604f
Optimize imports - image_app
Sep 7, 2024
a1a5dc0
fix image_app `gens` table creation/insert
Sep 7, 2024
12f5f37
Merge branch 'AnswerDotAI:main' into patch-1
matatratata Sep 8, 2024
e8e269c
Optimize imports - image_app
Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions image_app_session_credits/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from fastcore.parallel import threaded
from fasthtml.common import *
import uuid, os, uvicorn, requests, replicate, stripe
import requests, uuid, stripe
from PIL import Image
from starlette.responses import RedirectResponse
from fasthtml.common import *
from replicate import Client

# Replicate setup (for generating images)
replicate_api_token = os.environ['REPLICATE_API_KEY']
client = replicate.Client(api_token=replicate_api_token)
client = Client(api_token=replicate_api_token)

# Stripe (for payments)
stripe.api_key = os.environ["STRIPE_KEY"]
Expand Down Expand Up @@ -105,9 +104,8 @@ def post(prompt: str, session):
folder = f"data/gens/{str(uuid.uuid4())}"
os.makedirs(folder, exist_ok=True)
g = gens.insert(
Generation(prompt=prompt,
folder=folder,
session_id=session['session_id']))
Generation(prompt=prompt, folder=folder, session_id=session['session_id'], id=f"{gens.count}")
)
generate_and_save(g.prompt, g.id, g.folder)

return generation_preview(g, session), clear_input
Expand Down
12 changes: 7 additions & 5 deletions image_app_session_credits/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from fastcore.parallel import threaded
from fasthtml.common import *
import uuid, os, uvicorn, requests, replicate
import requests, uuid
from PIL import Image
from fasthtml.common import *
from replicate import Client

# Replicate setup (for generating images)
replicate_api_token = os.environ['REPLICATE_API_KEY']
client = replicate.Client(api_token=replicate_api_token)
client = Client(api_token=replicate_api_token)

# gens database for storing generated image details
tables = database('gens.db').t
Expand Down Expand Up @@ -61,7 +61,9 @@ async def static(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')
async def post(prompt:str, session):
folder = f"gens/{str(uuid.uuid4())}"
os.makedirs(folder, exist_ok=True)
g = gens.insert(Generation(prompt=prompt, folder=folder, session_id=session['session_id']))
g = gens.insert(
Generation(prompt=prompt, folder=folder, session_id=session['session_id'], id=f"{gens.count}")
)
generate_and_save(g.prompt, g.id, g.folder)
clear_input = Input(id="new-prompt", name="prompt", placeholder="Enter a prompt", hx_swap_oob='true')
return generation_preview(g), clear_input
Expand Down
15 changes: 7 additions & 8 deletions image_app_simple/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
from fastcore.parallel import threaded
from fasthtml.common import *
import uuid, os, uvicorn, requests, replicate
import requests, uuid
from PIL import Image

from fasthtml.common import *
from replicate import Client
Copy link
Contributor Author

@matatratata matatratata Sep 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fasthtml.common imports most of the modules. Among them - basics.replicate fn which can be confused with replicate module.


# Replicate setup (for generating images)
replicate_api_token = os.environ['REPLICATE_API_KEY']
client = replicate.Client(api_token=replicate_api_token)
client = Client(api_token=replicate_api_token)

# gens database for storing generated image details
tables = database('data/gens.db').t
gens = tables.t.gens
if not gens in tables.t:
gens = tables.gens
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted changes - missed .t locally from line 11

if not gens in tables:
gens.create(prompt=str, id=int, folder=str, pk='id')
Generation = gens.dataclass()

Expand Down Expand Up @@ -58,7 +57,7 @@ def static(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')
def post(prompt:str):
folder = f"data/gens/{str(uuid.uuid4())}"
os.makedirs(folder, exist_ok=True)
g = gens.insert(Generation(prompt=prompt, folder=folder))
g = gens.insert(Generation(prompt=prompt, id=f"{gens.count}", folder=folder))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None was propagated, due to manual modules import. No longer an issue

generate_and_save(g.prompt, g.id, g.folder)
clear_input = Input(id="new-prompt", name="prompt", placeholder="Enter a prompt", hx_swap_oob='true')
return generation_preview(g), clear_input
Expand Down