Fix progress bar not showing in .then() chain by threading video_output through all pipeline phases

app.py

@@ -333,20 +333,21 @@ def generate_cpu(audio_file: str, style_name: str, cover_art: str | None,
 
     progress(0.45, desc="CPU steps done, requesting GPU...")
     # Return state for GPU phases (all values must be picklable strings)
-    return str(run_dir), style_name, str(step_num), cover_art or ""
+    # gr.update() for video_output keeps it unchanged but gives progress bar a visible target
+    return gr.update(), str(run_dir), style_name, str(step_num), cover_art or ""
 
 
-def generate_images(run_dir_str: str, style_name: str, step_num_str: str,
+def generate_images(video_out, run_dir_str: str, style_name: str, step_num_str: str,
                     cover_art: str, progress=gr.Progress()):
     """GPU phase: step 6 — generate images. Gets a fresh ZeroGPU token."""
     step_num = int(step_num_str)
     if step_num <= 7:
         progress(0.50, desc="Generating images...")
         _gpu_generate_images(run_dir_str, style_name)
-    return run_dir_str, style_name, step_num_str, cover_art
+    return gr.update(), run_dir_str, style_name, step_num_str, cover_art
 
 
-def generate_videos(run_dir_str: str, style_name: str, step_num_str: str,
+def generate_videos(video_out, run_dir_str: str, style_name: str, step_num_str: str,
                     cover_art: str, progress=gr.Progress()):
     """GPU phase: step 7 — generate video clips, one per GPU session."""
     step_num = int(step_num_str)
@@ -373,7 +374,7 @@ def generate_videos(run_dir_str: str, style_name: str, step_num_str: str,
                 pass
 
         print(f"All {len(segments)} video clips generated.")
-    return run_dir_str, cover_art
+    return gr.update(), run_dir_str, cover_art
 
 
 def generate_assembly(run_dir_str: str, cover_art: str, progress=gr.Progress()):
@@ -387,7 +388,7 @@ def generate_assembly(run_dir_str: str, cover_art: str, progress=gr.Progress()):
                                 cover_art=cover)
 
     progress(1.0, desc="Done!")
-    return str(final_path), run_dir_str, gr.update(visible=True)
+    return str(final_path), run_dir_str, gr.update(interactive=True)
 
 
 def reshuffle(run_dir_str: str, cover_art: str | None, progress=gr.Progress()):
@@ -704,7 +705,7 @@ with gr.Blocks(
 
     generate_btn = gr.Button("Generate Video", variant="primary")
     video_output = gr.Video(label="Generated Music Video")
-    reshuffle_btn = gr.Button("Reshuffle", variant="secondary", visible=False)
+    reshuffle_btn = gr.Button("Reshuffle", variant="secondary", visible=True, interactive=False)
     last_run_dir = gr.State(value="")
 
     # Hidden state for passing data between chained pipeline phases
@@ -740,15 +741,15 @@ with gr.Blocks(
         fn=generate_cpu,
         inputs=[audio_input, style_dropdown,
                 cover_art_input, run_mode, existing_run, start_step, reuse_files],
-        outputs=[_st_run_dir, _st_style, _st_step, _st_cover],
+        outputs=[video_output, _st_run_dir, _st_style, _st_step, _st_cover],
     ).then(
         fn=generate_images,
-        inputs=[_st_run_dir, _st_style, _st_step, _st_cover],
-        outputs=[_st_run_dir, _st_style, _st_step, _st_cover],
+        inputs=[video_output, _st_run_dir, _st_style, _st_step, _st_cover],
+        outputs=[video_output, _st_run_dir, _st_style, _st_step, _st_cover],
     ).then(
         fn=generate_videos,
-        inputs=[_st_run_dir, _st_style, _st_step, _st_cover],
-        outputs=[_st_run_dir, _st_cover],
+        inputs=[video_output, _st_run_dir, _st_style, _st_step, _st_cover],
+        outputs=[video_output, _st_run_dir, _st_cover],
     ).then(
         fn=generate_assembly,
         inputs=[_st_run_dir, _st_cover],