ban button after execute

gradio-web/gradio_callbacks.py

@@ -423,23 +423,40 @@ def on_video_end_transition(uid, ui_phase=None):
     return on_demo_video_end_transition(uid, ui_phase)
 
 
-def on_execute_video_end_transition(uid, exec_btn_interactive=True):
+def _normalize_post_execute_controls_state(state):
+    """Normalize legacy bool and dict payloads for execute-video exit transitions."""
+    if isinstance(state, dict):
+        exec_interactive = bool(state.get("exec_btn_interactive", True))
+        reference_interactive = bool(state.get("reference_action_interactive", True))
+        return {
+            "exec_btn_interactive": exec_interactive,
+            "reference_action_interactive": reference_interactive,
+        }
+    legacy_exec_interactive = bool(state)
+    return {
+        "exec_btn_interactive": legacy_exec_interactive,
+        "reference_action_interactive": legacy_exec_interactive,
+    }
+
+
+def on_execute_video_end_transition(uid, post_execute_controls_state=True):
     """Transition from execute video phase back to the action phase."""
+    controls_state = _normalize_post_execute_controls_state(post_execute_controls_state)
     LOGGER.debug(
-        "on_execute_video_end_transition uid=%s exec_btn_interactive=%s",
+        "on_execute_video_end_transition uid=%s controls_state=%s",
         _uid_for_log(uid),
-        exec_btn_interactive,
+        controls_state,
     )
     return (
         gr.update(visible=False),  # execution_video_group
         gr.update(visible=True),   # action_phase_group
         gr.update(visible=True),   # control_panel_group
         gr.update(interactive=True),  # options_radio
-        gr.update(interactive=bool(exec_btn_interactive)),  # exec_btn
+        gr.update(interactive=controls_state["exec_btn_interactive"]),  # exec_btn
         gr.update(interactive=True),  # restart_episode_btn
         gr.update(interactive=True),  # next_task_btn
         _live_obs_update(interactive=False),  # img_display
-        gr.update(interactive=True),  # reference_action_btn
+        gr.update(interactive=controls_state["reference_action_interactive"]),  # reference_action_btn
         gr.update(interactive=True),  # task_hint_display
         "action_point",  # ui_phase_state
     )
@@ -1045,7 +1062,7 @@ def execute_step(uid, option_idx, coords_str):
         coords_update=None,
         reference_update=gr.update(interactive=True),
         task_hint_update=gr.update(interactive=True),
-        post_execute_exec_interactive=True,
+        post_execute_controls_state=None,
         show_execution_video=False,
         ui_phase="action_point",
     ):
@@ -1053,6 +1070,14 @@ def execute_step(uid, option_idx, coords_str):
             execute_video_update = gr.update(value=None, visible=False, playback_position=0)
         if coords_update is None:
             coords_update = _ui_text("coords", "not_needed")
+        if post_execute_controls_state is None:
+            post_execute_controls_state = {
+                "exec_btn_interactive": True,
+                "reference_action_interactive": True,
+            }
+        normalized_post_execute_controls_state = _normalize_post_execute_controls_state(
+            post_execute_controls_state
+        )
         return (
             img_update,
             log_update,
@@ -1069,7 +1094,7 @@ def execute_step(uid, option_idx, coords_str):
             coords_update,
             reference_update,
             task_hint_update,
-            bool(post_execute_exec_interactive),
+            normalized_post_execute_controls_state,
             ui_phase,
         )
 
@@ -1085,7 +1110,10 @@ def execute_step(uid, option_idx, coords_str):
             options_update=gr.update(interactive=False),
             reference_update=gr.update(interactive=False),
             task_hint_update=gr.update(interactive=False),
-            post_execute_exec_interactive=False,
+            post_execute_controls_state={
+                "exec_btn_interactive": False,
+                "reference_action_interactive": False,
+            },
             show_execution_video=False,
         )
 
@@ -1128,7 +1156,10 @@ def execute_step(uid, option_idx, coords_str):
             options_update=gr.update(choices=_build_radio_choices(session), value=None, interactive=True),
             reference_update=gr.update(interactive=True),
             task_hint_update=gr.update(interactive=True),
-            post_execute_exec_interactive=True,
+            post_execute_controls_state={
+                "exec_btn_interactive": True,
+                "reference_action_interactive": True,
+            },
             show_execution_video=False,
         )
 
@@ -1153,7 +1184,10 @@ def execute_step(uid, option_idx, coords_str):
                 coords_update=coords_str,
                 reference_update=gr.update(interactive=True),
                 task_hint_update=gr.update(interactive=True),
-                post_execute_exec_interactive=True,
+                post_execute_controls_state={
+                    "exec_btn_interactive": True,
+                    "reference_action_interactive": True,
+                },
                 show_execution_video=False,
             )
 
@@ -1288,13 +1322,16 @@ def execute_step(uid, option_idx, coords_str):
     execute_video_update = _build_execution_video_update(uid, session)
     show_execution_video = execute_video_update.get("visible") is True
     radio_choices = _build_radio_choices(session)
-    post_execute_exec_interactive = not done
+    post_execute_controls_state = {
+        "exec_btn_interactive": not done,
+        "reference_action_interactive": not done,
+    }
     restart_episode_update = gr.update(interactive=False) if show_execution_video else gr.update(interactive=True)
     next_task_update = gr.update(interactive=False) if show_execution_video else gr.update(interactive=True)
     exec_btn_update = (
         gr.update(interactive=False)
         if show_execution_video
-        else gr.update(interactive=post_execute_exec_interactive)
+        else gr.update(interactive=post_execute_controls_state["exec_btn_interactive"])
     )
     options_update = gr.update(
         choices=radio_choices,
@@ -1308,12 +1345,12 @@ def execute_step(uid, option_idx, coords_str):
     # 格式化日志消息为 HTML 格式（支持颜色显示）
     formatted_status = format_log_markdown(status)
     LOGGER.debug(
-        "execute_step done uid=%s env=%s ep=%s done=%s exec_btn_interactive=%s show_execution_video=%s",
+        "execute_step done uid=%s env=%s ep=%s done=%s post_execute_controls=%s show_execution_video=%s",
         _uid_for_log(uid),
         getattr(session, "env_id", None),
         getattr(session, "episode_idx", None),
         done,
-        not done,
+        post_execute_controls_state,
         show_execution_video,
     )
 
@@ -1330,7 +1367,7 @@ def execute_step(uid, option_idx, coords_str):
         coords_update=coords_update,
         reference_update=reference_update,
         task_hint_update=task_hint_update,
-        post_execute_exec_interactive=post_execute_exec_interactive,
+        post_execute_controls_state=post_execute_controls_state,
         show_execution_video=show_execution_video,
         ui_phase="execution_video" if show_execution_video else "action_point",
     )

gradio-web/test/test_ui_phase_machine_runtime_e2e.py

@@ -2556,7 +2556,7 @@ def test_header_task_switch_to_video_task_shows_demo_phase(monkeypatch):
         demo.close()
 
 
-def test_phase_machine_runtime_local_video_path_end_transition():
+def _run_local_execute_video_transition_test(*, status_text, done, expect_terminal_buttons_disabled):
     import gradio_callbacks as cb
     import config as config_module
 
@@ -2590,7 +2590,7 @@ def test_phase_machine_runtime_local_video_path_end_transition():
             _ = option_idx, click_coords
             self.last_execution_frames = [fake_obs.copy() for _ in range(3)]
             self.base_frames.extend(self.last_execution_frames)
-            return fake_obs.copy(), "Executing: pick", False
+            return fake_obs.copy(), status_text, done
 
     originals = {
         "get_session": cb.get_session,
@@ -2608,7 +2608,12 @@ def test_phase_machine_runtime_local_video_path_end_transition():
         with gr.Blocks(title="Native phase machine local video test") as demo:
             uid_state = gr.State(value="uid-local-video")
             phase_state = gr.State(value="action_point")
-            post_execute_exec_state = gr.State(value=True)
+            post_execute_controls_state = gr.State(
+                value={
+                    "exec_btn_interactive": True,
+                    "reference_action_interactive": True,
+                }
+            )
             suppress_state = gr.State(value=False)
             with gr.Column(visible=True, elem_id="main_interface") as main_interface:
                 with gr.Column(visible=False, elem_id="video_phase_group") as video_phase_group:
@@ -2676,7 +2681,7 @@ def test_phase_machine_runtime_local_video_path_end_transition():
                     coords_box,
                     reference_action_btn,
                     task_hint_display,
-                    post_execute_exec_state,
+                    post_execute_controls_state,
                     phase_state,
                 ],
                 queue=False,
@@ -2690,7 +2695,7 @@ def test_phase_machine_runtime_local_video_path_end_transition():
 
             execute_video_display.end(
                 fn=cb.on_execute_video_end_transition,
-                inputs=[uid_state, post_execute_exec_state],
+                inputs=[uid_state, post_execute_controls_state],
                 outputs=[
                     execution_video_group,
                     action_phase_group,
@@ -2708,7 +2713,7 @@ def test_phase_machine_runtime_local_video_path_end_transition():
             )
             execute_video_display.stop(
                 fn=cb.on_execute_video_end_transition,
-                inputs=[uid_state, post_execute_exec_state],
+                inputs=[uid_state, post_execute_controls_state],
                 outputs=[
                     execution_video_group,
                     action_phase_group,
@@ -2818,30 +2823,66 @@ def test_phase_machine_runtime_local_video_path_end_transition():
                     }""",
                     timeout=2000,
                 )
-                page.locator("#action_radio input[type='radio']").nth(1).check(force=True)
-                page.wait_for_function(
-                    """(state) => {
-                        const liveObs = document.getElementById('live_obs');
-                        const coordsRoot = document.getElementById('coords_box');
-                        const coordsField = coordsRoot?.querySelector('textarea, input');
-                        const logRoot = document.getElementById('log_output');
-                        const logField = logRoot?.querySelector('textarea, input');
-                        const coordsValue = coordsField ? coordsField.value.trim() : '';
-                        const logValue = logField ? logField.value.trim() : (logRoot?.textContent || '').trim();
-                        return (
-                            !!liveObs &&
-                            liveObs.classList.contains(state.waitClass) &&
-                            coordsValue === state.coordsPrompt &&
-                            logValue === state.waitLog
-                        );
-                    }""",
-                    arg={
-                        "waitClass": config_module.LIVE_OBS_POINT_WAIT_CLASS,
-                        "coordsPrompt": config_module.UI_TEXT["coords"]["select_point"],
-                        "waitLog": config_module.UI_TEXT["log"]["point_selection_prompt"],
-                    },
-                    timeout=5000,
-                )
+                if expect_terminal_buttons_disabled:
+                    button_snapshot = page.evaluate(
+                        """() => {
+                            const resolveButton = (id) => {
+                                return document.querySelector(`#${id} button`) || document.querySelector(`button#${id}`);
+                            };
+                            const execBtn = resolveButton('exec_btn');
+                            const refBtn = resolveButton('reference_action_btn');
+                            return {
+                                execDisabled: execBtn ? execBtn.disabled : null,
+                                refDisabled: refBtn ? refBtn.disabled : null,
+                            };
+                        }"""
+                    )
+                    assert button_snapshot == {
+                        "execDisabled": True,
+                        "refDisabled": True,
+                    }
+                else:
+                    button_snapshot = page.evaluate(
+                        """() => {
+                            const resolveButton = (id) => {
+                                return document.querySelector(`#${id} button`) || document.querySelector(`button#${id}`);
+                            };
+                            const execBtn = resolveButton('exec_btn');
+                            const refBtn = resolveButton('reference_action_btn');
+                            return {
+                                execDisabled: execBtn ? execBtn.disabled : null,
+                                refDisabled: refBtn ? refBtn.disabled : null,
+                            };
+                        }"""
+                    )
+                    assert button_snapshot == {
+                        "execDisabled": False,
+                        "refDisabled": False,
+                    }
+                    page.locator("#action_radio input[type='radio']").nth(1).check(force=True)
+                    page.wait_for_function(
+                        """(state) => {
+                            const liveObs = document.getElementById('live_obs');
+                            const coordsRoot = document.getElementById('coords_box');
+                            const coordsField = coordsRoot?.querySelector('textarea, input');
+                            const logRoot = document.getElementById('log_output');
+                            const logField = logRoot?.querySelector('textarea, input');
+                            const coordsValue = coordsField ? coordsField.value.trim() : '';
+                            const logValue = logField ? logField.value.trim() : (logRoot?.textContent || '').trim();
+                            return (
+                                !!liveObs &&
+                                liveObs.classList.contains(state.waitClass) &&
+                                coordsValue === state.coordsPrompt &&
+                                logValue === state.waitLog
+                            );
+                        }""",
+                        arg={
+                            "waitClass": config_module.LIVE_OBS_POINT_WAIT_CLASS,
+                            "coordsPrompt": config_module.UI_TEXT["coords"]["select_point"],
+                            "waitLog": config_module.UI_TEXT["log"]["point_selection_prompt"],
+                        },
+                        timeout=5000,
+                    )
 
                 browser.close()
         finally:
@@ -2851,3 +2892,27 @@ def test_phase_machine_runtime_local_video_path_end_transition():
     finally:
         for name, value in originals.items():
             setattr(cb, name, value)
+
+
+def test_phase_machine_runtime_local_video_path_end_transition():
+    _run_local_execute_video_transition_test(
+        status_text="Executing: pick",
+        done=False,
+        expect_terminal_buttons_disabled=False,
+    )
+
+
+def test_phase_machine_runtime_local_video_path_end_transition_terminal_success():
+    _run_local_execute_video_transition_test(
+        status_text="SUCCESS",
+        done=True,
+        expect_terminal_buttons_disabled=True,
+    )
+
+
+def test_phase_machine_runtime_local_video_path_end_transition_terminal_failed():
+    _run_local_execute_video_transition_test(
+        status_text="Executing: pick | FAILED",
+        done=True,
+        expect_terminal_buttons_disabled=True,
+    )

gradio-web/test/test_ui_text_config.py

@@ -83,16 +83,22 @@ def test_on_video_end_transition_uses_configured_action_prompt(monkeypatch, relo
     assert result[5] == "action_point"
 
 
-def test_on_execute_video_end_transition_preserves_log_and_restores_controls(reload_module):
+def test_on_execute_video_end_transition_restores_controls_for_non_terminal_state(reload_module):
     callbacks = reload_module("gradio_callbacks")
 
-    result = callbacks.on_execute_video_end_transition("uid-1", False)
+    result = callbacks.on_execute_video_end_transition(
+        "uid-1",
+        {
+            "exec_btn_interactive": True,
+            "reference_action_interactive": True,
+        },
+    )
 
     assert result[0]["visible"] is False
     assert result[1]["visible"] is True
     assert result[2]["visible"] is True
     assert result[3]["interactive"] is True
-    assert result[4]["interactive"] is False
+    assert result[4]["interactive"] is True
     assert result[5]["interactive"] is True
     assert result[6]["interactive"] is True
     assert result[8]["interactive"] is True
@@ -100,6 +106,29 @@ def test_on_execute_video_end_transition_preserves_log_and_restores_controls(rel
     assert result[10] == "action_point"
 
 
+def test_on_execute_video_end_transition_keeps_terminal_buttons_disabled(reload_module):
+    callbacks = reload_module("gradio_callbacks")
+
+    result = callbacks.on_execute_video_end_transition(
+        "uid-1",
+        {
+            "exec_btn_interactive": False,
+            "reference_action_interactive": False,
+        },
+    )
+
+    assert result[0]["visible"] is False
+    assert result[1]["visible"] is True
+    assert result[2]["visible"] is True
+    assert result[3]["interactive"] is True
+    assert result[4]["interactive"] is False
+    assert result[5]["interactive"] is True
+    assert result[6]["interactive"] is True
+    assert result[8]["interactive"] is False
+    assert result[9]["interactive"] is True
+    assert result[10] == "action_point"
+
+
 def test_on_demo_video_play_disables_button_and_sets_single_use_state(monkeypatch, reload_module):
     reload_module("config")
     callbacks = reload_module("gradio_callbacks")

gradio-web/ui_layout.py

@@ -952,7 +952,12 @@ def create_ui_blocks():
             delete_callback=cleanup_user_session,
         )
         ui_phase_state = gr.State(value=PHASE_INIT)
-        post_execute_exec_interactive_state = gr.State(value=True)
+        post_execute_controls_state = gr.State(
+            value={
+                "exec_btn_interactive": True,
+                "reference_action_interactive": True,
+            }
+        )
         current_task_env_state = gr.State(value=None)
         suppress_next_option_change_state = gr.State(value=False)
 
@@ -1393,7 +1398,7 @@ def create_ui_blocks():
 
         execute_video_display.end(
             fn=on_execute_video_end_transition,
-            inputs=[uid_state, post_execute_exec_interactive_state],
+            inputs=[uid_state, post_execute_controls_state],
             outputs=[
                 execution_video_group,
                 action_phase_group,
@@ -1418,7 +1423,7 @@ def create_ui_blocks():
         )
         execute_video_display.stop(
             fn=on_execute_video_end_transition,
-            inputs=[uid_state, post_execute_exec_interactive_state],
+            inputs=[uid_state, post_execute_controls_state],
             outputs=[
                 execution_video_group,
                 action_phase_group,
@@ -1542,7 +1547,7 @@ def create_ui_blocks():
                 coords_box,
                 reference_action_btn,
                 task_hint_display,
-                post_execute_exec_interactive_state,
+                post_execute_controls_state,
                 ui_phase_state,
             ],
             show_progress="hidden",