Update main.py

main.py

@@ -4,12 +4,59 @@ import tempfile
 import shutil
 import os
 import logging
+import traceback
 
-# Import your existing merge functions here
-# from your_module import merge_videos_and_audios  # if separated, or define inline
+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):
+    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 = [AudioFileClip(a) for a in audio_files]
+            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]
+        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
+            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:
+            final_video = final_video.volumex(orig_vol)
+
+        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()}"
+        logger.error(error_msg)
+        return error_msg
 
 app = FastAPI()
-logger = logging.getLogger("uvicorn.error")
 
 @app.post("/merge")
 async def merge_endpoint(
@@ -21,33 +68,37 @@ async def merge_endpoint(
     try:
         saved_files = []
         for uploaded_file in files:
-            # Save each uploaded file to disk
-            file_location = os.path.join(temp_dir, uploaded_file.filename)
-            with open(file_location, "wb") as out_file:
+            file_path = os.path.join(temp_dir, uploaded_file.filename)
+            with open(file_path, "wb") as out_file:
                 content = await uploaded_file.read()
                 out_file.write(content)
-            saved_files.append(file_location)
+            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 video/audio files."}
-
-        # Call your existing merge function
-        output_path = merge_videos_and_audios(
-            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"))],
-            orig_vol=orig_vol,
-            music_vol=music_vol,
-            temp_dir=temp_dir,
-        )
-
-        if isinstance(output_path, str) and output_path.startswith("Error"):
-            return {"error": output_path}
-        
-        # Return the merged file with appropriate media type
-        media_type = "video/mp4" if output_path.lower().endswith(".mp4") else "audio/mpeg"
-        file_name = os.path.basename(output_path)
-        return FileResponse(output_path, media_type=media_type, filename=file_name)
+            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)
+
+        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:
-        # Clean up uploaded files after response is sent
-        shutil.rmtree(temp_dir)
+        shutil.rmtree(temp_dir)
+
+
+# Log the public URL at startup
+def log_api_url():
+    url = os.getenv("SPACE_PUBLIC_URL")
+    if url:
+        logger.info(f"API is available at: {url}/merge")
+    else:
+        logger.info("SPACE_PUBLIC_URL environment variable not found")
+
+log_api_url()