aidev-bkplugin 2.2.0.post4__tar.gz → 2.2.0.post10__tar.gz

{aidev_bkplugin-2.2.0.post4 → aidev_bkplugin-2.2.0.post10}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: aidev-bkplugin
-Version: 2.2.0.post4
+Version: 2.2.0.post10
 Summary: AiDev Agent Bkplugin builtin functions
 Requires-Python: <3.12,>=3.11
-Requires-Dist: aidev-agent>=2.2.0post4
+Requires-Dist: aidev-agent>=2.2.0post10
 Requires-Dist: blueapps<5.0,>=4.15.1
 Requires-Dist: django<5.0,>=4.2.28
 Description-Content-Type: text/markdown

{aidev_bkplugin-2.2.0.post4 → aidev_bkplugin-2.2.0.post10}/aidev_bkplugin/services/agent_execution.py

@@ -77,6 +77,9 @@ class AgentExecutor:
         result = agent_instance.execute(execute_kwargs)
         # 非流式 ainvoke 不经过 AG-UI 事件分发，必须显式写回 assistant
         self.session_manager.save_ai_response(session_code, result, turn_id=turn_id)
+        event_handler = getattr(agent_instance, "event_handler", None)
+        if isinstance(event_handler, BaseSessionWriter) and hasattr(event_handler, "set_streaming_finished"):
+            event_handler.set_streaming_finished()
         return result
 
     @classmethod
@@ -89,7 +92,7 @@ class AgentExecutor:
         *,
         turn_id: str = "",
     ):
-        """执行 agent 直至结束；后台消费者完整 drain 后统一收尾会话状态。"""
+        """执行 agent 直至结束；会话终态由 Agent 流完成回调统一写入。"""
         # 后台 drain（for _ in out: pass，无 SSE 下游）：标记为 background_only，
         # 使消费者读到 EOD 时不立即清理队列，保留 DLQ 历史供前端在清理窗口内接管续流。
         execute_kwargs.background_only = True
@@ -108,8 +111,6 @@ class AgentExecutor:
         if execute_kwargs.stream:
             for _ in out:
                 pass
-            if isinstance(handler, BaseSessionWriter) and hasattr(handler, "set_streaming_finished"):
-                handler.set_streaming_finished()
         return out
 
     def wrap_generator(self, generator, session_code: str, *, turn_id: str = ""):

{aidev_bkplugin-2.2.0.post4 → aidev_bkplugin-2.2.0.post10}/aidev_bkplugin/views/chat.py

@@ -136,14 +136,8 @@ class ChatCompletionViewSet(PluginViewSet):
                     turn_id=turn_id,
                 )
                 handler = getattr(agent_instance, "event_handler", None)
-                if handler and all(hasattr(handler, m) for m in ["set_streaming_started", "set_streaming_finished"]):
+                if handler and hasattr(handler, "set_streaming_started"):
                     handler.set_streaming_started()
-                    stream_out = self._wrap_streaming_with_status(
-                        stream_out,
-                        handler,
-                        session_code=session_code,
-                        username=username,
-                    )
                 return self.streaming_response(stream_out, session_code=session_code)
             else:
                 result = AgentExecutor(SessionManager(username=username)).execute_with_save(
@@ -374,16 +368,8 @@ class ChatCompletionViewSet(PluginViewSet):
             raise ClientBlueException(message=message)
 
         logger.info(f"[FLOW_AGENT] Streaming started: session_code={session_code}, task_id={task_id}")
-        if event_handler and all(
-            hasattr(event_handler, m) for m in ["set_streaming_started", "set_streaming_finished"]
-        ):
+        if event_handler and hasattr(event_handler, "set_streaming_started"):
             event_handler.set_streaming_started()
-            generator = self._wrap_streaming_with_status(
-                generator,
-                event_handler,
-                session_code=session_code,
-                username=username,
-            )
         return self.streaming_response(generator, session_code=session_code)
 
     def _wrap_streaming_with_status(self, generator, event_handler, session_code: str = "", username: str = ""):

{aidev_bkplugin-2.2.0.post4 → aidev_bkplugin-2.2.0.post10}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "aidev-bkplugin"
-version = "2.2.0post4"
+version = "2.2.0post10"
 description = "AiDev Agent Bkplugin builtin functions"
 readme = "readme.md"
 requires-python = "<3.12,>=3.11"
 dependencies = [
-    "aidev-agent>=2.2.0post4",
+    "aidev-agent>=2.2.0post10",
     "blueapps>=4.15.1, <5.0",
     "django>=4.2.28,<5.0",
 ]

{aidev_bkplugin-2.2.0.post4 → aidev_bkplugin-2.2.0.post10}/tests/services/test_agent_completion.py

@@ -18,7 +18,24 @@ sys.modules.setdefault("bk_plugin_framework.kit.decorators", _bk_plugin_framewor
 
 
 class TestAgentExecutorCompletion:
-    def test_sets_finished_after_stream_is_drained(self):
+    def test_non_streaming_sets_finished_after_response_is_saved(self):
+        from aidev_agent.services.event_handlers.base import BaseSessionWriter
+        from aidev_bkplugin.services.agent_execution import AgentExecutor
+
+        result = {"choices": [{"delta": {"content": "done"}}]}
+        handler = MagicMock(spec=BaseSessionWriter)
+        agent = MagicMock(event_handler=handler)
+        agent.execute.return_value = result
+        execute_kwargs = MagicMock(stream=False)
+        manager = MagicMock()
+
+        assert (
+            AgentExecutor(manager).execute_with_save(agent, execute_kwargs, "session-abc", turn_id="turn-1") == result
+        )
+        manager.save_ai_response.assert_called_once_with("session-abc", result, turn_id="turn-1")
+        handler.set_streaming_finished.assert_called_once_with()
+
+    def test_drain_does_not_write_terminal_state(self):
         from aidev_agent.services.event_handlers.base import BaseSessionWriter
         from aidev_bkplugin.services.agent_execution import AgentExecutor
 
@@ -29,14 +46,14 @@ class TestAgentExecutorCompletion:
             lifecycle.append("drained")
 
         handler = MagicMock(spec=BaseSessionWriter)
-        handler.set_streaming_finished.side_effect = lambda: lifecycle.append("finished")
         agent = MagicMock(event_handler=handler)
         execute_kwargs = MagicMock(stream=True)
         with patch.object(AgentExecutor, "execute_with_save", return_value=stream()):
             AgentExecutor.run_agent_to_completion(agent, execute_kwargs, "session-abc", MagicMock())
 
         assert execute_kwargs.background_only is True
-        assert lifecycle == ["drained", "finished"]
+        assert lifecycle == ["drained"]
+        handler.set_streaming_finished.assert_not_called()
 
     def test_does_not_set_finished_when_stream_drain_fails(self):
         from aidev_agent.services.event_handlers.base import BaseSessionWriter

{aidev_bkplugin-2.2.0.post4 → aidev_bkplugin-2.2.0.post10}/tests/services/test_agui_handler.py

@@ -254,8 +254,8 @@ class TestCustomEventSessionPath:
 class TestHandleRunError:
     """测试 handle_run_error 的回写逻辑"""
 
-    def test_run_error_writes_fail_status(self, session_writer, mock_client):
-        """运行错误时回写 fail 状态"""
+    def test_run_error_defers_session_status(self, session_writer, mock_client):
+        """RUN_ERROR 只记录错误内容，不能抢先写会话终态。"""
         event = RunErrorEvent(type=EventType.RUN_ERROR, message="执行过程中发生错误")
 
         session_writer(event)
@@ -268,24 +268,39 @@ class TestHandleRunError:
         assert payload["role"] == PromptRole.ASSISTANT.value
         assert payload["content"] == "执行过程中发生错误"
         assert payload["property"]["builtin_property"]["error"] is True
+        mock_client.api.update_chat_session.assert_not_called()
+
+    def test_run_error_finished_keeps_session_failed(self, session_writer, mock_client):
+        """运行错误后结束流，不应把会话覆盖为 finished"""
+        event = RunErrorEvent(type=EventType.RUN_ERROR, message="执行过程中发生错误")
+
+        session_writer(event)
+        session_writer.set_streaming_finished()
+
         mock_client.api.update_chat_session.assert_called_once_with(
             path_params={"session_code": "test-session-123"},
             json={"status": SessionsStatus.FAILED.value},
             headers={"X-BKAIDEV-USER": "test-user"},
         )
 
-    def test_run_error_finished_keeps_session_failed(self, session_writer, mock_client):
-        """运行错误后结束流，不应把会话覆盖为 finished"""
-        event = RunErrorEvent(type=EventType.RUN_ERROR, message="执行过程中发生错误")
+    def test_finished_status_retries_then_succeeds(self, session_writer, mock_client, monkeypatch):
+        sleep = MagicMock()
+        monkeypatch.setattr("aidev_agent.services.event_handlers.agui_writer.time.sleep", sleep)
+        mock_client.api.update_chat_session.side_effect = [RuntimeError("one"), RuntimeError("two"), {}]
 
-        session_writer(event)
         session_writer.set_streaming_finished()
 
-        status_payloads = [call.kwargs["json"] for call in mock_client.api.update_chat_session.call_args_list]
-        assert status_payloads == [
-            {"status": SessionsStatus.FAILED.value},
-            {"status": SessionsStatus.FAILED.value},
-        ]
+        assert mock_client.api.update_chat_session.call_count == 3
+        assert [call.args[0] for call in sleep.call_args_list] == [0.2, 0.4]
+
+    def test_finished_status_raises_after_retries_exhausted(self, session_writer, mock_client, monkeypatch):
+        monkeypatch.setattr("aidev_agent.services.event_handlers.agui_writer.time.sleep", MagicMock())
+        mock_client.api.update_chat_session.side_effect = RuntimeError("platform unavailable")
+
+        with pytest.raises(RuntimeError, match="platform unavailable"):
+            session_writer.set_streaming_finished()
+
+        assert mock_client.api.update_chat_session.call_count == 3
 
 
 def make_flow_agent_result_event(task_id: str, task_state: str = "RUNNING"):

{aidev_bkplugin-2.2.0.post4 → aidev_bkplugin-2.2.0.post10}/tests/views/test_chat_flow_agent.py

@@ -72,3 +72,15 @@ def test_no_marker_starts_new_task_without_touching_marker(flow_agent_env):
 
     assert build_agent.call_args.kwargs["task_id"] is None
     sm.set_flow_resume_pending.assert_not_called()
+
+
+def test_flow_http_does_not_install_second_terminal_status_writer(flow_agent_env):
+    view, _build_agent, sm, writer_cls = flow_agent_env
+    sm.get_flow_info.return_value = {}
+    view._wrap_streaming_with_status = MagicMock(side_effect=AssertionError("duplicate terminal writer"))
+
+    result = view._handle_flow_agent(_data(), "sc-1", "alice", turn_id="turn-1")
+
+    assert result == "STREAM"
+    writer_cls.return_value.set_streaming_started.assert_called_once_with()
+    view._wrap_streaming_with_status.assert_not_called()