Update main.py

main.py

@@ -12,33 +12,58 @@ from moviepy.editor import (
     CompositeAudioClip,
     concatenate_audioclips,
 )
-import zipfile
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger("main")
 
-# Merge function
-def merge_videos_and_audios(video_paths, audio_paths, output_path):
+# Safe audio clip loader
+def safe_audio_clip(path):
+    try:
+        clip = AudioFileClip(path)
+        if clip.reader is None or clip.duration is None or clip.duration <= 0:
+            clip.close()
+            raise ValueError(f"Invalid or empty audio file: {os.path.basename(path)}")
+        return clip
+    except Exception as e:
+        raise ValueError(f"Failed to load audio file '{os.path.basename(path)}': {str(e)}")
+
+def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir):
+    # Load video clips
     video_clips = [VideoFileClip(vp) for vp in video_paths]
 
+    # Load audio clips, only if valid files
     audio_clips = []
     for ap in audio_paths:
         try:
-            audio_clip = AudioFileClip(ap)
+            audio_clip = safe_audio_clip(ap)
             audio_clips.append(audio_clip)
         except Exception as e:
-            logger.warning(f"Skipping invalid audio file: {ap}: {str(e)}")
+            logger.warning(f"Skipping invalid audio file {ap}: {e}")
 
-    final_audio = CompositeAudioClip(audio_clips) if audio_clips else None
+    # Combine all audio clips into one composite audio clip (optional)
+    if audio_clips:
+        final_audio = CompositeAudioClip(audio_clips)
+    else:
+        final_audio = None
+
+    # Concatenate video clips
     final_video = concatenate_videoclips(video_clips, method="compose")
 
+    # Set the audio if available
     if final_audio is not None:
         final_video = final_video.set_audio(final_audio)
 
-    final_video.write_videofile(output_path, codec="libx264", audio_codec="aac")
+    # Write output — FIX: use temp_audiofile in /tmp
+    final_video.write_videofile(
+        output_path,
+        codec="libx264",
+        audio_codec="aac",
+        temp_audiofile=os.path.join(temp_dir, "temp-audio.m4a"),
+        remove_temp=True
+    )
 
-    # Cleanup
+    # Close clips to release resources
     final_video.close()
     for vc in video_clips:
         vc.close()
@@ -49,60 +74,49 @@ app = FastAPI()
 
 @app.post("/merge")
 async def merge_endpoint(
-    zip_file: UploadFile = File(...),
+    files: list[UploadFile] = File(...),
     orig_vol: float = Form(1.0),
     music_vol: float = Form(0.5),
 ):
     temp_dir = tempfile.mkdtemp()
     try:
-        # Save uploaded ZIP
-        zip_path = os.path.join(temp_dir, zip_file.filename)
-        with open(zip_path, "wb") as f:
-            f.write(await zip_file.read())
-
-        # Extract ZIP
-        extract_dir = os.path.join(temp_dir, "extracted")
-        os.makedirs(extract_dir, exist_ok=True)
-
-        with zipfile.ZipFile(zip_path, "r") as zip_ref:
-            zip_ref.extractall(extract_dir)
-
-        # Collect files
-        files = os.listdir(extract_dir)
-        video_files = [
-            os.path.join(extract_dir, f)
-            for f in files
-            if f.lower().endswith(".mp4")
-        ]
+        saved_files = []
+
+        # Save uploaded files
+        for uploaded_file in files:
+            file_path = os.path.join(temp_dir, uploaded_file.filename)
+            with open(file_path, "wb") as out_file:
+                content = await uploaded_file.read()
+                out_file.write(content)
+            saved_files.append(file_path)
+
+        # Separate video and audio files
+        video_files = [f for f in saved_files if f.lower().endswith(".mp4")]
         audio_files = [
-            os.path.join(extract_dir, f)
-            for f in files
+            f
+            for f in saved_files
             if f.lower().endswith((".mp3", ".wav", ".aac", ".m4a", ".ogg"))
         ]
 
-        if len(video_files) == 0 and len(audio_files) == 0:
-            return {"error": "No valid video or audio files found in ZIP."}
+        if len(saved_files) < 2:
+            return {"error": "Please upload at least 2 files (videos or audios)."}
 
-        # Output path
+        # Prepare output path
         output_path = os.path.join(temp_dir, "merged_output.mp4")
 
-        # Merge
-        merge_videos_and_audios(video_files, audio_files, output_path)
+        # Merge videos and audios
+        merge_videos_and_audios(video_files, audio_files, output_path, temp_dir)
 
-        # Return result
-        return FileResponse(
-            output_path,
-            media_type="video/mp4",
-            filename="merged_output.mp4"
-        )
+        # Return merged file
+        return FileResponse(output_path, media_type="video/mp4", filename="merged_output.mp4")
 
     except Exception as e:
-        error_msg = f"Error: {str(e)}\n{traceback.format_exc()}"
+        error_msg = f"Error: {str(e)}\n\n{traceback.format_exc()}"
         logger.error(error_msg)
         return {"error": error_msg}
 
     finally:
-        shutil.rmtree(temp_dir)
+        shutil.rmtree(temp_dir, ignore_errors=True)
 
 # Optional: log public URL
 def log_api_url():