Minor bugfixes

Author: chriscarrollsmith

main.py

@@ -6,7 +6,7 @@
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from fastapi.responses import RedirectResponse
-from routers import chat, files, api_keys, assistants
+from routers import chat, files, setup
 from utils.threads import create_thread
 from fastapi.exceptions import HTTPException
 
@@ -24,8 +24,7 @@ async def lifespan(app: FastAPI):
 # Mount routers
 app.include_router(chat.router)
 app.include_router(files.router)
-app.include_router(api_keys.router)
-app.include_router(assistants.router)
+app.include_router(setup.router)
 
 # Mount static files (e.g., CSS, JS)
 app.mount("/static", StaticFiles(directory=os.path.join(os.getcwd(), "static")), name="static")
@@ -61,7 +60,7 @@ async def read_home(request: Request, thread_id: str = None, messages: list = []
     # Check if environment variables are missing
     load_dotenv(override=True)
     if not os.getenv("OPENAI_API_KEY") or not os.getenv("ASSISTANT_ID"):
-        return RedirectResponse(url="/setup")
+        return RedirectResponse(url=app.url_path_for("read_setup"))
 
     # Create a new assistant chat thread if no thread ID is provided
     if not thread_id or thread_id == "None" or thread_id == "null":
@@ -77,24 +76,6 @@ async def read_home(request: Request, thread_id: str = None, messages: list = []
         }
     )
 
-
-# Add new setup route
-@app.get("/setup")
-async def read_setup(request: Request, message: str = None):
-    # Check if assistant ID is missing
-    load_dotenv(override=True)
-    if not os.getenv("OPENAI_API_KEY"):
-        message="OpenAI API key is missing."
-    elif not os.getenv("ASSISTANT_ID"):
-        message="Assistant ID is missing."
-    else:
-        message="All set up!"
-    
-    return templates.TemplateResponse(
-        "setup.html",
-        {"request": request, "message": message}
-    )
-
 if __name__ == "__main__":
     import uvicorn
 

routers/__init__.py

@@ -0,0 +1 @@
+

routers/api_keys.py

@@ -228,7 +228,8 @@ async def event_generator():
         # First run of the assistant stream
         initial_manager = client.beta.threads.runs.stream(
             assistant_id=assistant_id,
-            thread_id=thread_id
+            thread_id=thread_id,
+            parallel_tool_calls=False
         )
 
         # We'll re-run the loop if needed for tool calls

routers/assistants.py

@@ -0,0 +1,82 @@
+import logging
+import os
+from dotenv import load_dotenv
+from fastapi import APIRouter, Depends, HTTPException, Form, Request
+from fastapi.responses import RedirectResponse
+from fastapi.templating import Jinja2Templates
+from openai import AsyncOpenAI
+
+from utils.create_assistant import create_or_update_assistant, request
+from utils.create_assistant import update_env_file
+
+# Configure logger
+logger: logging.Logger = logging.getLogger("uvicorn.error")
+
+# Load environment variables
+load_dotenv()
+
+router = APIRouter(prefix="/setup", tags=["Setup"])
+templates = Jinja2Templates(directory="templates")
+
+@router.put("/api-key")
+async def set_openai_api_key(api_key: str = Form()):
+    """
+    Set the OpenAI API key in the application's environment variables.
+    
+    Args:
+        api_key: OpenAI API key received from form submission
+    
+    Returns:
+        RedirectResponse: Redirects to home page on success
+    
+    Raises:
+        HTTPException: If there's an error updating the environment file
+    """
+    try:
+        update_env_file("OPENAI_API_KEY", api_key, logger)
+        return RedirectResponse(url="/", headers={"HX-Redirect": "/"}, status_code=303)
+    except Exception as e:
+        raise HTTPException(
+            status_code=500,
+            detail=f"Failed to update API key: {str(e)}"
+        )
+
+
+# Add new setup route
+@router.get("/")
+async def read_setup(request: Request, message: str = None):
+    # Check if assistant ID is missing
+    load_dotenv(override=True)
+    if not os.getenv("OPENAI_API_KEY"):
+        message="OpenAI API key is missing."
+    elif not os.getenv("ASSISTANT_ID"):
+        message="Assistant ID is missing."
+    else:
+        message="All set up!"
+    
+    return templates.TemplateResponse(
+        "setup.html",
+        {"request": request, "message": message}
+    )
+
+
+@router.post("/assistant")
+async def create_update_assistant(
+    client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())
+):
+    """
+    Create a new assistant or update an existing one.
+    Returns the assistant ID and status of the operation.
+    """
+    assistant_id = os.getenv("ASSISTANT_ID")
+
+    assistant_id: str = await create_or_update_assistant(
+        client=client,
+        assistant_id=assistant_id,
+        request=request,
+        logger=logger
+    )
+    if not assistant_id:
+        raise HTTPException(status_code=400, detail="Failed to create or update assistant")
+
+    return RedirectResponse(url="/", status_code=303)

routers/chat.py

@@ -8,7 +8,7 @@ <h1 class="title">Setup Required</h1>
           {% if "API key" in message %}
             <div class="setupForm">
               <p class="setupMessage">Please enter your OpenAI API key to continue:</p>
-                <form action="/api-keys/set" method="POST">
+                <form action="{{ url_for('set_openai_api_key') }}" method="POST">
                   <div class="inputWrapper">
                     <input 
                       type="password"
@@ -29,7 +29,7 @@ <h1 class="title">Setup Required</h1>
           {% elif "Assistant ID" in message %}
               <div class="setupForm">
                 <p class="setupMessage">You need to create an assistant to continue:</p>
-                <form action="/assistants/create-update" method="POST">
+                <form action="{{ url_for('create_update_assistant') }}" method="POST">
                   <button 
                     type="submit"
                     class="button"
@@ -41,7 +41,7 @@ <h1 class="title">Setup Required</h1>
           {% elif message == "All set up!" %}
               <div class="setupForm">
                 <p class="setupMessage">Your application is already configured and ready to use.</p>
-                <a href="/" class="button">Return to Home</a>
+                <a href="{{ url_for('read_home') }}" class="button">Return to Home</a>
               </div>
           {% endif %}
         </div>

routers/setup.py

@@ -0,0 +1 @@
+