fix sys log after success fail

gradio-web/gradio_callbacks.py

@@ -62,6 +62,29 @@ def _point_selection_log():
     return format_log_markdown(_ui_text("log", "point_selection_prompt"))
 
 
+def _default_post_execute_log_state():
+    return {
+        "preserve_terminal_log": False,
+        "terminal_log_value": None,
+    }
+
+
+def _normalize_post_execute_log_state(state):
+    """Normalize terminal-log preservation payloads across callback boundaries."""
+    if isinstance(state, dict):
+        preserve_terminal_log = bool(state.get("preserve_terminal_log", False))
+        terminal_log_value = state.get("terminal_log_value")
+        if terminal_log_value is None:
+            preserve_terminal_log = False
+        else:
+            terminal_log_value = str(terminal_log_value)
+        return {
+            "preserve_terminal_log": preserve_terminal_log,
+            "terminal_log_value": terminal_log_value,
+        }
+    return _default_post_execute_log_state()
+
+
 def _session_error_text():
     return _ui_text("log", "session_error")
 
@@ -439,13 +462,22 @@ def _normalize_post_execute_controls_state(state):
     }
 
 
-def on_execute_video_end_transition(uid, post_execute_controls_state=True):
+def on_execute_video_end_transition(
+    uid,
+    post_execute_controls_state=True,
+    post_execute_log_state=None,
+):
     """Transition from execute video phase back to the action phase."""
     controls_state = _normalize_post_execute_controls_state(post_execute_controls_state)
+    log_state = _normalize_post_execute_log_state(post_execute_log_state)
+    log_update = gr.update()
+    if log_state["preserve_terminal_log"]:
+        log_update = gr.update(value=log_state["terminal_log_value"])
     LOGGER.debug(
-        "on_execute_video_end_transition uid=%s controls_state=%s",
+        "on_execute_video_end_transition uid=%s controls_state=%s log_state=%s",
         _uid_for_log(uid),
         controls_state,
+        log_state,
     )
     return (
         gr.update(visible=False),  # execution_video_group
@@ -456,6 +488,7 @@ def on_execute_video_end_transition(uid, post_execute_controls_state=True):
         gr.update(interactive=True),  # restart_episode_btn
         gr.update(interactive=True),  # next_task_btn
         _live_obs_update(interactive=False),  # img_display
+        log_update,  # log_output
         gr.update(interactive=controls_state["reference_action_interactive"]),  # reference_action_btn
         gr.update(interactive=True),  # task_hint_display
         "action_point",  # ui_phase_state
@@ -487,6 +520,7 @@ def _task_load_failed_response(uid, message):
         gr.update(visible=False),  # control_panel_group
         gr.update(value=""),  # task_hint_display
         gr.update(interactive=False),  # reference_action_btn
+        _default_post_execute_log_state(),  # post_execute_log_state
     )
 
 
@@ -564,6 +598,7 @@ def _load_status_task(uid, status):
             gr.update(visible=True),  # control_panel_group
             gr.update(value=get_task_hint(env_id) if env_id else ""),  # task_hint_display
             gr.update(interactive=False),  # reference_action_btn
+            _default_post_execute_log_state(),  # post_execute_log_state
         )
 
     goal_text = capitalize_first_letter(session.language_goal) if session.language_goal else ""
@@ -630,6 +665,7 @@ def _load_status_task(uid, status):
             gr.update(visible=False),  # control_panel_group
             gr.update(value=get_task_hint(actual_env_id)),  # task_hint_display
             gr.update(interactive=True),  # reference_action_btn
+            _default_post_execute_log_state(),  # post_execute_log_state
         )
 
     set_ui_phase(uid, "executing_task")
@@ -656,6 +692,7 @@ def _load_status_task(uid, status):
         gr.update(visible=True),  # control_panel_group
         gr.update(value=get_task_hint(actual_env_id)),  # task_hint_display
         gr.update(interactive=True),  # reference_action_btn
+        _default_post_execute_log_state(),  # post_execute_log_state
     )
 
 
@@ -840,11 +877,18 @@ def _is_valid_coords_text(coords_text: str) -> bool:
     return True
 
 
-def on_option_select(uid, option_value, coords_str=None, suppress_next_option_change=False):
+def on_option_select(
+    uid,
+    option_value,
+    coords_str=None,
+    suppress_next_option_change=False,
+    post_execute_log_state=None,
+):
     """
     处理选项选择事件
     """
     default_msg = _ui_text("coords", "not_needed")
+    normalized_post_execute_log_state = _normalize_post_execute_log_state(post_execute_log_state)
 
     if suppress_next_option_change:
         LOGGER.debug(
@@ -852,18 +896,44 @@ def on_option_select(uid, option_value, coords_str=None, suppress_next_option_ch
             _uid_for_log(uid),
             option_value,
         )
-        return gr.update(), gr.update(), gr.update(), False
+        return gr.update(), gr.update(), gr.update(), False, normalized_post_execute_log_state
+
+    if normalized_post_execute_log_state["preserve_terminal_log"]:
+        LOGGER.debug(
+            "on_option_select preserving terminal log uid=%s option=%s",
+            _uid_for_log(uid),
+            option_value,
+        )
+        return (
+            gr.update(),
+            gr.update(),
+            gr.update(value=normalized_post_execute_log_state["terminal_log_value"]),
+            False,
+            normalized_post_execute_log_state,
+        )
     
     if option_value is None:
         LOGGER.debug("on_option_select uid=%s option=None", _uid_for_log(uid))
         session = get_session(uid) if uid else None
         base_img = session.get_pil_image(use_segmented=USE_SEGMENTED_VIEW) if session else _LIVE_OBS_UPDATE_SKIP
-        return default_msg, _live_obs_update(value=base_img, interactive=False), _action_selection_log(), False
+        return (
+            default_msg,
+            _live_obs_update(value=base_img, interactive=False),
+            _action_selection_log(),
+            False,
+            normalized_post_execute_log_state,
+        )
     
     session = get_session(uid)
     if not session:
         LOGGER.warning("on_option_select: missing session uid=%s", _uid_for_log(uid))
-        return default_msg, _live_obs_update(interactive=False), format_log_markdown(_session_error_text()), False
+        return (
+            default_msg,
+            _live_obs_update(interactive=False),
+            format_log_markdown(_session_error_text()),
+            False,
+            normalized_post_execute_log_state,
+        )
     
     option_idx = _parse_option_idx(option_value)
     base_img = session.get_pil_image(use_segmented=USE_SEGMENTED_VIEW)
@@ -881,10 +951,17 @@ def on_option_select(uid, option_value, coords_str=None, suppress_next_option_ch
             _live_obs_update(value=base_img, interactive=True, waiting_for_point=True),
             _point_selection_log(),
             False,
+            normalized_post_execute_log_state,
         )
     
     LOGGER.debug("on_option_select uid=%s option=%s requires_coords=False", _uid_for_log(uid), option_idx)
-    return default_msg, _live_obs_update(value=base_img, interactive=False), _action_selection_log(), False
+    return (
+        default_msg,
+        _live_obs_update(value=base_img, interactive=False),
+        _action_selection_log(),
+        False,
+        normalized_post_execute_log_state,
+    )
 
 
 def on_reference_action(uid, current_option_value=None):
@@ -1063,6 +1140,7 @@ def execute_step(uid, option_idx, coords_str):
         reference_update=gr.update(interactive=True),
         task_hint_update=gr.update(interactive=True),
         post_execute_controls_state=None,
+        post_execute_log_state=None,
         show_execution_video=False,
         ui_phase="action_point",
     ):
@@ -1078,6 +1156,7 @@ def execute_step(uid, option_idx, coords_str):
         normalized_post_execute_controls_state = _normalize_post_execute_controls_state(
             post_execute_controls_state
         )
+        normalized_post_execute_log_state = _normalize_post_execute_log_state(post_execute_log_state)
         return (
             img_update,
             log_update,
@@ -1095,6 +1174,7 @@ def execute_step(uid, option_idx, coords_str):
             reference_update,
             task_hint_update,
             normalized_post_execute_controls_state,
+            normalized_post_execute_log_state,
             ui_phase,
         )
 
@@ -1114,6 +1194,7 @@ def execute_step(uid, option_idx, coords_str):
                 "exec_btn_interactive": False,
                 "reference_action_interactive": False,
             },
+            post_execute_log_state=_default_post_execute_log_state(),
             show_execution_video=False,
         )
 
@@ -1160,6 +1241,7 @@ def execute_step(uid, option_idx, coords_str):
                 "exec_btn_interactive": True,
                 "reference_action_interactive": True,
             },
+            post_execute_log_state=_default_post_execute_log_state(),
             show_execution_video=False,
         )
 
@@ -1188,6 +1270,7 @@ def execute_step(uid, option_idx, coords_str):
                     "exec_btn_interactive": True,
                     "reference_action_interactive": True,
                 },
+                post_execute_log_state=_default_post_execute_log_state(),
                 show_execution_video=False,
             )
 
@@ -1326,6 +1409,7 @@ def execute_step(uid, option_idx, coords_str):
         "exec_btn_interactive": not done,
         "reference_action_interactive": not done,
     }
+    post_execute_log_state = _default_post_execute_log_state()
     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 = (
@@ -1344,13 +1428,19 @@ def execute_step(uid, option_idx, coords_str):
     
     # 格式化日志消息为 HTML 格式（支持颜色显示）
     formatted_status = format_log_markdown(status)
+    if done:
+        post_execute_log_state = {
+            "preserve_terminal_log": True,
+            "terminal_log_value": formatted_status,
+        }
     LOGGER.debug(
-        "execute_step done uid=%s env=%s ep=%s done=%s post_execute_controls=%s show_execution_video=%s",
+        "execute_step done uid=%s env=%s ep=%s done=%s post_execute_controls=%s post_execute_log=%s show_execution_video=%s",
         _uid_for_log(uid),
         getattr(session, "env_id", None),
         getattr(session, "episode_idx", None),
         done,
         post_execute_controls_state,
+        post_execute_log_state,
         show_execution_video,
     )
 
@@ -1368,6 +1458,7 @@ def execute_step(uid, option_idx, coords_str):
         reference_update=reference_update,
         task_hint_update=task_hint_update,
         post_execute_controls_state=post_execute_controls_state,
+        post_execute_log_state=post_execute_log_state,
         show_execution_video=show_execution_video,
         ui_phase="execution_video" if show_execution_video else "action_point",
     )

gradio-web/test/test_reference_action_callbacks.py

@@ -122,24 +122,26 @@ def test_on_option_select_resets_to_point_wait_state_for_point_action(monkeypatc
     session = _FakeOptionSession()
     monkeypatch.setattr(callbacks, "get_session", lambda uid: session)
 
-    coords_text, img_update, log_text, suppress_flag = callbacks.on_option_select("uid-1", 0, "12, 34", False)
+    coords_text, img_update, log_text, suppress_flag, log_state = callbacks.on_option_select("uid-1", 0, "12, 34", False)
 
     assert coords_text == config.UI_TEXT["coords"]["select_point"]
     assert img_update.get("interactive") is True
     assert img_update.get("elem_classes") == config.get_live_obs_elem_classes(waiting_for_point=True)
     assert log_text == config.UI_TEXT["log"]["point_selection_prompt"]
     assert suppress_flag is False
+    assert log_state == callbacks._default_post_execute_log_state()
 
 
 def test_on_option_select_suppresses_programmatic_reference_change(reload_module):
     callbacks = reload_module("gradio_callbacks")
 
-    coords_update, img_update, log_update, suppress_flag = callbacks.on_option_select("uid-1", 0, "12, 34", True)
+    coords_update, img_update, log_update, suppress_flag, log_state = callbacks.on_option_select("uid-1", 0, "12, 34", True)
 
     assert coords_update.get("__type__") == "update"
     assert img_update.get("__type__") == "update"
     assert log_update.get("__type__") == "update"
     assert suppress_flag is False
+    assert log_state == callbacks._default_post_execute_log_state()
 
 
 def test_on_map_click_clears_wait_state_and_restores_action_prompt(monkeypatch, reload_module):

gradio-web/test/test_ui_phase_machine_runtime_e2e.py

@@ -2556,7 +2556,13 @@ def test_header_task_switch_to_video_task_shows_demo_phase(monkeypatch):
         demo.close()
 
 
-def _run_local_execute_video_transition_test(*, status_text, done, expect_terminal_buttons_disabled):
+def _run_local_execute_video_transition_test(
+    *,
+    status_text,
+    done,
+    expect_terminal_buttons_disabled,
+    expected_terminal_log=None,
+):
     import gradio_callbacks as cb
     import config as config_module
 
@@ -2614,6 +2620,12 @@ def _run_local_execute_video_transition_test(*, status_text, done, expect_termin
                     "reference_action_interactive": True,
                 }
             )
+            post_execute_log_state = gr.State(
+                value={
+                    "preserve_terminal_log": False,
+                    "terminal_log_value": None,
+                }
+            )
             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:
@@ -2682,20 +2694,21 @@ def _run_local_execute_video_transition_test(*, status_text, done, expect_termin
                     reference_action_btn,
                     task_hint_display,
                     post_execute_controls_state,
+                    post_execute_log_state,
                     phase_state,
                 ],
                 queue=False,
             )
             options_radio.change(
                 fn=cb.on_option_select,
-                inputs=[uid_state, options_radio, coords_box, suppress_state],
-                outputs=[coords_box, img_display, log_output, suppress_state],
+                inputs=[uid_state, options_radio, coords_box, suppress_state, post_execute_log_state],
+                outputs=[coords_box, img_display, log_output, suppress_state, post_execute_log_state],
                 queue=False,
             )
 
             execute_video_display.end(
                 fn=cb.on_execute_video_end_transition,
-                inputs=[uid_state, post_execute_controls_state],
+                inputs=[uid_state, post_execute_controls_state, post_execute_log_state],
                 outputs=[
                     execution_video_group,
                     action_phase_group,
@@ -2705,6 +2718,7 @@ def _run_local_execute_video_transition_test(*, status_text, done, expect_termin
                     restart_episode_btn,
                     next_task_btn,
                     img_display,
+                    log_output,
                     reference_action_btn,
                     task_hint_display,
                     phase_state,
@@ -2713,7 +2727,7 @@ def _run_local_execute_video_transition_test(*, status_text, done, expect_termin
             )
             execute_video_display.stop(
                 fn=cb.on_execute_video_end_transition,
-                inputs=[uid_state, post_execute_controls_state],
+                inputs=[uid_state, post_execute_controls_state, post_execute_log_state],
                 outputs=[
                     execution_video_group,
                     action_phase_group,
@@ -2723,6 +2737,7 @@ def _run_local_execute_video_transition_test(*, status_text, done, expect_termin
                     restart_episode_btn,
                     next_task_btn,
                     img_display,
+                    log_output,
                     reference_action_btn,
                     task_hint_display,
                     phase_state,
@@ -2841,6 +2856,13 @@ def _run_local_execute_video_transition_test(*, status_text, done, expect_termin
                         "execDisabled": True,
                         "refDisabled": True,
                     }
+                    terminal_log_before = _read_log_output_value(page)
+                    assert terminal_log_before is not None
+                    assert expected_terminal_log is not None
+                    assert expected_terminal_log in terminal_log_before
+                    page.locator("#action_radio input[type='radio']").nth(1).check(force=True)
+                    page.wait_for_timeout(300)
+                    assert _read_log_output_value(page) == terminal_log_before
                 else:
                     button_snapshot = page.evaluate(
                         """() => {
@@ -2907,6 +2929,7 @@ def test_phase_machine_runtime_local_video_path_end_transition_terminal_success(
         status_text="SUCCESS",
         done=True,
         expect_terminal_buttons_disabled=True,
+        expected_terminal_log="episode success",
     )
 
 
@@ -2915,4 +2938,5 @@ def test_phase_machine_runtime_local_video_path_end_transition_terminal_failed()
         status_text="Executing: pick | FAILED",
         done=True,
         expect_terminal_buttons_disabled=True,
+        expected_terminal_log="episode failed",
     )

gradio-web/test/test_ui_text_config.py

@@ -42,13 +42,14 @@ def test_on_option_select_uses_configured_select_point_and_log_messages(monkeypa
     )
     monkeypatch.setattr(callbacks, "get_session", lambda uid: _FakeOptionSession())
 
-    coords_text, img_update, log_text, suppress_flag = callbacks.on_option_select("uid-1", 0, None, False)
+    coords_text, img_update, log_text, suppress_flag, log_state = callbacks.on_option_select("uid-1", 0, None, False)
 
     assert coords_text == "pick a point from config"
     assert img_update.get("interactive") is True
     assert callbacks.get_live_obs_elem_classes(waiting_for_point=True) == img_update.get("elem_classes")
     assert log_text == "custom log prompt from config"
     assert suppress_flag is False
+    assert log_state == callbacks._default_post_execute_log_state()
 
 
 def test_precheck_execute_inputs_uses_configured_before_execute_message(monkeypatch, reload_module):
@@ -92,6 +93,7 @@ def test_on_execute_video_end_transition_restores_controls_for_non_terminal_stat
             "exec_btn_interactive": True,
             "reference_action_interactive": True,
         },
+        callbacks._default_post_execute_log_state(),
     )
 
     assert result[0]["visible"] is False
@@ -101,9 +103,10 @@ def test_on_execute_video_end_transition_restores_controls_for_non_terminal_stat
     assert result[4]["interactive"] is True
     assert result[5]["interactive"] is True
     assert result[6]["interactive"] is True
-    assert result[8]["interactive"] is True
+    assert result[8].get("__type__") == "update"
     assert result[9]["interactive"] is True
-    assert result[10] == "action_point"
+    assert result[10]["interactive"] is True
+    assert result[11] == "action_point"
 
 
 def test_on_execute_video_end_transition_keeps_terminal_buttons_disabled(reload_module):
@@ -115,6 +118,10 @@ def test_on_execute_video_end_transition_keeps_terminal_buttons_disabled(reload_
             "exec_btn_interactive": False,
             "reference_action_interactive": False,
         },
+        {
+            "preserve_terminal_log": True,
+            "terminal_log_value": "terminal banner",
+        },
     )
 
     assert result[0]["visible"] is False
@@ -124,9 +131,34 @@ def test_on_execute_video_end_transition_keeps_terminal_buttons_disabled(reload_
     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"
+    assert result[8]["value"] == "terminal banner"
+    assert result[9]["interactive"] is False
+    assert result[10]["interactive"] is True
+    assert result[11] == "action_point"
+
+
+def test_on_option_select_preserves_terminal_log_state(reload_module):
+    callbacks = reload_module("gradio_callbacks")
+
+    coords_update, img_update, log_update, suppress_flag, log_state = callbacks.on_option_select(
+        "uid-1",
+        None,
+        None,
+        False,
+        {
+            "preserve_terminal_log": True,
+            "terminal_log_value": "episode success banner",
+        },
+    )
+
+    assert coords_update.get("__type__") == "update"
+    assert img_update.get("__type__") == "update"
+    assert log_update["value"] == "episode success banner"
+    assert suppress_flag is False
+    assert log_state == {
+        "preserve_terminal_log": True,
+        "terminal_log_value": "episode success banner",
+    }
 
 
 def test_on_demo_video_play_disables_button_and_sets_single_use_state(monkeypatch, reload_module):

gradio-web/ui_layout.py

@@ -872,6 +872,13 @@ def _normalize_load_result(load_result):
     if len(normalized) in {19, 20}:
         normalized.insert(8, gr.update(value=None, visible=False, playback_position=0))
         normalized.insert(16, gr.update(visible=False))
+    if len(normalized) == 21:
+        normalized.append(
+            {
+                "preserve_terminal_log": False,
+                "terminal_log_value": None,
+            }
+        )
     return tuple(normalized)
 
 
@@ -958,6 +965,12 @@ def create_ui_blocks():
                 "reference_action_interactive": True,
             }
         )
+        post_execute_log_state = gr.State(
+            value={
+                "preserve_terminal_log": False,
+                "terminal_log_value": None,
+            }
+        )
         current_task_env_state = gr.State(value=None)
         suppress_next_option_change_state = gr.State(value=False)
 
@@ -1123,6 +1136,7 @@ def create_ui_blocks():
             control_panel_group,
             task_hint_display,
             reference_action_btn,
+            post_execute_log_state,
             ui_phase_state,
             native_progress_host,
         ]
@@ -1398,7 +1412,7 @@ def create_ui_blocks():
 
         execute_video_display.end(
             fn=on_execute_video_end_transition,
-            inputs=[uid_state, post_execute_controls_state],
+            inputs=[uid_state, post_execute_controls_state, post_execute_log_state],
             outputs=[
                 execution_video_group,
                 action_phase_group,
@@ -1408,6 +1422,7 @@ def create_ui_blocks():
                 restart_episode_btn,
                 next_task_btn,
                 img_display,
+                log_output,
                 reference_action_btn,
                 task_hint_display,
                 ui_phase_state,
@@ -1423,7 +1438,7 @@ def create_ui_blocks():
         )
         execute_video_display.stop(
             fn=on_execute_video_end_transition,
-            inputs=[uid_state, post_execute_controls_state],
+            inputs=[uid_state, post_execute_controls_state, post_execute_log_state],
             outputs=[
                 execution_video_group,
                 action_phase_group,
@@ -1433,6 +1448,7 @@ def create_ui_blocks():
                 restart_episode_btn,
                 next_task_btn,
                 img_display,
+                log_output,
                 reference_action_btn,
                 task_hint_display,
                 ui_phase_state,
@@ -1463,8 +1479,8 @@ def create_ui_blocks():
 
         options_radio.change(
             fn=on_option_select,
-            inputs=[uid_state, options_radio, coords_box, suppress_next_option_change_state],
-            outputs=[coords_box, img_display, log_output, suppress_next_option_change_state],
+            inputs=[uid_state, options_radio, coords_box, suppress_next_option_change_state, post_execute_log_state],
+            outputs=[coords_box, img_display, log_output, suppress_next_option_change_state, post_execute_log_state],
             queue=False,
             show_progress="hidden",
         ).then(
@@ -1548,6 +1564,7 @@ def create_ui_blocks():
                 reference_action_btn,
                 task_hint_display,
                 post_execute_controls_state,
+                post_execute_log_state,
                 ui_phase_state,
             ],
             show_progress="hidden",