Update app.py

app.py

@@ -25,21 +25,60 @@ def check_port(port):
         except socket.error:
             return False
 
-def merge_videos_and_audios(video_files, audio_files=None, orig_vol=1.0, music_vol=0.5):
+def merge_videos_and_audios(video_files=None, audio_files=None, orig_vol=1.0, music_vol=0.5):
     """
-    Merge multiple video clips into one and optionally add a concatenated audio track.
-    If audio_files is None, the video will retain its original audio (if any).
-    Volumes for original video audio and background audio (if provided) can be controlled.
-    Uses method='compose' to avoid cropping in landscape videos.
-    Returns the path to the merged video file.
+    Merge multiple video clips and/or audio clips based on inputs provided.
+    - If only video_files: Merge videos, retaining their original audio.
+    - If only audio_files: Merge audio files into a single audio file.
+    - If both: Merge videos and overlay the concatenated audio.
+    Args:
+        video_files: List of video file paths (optional)
+        audio_files: List of audio file paths (optional)
+        orig_vol: Volume for original video audio (0.0 to 1.0)
+        music_vol: Volume for background audio (0.0 to 1.0)
+    Returns:
+        Path to the merged file (video or audio) or error message.
     """
     try:
-        logger.info(f"Starting merge with {len(video_files)} video files and {len(audio_files) if audio_files else 0} audio files")
+        # Ensure at least two files are provided (videos, audios, or combination)
+        video_count = len(video_files) if video_files else 0
+        audio_count = len(audio_files) if audio_files else 0
+        total_files = video_count + audio_count
+
+        logger.info(f"Starting merge with {video_count} video files and {audio_count} audio files")
+
+        if total_files < 2:
+            error_msg = "Error: Please upload at least 2 files total (videos, audios, or a combination)."
+            logger.error(error_msg)
+            return error_msg
 
         # Create a temporary output path
         temp_dir = tempfile.mkdtemp()
-        output_path = os.path.join(temp_dir, "merged_output.mp4")
 
+        # Case 1: Audio only
+        if audio_count >= 2 and video_count == 0:
+            output_path = os.path.join(temp_dir, "merged_output.mp3")
+            logger.info("Merging audio files only")
+            
+            # Load and concatenate audio clips
+            audio_clips = [AudioFileClip(audio) for audio in audio_files]
+            final_audio_clip = concatenate_audioclips(audio_clips)
+            
+            # Write the final audio
+            logger.info(f"Writing output audio to {output_path}")
+            final_audio_clip.write_audiofile(output_path, codec="mp3")
+            
+            # Close resources
+            final_audio_clip.close()
+            for clip in audio_clips:
+                clip.close()
+            
+            logger.info("Audio merge completed successfully")
+            return output_path
+
+        # Case 2: Video only or Video with Audio
+        output_path = os.path.join(temp_dir, "merged_output.mp4")
+        
         # Load and concatenate video clips
         video_clips = [VideoFileClip(video) for video in video_files]
         final_video_clip = concatenate_videoclips(video_clips, method='compose')
@@ -48,7 +87,7 @@ def merge_videos_and_audios(video_files, audio_files=None, orig_vol=1.0, music_v
         video_duration = final_video_clip.duration or sum(clip.duration for clip in video_clips)
         logger.info(f"Total video duration: {video_duration} seconds")
         
-        # Handle audio (optional)
+        # Handle audio (if provided)
         if audio_files:
             logger.info("Processing audio files")
             # Load and concatenate audio clips
@@ -94,10 +133,10 @@ def merge_videos_and_audios(video_files, audio_files=None, orig_vol=1.0, music_v
                 clip.close()
             concatenated_audio.close()
         
-        logger.info("Merge completed successfully")
+        logger.info("Video merge completed successfully")
         return output_path
     except Exception as e:
-        error_msg = f"Error during video and audio merging: {str(e)}\n{traceback.format_exc()}"
+        error_msg = f"Error during merging: {str(e)}\n{traceback.format_exc()}"
         logger.error(error_msg)
         return error_msg
 
@@ -105,21 +144,16 @@ def merge_videos_and_audios(video_files, audio_files=None, orig_vol=1.0, music_v
 
 def gradio_merge_videos(video_files, audio_files, orig_vol, music_vol):
     """
-    Gradio endpoint to merge videos and optionally add audio.
+    Gradio endpoint to merge videos and/or audio.
     Args:
-        video_files: List of video file paths
+        video_files: List of video file paths (optional)
         audio_files: List of audio file paths (optional)
         orig_vol: Volume for original video audio (0.0 to 1.0)
         music_vol: Volume for background audio (0.0 to 1.0)
     Returns:
-        Path to the merged video file or error message
+        Path to the merged file (video or audio) or error message
     """
-    logger.info(f"Received {len(video_files)} video files and {len(audio_files) if audio_files else 0} audio files")
-    
-    if len(video_files) <= 1:
-        error_msg = "Error: Please upload more than 1 video file."
-        logger.error(error_msg)
-        return error_msg
+    logger.info(f"Received {len(video_files) if video_files else 0} video files and {len(audio_files) if audio_files else 0} audio files")
     
     result = merge_videos_and_audios(
         video_files, audio_files, orig_vol=orig_vol, music_vol=music_vol
@@ -127,10 +161,14 @@ def gradio_merge_videos(video_files, audio_files, orig_vol, music_vol):
     
     if isinstance(result, str) and result.startswith("Error"):
         logger.error(result)
-        return result
+        return result, None
     else:
         logger.info(f"Merge successful. Output saved at: {result}")
-        return result  # Gradio will serve this as a downloadable video
+        # Return appropriate output based on file type
+        if result.endswith(".mp3"):
+            return None, result  # Audio output
+        else:
+            return result, None  # Video output
 
 # --- Main Execution ---
 
@@ -160,28 +198,28 @@ if __name__ == "__main__":
 
     with gr.Blocks(title="Video and Audio Merger API") as app:
         gr.Markdown("## Video and Audio Merger API")
-        gr.Markdown("Upload more than 1 video file to merge them into a single video. Optionally upload audio files to add as background audio.")
+        gr.Markdown("Upload at least 2 files total (videos, audios, or a combination) to merge them. Videos and audios are optional.")
         
         with gr.Row():
-            video_input = gr.File(label="Video Files (more than 1)", type="filepath", file_count="multiple")
-            audio_input = gr.File(label="Audio Files (Optional)", type="filepath", file_count="multiple")
+            video_input = gr.File(label="Video Files (Optional, at least 2 if no audio)", type="filepath", file_count="multiple")
+            audio_input = gr.File(label="Audio Files (Optional, at least 2 if no video)", type="filepath", file_count="multiple")
         
         with gr.Row():
             orig_vol_input = gr.Slider(minimum=0.0, maximum=1.0, value=1.0, step=0.05, label="Original Video Audio Volume")
             music_vol_input = gr.Slider(minimum=0.0, maximum=1.0, value=0.5, step=0.05, label="Background Audio Volume")
         
-        output_video = gr.Video(label="Merged Video")
-        merge_button = gr.Button("Merge Videos and Audios")
+        output_video = gr.Video(label="Merged Video (if videos provided)")
+        output_audio = gr.Audio(label="Merged Audio (if only audios provided)")
+        merge_button = gr.Button("Merge Files")
         
         merge_button.click(
             fn=gradio_merge_videos,
             inputs=[video_input, audio_input, orig_vol_input, music_vol_input],
-            outputs=output_video
+            outputs=[output_video, output_audio]
         )
 
     try:
         logger.info(f"Attempting to launch Gradio app on port {selected_port}")
-        # Set share=True to bypass localhost check
         app.launch(server_port=selected_port, share=True)
         logger.info(f"Gradio app launched successfully on port {app.server_port}")
     except Exception as e: