Update main.py

main.py

@@ -7,102 +7,51 @@ import logging
 import traceback
 from moviepy.editor import (
     VideoFileClip,
-    concatenate_videoclips,
     AudioFileClip,
     CompositeAudioClip,
-    concatenate_audioclips,
+    concatenate_videoclips,
 )
-import numpy as np
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-# Safe audio clip loader
-def safe_audio_clip(path):
+def merge_videos_and_audios(video_paths, audio_paths, output_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)}")
+        # 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_clips.append(audio_clip)
+            except Exception as e:
+                logger.warning(f"Could not load audio file {ap}: {e}")
+
+        # Combine all audio clips into one composite audio clip (plays simultaneously)
+        if audio_clips:
+            final_audio = CompositeAudioClip(audio_clips)
+        else:
+            final_audio = None
 
-def merge_videos_and_audios(
-    video_files, audio_files, orig_vol=1.0, music_vol=0.5, temp_dir=None
-):
-    try:
-        output_path = os.path.join(
-            temp_dir, "merged_output.mp4" if video_files else "merged_output.mp3"
-        )
-
-        # If no videos, just concatenate audios
-        if not video_files and audio_files:
-            audio_clips = []
-            for a in audio_files:
-                try:
-                    audio_clip = safe_audio_clip(a)
-                    audio_clips.append(audio_clip)
-                except Exception as e:
-                    logger.warning(f"Skipping invalid audio file: {a} → {str(e)}")
-
-            if not audio_clips:
-                raise ValueError("No valid audio files to merge.")
-
-            final_audio = concatenate_audioclips(audio_clips)
-            final_audio.write_audiofile(output_path)
-            for clip in audio_clips:
-                clip.close()
-            final_audio.close()
-            return output_path
-
-        # If videos are present:
-        video_clips = [VideoFileClip(v) for v in video_files]
+        # Concatenate video clips
         final_video = concatenate_videoclips(video_clips, method="compose")
 
-        if audio_files:
-            audio_clips = []
-            for a in audio_files:
-                try:
-                    audio_clip = safe_audio_clip(a)
-                    audio_clips.append(audio_clip)
-                except Exception as e:
-                    logger.warning(f"Skipping invalid audio file: {a} → {str(e)}")
-
-            if audio_clips:
-                final_audio = concatenate_audioclips(audio_clips).volumex(music_vol)
-
-                original_audio = (
-                    final_video.audio.volumex(orig_vol)
-                    if final_video.audio is not None
-                    else None
-                )
-
-                if original_audio:
-                    composite_audio = CompositeAudioClip([original_audio, final_audio])
-                else:
-                    composite_audio = final_audio
-
-                final_video = final_video.set_audio(composite_audio)
-
-                for clip in audio_clips:
-                    clip.close()
-            else:
-                logger.warning("No valid audio files found. Using only video audio (if present).")
-                if final_video.audio is not None:
-                    final_video = final_video.volumex(orig_vol)
-
-        else:
-            # No audio files provided
-            if final_video.audio is not None:
-                final_video = final_video.volumex(orig_vol)
+        # 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")
 
-        for clip in video_clips:
-            clip.close()
+        # Close clips to release resources
         final_video.close()
+        for vc in video_clips:
+            vc.close()
+        for ac in audio_clips:
+            ac.close()
 
         return output_path
 
@@ -116,8 +65,6 @@ 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:
@@ -131,30 +78,27 @@ async def merge_endpoint(
 
         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"))
         ]
 
         if len(saved_files) < 2:
             return {"error": "Please upload at least 2 files (videos or audios)."}
 
-        result_path = merge_videos_and_audios(
-            video_files, audio_files, orig_vol, music_vol, temp_dir
-        )
+        output_file = os.path.join(temp_dir, "merged_output.mp4")
+        result_path = merge_videos_and_audios(video_files, audio_files, output_file)
 
         if isinstance(result_path, str) and result_path.startswith("Error"):
             return {"error": result_path}
 
-        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)
+        return FileResponse(result_path, media_type="video/mp4", filename="merged_output.mp4")
 
     finally:
-        shutil.rmtree(temp_dir)
+        # 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
 
 # Optional: log space public URL
 def log_api_url():