fix: 修复 'ToolResult' object has no attribute 'get'
根因: cli_tools.process_tool_call 在启用 UnifiedToolManager 时直接返回
ToolResult 对象,而 7 个调用点全部按 dict 用 result.get('result'),触发
AttributeError;FC 路径 _execute_tool_by_name 也可能把 ToolResult 透传出去,
后续 result[:5000] 会再炸 TypeError。
- tool_result.py: 新增 normalize_tool_text / normalize_tool_dict,
统一收敛 ToolResult / dict / str / None 三种历史返回形态。
- cli_tools.process_tool_call: 统一返回 dict(附带 success/error_code/
tool_result),回退 handler 路径同样归一。
- cli_core._execute_tool_by_name: handler / memory / scheduler 返回值
归一成 str,保证 FC 路径可安全切片。
- openai/ollama/manual 引擎、websocket_server、cli_clawli: 取工具结果改用
normalize_tool_text(带本地兜底实现,避免循环导入)。
- cli_clawli: 顺带修复只回传最后一个工具结果的 bug,改为汇总全部。
- 测试: 23 项全过;纯格式/讯飞 500 降级回归冒烟通过。
This commit is contained in:
1 parent
dfc42d8583
commit
a63b9d2f97
8 files changed
+129
-20
No files matched your search
+13
-2
@@ -24,6 +24,17 @@ import os
|
||||
from datetime import datetime
|
||||
from typing import Optional, Dict, List
|
||||
|
||||
try:
|
||||
from xcli_core.tool_result import normalize_tool_text
|
||||
except Exception:
|
||||
def normalize_tool_text(result, default="无结果"):
|
||||
"""兜底归一化:ToolResult / dict / str 统一成字符串"""
|
||||
if result is None:
|
||||
return default
|
||||
if isinstance(result, dict):
|
||||
return str(result.get("result", default))
|
||||
return str(result)
|
||||
|
||||
# 全局变量
|
||||
websocket_server = None # 当前活动的服务器实例(供外部访问)
|
||||
proxy_client = None
|
||||
@@ -583,7 +594,7 @@ class LocalServer:
|
||||
await self._send_tool_status(websocket, tool_name, tool_args, "calling")
|
||||
|
||||
result = self.cli.process_tool_call(tool_data)
|
||||
result_text = result.get('result', '无结果')
|
||||
result_text = normalize_tool_text(result)
|
||||
results.append(result_text)
|
||||
|
||||
if websocket:
|
||||
@@ -957,7 +968,7 @@ class ProxyClient:
|
||||
results = []
|
||||
for tool_data in tool_calls:
|
||||
result = self.cli.process_tool_call(tool_data)
|
||||
results.append(result.get('result', '无结果'))
|
||||
results.append(normalize_tool_text(result))
|
||||
|
||||
self.cli.shared_conversation_history.append({
|
||||
"role": "assistant",
|
||||
|
||||
Reference in new issue
Block a user