Update app.py

app.py

@@ -1,4 +1,4 @@
-# 1. Import libraries
+# Import libraries
 import gradio as gr
 import os
 import shutil
@@ -36,9 +36,11 @@ def update_output_visibility(choice):
 async def separate_stems(audio_file_path, stem_choice, progress=gr.Progress(track_tqdm=True)):
     # Separates the uploaded audio using Demucs
     if audio_file_path is None: raise gr.Error("No audio file uploaded!")
-    progress(0, desc="Starting separation...")
+    
     log_history = "Starting separation...\n"
-    yield { status_log: log_history, progress_bar: progress(0, desc="Starting...") }
+    # Initial yield to update UI immediately
+    yield { status_log: log_history, progress_bar: progress(0, desc="Starting...", visible=True) } 
+    
     try:
         progress(0.05, desc="Preparing audio file...")
         log_history += "Preparing audio file...\n"; yield { status_log: log_history, progress_bar: progress(0.05, desc="Preparing...") }
@@ -70,7 +72,7 @@ async def separate_stems(audio_file_path, stem_choice, progress=gr.Progress(trac
         # Find the model-specific subfolder created by Demucs
         subfolders = [f.name for f in os.scandir(output_dir) if f.is_dir()]
         if not subfolders: raise gr.Error("Demucs output folder structure not found!")
-        model_folder_name = subfolders[0] # Assume the first subfolder is the correct one
+        model_folder_name = subfolders[0] 
         stems_path = os.path.join(output_dir, model_folder_name, stable_filename_base)
         
         if not os.path.exists(stems_path): 
@@ -87,7 +89,7 @@ async def separate_stems(audio_file_path, stem_choice, progress=gr.Progress(trac
         log_history += "✅ Stem separation complete!\n"; 
         yield { 
             status_log: log_history, 
-            progress_bar: progress(1, desc="Complete!"),
+            progress_bar: progress(1, desc="Complete!", visible=False), # Hide progress bar when done
             vocals_output: gr.update(value=vocals_path),
             drums_output: gr.update(value=drums_path),
             bass_output: gr.update(value=bass_path),
@@ -95,7 +97,7 @@ async def separate_stems(audio_file_path, stem_choice, progress=gr.Progress(trac
         }
     except Exception as e:
         print(f"An error occurred during separation: {e}")
-        yield { status_log: log_history + f"❌ ERROR: {e}" }
+        yield { status_log: log_history + f"❌ ERROR: {e}", progress_bar: gr.update(visible=False) }
 
 def slice_stem_real(stem_audio_data, loop_choice, sensitivity, stem_name, progress_fn=None):
     # Slices a single stem into loops or one-shots
@@ -114,7 +116,7 @@ def slice_stem_real(stem_audio_data, loop_choice, sensitivity, stem_name, progre
     print(f"Detected BPM for {stem_name}: {bpm_int}")
     
     output_files = []
-    loops_dir = tempfile.mkdtemp() # Use a unique temp dir for each run
+    loops_dir = tempfile.mkdtemp() 
 
     if "One-Shots" in loop_choice:
         if progress_fn: progress_fn(0.3, desc="Finding transients...")
@@ -162,8 +164,8 @@ def slice_stem_real(stem_audio_data, loop_choice, sensitivity, stem_name, progre
 async def slice_all_and_zip_real(vocals, drums, bass, other, loop_choice, sensitivity, progress=gr.Progress(track_tqdm=True)):
     # Slices all available stems and creates a zip pack
     log_history = "Starting batch slice...\n"
-    yield { status_log: log_history, progress_bar: progress(0, desc="Starting...") }
-    await asyncio.sleep(0.1) # Give Gradio time to update UI
+    yield { status_log: log_history, progress_bar: progress(0, desc="Starting...", visible=True) }
+    await asyncio.sleep(0.1) 
     
     stems_to_process = {"vocals": vocals, "drums": drums, "bass": bass, "other": other}
     zip_path = "Loop_Architect_Pack.zip"
@@ -179,7 +181,6 @@ async def slice_all_and_zip_real(vocals, drums, bass, other, loop_choice, sensit
             if data is not None:
                 log_history += f"--- Slicing {name} stem ---\n"; yield { status_log: log_history }
                 
-                # Define a function to update the main progress bar from within slice_stem_real
                 def update_main_progress(p, desc=""):
                     overall_progress = (processed_count + p) / num_stems
                     progress(overall_progress, desc=f"Slicing {name}: {desc}")
@@ -188,20 +189,18 @@ async def slice_all_and_zip_real(vocals, drums, bass, other, loop_choice, sensit
                 
                 if sliced_files:
                     log_history += f"Generated {len(sliced_files)} slices for {name}.\n"; yield { status_log: log_history }
-                    all_temp_dirs.append(temp_dir) # Keep track of temp dirs for cleanup
+                    all_temp_dirs.append(temp_dir) 
                     for loop_file in sliced_files:
-                        arcname = os.path.join(name, os.path.basename(loop_file)) # Add to subfolder in zip
+                        arcname = os.path.join(name, os.path.basename(loop_file)) 
                         zf.write(loop_file, arcname)
                 else:
                     log_history += f"No slices generated for {name}.\n"; yield { status_log: log_history }
 
                 processed_count += 1
-                # Yield intermediate progress after each stem is fully processed
                 yield { status_log: log_history, progress_bar: progress(processed_count / num_stems, desc=f"Finished {name}") }
 
-    log_history += "Packaging complete!\n"; yield { status_log: log_history, progress_bar: progress(1, desc="Pack Ready!") }
+    log_history += "Packaging complete!\n"; yield { status_log: log_history, progress_bar: progress(1, desc="Pack Ready!", visible=False) }
     
-    # Clean up all temporary directories used for slicing
     for d in all_temp_dirs:
         if d and os.path.exists(d):
             shutil.rmtree(d)
@@ -219,7 +218,6 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="blue", secondary_hue="red"))
             stem_options = gr.Radio(["4 Stems (Vocals, Drums, Bass, Other)", "2 Stems (Vocals + Instrumental)"], label="Separation Type", value="4 Stems (Vocals, Drums, Bass, Other)")
             submit_button = gr.Button("Separate Stems")
             
-            # --- SLICING OPTIONS ARE BACK ---
             with gr.Accordion("Slicing Options", open=True):
                 loop_options_radio = gr.Radio(["One-Shots (All Transients)", "4 Bar Loops", "8 Bar Loops"], label="Slice Type", value="One-Shots (All Transients)")
                 sensitivity_slider = gr.Slider(minimum=0.01, maximum=0.5, value=0.05, step=0.01, label="One-Shot Sensitivity", info="Lower values = more slices")
@@ -229,14 +227,15 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="blue", secondary_hue="red"))
             download_zip_file = gr.File(label="Download Your Loop Pack", visible=False)
 
             gr.Markdown("### Status")
-            progress_bar = gr.Progress()
+            # Removed label from gr.Progress
+            progress_bar = gr.Progress(visible=False) 
             status_log = gr.Textbox(label="Status Log", lines=10, interactive=False)
 
         with gr.Column(scale=2):
             with gr.Accordion("Separated Stems", open=True):
                 with gr.Row(): 
                     vocals_output = gr.Audio(label="Vocals", scale=4)
-                    slice_vocals_btn = gr.Button("Slice Vocals", scale=1) # Renamed for clarity
+                    slice_vocals_btn = gr.Button("Slice Vocals", scale=1)
                 with gr.Row(): 
                     drums_output = gr.Audio(label="Drums", scale=4)
                     slice_drums_btn = gr.Button("Slice Drums", scale=1)
@@ -249,48 +248,53 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="blue", secondary_hue="red"))
             gr.Markdown("### Sliced Loops / Samples (Preview)")
             loop_gallery = gr.Gallery(label="Generated Loops Preview", columns=8, object_fit="contain", height="auto", preview=True)
 
-  # --- Define Event Listeners ---
-def slice_and_display(stem_data, loop_choice, sensitivity):
-    # This wrapper remains the same
-    log_history = f"Slicing...\n"
-    yield { status_log: log_history, progress_bar: gr.update(visible=True) } # Show progress bar
-
-    # Define how slice_stem_real updates the progress bar
-    def update_single_progress(p, desc=""):
-         progress_bar.update(value=p, label=desc, visible=True) 
-
-    files, temp_dir = slice_stem_real(stem_data, loop_choice, sensitivity, "stem", progress_fn=update_single_progress) # Pass stem_name placeholder
-    
-    if temp_dir and os.path.exists(temp_dir):
-         shutil.rmtree(temp_dir) 
-    
-    yield { 
-        loop_gallery: gr.update(value=files), 
-        status_log: log_history + f"✅ Sliced into {len(files) if files else 0} pieces.",
-        progress_bar: gr.update(visible=False) # Hide progress bar when done
-    }
-
+    # --- Define Event Listeners ---
+    def slice_and_display(stem_data, loop_choice, sensitivity, stem_name):
+        # Wrapper to handle progress display for single slice buttons
+        log_history = f"Slicing {stem_name}...\n"
+        # Use a dictionary to update multiple components
+        yield { 
+            status_log: log_history, 
+            progress_bar: gr.update(value=0, visible=True, label=f"Slicing {stem_name}...") 
+        } 
+        
+        # Define how slice_stem_real updates the progress bar
+        def update_single_progress(p, desc=""):
+            progress_bar.update(value=p, label=desc, visible=True) 
 
-submit_event = submit_button.click(
-    fn=separate_stems, 
-    inputs=[audio_input, stem_options], 
-    # Corrected outputs: progress_bar removed
-    outputs=[vocals_output, drums_output, bass_output, other_output, status_log] 
-)
+        files, temp_dir = slice_stem_real(stem_data, loop_choice, sensitivity, stem_name, progress_fn=update_single_progress)
+        
+        if temp_dir and os.path.exists(temp_dir):
+             shutil.rmtree(temp_dir) 
+        
+        yield { 
+            loop_gallery: gr.update(value=files), 
+            status_log: log_history + f"✅ Sliced {stem_name} into {len(files) if files else 0} pieces.",
+            progress_bar: gr.update(visible=False) # Hide progress bar when done
+        }
 
-stem_options.change(fn=update_output_visibility, inputs=stem_options, outputs=[vocals_output, drums_output, bass_output, other_output])
 
-slice_vocals_btn.click(fn=slice_and_display, inputs=[vocals_output, loop_options_radio, sensitivity_slider, gr.Textbox("vocals", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
-slice_drums_btn.click(fn=slice_and_display, inputs=[drums_output, loop_options_radio, sensitivity_slider, gr.Textbox("drums", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
-slice_bass_btn.click(fn=slice_and_display, inputs=[bass_output, loop_options_radio, sensitivity_slider, gr.Textbox("bass", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
-slice_other_btn.click(fn=slice_and_display, inputs=[other_output, loop_options_radio, sensitivity_slider, gr.Textbox("other", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
+    submit_event = submit_button.click(
+        fn=separate_stems, 
+        inputs=[audio_input, stem_options], 
+        # Corrected outputs: progress_bar removed from here
+        outputs=[vocals_output, drums_output, bass_output, other_output, status_log] 
+    )
 
-slice_all_event = slice_all_button.click(
-    fn=slice_all_and_zip_real, 
-    inputs=[vocals_output, drums_output, bass_output, other_output, loop_options_radio, sensitivity_slider], 
-    # Corrected outputs: progress_bar removed
-    outputs=[download_zip_file, download_zip_file, status_log] 
-)
+    stem_options.change(fn=update_output_visibility, inputs=stem_options, outputs=[vocals_output, drums_output, bass_output, other_output])
+    
+    # Use the wrapper function for individual slice buttons
+    slice_vocals_btn.click(fn=slice_and_display, inputs=[vocals_output, loop_options_radio, sensitivity_slider, gr.Textbox("vocals", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
+    slice_drums_btn.click(fn=slice_and_display, inputs=[drums_output, loop_options_radio, sensitivity_slider, gr.Textbox("drums", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
+    slice_bass_btn.click(fn=slice_and_display, inputs=[bass_output, loop_options_radio, sensitivity_slider, gr.Textbox("bass", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
+    slice_other_btn.click(fn=slice_and_display, inputs=[other_output, loop_options_radio, sensitivity_slider, gr.Textbox("other", visible=False)], outputs=[loop_gallery, status_log, progress_bar])
+    
+    slice_all_event = slice_all_button.click(
+        fn=slice_all_and_zip_real, 
+        inputs=[vocals_output, drums_output, bass_output, other_output, loop_options_radio, sensitivity_slider], 
+        # Corrected outputs: progress_bar removed from here
+        outputs=[download_zip_file, download_zip_file, status_log] 
+    )
 
 # --- Launch the UI ---
 demo.launch()