Update server.py

server.py

@@ -172,54 +172,78 @@ async def generate_video(
     files: List[UploadFile] = File(...)
 ):
     """
-    Full pipeline: Upload images + manifest, compose MP4 and return it.
+    Full pipeline: Upload candidates + manifest → select best → compose → return MP4.
+    
+    Workflow:
+    1. Accepts multiple image files organized by scene (scene_0/img1.jpg, scene_0/img2.jpg, etc.)
+    2. Saves to candidates/ folder
+    3. Calls scene selector to pick best from each
+    4. Composes video
+    5. Returns MP4 file
     
     Form parameters:
-    - manifest: JSON string with title and scenes
-    - files: Uploaded image files for each scene (one per scene)
+    - manifest: JSON string with {"title": str, "scenes": [{"label": str, "image_query": str}]}
+    - files: Uploaded image files (can be multiple per scene, sent as scene_N/filename)
     
-    Returns: MP4 video file
+    Returns: MP4 video file (video/mp4)
     """
     try:
-        # Parse manifest
+        # Step 1: Parse manifest
         manifest_data = json.loads(manifest)
         manifest_req = ManifestRequest(**manifest_data)
         
-        if len(files) != len(manifest_req.scenes):
-            raise Exception(
-                f"Expected {len(manifest_req.scenes)} files, received {len(files)}"
-            )
+        # Step 2: Clean and prepare candidates directory
+        if CANDIDATES_DIR.exists():
+            shutil.rmtree(CANDIDATES_DIR)
+        CANDIDATES_DIR.mkdir(exist_ok=True)
         
-        # Clean and prepare selected directory
-        if SELECTED_DIR.exists():
-            shutil.rmtree(SELECTED_DIR)
-        SELECTED_DIR.mkdir(exist_ok=True)
-        
-        # Save uploaded files directly to selected/ directory
-        for i, file in enumerate(files):
+        # Step 3: Save uploaded files to candidates/ organized by scene
+        files_saved = {}
+        for file in files:
             if file.filename:
-                # Save with standard naming: scene_00.jpg, scene_01.jpg, etc.
-                file_path = SELECTED_DIR / f"scene_{i:02d}.jpg"
+                # Parse filename to extract scene index
+                # Format: "scene_0/image1.jpg" or just "image1.jpg"
+                parts = file.filename.split("/")
+                if len(parts) == 2:
+                    scene_folder = parts[0]  # "scene_0"
+                    filename = parts[1]      # "image1.jpg"
+                else:
+                    # Fallback: use filename directly
+                    scene_folder = "scene_0"
+                    filename = file.filename
+                
+                # Create scene folder if needed
+                scene_path = CANDIDATES_DIR / scene_folder
+                scene_path.mkdir(parents=True, exist_ok=True)
+                
+                # Save file
+                file_path = scene_path / filename
+                content = await file.read()
                 with open(file_path, "wb") as f:
-                    content = await file.read()
                     f.write(content)
+                
+                # Track saved files
+                if scene_folder not in files_saved:
+                    files_saved[scene_folder] = 0
+                files_saved[scene_folder] += 1
         
-        # Verify all files were saved
-        selected_images = sorted(SELECTED_DIR.glob("scene_*.jpg"))
-        if len(selected_images) != len(manifest_req.scenes):
-            raise Exception(
-                f"Failed to save all images. Expected {len(manifest_req.scenes)}, got {len(selected_images)}"
-            )
+        if len(files_saved) == 0:
+            raise Exception("No files were saved")
+        
+        # Step 4: Call scene selector to pick best from each candidate folder
+        select_result = await _select_scenes(manifest_req, CANDIDATES_DIR)
+        if select_result["status"] != "success":
+            raise Exception(select_result.get("message", "Scene selection failed"))
         
-        # Compose video with manifest data
+        # Step 5: Compose video with selected images and manifest
         compose_result = await _compose(manifest_req)
         if compose_result["status"] != "success":
             raise Exception(compose_result.get("message", "Composition failed"))
         
-        # Return the MP4 file
+        # Step 6: Return the MP4 file
         output_file = Path(compose_result["output_path"])
         if not output_file.exists():
-            raise Exception("Output file not created")
+            raise Exception("Output video file not found")
         
         return FileResponse(
             path=output_file,