Update main.py

main.py

@@ -13,6 +13,7 @@ from moviepy.editor import (
     concatenate_audioclips,
 )
 import io
+from PIL import Image
 
 # Configure logging
 logging.basicConfig(level=logging.DEBUG)
@@ -30,6 +31,12 @@ def safe_video_clip(path):
             clip.close()
             raise ValueError(f"Invalid or empty video file: {os.path.basename(path)}")
         logger.debug(f"Loaded video: {path}, duration: {clip.duration}s")
+        # Resize with compatible resampling method
+        try:
+            clip = clip.resize((1280, 720), resample=Image.Resampling.LANCZOS)
+        except Exception as e:
+            logger.warning(f"Failed to resize video {path}: {e}")
+            clip = clip.resize((1280, 720))  # Fallback without explicit resampling
         return clip
     except Exception as e:
         raise ValueError(f"Failed to load video file '{os.path.basename(path)}': {str(e)}")
@@ -54,8 +61,6 @@ 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}")
@@ -68,7 +73,7 @@ def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, ori
     for ap in audio_paths:
         try:
             clip = safe_audio_clip(ap)
-            clip = clip.volumex(music_vol)  # Apply volume adjustment
+            clip = clip.volumex(music_vol)
             audio_clips.append(clip)
         except Exception as e:
             logger.warning(f"Skipping invalid audio file {ap}: {e}")
@@ -87,13 +92,17 @@ def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, ori
     final_audio = None
     if audio_clips:
         if audio_mode == "concatenate":
-            final_audio = concatenate_audioclips(audio_clips)  # Play audios sequentially
+            final_audio = concatenate_audioclips(audio_clips)
             logger.debug(f"Concatenated audio duration: {final_audio.duration}s")
         else:
-            final_audio = CompositeAudioClip(audio_clips)  # Play audios simultaneously
+            final_audio = CompositeAudioClip(audio_clips)
             logger.debug(f"Composite audio duration: {final_audio.duration}s")
         
-        # If original audio exists, combine it with uploaded audio
+        # Match audio duration to video
+        if final_audio.duration < final_video.duration:
+            logger.debug(f"Looping audio to match video duration: {final_video.duration}s")
+            final_audio = final_audio.fx(vfx.loop, duration=final_video.duration)
+        
         if original_audio:
             final_audio = CompositeAudioClip([final_audio, original_audio])
             logger.debug(f"Combined audio (original + uploaded) duration: {final_audio.duration}s")
@@ -122,7 +131,7 @@ def merge_videos_and_audios(video_paths, audio_paths, output_path, temp_dir, ori
         logger.error(f"MoviePy failed to write output: {str(e)}")
         raise
 
-    # Close clips to release resources
+    # Close clips
     final_video.close()
     for vc in video_clips:
         vc.close()
@@ -138,7 +147,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"
+    audio_mode: str = Form("composite"),
     background_tasks: BackgroundTasks = BackgroundTasks(),
 ):
     temp_dir = tempfile.mkdtemp()
@@ -146,8 +155,6 @@ async def merge_endpoint(
     
     try:
         saved_files = []
-
-        # Save uploaded files
         for uploaded_file in files:
             if not uploaded_file.filename:
                 logger.warning("Skipping file with no filename")
@@ -162,29 +169,21 @@ async def merge_endpoint(
             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"))
-        ]
+        audio_files = [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(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, audio_mode)
 
-        # 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()
@@ -192,10 +191,7 @@ 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
         background_tasks.add_task(shutil.rmtree, temp_dir, ignore_errors=True)
-
-        # Return the file
         logger.debug("Sending streaming response")
         return StreamingResponse(
             io.BytesIO(content),