Skip to content

fix: on_tool_end无法获得工具返回的结果 #2956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Soulter merged 1 commit into from
Oct 4, 2025
Merged

fix: on_tool_end无法获得工具返回的结果 #2956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions astrbot/core/agent/runners/tool_loop_agent_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,17 @@ async def _handle_function_tools(
func_tool = req.func_tool.get_func(func_tool_name)
logger.info(f"使用工具：{func_tool_name}，参数：{func_tool_args}")

if not func_tool:
logger.warning(f"未找到指定的工具: {func_tool_name}，将跳过。")
tool_call_result_blocks.append(
ToolCallMessageSegment(
role="tool",
tool_call_id=func_tool_id,
content=f"error: 未找到工具 {func_tool_name}",
)
)
continue

try:
await self.agent_hooks.on_tool_start(
self.run_context, func_tool, func_tool_args
Expand All @@ -210,9 +221,12 @@ async def _handle_function_tools(
run_context=self.run_context,
**func_tool_args,
)
async for resp in executor:

_final_resp: CallToolResult | None = None
async for resp in executor: # type: ignore
if isinstance(resp, CallToolResult):
res = resp
_final_resp = resp
if isinstance(res.content[0], TextContent):
tool_call_result_blocks.append(
ToolCallMessageSegment(
Expand Down Expand Up @@ -279,13 +293,14 @@ async def _handle_function_tools(
chain=res.chain, type="tool_direct_result"
)
else:
# 不应该出现其他类型
logger.warning(
f"Tool 返回了不支持的类型: {type(resp)}，将忽略。"
)

try:
await self.agent_hooks.on_tool_end(
self.run_context, func_tool, func_tool_args, None
self.run_context, func_tool, func_tool_args, _final_resp
)
except Exception as e:
logger.error(f"Error in on_tool_end hook: {e}", exc_info=True)
Expand Down