v2

gradio-web/test/test_ui_phase_machine_runtime_e2e.py

@@ -1082,52 +1082,39 @@ def test_header_task_switch_to_video_task_shows_demo_phase(monkeypatch):
     demo_video_path = gr.get_video("world.mp4")
     switch_calls = []
 
-    def fake_init_app(request=None):
-        _ = request
+    def _pick_task_response(uid, task_name, show_video):
         return (
-            "uid-header-video",
+            uid,
             gr.update(visible=True),  # main_interface
             gr.update(value=fake_obs_img, interactive=False),  # img_display
-            "ready",  # log_output
+            "demo prompt" if show_video else "ready",  # log_output
             gr.update(choices=[("pick", 0)], value=None),  # options_radio
-            "goal",  # goal_box
+            "video goal" if show_video else "goal",  # goal_box
             "No need for coordinates",  # coords_box
-            gr.update(value=None, visible=False),  # video_display
-            "PickXtimes (Episode 1)",  # task_info_box
+            gr.update(value=demo_video_path if show_video else None, visible=show_video),  # video_display
+            f"{task_name} (Episode 1)",  # task_info_box
             "Completed: 0",  # progress_info_box
             gr.update(interactive=True),  # restart_episode_btn
             gr.update(interactive=True),  # next_task_btn
             gr.update(interactive=True),  # exec_btn
-            gr.update(visible=False),  # video_phase_group
-            gr.update(visible=True),  # action_phase_group
-            gr.update(visible=True),  # control_panel_group
-            gr.update(value="hint"),  # task_hint_display
+            gr.update(visible=show_video),  # video_phase_group
+            gr.update(visible=not show_video),  # action_phase_group
+            gr.update(visible=not show_video),  # control_panel_group
+            gr.update(value="video hint" if show_video else "hint"),  # task_hint_display
             gr.update(visible=False),  # loading_overlay
             gr.update(interactive=True),  # reference_action_btn
         )
 
+    def fake_init_app(request=None):
+        _ = request
+        return _pick_task_response("uid-header-video", "PickXtimes", show_video=False)
+
     def fake_switch_env_wrapper(uid, selected_env):
         switch_calls.append((uid, selected_env))
-        return (
+        return _pick_task_response(
             uid,
-            gr.update(visible=True),  # main_interface
-            gr.update(value=fake_obs_img, interactive=False),  # img_display
-            "demo prompt",  # log_output
-            gr.update(choices=[("pick", 0)], value=None),  # options_radio
-            "video goal",  # goal_box
-            "No need for coordinates",  # coords_box
-            gr.update(value=demo_video_path, visible=True),  # video_display
-            "VideoPlaceButton (Episode 1)",  # task_info_box
-            "Completed: 0",  # progress_info_box
-            gr.update(interactive=True),  # restart_episode_btn
-            gr.update(interactive=True),  # next_task_btn
-            gr.update(interactive=True),  # exec_btn
-            gr.update(visible=True),  # video_phase_group
-            gr.update(visible=False),  # action_phase_group
-            gr.update(visible=False),  # control_panel_group
-            gr.update(value="video hint"),  # task_hint_display
-            gr.update(visible=False),  # loading_overlay
-            gr.update(interactive=True),  # reference_action_btn
+            selected_env,
+            show_video=selected_env == "VideoPlaceButton",
         )
 
     monkeypatch.setattr(ui_layout, "init_app", fake_init_app)
@@ -1163,6 +1150,7 @@ def test_header_task_switch_to_video_task_shows_demo_phase(monkeypatch):
                 }""",
                 timeout=5000,
             )
+            assert switch_calls == []
 
             page.click("#header_task input")
             page.get_by_role("option", name="VideoPlaceButton").click()
@@ -1195,6 +1183,10 @@ def test_header_task_switch_to_video_task_shows_demo_phase(monkeypatch):
             assert phase_after_switch["currentSrc"]
             assert switch_calls == [("uid-header-video", "VideoPlaceButton")]
 
+            page.wait_for_timeout(1500)
+            assert switch_calls == [("uid-header-video", "VideoPlaceButton")]
+            assert _read_header_task_value(page) == "VideoPlaceButton"
+
             did_dispatch_end = page.evaluate(
                 """() => {
                     const videoEl = document.querySelector('#demo_video video');

gradio-web/ui_layout.py

@@ -361,8 +361,7 @@ def create_ui_blocks():
 
         uid_state = gr.State(value=None)
         ui_phase_state = gr.State(value=PHASE_INIT)
-        pending_header_task_state = gr.State(value=None)
-        programmatic_header_task_state = gr.State(value=None)
+        current_task_env_state = gr.State(value=None)
         live_obs_timer = gr.Timer(value=1.0 / LIVE_OBS_REFRESH_HZ, active=True)
 
         task_info_box = gr.Textbox(visible=False, elem_id="task_info_box")
@@ -557,42 +556,52 @@ def create_ui_blocks():
         def switch_env_with_phase(uid, selected_env):
             return _with_phase_from_load(switch_env_wrapper(uid, selected_env))
 
-        def maybe_switch_env_with_phase(uid, selected_env):
-            if not selected_env:
-                return _skip_load_flow()
-            return switch_env_with_phase(uid, selected_env)
-
-        def prepare_header_task_switch(selected_env, programmatic_selected_env):
+        def _normalize_selected_env(selected_env, current_task_env):
             base_choices = list(user_manager.env_choices)
             normalized_selected_env = _normalize_env_choice(selected_env, base_choices)
-            normalized_programmatic_env = _normalize_env_choice(programmatic_selected_env, base_choices)
+            normalized_current_env = _normalize_env_choice(current_task_env, base_choices)
+            return normalized_selected_env, normalized_current_env
 
+        def prepare_header_task_switch(selected_env, current_task_env):
+            normalized_selected_env, normalized_current_env = _normalize_selected_env(
+                selected_env,
+                current_task_env,
+            )
             if not normalized_selected_env:
-                return None, None, gr.update(visible=False)
-            if normalized_selected_env == normalized_programmatic_env:
-                return None, None, gr.update(visible=False)
-            return normalized_selected_env, None, show_loading_info()
+                return gr.update(visible=False)
+            if normalized_selected_env == normalized_current_env:
+                return gr.update(visible=False)
+            return show_loading_info()
+
+        def maybe_switch_env_with_phase(uid, selected_env, current_task_env):
+            normalized_selected_env, normalized_current_env = _normalize_selected_env(
+                selected_env,
+                current_task_env,
+            )
+            if not normalized_selected_env or normalized_selected_env == normalized_current_env:
+                return _skip_load_flow()
+            return switch_env_with_phase(uid, normalized_selected_env)
 
         task_info_box.change(
             fn=sync_header_from_task,
             inputs=[task_info_box, goal_box],
-            outputs=[header_task_box, header_goal_box, programmatic_header_task_state],
+            outputs=[header_task_box, header_goal_box, current_task_env_state],
         )
         goal_box.change(
             fn=sync_header_from_goal,
             inputs=[goal_box, task_info_box, header_task_box],
-            outputs=[header_task_box, header_goal_box, programmatic_header_task_state],
+            outputs=[header_task_box, header_goal_box, current_task_env_state],
         )
 
-        header_task_box.change(
+        header_task_box.select(
             fn=prepare_header_task_switch,
-            inputs=[header_task_box, programmatic_header_task_state],
-            outputs=[pending_header_task_state, programmatic_header_task_state, loading_overlay],
+            inputs=[header_task_box, current_task_env_state],
+            outputs=[loading_overlay],
             queue=False,
             show_progress="hidden",
         ).then(
             fn=maybe_switch_env_with_phase,
-            inputs=[uid_state, pending_header_task_state],
+            inputs=[uid_state, header_task_box, current_task_env_state],
             outputs=load_flow_outputs,
         ).then(
             fn=_phase_visibility_updates,
@@ -601,11 +610,9 @@ def create_ui_blocks():
             queue=False,
             show_progress="hidden",
         ).then(
-            fn=lambda _selected_env: None,
-            inputs=[pending_header_task_state],
-            outputs=[pending_header_task_state],
-            queue=False,
-            show_progress="hidden",
+            fn=sync_header_from_task,
+            inputs=[task_info_box, goal_box],
+            outputs=[header_task_box, header_goal_box, current_task_env_state],
         )
 
         next_task_btn.click(fn=show_loading_info, outputs=[loading_overlay]).then(
@@ -621,7 +628,7 @@ def create_ui_blocks():
         ).then(
             fn=sync_header_from_task,
             inputs=[task_info_box, goal_box],
-            outputs=[header_task_box, header_goal_box, programmatic_header_task_state],
+            outputs=[header_task_box, header_goal_box, current_task_env_state],
         )
 
         restart_episode_btn.click(fn=show_loading_info, outputs=[loading_overlay]).then(
@@ -637,7 +644,7 @@ def create_ui_blocks():
         ).then(
             fn=sync_header_from_task,
             inputs=[task_info_box, goal_box],
-            outputs=[header_task_box, header_goal_box, programmatic_header_task_state],
+            outputs=[header_task_box, header_goal_box, current_task_env_state],
         )
 
         video_display.end(
@@ -754,7 +761,7 @@ def create_ui_blocks():
         ).then(
             fn=sync_header_from_task,
             inputs=[task_info_box, goal_box],
-            outputs=[header_task_box, header_goal_box, programmatic_header_task_state],
+            outputs=[header_task_box, header_goal_box, current_task_env_state],
         )
 
     return demo