Cleanup and minor bugfixes in file endpoints

Author: chriscarrollsmith

routers/files.py

@@ -1,9 +1,8 @@
 import os
 import logging
 from dotenv import load_dotenv
-from fastapi import APIRouter, Request, UploadFile, File, HTTPException, Depends
+from fastapi import APIRouter, Request, UploadFile, File, HTTPException, Depends, Form
 from fastapi.responses import StreamingResponse
-from pydantic import BaseModel
 from openai import AsyncOpenAI
 
 logger = logging.getLogger("uvicorn.error")
@@ -17,21 +16,13 @@
     tags=["assistants_files"]
 )
 
-# Pydantic model for DELETE request body
-class DeleteRequest(BaseModel):
-    fileId: str
-
-# Pydantic model for request parameters
-class FileParams(BaseModel):
-    file_id: str
-
 # Helper function to get or create a vector store
 async def get_or_create_vector_store(assistantId: str, client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())) -> str:
     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.vectorStores.create(name="sample-assistant-vector-store")
+    vector_store = await client.beta.vector_stores.create(name="sample-assistant-vector-store")
     await client.beta.assistants.update(assistantId, {
         "tool_resources": {
             "file_search": {
@@ -42,24 +33,26 @@ async def get_or_create_vector_store(assistantId: str, client: AsyncOpenAI = Dep
     return vector_store.id
 
 
-@router.get("/files/{file_id}")
-async def get_file(file_id: str):
-    try:
-        # Retrieve file metadata and content concurrently
-        client = AsyncOpenAI()
-        file, file_content = await client.files.retrieve(file_id), await client.files.content(file_id)
-        
-        # Return the file content as a streaming response
-        return StreamingResponse(
-            file_content.body,
-            headers={"Content-Disposition": f'attachment; filename="{file.filename}"'}
-        )
-    except Exception as e:
-        # Handle exceptions and return an HTTP error response
-        raise HTTPException(status_code=500, detail=str(e))
+@router.get("/")
+async def list_files(client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())):
+    # List files in the vector store
+    vector_store_id = await get_or_create_vector_store(assistant_id, client)
+    file_list = await client.beta.vectorStores.files.list(vector_store_id)
+    
+    files_array = []
+    for file in file_list.data:
+        file_details = await client.files.retrieve(file.id)
+        vector_file_details = await client.beta.vectorStores.files.retrieve(vector_store_id, file.id)
+        files_array.append({
+            "file_id": file.id,
+            "filename": file_details.filename,
+            "status": vector_file_details.status,
+        })
+    
+    return files_array
 
 
-@router.post("/upload")
+@router.post("/")
 async def upload_file(file: UploadFile = File(...)):
     try:
         client = AsyncOpenAI()
@@ -81,29 +74,25 @@ async def upload_file(file: UploadFile = File(...)):
         raise HTTPException(status_code=500, detail=str(e))
 
 
-@router.get("")
-async def list_files(client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())):
-    # List files in the vector store
-    vector_store_id = await get_or_create_vector_store(assistant_id, client)
-    file_list = await client.beta.vectorStores.files.list(vector_store_id)
-    
-    files_array = []
-    for file in file_list.data:
-        file_details = await client.files.retrieve(file.id)
-        vector_file_details = await client.beta.vectorStores.files.retrieve(vector_store_id, file.id)
-        files_array.append({
-            "file_id": file.id,
-            "filename": file_details.filename,
-            "status": vector_file_details.status,
-        })
-    
-    return files_array
+@router.get("/{file_id}")
+async def get_file(file_id: str = Form(...), client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())):
+    try:
+        # Retrieve file metadata and content concurrently
+        file, file_content = await client.files.retrieve(file_id), await client.files.content(file_id)
+        
+        # Return the file content as a streaming response
+        return StreamingResponse(
+            file_content.body,
+            headers={"Content-Disposition": f'attachment; filename="{file.filename}"'}
+        )
+    except Exception as e:
+        # Handle exceptions and return an HTTP error response
+        raise HTTPException(status_code=500, detail=str(e))
+
 
 @router.delete("/delete")
-async def delete_file(request: Request, client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())):
+async def delete_file(request: Request, fileId: str = Form(...), client: AsyncOpenAI = Depends(lambda: AsyncOpenAI())):
     # Delete file from vector store
-    body = await request.json()
-    delete_request = DeleteRequest(**body)
     vector_store_id = await get_or_create_vector_store(assistant_id, client)
-    await client.beta.vectorStores.files.delete(vector_store_id, delete_request.fileId)
+    await client.beta.vectorStores.files.delete(vector_store_id, fileId)
     return {"message": "File deleted successfully"}

utils/create_assistant.py

@@ -7,6 +7,7 @@
 from openai.types.beta.assistant_tool_param import CodeInterpreterToolParam, FileSearchToolParam, FunctionToolParam
 from openai.types.beta.assistant import Assistant
 from openai.types import FunctionDefinition
+from openai.types.beta.file_search_tool_param import FileSearch
 
 
 request: AssistantCreateParams = AssistantCreateParams(
@@ -15,7 +16,12 @@
     model="gpt-4o",
     tools=[
         CodeInterpreterToolParam(type="code_interpreter"),
-        FileSearchToolParam(type="file_search"),
+        FileSearchToolParam(
+            type="file_search",
+            file_search=FileSearch(
+                max_num_results=5
+            )
+        ),
         FunctionToolParam(
             type="function",
             function=FunctionDefinition(