Update server.py

server.py

@@ -172,11 +172,11 @@ async def generate_video(
     files: List[UploadFile] = File(...)
 ):
     """
-    Full pipeline: Upload candidates + manifest, get MP4 back.
+    Full pipeline: Upload images + manifest, compose MP4 and return it.
     
     Form parameters:
     - manifest: JSON string with title and scenes
-    - files: Uploaded image files for each scene
+    - files: Uploaded image files for each scene (one per scene)
     
     Returns: MP4 video file
     """
@@ -185,41 +185,41 @@ async def generate_video(
         manifest_data = json.loads(manifest)
         manifest_req = ManifestRequest(**manifest_data)
         
-        # Step 1: Clean and prepare upload directory
-        upload_dir = BASE_DIR / "upload_candidates"
-        if upload_dir.exists():
-            shutil.rmtree(upload_dir)
-        upload_dir.mkdir(exist_ok=True)
+        if len(files) != len(manifest_req.scenes):
+            raise Exception(
+                f"Expected {len(manifest_req.scenes)} files, received {len(files)}"
+            )
+        
+        # Clean and prepare selected directory
+        if SELECTED_DIR.exists():
+            shutil.rmtree(SELECTED_DIR)
+        SELECTED_DIR.mkdir(exist_ok=True)
         
-        # Step 2: Save uploaded files organized by scene index
-        uploaded_count = 0
-        for file in files:
+        # Save uploaded files directly to selected/ directory
+        for i, file in enumerate(files):
             if file.filename:
-                # Save to upload_candidates folder
-                file_path = upload_dir / file.filename
+                # Save with standard naming: scene_00.jpg, scene_01.jpg, etc.
+                file_path = SELECTED_DIR / f"scene_{i:02d}.jpg"
                 with open(file_path, "wb") as f:
-                    f.write(await file.read())
-                uploaded_count += 1
+                    content = await file.read()
+                    f.write(content)
         
-        if uploaded_count != len(manifest_req.scenes):
+        # Verify all files were saved
+        selected_images = sorted(SELECTED_DIR.glob("scene_*.jpg"))
+        if len(selected_images) != len(manifest_req.scenes):
             raise Exception(
-                f"Expected {len(manifest_req.scenes)} files, received {uploaded_count}"
+                f"Failed to save all images. Expected {len(manifest_req.scenes)}, got {len(selected_images)}"
             )
         
-        # Step 3: Select scenes (evaluate and copy to selected/)
-        select_result = await _select_scenes(manifest_req, upload_dir)
-        if select_result["status"] != "success":
-            raise Exception(select_result.get("message", "Scene selection failed"))
-        
-        # Step 4: Compose video with manifest data
+        # Compose video with manifest data
         compose_result = await _compose(manifest_req)
         if compose_result["status"] != "success":
             raise Exception(compose_result.get("message", "Composition failed"))
         
-        # Step 5: Return the MP4 file
+        # Return the MP4 file
         output_file = Path(compose_result["output_path"])
         if not output_file.exists():
-            raise Exception("Output file not found")
+            raise Exception("Output file not created")
         
         return FileResponse(
             path=output_file,