Revert: Restore /analyze_video to handle both URL and file upload

modal_whisper_app.py

@@ -443,7 +443,7 @@ async def analyze_video_comprehensive(video_bytes: bytes) -> Dict[str, Any]:
 
 # --- Pydantic model for FastAPI request ---
 class VideoAnalysisRequestPayload(BaseModel):
-    video_url: Optional[str] = None
+    video_url: Optional[str] = None # Reverted to optional
 
 
 # === FastAPI Endpoint for Comprehensive Analysis ===
@@ -456,30 +456,40 @@ async def process_video_for_analysis(
     video_bytes_content: Optional[bytes] = None
     video_source_description: str = "Unknown"
 
-    if video_file:
-        print(f"[FastAPI Endpoint] Processing uploaded video file: {video_file.filename}, size: {video_file.size} bytes.")
-        video_bytes_content = await video_file.read() # Use await for async read
+    if video_file: # Prioritize file upload
+        print(f"[FastAPI Endpoint] Processing uploaded video file: {video_file.filename}")
+        video_bytes_content = await video_file.read()
+        await video_file.close() # Important to close the file
+        if not video_bytes_content:
+            print(f"[FastAPI Endpoint] Uploaded video file {video_file.filename} is empty.")
+            return JSONResponse(status_code=400, content={"error": "Uploaded video file is empty."})
         video_source_description = f"direct file upload: {video_file.filename}"
+        print(f"[FastAPI Endpoint] Read {len(video_bytes_content)} bytes from uploaded file {video_file.filename}.")
+
     elif payload and payload.video_url:
         video_url = str(payload.video_url) # Ensure it's a string
         print(f"[FastAPI Endpoint] Processing video_url: {video_url}")
         video_source_description = f"URL: {video_url}"
         try:
             async with httpx.AsyncClient() as client:
-                response = await client.get(video_url, follow_redirects=True, timeout=60.0)
+                response = await client.get(video_url, follow_redirects=True, timeout=60.0) # Download timeout
                 response.raise_for_status()
                 video_bytes_content = await response.aread()
                 if not video_bytes_content:
                     print(f"[FastAPI Endpoint] Download failed: content was empty for URL: {video_url}")
                     return JSONResponse(status_code=400, content={"error": f"Failed to download video from URL: {video_url}. Content was empty."})
                 print(f"[FastAPI Endpoint] Successfully downloaded {len(video_bytes_content)} bytes from {video_url}")
+        except httpx.TimeoutException: # Specific timeout exception
+            print(f"[FastAPI Endpoint] Timeout downloading video from URL: {video_url}")
+            return JSONResponse(status_code=408, content={"error": f"Timeout downloading video from URL: {video_url}."})
         except httpx.RequestError as e:
             print(f"[FastAPI Endpoint] httpx.RequestError downloading video: {e}")
             return JSONResponse(status_code=400, content={"error": f"Error downloading video from URL: {video_url}. Details: {str(e)}"})
-        except Exception as e:
+        except Exception as e: # Catch any other unexpected error during download
             print(f"[FastAPI Endpoint] Unexpected Exception downloading video: {e}")
             return JSONResponse(status_code=500, content={"error": f"Unexpected error downloading video. Details: {str(e)}"})
     else:
+        # Neither file nor URL provided
         print("[FastAPI Endpoint] No video_url in payload and no video_file uploaded.")
         return JSONResponse(status_code=400, content={"error": "Either 'video_url' in JSON payload or a 'video_file' in form-data must be provided."})