chat working again

aitino/__init__.py

@@ -11,8 +11,6 @@
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse, StreamingResponse
-from openai import OpenAI
-from pydantic import BaseModel
 
 from .improver import PromptType, improve_prompt
 from .interfaces import db
@@ -65,14 +63,12 @@ def compile(id: UUID) -> dict[str, str | Composition]:
 def improve(
     word_limit: int, prompt: str, prompt_type: PromptType, temperature: float
 ) -> str:
-    return improve_prompt(
-        word_limit, prompt, prompt_type, OpenAI().chat.completions, temperature
-    )
+    return improve_prompt(word_limit, prompt, prompt_type, temperature)
 
 
 @app.get("/maeve")
 async def run_maeve(
-    id: UUID, session_id: UUID | None = None, reply: str | None = None
+    id: UUID, profile_id: UUID, session_id: UUID | None = None, reply: str | None = None
 ) -> StreamingResponse:
     if reply and not session_id:
         raise HTTPException(
@@ -109,7 +105,10 @@ async def run_maeve(
         )
 
     if session is None:
-        session = Session()
+        session = Session(
+            maeve_id=id,
+            profile_id=profile_id,
+        )
         db.post_session(session)
 
     q: Queue[Message | object] = Queue()

aitino/improver.py

@@ -1,36 +1,50 @@
 import os
 from pathlib import Path
 from typing import Literal, Protocol
+from dotenv import load_dotenv
 
 from openai import OpenAI
 
+load_dotenv()
+client = OpenAI()
+
 PromptType = Literal["generic", "system", "user"]
 
-class InvalidPromptTypeError(BaseException):
-    ...
+
+class InvalidPromptTypeError(BaseException): ...
+
+
 class ContentProtocol(Protocol):
     content: str
 
+
 class MessageProtocol(Protocol):
     message: ContentProtocol
 
+
 class ResponseProtocol(Protocol):
     choices: list[MessageProtocol]
-
+
+
 class CompletionsProtocol(Protocol):
-    def create(self, messages, model, temperature, frequency_penalty, presence_penalty) -> ResponseProtocol:
-        ...
+    def create(
+        self, messages, model, temperature, frequency_penalty, presence_penalty
+    ) -> ResponseProtocol: ...
+
 
 def improve_prompt(
-    word_limit: int, prompt: str, prompt_type: PromptType, client: CompletionsProtocol, temperature: float = 0.0
-) -> str | None:
-    if (word_limit <= 0):
+    word_limit: int,
+    prompt: str,
+    prompt_type: PromptType,
+    temperature: float = 0.0,
+) -> str:
+    if word_limit <= 0:
         raise ValueError("Word limit must be greater than 0")
 
-    if (prompt_type not in ["generic", "system", "user"]):
+    if prompt_type not in ["generic", "system", "user"]:
         raise InvalidPromptTypeError(f"Invalid prompt type: {prompt_type}")
-    
-    if (temperature < -2.0 or temperature > 2.0):
+
+    if temperature < -2.0 or temperature > 2.0:
         raise ValueError("Temperature must be in between -2 and 2")
 
     with open(
@@ -43,7 +57,7 @@ def improve_prompt(
             f"\n4. Limit the amount of words in this prompt to {word_limit} words"
         )
 
-    result = client.create(
+    result = client.chat.completions.create(
         messages=[
             {"role": "system", "content": system_prompt},
             {"role": "user", "content": prompt},
@@ -55,4 +69,4 @@ def improve_prompt(
     )
 
     content = result.choices[0].message.content
-    return content if content else None
+    return content if content else "error"

aitino/interfaces/db.py

@@ -29,7 +29,7 @@ def get_complied(maeve_id: UUID) -> tuple[str, Composition] | tuple[None, None]:
     Get the complied message and composition for a given Maeve ID.
     """
     logger.debug(f"Getting complied message and composition for {maeve_id}")
-    response = supabase.table("maeve_nodes").select("*").eq("id", maeve_id).execute()
+    response = supabase.table("maeves").select("*").eq("id", maeve_id).execute()
 
     if len(response.data) == 0:
         return None, None

aitino/models/session.py

@@ -6,4 +6,6 @@
 
 class Session(BaseModel):
     id: UUID = Field(default_factory=lambda: uuid4())
+    maeve_id: UUID
+    profile_id: UUID
     created_at: datetime = Field(default_factory=lambda: datetime.now(tz=UTC))