Update dependencies and lint types

Author: chriscarrollsmith

.gitignore

@@ -7,4 +7,6 @@ __pycache__
 .specstory
 .mypy_cache
 .cursorrules
-.repomix-output.txt
+.repomix-output.txt
+repomix-output.txt
+artifacts/

routers/chat.py

@@ -7,15 +7,16 @@
 from fastapi import APIRouter, Form, Depends, Request
 from fastapi.responses import StreamingResponse, HTMLResponse
 from openai import AsyncOpenAI
-from openai.resources.beta.threads.runs.runs import AsyncAssistantStreamManager
+from openai.lib.streaming._assistants import AsyncAssistantStreamManager, AsyncAssistantEventHandler
 from openai.types.beta.assistant_stream_event import (
     ThreadMessageCreated, ThreadMessageDelta, ThreadRunCompleted,
     ThreadRunRequiresAction, ThreadRunStepCreated, ThreadRunStepDelta
 )
 from openai.types.beta import AssistantStreamEvent
-from openai.lib.streaming._assistants import AsyncAssistantEventHandler
 from openai.types.beta.threads.run_submit_tool_outputs_params import ToolOutput
-from openai.types.beta.threads.run import RequiredAction, Run
+from openai.types.beta.threads.run import RequiredAction
+from openai.types.beta.threads.message_content_delta import MessageContentDelta
+from openai.types.beta.threads.text_delta_block import TextDeltaBlock
 from fastapi.responses import StreamingResponse
 from fastapi import APIRouter, Depends, Form, HTTPException
 from pydantic import BaseModel
@@ -188,8 +189,8 @@ async def handle_assistant_stream(
                     time.sleep(0.25)  # Give the client time to render the message
 
                 if isinstance(event, ThreadMessageDelta) and event.data.delta.content:
-                    content = event.data.delta.content[0]
-                    if hasattr(content, 'text') and content.text and content.text.value:
+                    content: MessageContentDelta = event.data.delta.content[0]
+                    if isinstance(content, TextDeltaBlock) and content.text and content.text.value:
                         yield sse_format(
                             f"textDelta{step_id}",
                             content.text.value
@@ -297,8 +298,8 @@ async def event_generator() -> AsyncGenerator[str, None]:
                                     location = args.get("location", "Unknown")
                                     dates_raw = args.get("dates", [datetime.today().strftime("%Y-%m-%d")])
                                     dates = [
-                                        datetime.strptime(d, "%Y-%m-%d") if isinstance(d, str) else d 
-                                        for d in dates_raw
+                                        datetime.strptime(d, "%Y-%m-%d")
+                                        for d in dates_raw if isinstance(d, str)
                                     ]
                                 except Exception as err:
                                     logger.error(f"Failed to parse function arguments: {err}")

routers/files.py

@@ -25,7 +25,7 @@ async def get_or_create_vector_store(assistantId: str, client: AsyncOpenAI = Dep
     assistant = await client.beta.assistants.retrieve(assistantId)
     if assistant.tool_resources and assistant.tool_resources.file_search and assistant.tool_resources.file_search.vector_store_ids:
         return assistant.tool_resources.file_search.vector_store_ids[0]
-    vector_store = await client.beta.vector_stores.create(name="sample-assistant-vector-store")
+    vector_store = await client.vector_stores.create(name="sample-assistant-vector-store")
     await client.beta.assistants.update(
         assistantId,
         tool_resources={
@@ -40,13 +40,13 @@ async def get_or_create_vector_store(assistantId: str, client: AsyncOpenAI = Dep
 async def list_files(client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())) -> List[Dict[str, str]]:
     # List files in the vector store
     vector_store_id = await get_or_create_vector_store(assistant_id, client)
-    file_list = await client.beta.vector_stores.files.list(vector_store_id)
+    file_list = await client.vector_stores.files.list(vector_store_id)
     files_array: List[Dict[str, str]] = []
 
     if file_list.data:
         for file in file_list.data:
             file_details = await client.files.retrieve(file.id)
-            vector_file_details = await client.beta.vector_stores.files.retrieve(
+            vector_file_details = await client.vector_stores.files.retrieve(
                 vector_store_id=vector_store_id,
                 file_id=file.id
             )
@@ -66,7 +66,7 @@ async def upload_file(file: UploadFile = File(...)) -> Dict[str, str]:
             file=file.file,
             purpose="assistants"
         )
-        await client.beta.vector_stores.files.create(
+        await client.vector_stores.files.create(
             vector_store_id=vector_store_id,
             file_id=openai_file.id
         )
@@ -103,7 +103,7 @@ async def delete_file(
     client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())
 ) -> Dict[str, str]:
     vector_store_id = await get_or_create_vector_store(assistant_id, client)
-    await client.beta.vector_stores.files.delete(vector_store_id=vector_store_id, file_id=fileId)
+    await client.vector_stores.files.delete(vector_store_id=vector_store_id, file_id=fileId)
     return {"message": "File deleted successfully"}
 
 @router.get("/{file_id}/content")

utils/create_assistant.py

@@ -6,7 +6,9 @@
 from openai import AsyncOpenAI
 from openai.types.beta.assistant_create_params import AssistantCreateParams
 from openai.types.beta.assistant_update_params import AssistantUpdateParams
-from openai.types.beta.assistant_tool_param import CodeInterpreterToolParam, FileSearchToolParam, FunctionToolParam
+from openai.types.beta.code_interpreter_tool_param import CodeInterpreterToolParam
+from openai.types.beta.file_search_tool_param import FileSearchToolParam
+from openai.types.beta.function_tool_param import FunctionToolParam
 from openai.types.beta.assistant import Assistant
 from openai.types.shared_params.function_definition import FunctionDefinition
 from openai.types.beta.file_search_tool_param import FileSearch
@@ -93,12 +95,12 @@ async def create_or_update_assistant(
         assistant_id: str | None,
         request: AssistantCreateParams | AssistantUpdateParams,
         logger: logging.Logger
-) -> str:
+) -> str | None:
     """
     Create or update the assistant based on the presence of an assistant_id.
     """
+    assistant = None  # Initialize assistant
     try:
-        assistant: Assistant
         if assistant_id:
             # Update the existing assistant
             assistant = await client.beta.assistants.update(
@@ -120,7 +122,7 @@ async def create_or_update_assistant(
         action = "update" if assistant_id else "create"
         logger.error(f"Failed to {action} assistant: {e}")
 
-    return assistant.id
+    return assistant.id if assistant else None  # Conditionally return ID
 
 
 # Run the assistant creation in an asyncio event loop

utils/custom_functions.py

@@ -1,10 +1,11 @@
 import random
 import logging
 from datetime import datetime
+from typing import Sequence
 
 logger = logging.getLogger("uvicorn.error")
 
-def get_weather(location, dates: list[str | datetime] = [datetime.today()]):
+def get_weather(location, dates: Sequence[str | datetime] = [datetime.today()]):
     """
     Generate random weather reports for a given location over a date range.
 
@@ -36,4 +37,3 @@ def get_weather(location, dates: list[str | datetime] = [datetime.today()]):
         })
 
     return weather_reports
-