Update main.py

main.py

@@ -10,11 +10,12 @@ from moviepy.editor import (
     concatenate_videoclips,
     AudioFileClip,
     CompositeAudioClip,
+    concatenate_audioclips,
 )
 import io
 
 # Configure logging
-logging.basicConfig(level=logging.DEBUG)  # Set to DEBUG for detailed output
+logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger("main")
 
 # Enable MoviePy verbose logging
@@ -28,6 +29,7 @@ def safe_video_clip(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)}")
+        logger.debug(f"Loaded video: {path}, duration: {clip.duration}s")
         return clip
     except Exception as e:
         raise ValueError(f"Failed to load video file '{os.path.basename(path)}': {str(e)}")
@@ -39,11 +41,12 @@ def safe_audio_clip(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)}")
+        logger.debug(f"Loaded audio: {path}, duration: {clip.duration}s")
         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, orig_vol=1.0, music_vol=0.5):
+def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, orig_vol=1.0, music_vol=0.5, audio_mode="composite"):
     logger.debug(f"Merging {len(video_paths)} videos and {len(audio_paths)} audios to {output_path}")
     
     # Load video clips
@@ -51,6 +54,8 @@ def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, ori
     for vp in video_paths:
         try:
             clip = safe_video_clip(vp)
+            # Resize to a common resolution (e.g., 1280x720) for compatibility
+            clip = clip.resize((1280, 720))
             video_clips.append(clip)
         except Exception as e:
             logger.warning(f"Skipping invalid video file {vp}: {e}")
@@ -70,15 +75,36 @@ def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, ori
 
     # Concatenate video clips
     final_video = concatenate_videoclips(video_clips, method="compose")
+    logger.debug(f"Concatenated video duration: {final_video.duration}s")
 
-    # Combine audio clips if available
+    # Handle original video audio
+    original_audio = None
+    if final_video.audio:
+        original_audio = final_video.audio.volumex(orig_vol)
+        logger.debug(f"Original video audio preserved, duration: {original_audio.duration}s")
+
+    # Combine audio clips
+    final_audio = None
     if audio_clips:
-        final_audio = CompositeAudioClip(audio_clips)
+        if audio_mode == "concatenate":
+            final_audio = concatenate_audioclips(audio_clips)  # Play audios sequentially
+            logger.debug(f"Concatenated audio duration: {final_audio.duration}s")
+        else:
+            final_audio = CompositeAudioClip(audio_clips)  # Play audios simultaneously
+            logger.debug(f"Composite audio duration: {final_audio.duration}s")
+        
+        # If original audio exists, combine it with uploaded audio
+        if original_audio:
+            final_audio = CompositeAudioClip([final_audio, original_audio])
+            logger.debug(f"Combined audio (original + uploaded) duration: {final_audio.duration}s")
+
+    # Set the audio for the final video
+    if final_audio:
         final_video = final_video.set_audio(final_audio)
+    elif original_audio:
+        final_video = final_video.set_audio(original_audio)
     else:
-        # Optionally adjust original video audio volume
-        if final_video.audio:
-            final_video.audio = final_video.audio.volumex(orig_vol)
+        logger.warning("No audio (uploaded or original) available for the final video")
 
     # Write output
     logger.debug(f"Writing output to {output_path}")
@@ -102,6 +128,8 @@ def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, ori
         vc.close()
     for ac in audio_clips:
         ac.close()
+    if original_audio:
+        original_audio.close()
 
 app = FastAPI()
 
@@ -110,6 +138,7 @@ async def merge_endpoint(
     files: list[UploadFile] = File(...),
     orig_vol: float = Form(1.0),
     music_vol: float = Form(0.5),
+    audio_mode: str = Form("composite"),  # New parameter: "composite" or "concatenate"
     background_tasks: BackgroundTasks = BackgroundTasks(),
 ):
     temp_dir = tempfile.mkdtemp()
@@ -141,14 +170,14 @@ async def merge_endpoint(
         logger.debug(f"Video files: {video_files}")
         logger.debug(f"Audio files: {audio_files}")
 
-        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")
+        if len(video_files) < 1:
+            raise HTTPException(status_code=400, detail="Please upload at least one valid video 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, orig_vol, music_vol)
+        merge_videos_and_audios(video_files, audio_files, output_path, temp_dir, orig_vol, music_vol, audio_mode)
 
         # Verify the output file exists
         if not os.path.exists(output_path):
@@ -163,10 +192,10 @@ async def merge_endpoint(
                 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
+        # Schedule cleanup
         background_tasks.add_task(shutil.rmtree, temp_dir, ignore_errors=True)
 
-        # Return the file as a streaming response
+        # Return the file
         logger.debug("Sending streaming response")
         return StreamingResponse(
             io.BytesIO(content),
@@ -180,11 +209,10 @@ async def merge_endpoint(
         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
+# Log public URL
 def log_api_url():
     url = os.getenv("SPACE_PUBLIC_URL")
     if url: