Update app.py

app.py

@@ -334,20 +334,21 @@ def merge_videos_and_audios(video_files=None, audio_files=None, orig_vol=1.0, mu
 
 # --- Gradio App Using Blocks ---
 
-def gradio_merge_files(file_objects, orig_vol, music_vol):
+def gradio_merge_files(file_binaries, orig_vol, music_vol, file_names=None):
     """
     Gradio endpoint to merge videos and/or audio from binary file uploads.
     Args:
-        file_objects: List of file objects (binary uploads)
+        file_binaries: List of binary data (bytes objects)
         orig_vol: Volume for original video audio (0.0 to 1.0)
         music_vol: Volume for background audio (0.0 to 1.0)
+        file_names: List of original filenames (passed separately for API calls)
     Returns:
         Path to the merged file (video or audio) or error message
     """
     try:
-        logger.info(f"Received {len(file_objects) if file_objects else 0} file objects")
+        logger.info(f"Received {len(file_binaries) if file_binaries else 0} binary files")
         
-        if not file_objects or len(file_objects) < 2:
+        if not file_binaries or len(file_binaries) < 2:
             error_msg = "Error: Please upload at least 2 files."
             logger.error(error_msg)
             return error_msg, None
@@ -356,23 +357,38 @@ def gradio_merge_files(file_objects, orig_vol, music_vol):
         temp_dir = tempfile.mkdtemp()
         all_files = []
 
-        # Save each file object to the temporary directory
-        for file_obj in file_objects:
-            if file_obj is None:
-                logger.warning("Skipping None file object")
+        # When called via the UI, Gradio provides binary data but not filenames directly.
+        # When called via API (e.g., n8n), we need to get filenames from the request.
+        # For UI testing, infer filenames based on index; for API, use provided file_names.
+        if file_names is None:
+            # Fallback for UI: assign temporary filenames (not ideal for production)
+            file_names = []
+            for idx, binary in enumerate(file_binaries):
+                ext = ".mp4" if idx % 2 == 0 else ".mp3"  # Dummy assignment for UI testing
+                file_names.append(f"temp_file_{idx}{ext}")
+            logger.warning("No file names provided; using temporary names for UI testing. For API calls, pass file_names.")
+
+        if len(file_names) != len(file_binaries):
+            error_msg = f"Error: Mismatch between file binaries ({len(file_binaries)}) and file names ({len(file_names)})."
+            logger.error(error_msg)
+            return error_msg, None
+
+        # Save each binary file to the temporary directory
+        for binary, filename in zip(file_binaries, file_names):
+            if binary is None:
+                logger.warning(f"Skipping None binary data for file {filename}")
                 continue
-            # Get the original filename from the file object
-            original_filename = os.path.basename(file_obj.name)
-            # Ensure the filename matches expected patterns
+            # Validate filename
+            original_filename = os.path.basename(filename)
             if not re.match(r'file\d+\.mp4', original_filename, re.IGNORECASE) and \
                not re.match(r'audio\d+\.(mp3|wav)', original_filename, re.IGNORECASE):
                 logger.warning(f"Filename {original_filename} does not match expected pattern; skipping")
                 continue
             # Create a temporary file path
             temp_file_path = os.path.join(temp_dir, original_filename)
-            # Copy the file data to the temporary location
+            # Write the binary data to the temporary file
             with open(temp_file_path, 'wb') as temp_file:
-                shutil.copyfileobj(file_obj, temp_file)
+                temp_file.write(binary)
             all_files.append(temp_file_path)
             logger.info(f"Saved uploaded file to {temp_file_path}")
 
@@ -444,7 +460,7 @@ if __name__ == "__main__":
         gr.Markdown("For API usage, send binary files via multipart/form-data. Name videos as file1.mp4, file2.mp4, etc., and audios as audio1.mp3, audio2.mp3, etc.")
         
         with gr.Row():
-            file_input = gr.File(label="Upload Files (Videos: .mp4, Audios: .mp3/.wav)", type="file", file_count="multiple")
+            file_input = gr.File(label="Upload Files (Videos: .mp4, Audios: .mp3/.wav)", type="binary", 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")