Update app.py

app.py

@@ -2,6 +2,7 @@ from fastapi import FastAPI, UploadFile, File, HTTPException, BackgroundTasks, Q
 from fastapi.responses import FileResponse, JSONResponse
 from fastapi.middleware.cors import CORSMiddleware
 import os
+import shutil  # Add missing import
 import uuid
 import time
 from typing import Dict, List, Optional
@@ -30,9 +31,12 @@ app.add_middleware(
     allow_headers=["*"],  # Allows all headers
 )
 
+# Define MP4_UPLOAD_FOLDER if not imported from processing_logic
+MP4_UPLOAD_FOLDER = os.path.join(UPLOAD_DIRECTORY, "uploads")
+
 processing_thread = None
 
-# ==== API ENDPOINTS ====
+# ==== HELPER FUNCTIONS ====
 
 def save_file(uploaded_file: UploadFile, save_path: str):
     os.makedirs(os.path.dirname(save_path), exist_ok=True)
@@ -42,8 +46,22 @@ def save_file(uploaded_file: UploadFile, save_path: str):
 # === ROUTES ===
 
 @app.get("/")
-def root():
-    return {"message": "FastAPI Florence-2 backend"}
+async def root():
+    """API root endpoint"""
+    return {
+        "message": "MP4 Processing API",
+        "version": "1.0.0",
+        "endpoints": {
+            "upload": "POST /upload - Upload MP4 file",
+            "download": "GET /download/{mp4_path:path} - Download MP4 file",
+            "list": "GET /list - List uploaded files", 
+            "courses": "GET /courses - List all course folders",
+            "images": "GET /images/{course_folder:path} - List MP4s in course",
+            "start_processing": "POST /process/start - Start HF processing",
+            "processing_status": "GET /process/status - Get processing status",
+            "stop_processing": "POST /process/stop - Stop processing"
+        }
+    }
 
 @app.post("/upload/")
 async def upload_file(file: UploadFile = File(...)):
@@ -62,30 +80,59 @@ async def list_uploaded_files():
                 files.append(file)
     return JSONResponse(content=files)
 
-
 @app.get("/download/{mp4_path:path}")
 async def download_file(mp4_path: str):
     """
     Download any MP4 under processed_mp4s, including nested course folders.
     e.g. GET /download/MDS_CGAdventure_DownloadPirate.com/1.mp4
     """
+    print(f"[DEBUG] Download request for: {mp4_path}")
+    
     # Compose the full file path
     full_path = os.path.join(MP4_OUTPUT_FOLDER, mp4_path)
+    print(f"[DEBUG] Full path: {full_path}")
 
     # Security: Prevent escaping outside of MP4_OUTPUT_FOLDER
     full_path = os.path.normpath(full_path)
     if not full_path.startswith(os.path.abspath(MP4_OUTPUT_FOLDER)):
+        print(f"[ERROR] Security violation - path outside output folder")
         raise HTTPException(status_code=400, detail="Invalid path")
 
-    if not os.path.exists(full_path) or not full_path.lower().endswith(".mp4"):
-        raise HTTPException(status_code=404, detail="File not found")
-
-    return FileResponse(path=full_path, filename=os.path.basename(full_path), media_type="video/mp4")
+    print(f"[DEBUG] Normalized path: {full_path}")
+    print(f"[DEBUG] File exists: {os.path.exists(full_path)}")
+    print(f"[DEBUG] Is MP4: {full_path.lower().endswith('.mp4')}")
+    
+    if not os.path.exists(full_path):
+        # Try to find the file in subdirectories
+        print(f"[DEBUG] File not found at expected path, searching...")
+        
+        # List what's actually in the MP4_OUTPUT_FOLDER
+        if os.path.exists(MP4_OUTPUT_FOLDER):
+            print(f"[DEBUG] Contents of {MP4_OUTPUT_FOLDER}:")
+            for root, dirs, files in os.walk(MP4_OUTPUT_FOLDER):
+                for file in files:
+                    if file.lower().endswith('.mp4'):
+                        rel_path = os.path.relpath(os.path.join(root, file), MP4_OUTPUT_FOLDER)
+                        print(f"[DEBUG]   Found MP4: {rel_path}")
+        
+        raise HTTPException(status_code=404, detail=f"File not found: {mp4_path}")
+    
+    if not full_path.lower().endswith(".mp4"):
+        raise HTTPException(status_code=400, detail="File is not an MP4")
+
+    print(f"[DEBUG] Serving file: {full_path}")
+    return FileResponse(
+        path=full_path, 
+        filename=os.path.basename(full_path), 
+        media_type="video/mp4"
+    )
 
 @app.get("/courses")
 async def list_courses():
     """List all unique course folder names based on extracted MP4 paths."""
     course_folders = set()
+    
+    print(f"[DEBUG] Scanning {MP4_OUTPUT_FOLDER} for courses")
 
     if os.path.exists(MP4_OUTPUT_FOLDER):
         for root, dirs, files in os.walk(MP4_OUTPUT_FOLDER):
@@ -93,41 +140,70 @@ async def list_courses():
                 if file.lower().endswith(".mp4"):
                     rel_path = os.path.relpath(os.path.join(root, file), MP4_OUTPUT_FOLDER)
                     course_folder = os.path.dirname(rel_path)
-                    if course_folder:
+                    if course_folder and course_folder != ".":
                         course_folders.add(course_folder)
+                        print(f"[DEBUG] Found course: {course_folder} (from file: {rel_path})")
 
-    return JSONResponse(content={"courses": sorted(course_folders), "total": len(course_folders)})
+    courses_list = sorted(course_folders)
+    print(f"[DEBUG] Returning courses: {courses_list}")
+    return JSONResponse(content={"courses": courses_list, "total": len(courses_list)})
 
 @app.get("/images/{course_folder:path}")
 async def list_mp4s_in_course(course_folder: str):
     """List MP4s available for a specific course folder"""
+    print(f"[DEBUG] Listing MP4s for course: {course_folder}")
+    
     course_path = os.path.join(MP4_OUTPUT_FOLDER, course_folder)
+    print(f"[DEBUG] Course path: {course_path}")
+    print(f"[DEBUG] Path exists: {os.path.exists(course_path)}")
+    
     if not os.path.exists(course_path):
-        raise HTTPException(status_code=404, detail="Course folder not found")
+        # List what's actually available
+        print(f"[DEBUG] Course folder not found. Available folders:")
+        if os.path.exists(MP4_OUTPUT_FOLDER):
+            for item in os.listdir(MP4_OUTPUT_FOLDER):
+                item_path = os.path.join(MP4_OUTPUT_FOLDER, item)
+                if os.path.isdir(item_path):
+                    print(f"[DEBUG]   {item}")
+        
+        raise HTTPException(status_code=404, detail=f"Course folder not found: {course_folder}")
 
     mp4s = []
-    for file in os.listdir(course_path):
-        if file.lower().endswith(".mp4"):
-            mp4s.append(file)
+    try:
+        for file in os.listdir(course_path):
+            if file.lower().endswith(".mp4"):
+                mp4s.append(file)
+                print(f"[DEBUG] Found MP4: {file}")
+    except Exception as e:
+        print(f"[ERROR] Failed to list files in {course_path}: {e}")
+        raise HTTPException(status_code=500, detail="Failed to list files")
 
+    print(f"[DEBUG] Returning MP4s: {mp4s}")
     return JSONResponse(content=mp4s)
 
-@app.get("/")
-async def root():
-    """API root endpoint"""
-    return {
-        "message": "MP4 Processing API",
-        "version": "1.0.0",
-        "endpoints": {
-            "upload": "POST /upload - Upload MP4 file",
-            "download": "GET /download/{mp4_id} - Download MP4 file",
-            "delete": "DELETE /delete/{mp4_id} - Delete MP4 file",
-            "list": "GET /mp4s - List all MP4 files",
-            "start_processing": "POST /process/start - Start HF processing",
-            "processing_status": "GET /process/status - Get processing status",
-            "stop_processing": "POST /process/stop - Stop processing"
-        }
-    }
+# Add debug endpoint to help troubleshoot
+@app.get("/debug/structure")
+async def debug_file_structure():
+    """Debug endpoint to show the actual file structure"""
+    structure = {}
+    
+    if os.path.exists(MP4_OUTPUT_FOLDER):
+        for root, dirs, files in os.walk(MP4_OUTPUT_FOLDER):
+            rel_root = os.path.relpath(root, MP4_OUTPUT_FOLDER)
+            if rel_root == ".":
+                rel_root = "/"
+            
+            structure[rel_root] = {
+                "directories": dirs,
+                "mp4_files": [f for f in files if f.lower().endswith('.mp4')],
+                "other_files": [f for f in files if not f.lower().endswith('.mp4')]
+            }
+    
+    return JSONResponse(content={
+        "mp4_output_folder": MP4_OUTPUT_FOLDER,
+        "folder_exists": os.path.exists(MP4_OUTPUT_FOLDER),
+        "structure": structure
+    })
 
 @app.on_event("startup")
 async def startup_event():
@@ -141,6 +217,4 @@ async def startup_event():
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000)
-
-
+    uvicorn.run(app, host="0.0.0.0", port=8000)