Merge pull request #5 from Mirascope/fix-models

fix model ids

examples/sqlite_prompt.py

@@ -8,9 +8,9 @@
 
 
 @lilypad.trace
-def recommend_book(genre: str) -> str | None:
+def recommend_book(genre: str, topic: str) -> str | None:
     """Recommends a `genre` book using OpenAI"""
-    prompt = lilypad.prompt(recommend_book)(genre)
+    prompt = lilypad.prompt(recommend_book)(genre, topic)
     completion = client.chat.completions.create(
         model="gpt-4o-mini",
         messages=lilypad.openai.messages(prompt),
@@ -19,4 +19,4 @@ def recommend_book(genre: str) -> str | None:
     return message.content
 
 
-print(recommend_book("fantasy"))
+print(recommend_book("fantasy", "dragons"))

lilypad/app/main.py

@@ -119,7 +119,7 @@ async def create_version(
         select(ProjectTable).where(ProjectTable.name == project_name)
     ).first()
 
-    if not project:
+    if not project or not project.id:
         raise HTTPException(status_code=404)
 
     latest_prompt_version = session.exec(
@@ -190,7 +190,7 @@ async def create_calls(
         project.prompt_versions, key=lambda x: x.id or 0, reverse=True
     )[:1][0]
 
-    if not prompt_version:
+    if not prompt_version or not prompt_version.id:
         raise HTTPException(status_code=404)
 
     call = CallTable(

lilypad/app/models/calls.py

@@ -18,7 +18,7 @@ class CallTable(BaseSQLModel, table=True):
 
     __tablename__ = CALL_TABLE_NAME  # type: ignore
 
-    id: int = Field(default=None, primary_key=True)
+    id: int | None = Field(default=None, primary_key=True)
     prompt_version_id: int = Field(
         default=None, foreign_key=f"{PROMPT_VERSION_TABLE_NAME}.id"
     )

lilypad/app/models/projects.py

@@ -18,7 +18,7 @@ class ProjectTable(BaseSQLModel, table=True):
 
     __tablename__ = PROJECT_TABLE_NAME  # type: ignore
 
-    id: int = Field(default=None, primary_key=True)
+    id: int | None = Field(default=None, primary_key=True)
     name: str = Field(nullable=False, unique=True)
     created_at: datetime.datetime = Field(
         default=datetime.datetime.now(datetime.UTC), nullable=False

lilypad/app/models/prompt_versions.py

@@ -18,7 +18,7 @@ class PromptVersionTable(BaseSQLModel, table=True):
 
     __tablename__ = PROMPT_VERSION_TABLE_NAME  # type: ignore
 
-    id: int = Field(default=None, primary_key=True)
+    id: int | None = Field(default=None, primary_key=True)
     project_id: int = Field(default=None, foreign_key=f"{PROJECT_TABLE_NAME}.id")
     prompt_template: str = Field(nullable=False)
     created_at: datetime.datetime = Field(