Fixed some bad file path and template hierarchy references and included request object in the page template responses

Author: chriscarrollsmith

__pycache__/main.cpython-312.pyc

@@ -1,9 +1,10 @@
 import logging
 import dotenv
 from contextlib import asynccontextmanager
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
+import os
 
 
 logger = logging.getLogger("uvicorn.error")
@@ -20,32 +21,37 @@ async def lifespan(app: FastAPI):
 app = FastAPI(lifespan=lifespan)
 
 # Mount static files (e.g., CSS, JS)
-app.mount("/static", StaticFiles(directory="static"), name="static")
+app.mount("/static", StaticFiles(directory=os.path.join(os.getcwd(), "static")), name="static")
 
 # Initialize Jinja2 templates
 templates = Jinja2Templates(directory="templates")
 
 
 @app.get("/")
-async def read_home(
-):
+async def read_home(request: Request):
     categories = {
         "Basic chat": "basic-chat",
         "File search": "file-search",
         "Function calling": "function-calling",
         "All": "all",
     }
-    return templates.TemplateResponse("index.html", {"categories": categories})
+    return templates.TemplateResponse("index.html", {"request": request, "categories": categories})
+
+
+@app.get("/basic-chat")
+async def read_basic_chat(request: Request):
+    messages = []
+    
+    return templates.TemplateResponse("examples/basic-chat.html", {"request": request, "messages": messages})
 
 
 @app.get("/file-search")
-async def read_file_search(
-):
-    return templates.TemplateResponse("file-search.html")
+async def read_file_search(request: Request):
+    return templates.TemplateResponse("examples/file-search.html", {"request": request})
 
 
 @app.get("/function-calling")
-async def read_function_calling():
+async def read_function_calling(request: Request):
     # Define the condition class map
     conditionClassMap = {
         "Cloudy": "weatherBGCloudy",
@@ -63,7 +69,7 @@ async def read_function_calling():
 
     # Pass all necessary context variables to the template
     return templates.TemplateResponse(
-        "function-calling.html", 
+        "examples/function-calling.html", 
         {
             "conditionClassMap": conditionClassMap,
             "location": location,
@@ -75,9 +81,8 @@ async def read_function_calling():
 
 
 @app.get("/all")
-async def read_all(
-):
-    return templates.TemplateResponse("all.html")
+async def read_all(request: Request):
+    return templates.TemplateResponse("examples/all.html", {"request": request})
 
 
 if __name__ == "__main__":

main.py

@@ -1,9 +1,9 @@
 [project]
-name = "openai-assistants-quickstart"
+name = "openai-assistants-python-quickstart"
 version = "0.1.0"
 description = "Add your description here"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 dependencies = [
     "fastapi>=0.115.3",
     "jinja2>=3.1.4",

pyproject.toml

@@ -1,6 +1,3 @@
-{% extends "base.html" %}
-
-{% block content %}
 <div class="chatContainer">
   <div class="messages">
     {% for msg in messages %}
@@ -39,4 +36,3 @@
     </button>
   </form>
 </div>
-{% endblock %}

templates/components/chat.html

@@ -1,6 +1,3 @@
-{% extends "base.html" %}
-
-{% block content %}
 <div class="fileViewer">
   <div class="filesList {{ 'grow' if files|length != 0 else '' }}">
     {% if files|length == 0 %}
@@ -34,6 +31,4 @@
       <button type="submit">Upload</button>
     </form>
   </div>
-</div>
-{% endblock %}
-
+</div>

templates/components/file-viewer.html

@@ -1,27 +1,22 @@
-{% extends "base.html" %}
-
-{% block content %}
-  {% if not assistant_id %}
-    <div class="warningsContainer">
-      <h1>Start by creating your assistant</h1>
-      <div class="warningsMessage">
-        Create an assistant and set its ID in 
-        <span>app/assistant-config.ts</span>
-      </div>
-      {% if not new_assistant_id %}
-        <form method="post" action="/api/assistants">
-          <button type="submit" class="warningsButton">
-            {% if loading %}
-              Loading...
-            {% else %}
-              Create Assistant
-            {% endif %}
-          </button>
-        </form>
-      {% else %}
-        <div class="warningsResult">{{ new_assistant_id }}</div>
-      {% endif %}
+{% if not assistant_id %}
+  <div class="warningsContainer">
+    <h1>Start by creating your assistant</h1>
+    <div class="warningsMessage">
+      Create an assistant and set its ID in 
+      <span>app/assistant-config.ts</span>
     </div>
-  {% endif %}
-{% endblock %}
-
+    {% if not new_assistant_id %}
+      <form method="post" action="/api/assistants">
+        <button type="submit" class="warningsButton">
+          {% if loading %}
+            Loading...
+          {% else %}
+            Create Assistant
+          {% endif %}
+        </button>
+      </form>
+    {% else %}
+      <div class="warningsResult">{{ new_assistant_id }}</div>
+    {% endif %}
+  </div>
+{% endif %}

templates/components/warnings.html

@@ -1,6 +1,3 @@
-{% extends "base.html" %}
-
-{% block content %}
 <div class="{{ 'weatherWidget' }} {{ 'weatherEmptyState' if isEmpty else conditionClassMap.get(conditions, 'weatherBGSunny') }}">
   <div class="weatherWidgetData">
     {% if isEmpty %}
@@ -12,6 +9,4 @@ <h2>{{ temperature if temperature != '---' else temperature }}°F</h2>
       <p>{{ conditions }}</p>
     {% endif %}
   </div>
-</div>
-{% endblock %}
-
+</div>

templates/components/weather-widget.html

@@ -4,7 +4,7 @@
 <main class="main">
   <div class="container">
     <div class="column">
-      {% include "components/file-viewer.html" with files=files %}
+      {% include "components/file-viewer.html" %}
     </div>
     <div class="chatContainer">
       <div class="chat">

templates/examples/file-search.html

@@ -4,11 +4,11 @@
 <main class="main">
   <div class="container">
     <div class="column">
-      {% include "components/weather-widget.html" with context %}
+      {% include "components/weather-widget.html" %}
     </div>
     <div class="chatContainer">
       <div class="chat">
-        {% include "components/chat.html" with context %}
+        {% include "components/chat.html" %}
       </div>
     </div>
   </div>

templates/examples/function-calling.html

@@ -7,7 +7,7 @@
     </div>
     <div class="container">
       {% for name, url in categories.items() %}
-        <a class="category" href="/examples/{{ url }}">
+        <a class="category" href="/{{ url }}">
           {{ name }}
         </a>
       {% endfor %}