From cbb8c3198f70938039e24056074a69196b039803 Mon Sep 17 00:00:00 2001 From: raychen <815315825@qq.com> Date: Wed, 4 Nov 2026 16:39:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(agent):=20=E4=BF=AE=E5=A4=8D=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=8C=96=E5=93=8D=E5=BA=94=E6=A0=A1=E9=AA=8C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=90=8E=E6=97=A0=E6=B3=95=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 原因： set_model_response 校验失败产生的错误响应被误判为最终结果，导致 Agent 直接结束。 - 修复： 识别工具失败事件及并行合并后的错误响应，使校验错误返回模型并进入下一轮重试。 - 测试： 覆盖首次校验失败、模型修正后成功返回及并行工具错误场景。 --- .../core/test_output_schema_processor.py | 147 +++++++++++++++++- .../agents/core/_output_schema_processor.py | 13 +- 2 files changed, 157 insertions(+), 3 deletions(-) diff --git a/tests/agents/core/test_output_schema_processor.py b/tests/agents/core/test_output_schema_processor.py index 3d9065f22..5fbf96eab 100644 --- a/tests/agents/core/test_output_schema_processor.py +++ b/tests/agents/core/test_output_schema_processor.py @@ -9,6 +9,7 @@ import asyncio import json +from typing import Any from typing import List from unittest.mock import Mock @@ -24,9 +25,11 @@ from trpc_agent_sdk.context import InvocationContext, create_agent_context from trpc_agent_sdk.events import Event from trpc_agent_sdk.models import LLMModel, LlmRequest, LlmResponse, ModelRegistry +from trpc_agent_sdk.runners import Runner from trpc_agent_sdk.sessions import InMemorySessionService +from trpc_agent_sdk.tools import FunctionTool from trpc_agent_sdk.tools import TOOL_NAME as SET_MODEL_RESPONSE_TOOL_NAME -from trpc_agent_sdk.types import Content, FunctionResponse, Part +from trpc_agent_sdk.types import Content, FunctionCall, FunctionResponse, Part class MockLLMModel(LLMModel): @@ -41,6 +44,40 @@ def validate_request(self, request): pass +class ScriptedToolCallModel(LLMModel): + """Model test double that returns scripted function calls.""" + + def __init__(self, responses: list[dict[str, Any]]): + super().__init__(model_name="scripted-output-model") + self.responses = responses + self.calls = 0 + + @classmethod + def supported_models(cls) -> List[str]: + return [r"scripted-output-model"] + + async def _generate_async_impl(self, request, stream=False, ctx=None): + args = self.responses[self.calls] + self.calls += 1 + yield LlmResponse( + content=Content( + role="model", + parts=[ + Part( + function_call=FunctionCall( + id=f"set-response-{self.calls}", + name=SET_MODEL_RESPONSE_TOOL_NAME, + args=args, + ) + ) + ], + ) + ) + + def validate_request(self, request): + pass + + @pytest.fixture(scope="module", autouse=True) def register_test_model(): original_registry = ModelRegistry._registry.copy() @@ -108,7 +145,11 @@ def test_returns_none_for_none_event(self): assert get_structured_model_response(None) is None def test_returns_none_for_no_function_responses(self): - event = Event(invocation_id="inv-1", author="agent", content=Content(parts=[Part(text="text")])) + event = Event( + invocation_id="inv-1", + author="agent", + content=Content(parts=[Part(text="text")]), + ) assert get_structured_model_response(event) is None def test_returns_none_for_non_set_model_response(self): @@ -134,6 +175,108 @@ def test_returns_json_for_set_model_response(self): assert parsed["answer"] == "42" assert parsed["confidence"] == 0.95 + def test_returns_none_for_failed_set_model_response(self): + fr = FunctionResponse( + name=SET_MODEL_RESPONSE_TOOL_NAME, + response={ + "error": "tool_execution_error", + "message": "validation failed", + "status": "failed", + }, + ) + event = Event( + invocation_id="inv-1", + author="agent", + content=Content(parts=[Part(function_response=fr)]), + error_code="tool_execution_error", + error_message="validation failed", + ) + + assert get_structured_model_response(event) is None + + def test_returns_none_for_failed_response_in_merged_event(self): + """Parallel merging drops child error_code but retains its response.""" + success = FunctionResponse( + id="other-call", + name="other_tool", + response={"result": "ok"}, + ) + failed = FunctionResponse( + id="set-response", + name=SET_MODEL_RESPONSE_TOOL_NAME, + response={ + "error": "tool_execution_error", + "message": "validation failed", + "status": "failed", + }, + ) + event = Event( + invocation_id="inv-1", + author="agent", + content=Content( + parts=[ + Part(function_response=success), + Part(function_response=failed), + ] + ), + ) + + assert get_structured_model_response(event) is None + + +@pytest.mark.asyncio +async def test_invalid_set_model_response_retries_until_valid(): + model = ScriptedToolCallModel( + [ + {"answer": "missing confidence"}, + {"answer": "42", "confidence": 0.95}, + ] + ) + + def dummy_tool() -> str: + """Keep the agent on the output-schema-plus-tools code path.""" + return "ok" + + from trpc_agent_sdk.agents import LlmAgent + + agent = LlmAgent( + name="retry_output_agent", + model=model, + output_schema=SampleOutputSchema, + tools=[FunctionTool(dummy_tool)], + ) + session_service = InMemorySessionService() + await session_service.create_session( + app_name="test", + user_id="u1", + session_id="retry", + ) + runner = Runner( + app_name="test", + agent=agent, + session_service=session_service, + ) + + events = [ + event + async for event in runner.run_async( + user_id="u1", + session_id="retry", + new_message=Content( + role="user", + parts=[Part(text="Return a structured answer")], + ), + ) + ] + + assert model.calls == 2 + assert any(event.error_code == "tool_execution_error" for event in events) + final_event = events[-1] + assert json.loads(final_event.get_text()) == { + "answer": "42", + "confidence": 0.95, + } + # --------------------------------------------------------------------------- # OutputSchemaRequestProcessor diff --git a/trpc_agent_sdk/agents/core/_output_schema_processor.py b/trpc_agent_sdk/agents/core/_output_schema_processor.py index c40c13911..e20dddf0f 100644 --- a/trpc_agent_sdk/agents/core/_output_schema_processor.py +++ b/trpc_agent_sdk/agents/core/_output_schema_processor.py @@ -100,7 +100,18 @@ def get_structured_model_response(function_response_event: Event) -> str | None: for func_response in function_response_event.get_function_responses(): if func_response.name == SET_MODEL_RESPONSE_TOOL_NAME: + # Tool failures are returned as function responses so that the + # model can inspect the validation error and retry. Do not treat + # that error envelope as the final structured response. Checking + # the payload also covers errors inside merged parallel-tool + # events, where the child Event.error_code is not preserved. + response = func_response.response + if function_response_event.error_code or (isinstance(response, dict) and response.get("status") == "failed" + and "error" in response and "message" in response): + logger.debug("set_model_response failed; continuing the agent loop for retry") + return None + # Convert dict to JSON string - return json.dumps(func_response.response, ensure_ascii=False) + return json.dumps(response, ensure_ascii=False) return None