Kinda working

Author: chriscarrollsmith

routers/messages.py

@@ -1,19 +1,16 @@
-import os
 import logging
-from dotenv import load_dotenv
 from fastapi.templating import Jinja2Templates
-from fastapi import APIRouter, Form, HTTPException, Depends
+from fastapi import APIRouter, Form, Depends, Request
 from fastapi.responses import StreamingResponse
 from openai import AsyncOpenAI
 from openai.resources.beta.threads.runs.runs import AsyncAssistantStreamManager
-import json
 
 logger: logging.Logger = logging.getLogger("uvicorn.error")
 logger.setLevel(logging.DEBUG)
 
 # Initialize the router
 router: APIRouter = APIRouter(
-    prefix="/assistants/{assistant_id}/messages",
+    prefix="/assistants/{assistant_id}/messages/{thread_id}",
     tags=["assistants_messages"]
 )
 
@@ -23,40 +20,48 @@
 # Send a new message to a thread
 @router.post("/send")
 async def post_message(
+    request: Request,
+    assistant_id: str,
+    thread_id: str,
     userInput: str = Form(...),
-    thread_id: str = Form(),
     client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())
 ) -> dict:
     # Create a new message in the thread
     await client.beta.threads.messages.create(
         thread_id=thread_id,
         role="user",
         content=userInput
+
     )
 
-    return templates.TemplateResponse("components/chat-turn.html")
+    return templates.TemplateResponse(
+        "components/chat-turn.html",
+        {
+            "request": request,
+            "user_input": userInput,
+            "assistant_id": assistant_id,
+            "thread_id": thread_id
+        }
+    )
 
 @router.get("/receive")
 async def stream_response(
-    thread_id: str | None = None,
+    assistant_id: str,
+    thread_id: str,
     client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())
-) -> StreamingResponse:
-    if not thread_id:
-        raise HTTPException(status_code=400, message="thread_id is required")
-   
+) -> StreamingResponse:   
     # Create a generator to stream the response from the assistant
-    load_dotenv()
     async def event_generator():
         stream: AsyncAssistantStreamManager = client.beta.threads.runs.stream(
-            assistant_id=os.getenv("ASSISTANT_ID"),
+            assistant_id=assistant_id,
             thread_id=thread_id
         )
         async with stream as stream_manager:
             async for text in stream_manager.text_deltas:
-                yield f"data: {text}"
+                yield f"data: {text}\n\n"
 
             # Send a done event when the stream is complete
-            yield f"event: EndMessage"
+            yield f"event: EndMessage\n\n"
 
     return StreamingResponse(
         event_generator(),

templates/components/chat-turn.html

@@ -1,8 +1,8 @@
-<div class="userMessage">{{ userInput }}</div>
+<div class="userMessage">{{ user_input }}</div>
 <div
     class="assistantMessage"
     hx-ext="sse" 
-    sse-connect="/assistants/{{ assistant_id }}/messages/receive"
+    sse-connect="/assistants/{{ assistant_id }}/messages/{{ thread_id }}/receive"
     sse-swap="message"
     hx-swap="beforeend"
     sse-close="EndMessage"

templates/components/chat.html

@@ -19,7 +19,6 @@
     {% endfor %}
   </div>
   <form id="chatForm" class="inputForm clearfix">
-    <input type="hidden" value="{{ thread_id }}">
     <input
       type="text"
       class="input"
@@ -30,7 +29,7 @@
     <button
       type="submit"
       class="button"
-      hx-post="/assistants/{assistant_id}/messages/send"
+      hx-post="/assistants/{{ assistant_id }}/messages/{{ thread_id }}/send"
       hx-target="#messages"
       hx-swap="beforeEnd"
       {% if inputDisabled %}disabled{% endif %}