Update main.py

main.py

@@ -1,5 +1,5 @@
-from fastapi import FastAPI, UploadFile, File, Form
-from fastapi.responses import FileResponse
+from fastapi import FastAPI, UploadFile, File, Form, HTTPException, BackgroundTasks
+from fastapi.responses import StreamingResponse
 import tempfile
 import shutil
 import os
@@ -10,13 +10,28 @@ from moviepy.editor import (
     concatenate_videoclips,
     AudioFileClip,
     CompositeAudioClip,
-    concatenate_audioclips,
 )
+import io
 
 # Configure logging
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)  # Set to DEBUG for detailed output
 logger = logging.getLogger("main")
 
+# Enable MoviePy verbose logging
+from moviepy.config import change_settings
+change_settings({"VERBOSE": True})
+
+# Safe video clip loader
+def safe_video_clip(path):
+    try:
+        clip = VideoFileClip(path)
+        if clip.reader is None or clip.duration is None or clip.duration <= 0:
+            clip.close()
+            raise ValueError(f"Invalid or empty video file: {os.path.basename(path)}")
+        return clip
+    except Exception as e:
+        raise ValueError(f"Failed to load video file '{os.path.basename(path)}': {str(e)}")
+
 # Safe audio clip loader
 def safe_audio_clip(path):
     try:
@@ -28,40 +43,58 @@ def safe_audio_clip(path):
     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):
+def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, orig_vol=1.0, music_vol=0.5):
+    logger.debug(f"Merging {len(video_paths)} videos and {len(audio_paths)} audios to {output_path}")
+    
     # Load video clips
-    video_clips = [VideoFileClip(vp) for vp in video_paths]
+    video_clips = []
+    for vp in video_paths:
+        try:
+            clip = safe_video_clip(vp)
+            video_clips.append(clip)
+        except Exception as e:
+            logger.warning(f"Skipping invalid video file {vp}: {e}")
+
+    if not video_clips:
+        raise ValueError("No valid video files provided")
 
-    # Load audio clips, only if valid files
+    # Load audio clips
     audio_clips = []
     for ap in audio_paths:
         try:
-            audio_clip = safe_audio_clip(ap)
-            audio_clips.append(audio_clip)
+            clip = safe_audio_clip(ap)
+            clip = clip.volumex(music_vol)  # Apply volume adjustment
+            audio_clips.append(clip)
         except Exception as e:
             logger.warning(f"Skipping invalid audio file {ap}: {e}")
 
-    # 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:
+    # Combine audio clips if available
+    if audio_clips:
+        final_audio = CompositeAudioClip(audio_clips)
         final_video = final_video.set_audio(final_audio)
+    else:
+        # Optionally adjust original video audio volume
+        if final_video.audio:
+            final_video.audio = final_video.audio.volumex(orig_vol)
 
-    # 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
-    )
+    # Write output
+    logger.debug(f"Writing output to {output_path}")
+    try:
+        final_video.write_videofile(
+            output_path,
+            codec="libx264",
+            audio_codec="aac",
+            temp_audiofile=os.path.join(temp_dir, "temp-audio.m4a"),
+            remove_temp=True,
+            verbose=True,
+            logger='bar'
+        )
+    except Exception as e:
+        logger.error(f"MoviePy failed to write output: {str(e)}")
+        raise
 
     # Close clips to release resources
     final_video.close()
@@ -77,45 +110,78 @@ async def merge_endpoint(
     files: list[UploadFile] = File(...),
     orig_vol: float = Form(1.0),
     music_vol: float = Form(0.5),
+    background_tasks: BackgroundTasks = BackgroundTasks(),
 ):
     temp_dir = tempfile.mkdtemp()
+    logger.debug(f"Created temporary directory: {temp_dir}")
+    
     try:
         saved_files = []
 
         # Save uploaded files
         for uploaded_file in files:
+            if not uploaded_file.filename:
+                logger.warning("Skipping file with no filename")
+                continue
             file_path = os.path.join(temp_dir, uploaded_file.filename)
             with open(file_path, "wb") as out_file:
                 content = await uploaded_file.read()
+                if not content:
+                    logger.warning(f"Empty file uploaded: {uploaded_file.filename}")
+                    continue
                 out_file.write(content)
             saved_files.append(file_path)
+            logger.debug(f"Saved file: {file_path}")
 
         # Separate video and audio files
         video_files = [f for f in saved_files if f.lower().endswith(".mp4")]
         audio_files = [
-            f
-            for f in saved_files
-            if f.lower().endswith((".mp3", ".wav", ".aac", ".m4a", ".ogg"))
+            f for f in saved_files if f.lower().endswith((".mp3", ".wav", ".aac", ".m4a", ".ogg"))
         ]
+        logger.debug(f"Video files: {video_files}")
+        logger.debug(f"Audio files: {audio_files}")
 
-        if len(saved_files) < 2:
-            return {"error": "Please upload at least 2 files (videos or audios)."}
+        if len(video_files) < 1 and len(audio_files) < 1:
+            raise HTTPException(status_code=400, detail="Please upload at least one valid video or audio file")
 
         # Prepare output path
         output_path = os.path.join(temp_dir, "merged_output.mp4")
 
         # Merge videos and audios
-        merge_videos_and_audios(video_files, audio_files, output_path, temp_dir)
-
-        # Return merged file
-        return FileResponse(output_path, media_type="video/mp4", filename="merged_output.mp4")
+        merge_videos_and_audios(video_files, audio_files, output_path, temp_dir, orig_vol, music_vol)
+
+        # Verify the output file exists
+        if not os.path.exists(output_path):
+            logger.error(f"Output file not found: {output_path}")
+            raise HTTPException(status_code=500, detail="Failed to create merged video file")
+
+        # Read the file into memory
+        logger.debug(f"Reading output file: {output_path}")
+        with open(output_path, "rb") as file:
+            content = file.read()
+            if not content:
+                logger.error(f"Output file is empty: {output_path}")
+                raise HTTPException(status_code=500, detail="Output file is empty")
+
+        # Schedule cleanup as a background task
+        background_tasks.add_task(shutil.rmtree, temp_dir, ignore_errors=True)
+
+        # Return the file as a streaming response
+        logger.debug("Sending streaming response")
+        return StreamingResponse(
+            io.BytesIO(content),
+            media_type="video/mp4",
+            headers={"Content-Disposition": 'attachment; filename="merged_output.mp4"'}
+        )
 
     except Exception as e:
         error_msg = f"Error: {str(e)}\n\n{traceback.format_exc()}"
         logger.error(error_msg)
-        return {"error": error_msg}
+        raise HTTPException(status_code=500, detail=error_msg)
 
     finally:
+        # Fallback cleanup in case background task fails
+        logger.debug(f"Cleaning up temporary directory: {temp_dir}")
         shutil.rmtree(temp_dir, ignore_errors=True)
 
 # Optional: log public URL
@@ -126,4 +192,4 @@ def log_api_url():
     else:
         logger.info("SPACE_PUBLIC_URL environment variable not found")
 
-log_api_url()
+log_api_url()