Merge pull request #20 from Promptly-Technologies-LLC/event-handling

Working custom tool call stream

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 files, messages, tools, api_keys, assistants
+from routers import chat, files, api_keys, assistants
 from utils.threads import create_thread
 
 
@@ -21,9 +21,8 @@ async def lifespan(app: FastAPI):
 app = FastAPI(lifespan=lifespan)
 
 # Mount routers
-app.include_router(messages.router)
+app.include_router(chat.router)
 app.include_router(files.router)
-app.include_router(tools.router)
 app.include_router(api_keys.router)
 app.include_router(assistants.router)
 
@@ -33,124 +32,31 @@ async def lifespan(app: FastAPI):
 # Initialize Jinja2 templates
 templates = Jinja2Templates(directory="templates")
 
+# TODO: Implement some kind of thread id storage or management logic to allow
+# user to load an old thread, delete an old thread, etc. instead of start new
 @app.get("/")
-async def read_home(request: Request):
+async def read_home(request: Request, thread_id: str = None, messages: list = []):
     logger.info("Home page requested")
 
     # 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",
-        "File search": "file-search",
-        "Function calling": "function-calling",
-        "All": "all",
-    }
-    return templates.TemplateResponse(
-        "index.html",
-        {
-            "request": request,
-            "categories": categories
-        }
-    )
-
-# TODO: Implement some kind of thread id storage or management logic to allow
-# user to load an old thread, delete an old thread, etc. instead of start new
-@app.get("/basic-chat")
-async def read_basic_chat(request: Request, messages: list = [], thread_id: str = None):
-    # Get assistant ID from environment variables
-    load_dotenv()
-    assistant_id = os.getenv("ASSISTANT_ID")
-
     # Create a new assistant chat thread if no thread ID is provided
     if not thread_id or thread_id == "None" or thread_id == "null":
         thread_id: str = await create_thread()
 
     return templates.TemplateResponse(
-        "examples/basic-chat.html",
+        "index.html",
         {
             "request": request,
-            "assistant_id": assistant_id,
+            "assistant_id": os.getenv("ASSISTANT_ID"),
             "messages": messages,
             "thread_id": thread_id
         }
     )
 
-@app.get("/file-search")
-async def read_file_search(request: Request, messages: list = [], thread_id: str = None):
-    # Get assistant ID from environment variables
-    load_dotenv()
-    assistant_id = os.getenv("ASSISTANT_ID")
-
-    # Create a new assistant chat thread if no thread ID is provided
-    if not thread_id or thread_id == "None" or thread_id == "null":
-        thread_id: str = await create_thread()
-    
-    return templates.TemplateResponse(
-        "examples/file-search.html",
-        {
-            "request": request,
-            "messages": messages,
-            "thread_id": thread_id,
-            "assistant_id": assistant_id,  # Add assistant_id to template context
-        }
-    )
-
-@app.get("/function-calling")
-async def read_function_calling(request: Request, messages: list = [], thread_id: str = None):
-    # Get assistant ID from environment variables
-    load_dotenv()
-    assistant_id = os.getenv("ASSISTANT_ID")
-
-    # Create a new assistant chat thread if no thread ID is provided
-    if not thread_id or thread_id == "None" or thread_id == "null":
-        thread_id: str = await create_thread()
-    
-    # Define the condition class map
-    conditionClassMap = {
-        "Cloudy": "weatherBGCloudy",
-        "Sunny": "weatherBGSunny",
-        "Rainy": "weatherBGRainy",
-        "Snowy": "weatherBGSnowy",
-        "Windy": "weatherBGWindy",
-    }
-    
-    return templates.TemplateResponse(
-        "examples/function-calling.html", 
-        {
-            "conditionClassMap": conditionClassMap,
-            "location": "---",
-            "temperature": "---",
-            "conditions": "Sunny",
-            "isEmpty": True,
-            "thread_id": thread_id,
-            "messages": messages,
-            "assistant_id": assistant_id,  # Add assistant_id to template context
-        }
-    )
-
-
-@app.get("/all")
-async def read_all(request: Request, messages: list = [], thread_id: str = None):
-    # Get assistant ID from environment variables
-    load_dotenv()
-    assistant_id = os.getenv("ASSISTANT_ID")
-
-    # Create a new assistant chat thread if no thread ID is provided
-    if not thread_id or thread_id == "None" or thread_id == "null":
-        thread_id: str = await create_thread()
-    
-    return templates.TemplateResponse(
-        "examples/all.html",
-        {
-            "request": request,
-            "assistant_id": assistant_id,  # Add assistant_id to template context
-            "thread_id": thread_id,
-            "messages": messages
-        }
-    )
 
 # Add new setup route
 @app.get("/setup")

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "openai-assistants-python-quickstart"
 version = "0.1.0"
-description = "Add your description here"
+description = "A quickstart template using the OpenAI Assistants API with Python, FastAPI, Jinja2, and HTMX"
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [