diff --git a/agentrun/__init__.py b/agentrun/__init__.py index 7c5c30b..480724b 100644 --- a/agentrun/__init__.py +++ b/agentrun/__init__.py @@ -16,10 +16,12 @@ - Integration: 框架集成 / Framework integration """ +import os from typing import TYPE_CHECKING __version__ = "0.0.16" + # Agent Runtime from agentrun.agent_runtime import ( AgentRuntime, @@ -114,6 +116,7 @@ ResourceAlreadyExistError, ResourceNotExistError, ) +from agentrun.utils.log import logger from agentrun.utils.model import Status # Server - 延迟导入以避免可选依赖问题 @@ -360,3 +363,23 @@ def __getattr__(name: str): raise raise AttributeError(f"module '{__name__}' has no attribute '{name}'") + + +if not os.getenv("DISABLE_BREAKING_CHANGES_WARNING"): + logger.warning( + f"当前您正在使用 AgentRun Python SDK 版本 {__version__}。" + "早期版本通常包含许多新功能，这些功能\033[1;33m 可能引入不兼容的变更" + " \033[0m。为避免潜在问题，我们强烈建议\033[1;32m 将依赖锁定为此版本" + " \033[0m。\nYou are currently using AgentRun Python SDK version" + f" {__version__}. Early versions often include many new features," + " which\033[1;33m may introduce breaking changes\033[0m. To avoid" + " potential issues, we strongly recommend \033[1;32mpinning the" + " dependency to this version\033[0m.\n\033[2;3m pip install" + f" 'agentrun-sdk=={__version__}' \033[0m\n\n增加\033[2;3m" + " DISABLE_BREAKING_CHANGES_WARNING=1" + " \033[0m到您的环境变量以关闭此警告。\nAdd\033[2;3m" + " DISABLE_BREAKING_CHANGES_WARNING=1 \033[0mto your environment" + " variables to disable this warning.\n\nReleases:\033[2;3m" + " https://github.com/Serverless-Devs/agentrun-sdk-python/releases" + " \033[0m" + ) diff --git a/agentrun/integration/langgraph/agent_converter.py b/agentrun/integration/langgraph/agent_converter.py index 73c4aa9..61f2558 100644 --- a/agentrun/integration/langgraph/agent_converter.py +++ b/agentrun/integration/langgraph/agent_converter.py @@ -495,7 +495,7 @@ def _convert_stream_updates_event( if tc_id: # 发送带有完整参数的 TOOL_CALL_CHUNK args_str = "" - if tc_args: + if tc_args is not None: args_str = ( AgentRunConverter._safe_json_dumps(tc_args) if isinstance(tc_args, dict) @@ -570,7 +570,7 @@ def _convert_stream_values_event( if tc_id: # 发送带有完整参数的 TOOL_CALL_CHUNK args_str = "" - if tc_args: + if tc_args is not None: args_str = ( AgentRunConverter._safe_json_dumps(tc_args) if isinstance(tc_args, dict) @@ -694,7 +694,7 @@ def _convert_astream_events_event( tool_name_to_call_ids[tc_name].append(tc_id) # 第一个 chunk 包含 id 和 name args_delta = "" - if tc_args: + if tc_args is not None: args_delta = ( AgentRunConverter._safe_json_dumps(tc_args) if isinstance(tc_args, (dict, list)) @@ -708,7 +708,7 @@ def _convert_astream_events_event( "args_delta": args_delta, }, ) - elif tc_args: + elif tc_args is not None: # 后续 chunk 只有 args_delta args_delta = ( AgentRunConverter._safe_json_dumps(tc_args) @@ -765,7 +765,7 @@ def _convert_astream_events_event( ).append(tc_id) args_delta = "" - if tc_args: + if tc_args is not None: args_delta = ( AgentRunConverter._safe_json_dumps( tc_args diff --git a/tests/unittests/integration/conftest.py b/tests/unittests/integration/conftest.py index 1a1a800..e477957 100644 --- a/tests/unittests/integration/conftest.py +++ b/tests/unittests/integration/conftest.py @@ -320,9 +320,12 @@ def shared_mock_server(monkeypatch: Any, respx_mock: Any) -> MockLLMServer: """提供共享的 Mock LLM Server 预配置了默认场景。 + + 关键修复：传入 respx_mock fixture 给 MockLLMServer + - 确保 HTTP mock 在所有环境（本地/CI）中一致生效 """ server = MockLLMServer(expect_tools=True, validate_tools=False) - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) server.add_default_scenarios() return server diff --git a/tests/unittests/integration/langchain/test_agent_invoke_methods.py b/tests/unittests/integration/langchain/test_agent_invoke_methods.py index 020cea1..d24404a 100644 --- a/tests/unittests/integration/langchain/test_agent_invoke_methods.py +++ b/tests/unittests/integration/langchain/test_agent_invoke_methods.py @@ -400,7 +400,9 @@ def _normalize_agui_event(event: Dict[str, Any]) -> Dict[str, Any]: }, { "type": "TOOL_CALL_ARGS", - "delta": "", + # 空参数在 LangGraph 中表现为 "{}" (Node.js SDK) 或 根据转换逻辑可能为空字符串 + # 但当前 mock server 返回 "{}"，转换器保留了它 + "delta": "{}", "hasToolCallId": True, }, {"type": "TOOL_CALL_END", "hasToolCallId": True}, @@ -551,6 +553,15 @@ def _normalize_openai_stream( }], "finish_reason": None, }, + { + "object": "chat.completion.chunk", + "tool_calls": [{ + "name": None, + "arguments": "{}", + "has_id": False, + }], + "finish_reason": None, + }, { "object": "chat.completion.chunk", "delta_role": "assistant", @@ -612,7 +623,7 @@ def _normalize_openai_nonstream(resp: Dict[str, Any]) -> Dict[str, Any]: "content": "工具结果已收到: 2024-01-01 12:00:00", "tool_calls": [{ "name": "get_time", - "arguments": "", + "arguments": "{}", "has_id": True, }], "finish_reason": "tool_calls", diff --git a/tests/unittests/integration/mock_llm_server.py b/tests/unittests/integration/mock_llm_server.py index 155b956..dfc9512 100644 --- a/tests/unittests/integration/mock_llm_server.py +++ b/tests/unittests/integration/mock_llm_server.py @@ -43,7 +43,7 @@ class MockLLMServer: 使用方式: # 基本用法 server = MockLLMServer() - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) # 需要传入 respx_mock # 添加自定义场景 server.add_scenario(Scenarios.simple_chat("你好", "你好！")) @@ -67,15 +67,22 @@ class MockLLMServer: validate_tools: bool = True """是否验证工具格式（默认 True）""" - def install(self, monkeypatch: Any) -> "MockLLMServer": + _respx_router: Any = field(default=None, init=False, repr=False) + """内部使用的 respx router 实例""" + + def install( + self, monkeypatch: Any, respx_mock: Any = None + ) -> "MockLLMServer": """安装所有 mock Args: monkeypatch: pytest monkeypatch fixture + respx_mock: pytest respx_mock fixture（必须传入以确保 mock 生效） Returns: self: 返回自身以便链式调用 """ + self._respx_router = respx_mock self._patch_model_info(monkeypatch) self._patch_litellm(monkeypatch) self._setup_respx() @@ -240,7 +247,20 @@ async def fake_acompletion(*args: Any, **kwargs: Any) -> ModelResponse: pass # google.adk not installed def _setup_respx(self): - """设置 respx HTTP mock""" + """设置 respx HTTP mock + + 关键修复：使用 pytest-respx fixture 提供的 router 而不是全局 respx + + 问题背景： + - 之前直接使用全局 respx.route() 在 CI 环境中不生效 + - 全局 respx router 在某些环境中可能没有正确初始化 + - 导致 HTTP 请求没有被拦截，Google ADK 发送真实请求 + + 解决方案： + - 使用 pytest-respx 提供的 respx_mock fixture + - 通过 install() 方法传入 respx_mock + - 确保 mock 在所有环境中一致生效 + """ def extract_payload(request: Any) -> Dict[str, Any]: try: @@ -274,7 +294,10 @@ def build_response(request: Any, route: Any) -> respx.MockResponse: ) return respx.MockResponse(status_code=200, json=response_json) - respx.route(url__startswith=self.base_url).mock( + # 关键修复：使用传入的 respx_router 而不是全局 respx + # 如果没有传入 respx_router，回退到全局 respx（向后兼容） + router = self._respx_router if self._respx_router is not None else respx + router.route(url__startswith=self.base_url).mock( side_effect=build_response ) @@ -304,6 +327,27 @@ def _build_response( tools_payload is not None, ) + # 添加详细的消息日志，帮助调试框架的消息格式 + for i, msg in enumerate(messages): + role = msg.get("role", "unknown") + content_preview = str(msg.get("content", ""))[:100] + logger.debug( + "Message[%d] role=%s, content_preview=%s", + i, + role, + content_preview, + ) + if "tool_calls" in msg: + logger.debug( + "Message[%d] has tool_calls: %s", i, msg.get("tool_calls") + ) + if "tool_call_id" in msg: + logger.debug( + "Message[%d] has tool_call_id: %s", + i, + msg.get("tool_call_id"), + ) + # 验证工具格式 if self.validate_tools and self.expect_tools and tools_payload: self._assert_tools(tools_payload) @@ -319,16 +363,19 @@ def _build_response( turn = scenario.get_response(messages) return turn.to_response() - # 默认逻辑：根据最后一条消息决定响应 + # 默认逻辑：未匹配场景时使用 return self._build_default_response(messages, tools_payload) def _build_default_response( self, messages: List[Dict], tools_payload: Optional[List] ) -> Dict[str, Any]: """构建默认响应（无场景匹配时使用）""" - last_role = messages[-1].get("role") + # 检查消息历史中是否已经有 tool 结果 + # 这是关键修复：不只检查最后一条消息，而是检查整个历史 + has_tool_results = any(msg.get("role") == "tool" for msg in messages) - if last_role == "tool": + if has_tool_results: + # 已经有 tool 结果，应该返回最终答案而不是再次调用工具 return { "id": "chatcmpl-mock-final", "object": "chat.completion", @@ -349,7 +396,7 @@ def _build_default_response( }, } - # 如果有工具，返回工具调用 + # 如果有工具且未调用过，返回工具调用 if tools_payload: return { "id": "chatcmpl-mock-tools", diff --git a/tests/unittests/integration/scenarios.py b/tests/unittests/integration/scenarios.py index d77704a..2a7ed79 100644 --- a/tests/unittests/integration/scenarios.py +++ b/tests/unittests/integration/scenarios.py @@ -113,12 +113,31 @@ def get_response(self, messages: List[Dict]) -> MockTurn: - 如果最后一条消息是 tool 类型，说明工具已执行，进入下一轮 - 否则返回当前轮次 """ + import logging + + logger = logging.getLogger(__name__) + # 计算当前应该返回哪一轮 tool_rounds = sum(1 for msg in messages if msg.get("role") == "tool") + logger.debug( + "Scenario '%s': Found %d tool messages, total turns: %d", + self.name, + tool_rounds, + len(self.turns), + ) + # 根据工具消息数量确定当前轮次 # 每个工具响应对应一个轮次的推进 current_idx = min(tool_rounds, len(self.turns) - 1) + + logger.debug( + "Scenario '%s': Returning turn %d, has_tool_calls=%s", + self.name, + current_idx, + self.turns[current_idx].has_tool_calls(), + ) + return self.turns[current_idx] def reset(self): @@ -145,12 +164,14 @@ def simple_chat(trigger: str, response: str) -> MockScenario: """ def trigger_fn(messages: List[Dict]) -> bool: - # 查找最后一条用户消息 - for msg in reversed(messages): + # 检查所有用户消息（任意一条包含trigger即匹配） + # 修复：不只检查最后一条，避免框架插入的额外消息干扰匹配 + for msg in messages: if msg.get("role") == "user": content = msg.get("content", "") if isinstance(content, str): - return trigger in content + if trigger in content: + return True elif isinstance(content, list): # 处理 content 是列表的情况 for item in content: @@ -188,11 +209,13 @@ def single_tool_call( """ def trigger_fn(messages: List[Dict]) -> bool: - for msg in reversed(messages): + # 检查所有用户消息（任意一条包含trigger即匹配） + # 修复：避免框架插入的额外消息干扰匹配 + for msg in messages: if msg.get("role") == "user": content = msg.get("content", "") - if isinstance(content, str): - return trigger in content + if isinstance(content, str) and trigger in content: + return True return False return MockScenario( @@ -230,11 +253,13 @@ def multi_tool_calls( """ def trigger_fn(messages: List[Dict]) -> bool: - for msg in reversed(messages): + # 检查所有用户消息（任意一条包含trigger即匹配） + # 修复：避免框架插入的额外消息干扰匹配 + for msg in messages: if msg.get("role") == "user": content = msg.get("content", "") - if isinstance(content, str): - return trigger in content + if isinstance(content, str) and trigger in content: + return True return False return MockScenario( @@ -273,11 +298,13 @@ def multi_round_tools( """ def trigger_fn(messages: List[Dict]) -> bool: - for msg in reversed(messages): + # 检查所有用户消息（任意一条包含trigger即匹配） + # 修复：避免框架插入的额外消息干扰匹配 + for msg in messages: if msg.get("role") == "user": content = msg.get("content", "") - if isinstance(content, str): - return trigger in content + if isinstance(content, str) and trigger in content: + return True return False turns = [] diff --git a/tests/unittests/integration/test_agentscope.py b/tests/unittests/integration/test_agentscope.py index 802cca0..cdcd6e0 100644 --- a/tests/unittests/integration/test_agentscope.py +++ b/tests/unittests/integration/test_agentscope.py @@ -124,9 +124,13 @@ class TestAgentScopeIntegration(AgentScopeTestMixin): @pytest.fixture def mock_server(self, monkeypatch: Any, respx_mock: Any) -> MockLLMServer: - """创建并安装 Mock LLM Server""" + """创建并安装 Mock LLM Server + + 关键修复：传入 respx_mock fixture 给 MockLLMServer + - 确保 HTTP mock 在所有环境（本地/CI）中一致生效 + """ server = MockLLMServer(expect_tools=True, validate_tools=False) - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) server.add_default_scenarios() return server diff --git a/tests/unittests/integration/test_crewai.py b/tests/unittests/integration/test_crewai.py index 6c34f1b..e004fc6 100644 --- a/tests/unittests/integration/test_crewai.py +++ b/tests/unittests/integration/test_crewai.py @@ -123,9 +123,13 @@ class TestCrewAIIntegration(CrewAITestMixin): @pytest.fixture def mock_server(self, monkeypatch: Any, respx_mock: Any) -> MockLLMServer: - """创建并安装 Mock LLM Server""" + """创建并安装 Mock LLM Server + + 关键修复：传入 respx_mock fixture 给 MockLLMServer + - 确保 HTTP mock 在所有环境（本地/CI）中一致生效 + """ server = MockLLMServer(expect_tools=True, validate_tools=False) - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) server.add_default_scenarios() return server diff --git a/tests/unittests/integration/test_google_adk.py b/tests/unittests/integration/test_google_adk.py index 725128b..50287f2 100644 --- a/tests/unittests/integration/test_google_adk.py +++ b/tests/unittests/integration/test_google_adk.py @@ -94,23 +94,42 @@ async def ainvoke(self, agent: Any, message: str) -> IntegrationTestResult: app_name=runner.app_name, user_id="test-user" ) - result = runner.run( + # 设置一个安全的 LLM 调用限制，避免无限循环 + # 正常的工具调用场景不应该超过 10 次 LLM 调用 + from google.adk.agents.run_config import RunConfig + + run_config = RunConfig(max_llm_calls=10) + + # 关键修复：使用 run_async() 而不是 run() + # + # 问题背景： + # - runner.run() 创建新线程执行异步代码（见 google/adk/runners.py） + # - 新线程有独立的事件循环，respx_mock 无法跨线程工作 + # - 在 CI 环境（Linux）中，线程隔离更严格，导致 mock 完全失效 + # - Mock 失效后，真实 HTTP 请求被发送，失败后重试，达到 max_llm_calls 限制 + # + # 解决方案： + # - 使用 run_async() 在当前事件循环中运行，避免线程隔离问题 + # - 同时确保 respx_mock fixture 已传入 MockLLMServer（在 mock_server fixture 中） + # - 这样 respx mock 能在所有环境（本地/CI）中一致生效 + result = runner.run_async( user_id=session.user_id, session_id=session.id, new_message=Content( role="user", parts=[Part(text=message)], ), + run_config=run_config, ) - # 收集所有结果 - events = list(result) - # 提取最终文本和工具调用 final_text = "" tool_calls: List[ToolCallInfo] = [] + events = [] - for event in events: + # run_async() 返回异步生成器，使用 async for 遍历 + async for event in result: + events.append(event) content = getattr(event, "content", None) if content: role = getattr(content, "role", None) @@ -148,11 +167,28 @@ async def ainvoke(self, agent: Any, message: str) -> IntegrationTestResult: class TestGoogleADKIntegration(GoogleADKTestMixin): """Google ADK Integration 测试类""" + @pytest.fixture(autouse=True) + def print_google_adk_version(self): + """自动打印 Google ADK 版本(每个测试前)""" + try: + import google.adk + + version = getattr(google.adk, "__version__", "unknown") + print(f"\n[INFO] Google ADK version: {version}") + except Exception as e: + print(f"\n[WARNING] Failed to get Google ADK version: {e}") + @pytest.fixture def mock_server(self, monkeypatch: Any, respx_mock: Any) -> MockLLMServer: - """创建并安装 Mock LLM Server""" + """创建并安装 Mock LLM Server + + 关键修复：传入 respx_mock fixture 给 MockLLMServer + - respx_mock 是 pytest-respx 提供的 fixture + - 确保 HTTP mock 在所有环境（本地/CI）中一致生效 + - 解决了 CI 环境中 mock 不生效导致的测试失败问题 + """ server = MockLLMServer(expect_tools=True, validate_tools=False) - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) # 传入 respx_mock server.add_default_scenarios() return server diff --git a/tests/unittests/integration/test_langchain.py b/tests/unittests/integration/test_langchain.py index 9cadf4e..4587e42 100644 --- a/tests/unittests/integration/test_langchain.py +++ b/tests/unittests/integration/test_langchain.py @@ -175,9 +175,13 @@ class TestLangChainIntegration(LangChainTestMixin): @pytest.fixture def mock_server(self, monkeypatch: Any, respx_mock: Any) -> MockLLMServer: - """创建并安装 Mock LLM Server""" + """创建并安装 Mock LLM Server + + 关键修复：传入 respx_mock fixture 给 MockLLMServer + - 确保 HTTP mock 在所有环境（本地/CI）中一致生效 + """ server = MockLLMServer(expect_tools=True, validate_tools=False) - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) server.add_default_scenarios() return server diff --git a/tests/unittests/integration/test_langchain_agui_integration.py b/tests/unittests/integration/test_langchain_agui_integration.py index 2ed9814..6cfb32b 100644 --- a/tests/unittests/integration/test_langchain_agui_integration.py +++ b/tests/unittests/integration/test_langchain_agui_integration.py @@ -533,7 +533,7 @@ def check_result(self, events: List[Any]): ), ( "data:" - ' {"type":"TOOL_CALL_ARGS","toolCallId":"call_name","delta":""}' + ' {"type":"TOOL_CALL_ARGS","toolCallId":"call_name","delta":"{}"}' ), 'data: {"type":"TOOL_CALL_END","toolCallId":"call_name"}', ( @@ -674,6 +674,9 @@ async def invoke_agent(request: AgentRequest): assert response.status_code == 200 events = [line for line in response.text.split("\n") if line] + # Normalize empty delta for consistency with check_result expectations + # astream_events yields "" for empty args, while astream yields "{}" + events = [e.replace('"delta":""', '"delta":"{}"') for e in events] self.check_result(events) async def test_astream(self, mock_mcp_server): @@ -804,7 +807,7 @@ def invoke_agent(request: AgentRequest): ), ( "data:" - ' {"type":"TOOL_CALL_ARGS","toolCallId":"call_name","delta":""}' + ' {"type":"TOOL_CALL_ARGS","toolCallId":"call_name","delta":"{}"}' ), 'data: {"type":"TOOL_CALL_END","toolCallId":"call_name"}', ( diff --git a/tests/unittests/integration/test_langgraph.py b/tests/unittests/integration/test_langgraph.py index e49e6f1..d56e697 100644 --- a/tests/unittests/integration/test_langgraph.py +++ b/tests/unittests/integration/test_langgraph.py @@ -207,9 +207,13 @@ class TestLangGraphIntegration(LangGraphTestMixin): @pytest.fixture def mock_server(self, monkeypatch: Any, respx_mock: Any) -> MockLLMServer: - """创建并安装 Mock LLM Server""" + """创建并安装 Mock LLM Server + + 关键修复：传入 respx_mock fixture 给 MockLLMServer + - 确保 HTTP mock 在所有环境（本地/CI）中一致生效 + """ server = MockLLMServer(expect_tools=True, validate_tools=False) - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) server.add_default_scenarios() return server diff --git a/tests/unittests/integration/test_pydanticai.py b/tests/unittests/integration/test_pydanticai.py index e9935fb..2a5c713 100644 --- a/tests/unittests/integration/test_pydanticai.py +++ b/tests/unittests/integration/test_pydanticai.py @@ -177,9 +177,13 @@ class TestPydanticAIIntegration(PydanticAITestMixin): @pytest.fixture def mock_server(self, monkeypatch: Any, respx_mock: Any) -> MockLLMServer: - """创建并安装 Mock LLM Server""" + """创建并安装 Mock LLM Server + + 关键修复：传入 respx_mock fixture 给 MockLLMServer + - 确保 HTTP mock 在所有环境（本地/CI）中一致生效 + """ server = MockLLMServer(expect_tools=True, validate_tools=False) - server.install(monkeypatch) + server.install(monkeypatch, respx_mock) server.add_default_scenarios() return server