Created a setup page and pointed it to api key and assistants routers

Author: chriscarrollsmith

__pycache__/main.cpython-312.pyc

@@ -6,14 +6,11 @@
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from fastapi.responses import RedirectResponse
-from routers import files, messages, tools
+from routers import files, messages, tools, api_keys, assistants
 
 
 logger = logging.getLogger("uvicorn.error")
 
-# Get the assistant ID from .env file
-load_dotenv()
-
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     # Optional startup logic
@@ -26,7 +23,8 @@ async def lifespan(app: FastAPI):
 app.include_router(messages.router)
 app.include_router(files.router)
 app.include_router(tools.router)
-
+app.include_router(api_keys.router)
+app.include_router(assistants.router)
 
 # Mount static files (e.g., CSS, JS)
 app.mount("/static", StaticFiles(directory=os.path.join(os.getcwd(), "static")), name="static")
@@ -38,11 +36,10 @@ async def lifespan(app: FastAPI):
 async def read_home(request: Request):
     logger.info("Home page requested")
 
-    # Check if assistant ID is missing
-    if not os.getenv("ASSISTANT_ID"):
-        return RedirectResponse(url="/warnings", message="Assistant ID is missing")
-    elif not os.getenv("OPENAI_API_KEY"):
-        return RedirectResponse(url="/warnings", message="OpenAI API key is missing")
+    # 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")
 
     categories = {
         "Basic chat": "basic-chat",
@@ -115,12 +112,21 @@ async def read_all(request: Request, messages: list = [], thread_id: str = None)
         }
     )
 
-# Add new warnings route
-@app.get("/warnings")
-async def read_warnings(request: Request):
+# 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(
-        "warnings.html",
-        {"request": request}
+        "setup.html",
+        {"request": request, "message": message}
     )
 
 if __name__ == "__main__":

main.py

@@ -1,33 +1,30 @@
 import logging
-from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel
+from fastapi import APIRouter, HTTPException, Form
+from fastapi.responses import RedirectResponse
 from utils.create_assistant import update_env_file
 
 # Configure logger
 logger: logging.Logger = logging.getLogger("uvicorn.error")
 
 router = APIRouter(prefix="/api-keys", tags=["API Keys"])
 
-class APIKeyRequest(BaseModel):
-    api_key: str
-
-@router.post("")
-async def set_openai_api_key(request: APIKeyRequest):
+@router.post("/set")
+async def set_openai_api_key(api_key: str = Form()):
     """
     Set the OpenAI API key in the application's environment variables.
     
     Args:
-        request: APIKeyRequest containing the API key
+        api_key: OpenAI API key received from form submission
     
     Returns:
-        dict: Success message
+        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", request.api_key, logger)
-        return {"message": "API key updated successfully"}
+        update_env_file("OPENAI_API_KEY", api_key, logger)
+        return RedirectResponse(url="/", status_code=303)
     except Exception as e:
         raise HTTPException(
             status_code=500,

routers/api-keys.py renamed to routers/api_keys.py

@@ -1,4 +1,5 @@
 from fastapi import APIRouter, Depends
+from fastapi.responses import RedirectResponse
 from openai import AsyncOpenAI
 from utils.create_assistant import create_or_update_assistant, request
 import logging
@@ -34,6 +35,4 @@ async def create_update_assistant(
         logger=logger
     )
 
-    return {
-        "message": f"Assistant {assistant_id} successfully created/updated"
-    }
+    return RedirectResponse(url="/", status_code=303)

routers/assistants.py

@@ -452,3 +452,42 @@ pre {
   color: #b8b8b8;
   margin-right: 8px;
 }
+
+.setupContainer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 24px;
+  max-width: 600px;
+  width: 100%;
+  padding: 40px 20px;
+}
+
+.setupForm {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 20px;
+  width: 100%;
+}
+
+.inputWrapper {
+  margin-bottom: 20px;
+  width: 100%;
+  max-width: 400px;
+  display: flex;
+  justify-content: center;
+}
+
+.setupForm form {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+}
+
+.setupMessage {
+  font-size: 1.1em;
+  text-align: center;
+  margin-bottom: 8px;
+}

static/styles.css

@@ -1,16 +1,16 @@
-{% extends 'layout.html' %}
-
-{% block content %}
-  <main>
-    <div class="title">
-      Explore sample apps built with Assistants API
-    </div>
-    <div class="container">
-      {% for name, url in categories.items() %}
-        <a class="category" href="/{{ url }}">
-          {{ name }}
-        </a>
-      {% endfor %}
-    </div>
-  </main>
+{% extends 'layout.html' %}
+
+{% block content %}
+  <main class="main">
+    <div class="title">
+      Explore sample apps built with Assistants API
+    </div>
+    <div class="container">
+      {% for name, url in categories.items() %}
+        <a class="category" href="/{{ url }}">
+          {{ name }}
+        </a>
+      {% endfor %}
+    </div>
+  </main>
 {% endblock %}

templates/components/warnings.html

@@ -0,0 +1,51 @@
+{% extends "layout.html" %}
+
+{% block content %}
+<main class="main">
+    <div class="container">
+        <div class="setupContainer">
+            <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">
+                        <div class="inputWrapper">
+                            <input 
+                                type="password"
+                                name="api_key"
+                                placeholder="sk-..."
+                                required
+                                class="input"
+                            >
+                        </div>
+                        <button 
+                            type="submit"
+                            class="button"
+                        >
+                            Save API Key
+                        </button>
+                    </form>
+                </div>
+            {% 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">
+                        <button 
+                            type="submit"
+                            class="button"
+                        >
+                            Create Assistant
+                        </button>
+                    </form>
+                </div>
+            {% 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>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+</main>
+{% endblock %}