Update main.py

main.py

@@ -7,46 +7,81 @@ import logging
 import traceback
 from moviepy.editor import (
     VideoFileClip,
+    concatenate_videoclips,
     AudioFileClip,
     CompositeAudioClip,
-    concatenate_videoclips,
+    concatenate_audioclips,
 )
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-def merge_videos_and_audios(video_paths, audio_paths, output_path):
+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_files, audio_files, output_path, temp_dir,
+    orig_vol=1.0, music_vol=0.5,
+):
     try:
         # Load video clips
-        video_clips = [VideoFileClip(vp) for vp in video_paths]
+        video_clips = [VideoFileClip(v) for v in video_files]
 
-        # Load audio clips, only if valid files
+        # Load audio clips safely
         audio_clips = []
-        for ap in audio_paths:
+        for a in audio_files:
             try:
-                audio_clip = AudioFileClip(ap)
-                audio_clips.append(audio_clip)
+                clip = safe_audio_clip(a)
+                audio_clips.append(clip)
             except Exception as e:
-                logger.warning(f"Could not load audio file {ap}: {e}")
+                logger.warning(f"Skipping invalid audio file: {a} → {str(e)}")
 
-        # Combine all audio clips into one composite audio clip (plays simultaneously)
+        # Prepare final audio composite if audio clips exist
         if audio_clips:
-            final_audio = CompositeAudioClip(audio_clips)
+            final_audio = concatenate_audioclips(audio_clips).volumex(music_vol)
         else:
             final_audio = None
 
-        # Concatenate video clips
+        # Concatenate video clips with method 'compose' for safety
         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)
-
-        # Write output video file
-        final_video.write_videofile(output_path, codec="libx264", audio_codec="aac")
+        # Combine video audio with provided original volume
+        original_audio = final_video.audio.volumex(orig_vol) if final_video.audio else None
 
-        # Close clips to release resources
+        # Combine audios if both exist
+        if original_audio and final_audio:
+            composite_audio = CompositeAudioClip([original_audio, final_audio])
+            final_video = final_video.set_audio(composite_audio)
+        elif final_audio:
+            final_video = final_video.set_audio(final_audio)
+        elif original_audio:
+            final_video = final_video.set_audio(original_audio)
+        else:
+            final_video = final_video.set_audio(None)
+
+        # Explicit writable temp audio file path inside temp_dir
+        temp_audiofile_path = os.path.join(temp_dir, "temp_audiofile.m4a")
+
+        # Write output video with explicit temp audio file to avoid permission errors
+        final_video.write_videofile(
+            output_path,
+            codec="libx264",
+            audio_codec="aac",
+            temp_audiofile=temp_audiofile_path,
+            remove_temp=True,
+            verbose=False,
+            logger=None,
+        )
+
+        # Cleanup
         final_video.close()
         for vc in video_clips:
             vc.close()
@@ -65,6 +100,8 @@ app = FastAPI()
 @app.post("/merge")
 async def merge_endpoint(
     files: list[UploadFile] = File(...),
+    orig_vol: float = Form(1.0),
+    music_vol: float = Form(0.5),
 ):
     temp_dir = tempfile.mkdtemp()
     try:
@@ -85,20 +122,21 @@ async def merge_endpoint(
             return {"error": "Please upload at least 2 files (videos or audios)."}
 
         output_file = os.path.join(temp_dir, "merged_output.mp4")
-        result_path = merge_videos_and_audios(video_files, audio_files, output_file)
+
+        result_path = merge_videos_and_audios(
+            video_files, audio_files, output_file, temp_dir, orig_vol, music_vol
+        )
 
         if isinstance(result_path, str) and result_path.startswith("Error"):
             return {"error": result_path}
 
-        return FileResponse(result_path, media_type="video/mp4", filename="merged_output.mp4")
+        media_type = "video/mp4" if result_path.lower().endswith(".mp4") else "audio/mpeg"
+        filename = os.path.basename(result_path)
+
+        return FileResponse(result_path, media_type=media_type, filename=filename)
 
     finally:
-        # Delay deleting temp_dir to allow FileResponse to send file (FastAPI streams file)
-        # So do NOT delete temp_dir immediately here if you want to serve the file correctly.
-        # Instead, you might want a background task or periodic cleanup.
-        # For now, comment out or remove this line if the file disappears before sending:
-        # shutil.rmtree(temp_dir)
-        pass
+        shutil.rmtree(temp_dir)
 
 # Optional: log space public URL
 def log_api_url():