Update main.py

main.py

@@ -5,18 +5,26 @@ import shutil
 import os
 import logging
 import traceback
-
-from moviepy.editor import VideoFileClip, concatenate_videoclips, AudioFileClip, CompositeAudioClip, concatenate_audioclips
+from moviepy.editor import (
+    VideoFileClip,
+    concatenate_videoclips,
+    AudioFileClip,
+    CompositeAudioClip,
+    concatenate_audioclips,
+)
 import numpy as np
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-def merge_videos_and_audios(video_files, audio_files, orig_vol=1.0, music_vol=0.5, temp_dir=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")
-
+        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 = [AudioFileClip(a) for a in audio_files]
@@ -26,15 +34,16 @@ def merge_videos_and_audios(video_files, audio_files, orig_vol=1.0, music_vol=0.
                 clip.close()
             final_audio.close()
             return output_path
-
         # If videos are present:
         video_clips = [VideoFileClip(v) for v in video_files]
         final_video = concatenate_videoclips(video_clips, method="compose")
-
         if audio_files:
             audio_clips = [AudioFileClip(a) for a in audio_files]
             final_audio = concatenate_audioclips(audio_clips).volumex(music_vol)
-            original_audio = final_video.audio.volumex(orig_vol) if final_video.audio else None
+            # Fix here - check if original video audio exists before volumex
+            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:
@@ -43,13 +52,14 @@ def merge_videos_and_audios(video_files, audio_files, orig_vol=1.0, music_vol=0.
             for clip in audio_clips:
                 clip.close()
         else:
-            final_video = final_video.volumex(orig_vol)
-
+            # Fix here - only apply volumex if audio exists
+            if final_video.audio is not None:
+                final_video = final_video.volumex(orig_vol)
+            # else no audio
         final_video.write_videofile(output_path, codec="libx264", audio_codec="aac")
         for clip in video_clips:
             clip.close()
         final_video.close()
-
         return output_path
     except Exception as e:
         error_msg = f"Error during merge: {str(e)}\n{traceback.format_exc()}"
@@ -73,27 +83,21 @@ async def merge_endpoint(
                 content = await uploaded_file.read()
                 out_file.write(content)
             saved_files.append(file_path)
-
         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"))]
-
         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)
-
+        result_path = merge_videos_and_audios(
+            video_files, audio_files, orig_vol, music_vol, temp_dir
+        )
         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)
-
     finally:
         shutil.rmtree(temp_dir)
 
-
-# Log the public URL at startup
 def log_api_url():
     url = os.getenv("SPACE_PUBLIC_URL")
     if url: