f624971613
* chore(core.utils): 🚨 修正错误Lint
* chore(core.provider): 🚨 修复基类错误Lint
* chore(core.utils): 补全session_get()的重载
* chore(core.provider): 🚨 修正实现错误Lint
* chore(core.platform): 🚨 修正platform基类和webchat的错误Lint
* chore(core.platform): 修正错误实现Lint
* fix(core.provider): 修复循环调用和错误assert
* chore(core.platform): 修复部分实现Lint
* chore(core.provider): 补充Dify.text_chat_stream的参数类型
* chore(core.pipeline): 🚨 修复错误Lint
* fix(core.slack): 补充遗漏导入
* chore(core.utils): 修复错误的session_get声明
* chore(core.platform): 移除Lark adapter import中的wildcard
* chore(core.db): 修复声明和部分逻辑
* chore(core.db): 添加typings,使faiss参数能被正确识别。
* chore(core): 修复声明
* chore(core): 修改声明
* chore: 补充faiss声明
* chore(dashboard): 修改实现,减少报错
* chore(package): 修改部分声明与实现,减少报错
* chore(core): 添加Handler的overload,以去除部分assert同时通过类型检查
* chore(core.pipeline): 修改Pipeline Scheduler的execute,将判断属性改为判断类型,通过静态类型检查
* chore(core.config): 添加类型标注,通过类型检查
* chore(core.message): 为File._download_file添加检查,通过类型检查
* fix: 将断言改为条件判断以实现优雅关闭的容错性
* refactor: 移除 discord 客户端中的 assert,改用 if None 判断并抛出异常
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: DiscordPlatformAdapter 对 self.client.user 为 None 做日志并返回,移除断言
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 增强 Lark 相关空值/异常检查并完善日志输出
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 将断言替换为条件检查并加入日志与错误处理
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* chore: 移除LLM生成的无用注释
* refactor: 使用 File.get_file 替换下载逻辑并移除 assert,提供默认 filename
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: Slack Socket 未初始化抛出运行时异常,图片 URL 判空改为非空判断
* refactor: 将 WeChatPadProAdapter 的断言改为空值判断并添加日志
* refactor: 使用 isinstance 替代断言实现类型判断,便于静态检查
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 去除cast,直接使用字段与字典访问,修正端口解析
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 使用 match-case 重构 ProviderManager 加载并通过类型检查抛出 TypeError
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: group_name_display 时若 group 对象为空则记录错误并返回
* fix: 将 _get_current_persona_id 的 assert 替换成 if guard 并返回 None
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 优化插件目录存在性检查及图片URL非空验证,更新JSON排序配置
* fix: 将 datetime_str 的 assert 替换为显式检查并抛出异常
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除 cast,改为运行时检查并在找不到调度器时跳过
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除 cast,改用 isinstance 检查 FaissVecDB 并警告
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 删除 typing.cast 导入,并在获取文件绝对路径前校验 file_
* refactor: 移除 typing.cast,简化内容安全检查调用
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 将 PlatformMetadata.id 设为必填并在注册时传入 id,移除 cast
* refactor: 移除 cast,改用 HasInitialize 与 isinstance 进行初始化
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 为 ProviderManager.initialize 增加ID类型判断,避免 None 导致 get 失败
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 为 OTTSProvider 与 AzureNativeProvider 引入 _client 与 client 属性改进上下文管理
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 为 Whisper 自托管源添加模型未初始化校验并直接调用 transcribe
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除未使用的 cast 导入并简化 platform_name 赋值
* refactor: 引入 cast 并对 id 使用 cast(str, ...) 提升类型安全
* fix: 将 _id_to_sid 返回改为 str,空值返回空串;对 id 与 message_id 使用 cast
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 重构 Discord 处理逻辑:强制 类型转换、优先斜杠指令并优化提及判断
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 统一对 id 获取执行 cast,并在微信消息解析失败时抛错
* Revert "fix: 去除cast,直接使用字段与字典访问,修正端口解析"
This reverts commit 1cbfdf9d1b.
* fix: 百炼 Rerank 会话关闭时返回空结果;初始化 request.prompt 避免空值拼接
* fix: 统一处理搜索结果链接为字符串,新增 _get_url 助手并适配 Bing/Sogo
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 调整 call_handler 泛型、Discord 通道注解及 FishAudioTTS API 请求类型
* refactor: 使用 col(...) 替代列引用并对结果进行 CursorResult 强转
* chore: ruff format
---------
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
Co-authored-by: Soulter <905617992@qq.com>
251 lines
8.8 KiB
Python
251 lines
8.8 KiB
Python
import asyncio
|
|
import inspect
|
|
import traceback
|
|
import typing as T
|
|
|
|
import mcp
|
|
|
|
from astrbot import logger
|
|
from astrbot.core.agent.handoff import HandoffTool
|
|
from astrbot.core.agent.mcp_client import MCPTool
|
|
from astrbot.core.agent.run_context import ContextWrapper
|
|
from astrbot.core.agent.tool import FunctionTool, ToolSet
|
|
from astrbot.core.agent.tool_executor import BaseFunctionToolExecutor
|
|
from astrbot.core.astr_agent_context import AstrAgentContext
|
|
from astrbot.core.message.message_event_result import (
|
|
CommandResult,
|
|
MessageChain,
|
|
MessageEventResult,
|
|
)
|
|
from astrbot.core.provider.register import llm_tools
|
|
|
|
|
|
class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
|
|
@classmethod
|
|
async def execute(cls, tool, run_context, **tool_args):
|
|
"""执行函数调用。
|
|
|
|
Args:
|
|
event (AstrMessageEvent): 事件对象, 当 origin 为 local 时必须提供。
|
|
**kwargs: 函数调用的参数。
|
|
|
|
Returns:
|
|
AsyncGenerator[None | mcp.types.CallToolResult, None]
|
|
|
|
"""
|
|
if isinstance(tool, HandoffTool):
|
|
async for r in cls._execute_handoff(tool, run_context, **tool_args):
|
|
yield r
|
|
return
|
|
|
|
elif isinstance(tool, MCPTool):
|
|
async for r in cls._execute_mcp(tool, run_context, **tool_args):
|
|
yield r
|
|
return
|
|
|
|
else:
|
|
async for r in cls._execute_local(tool, run_context, **tool_args):
|
|
yield r
|
|
return
|
|
|
|
@classmethod
|
|
async def _execute_handoff(
|
|
cls,
|
|
tool: HandoffTool,
|
|
run_context: ContextWrapper[AstrAgentContext],
|
|
**tool_args,
|
|
):
|
|
input_ = tool_args.get("input")
|
|
|
|
# make toolset for the agent
|
|
tools = tool.agent.tools
|
|
if tools:
|
|
toolset = ToolSet()
|
|
for t in tools:
|
|
if isinstance(t, str):
|
|
_t = llm_tools.get_func(t)
|
|
if _t:
|
|
toolset.add_tool(_t)
|
|
elif isinstance(t, FunctionTool):
|
|
toolset.add_tool(t)
|
|
else:
|
|
toolset = None
|
|
|
|
ctx = run_context.context.context
|
|
event = run_context.context.event
|
|
umo = event.unified_msg_origin
|
|
prov_id = await ctx.get_current_chat_provider_id(umo)
|
|
llm_resp = await ctx.tool_loop_agent(
|
|
event=event,
|
|
chat_provider_id=prov_id,
|
|
prompt=input_,
|
|
system_prompt=tool.agent.instructions,
|
|
tools=toolset,
|
|
max_steps=30,
|
|
run_hooks=tool.agent.run_hooks,
|
|
)
|
|
yield mcp.types.CallToolResult(
|
|
content=[mcp.types.TextContent(type="text", text=llm_resp.completion_text)]
|
|
)
|
|
|
|
@classmethod
|
|
async def _execute_local(
|
|
cls,
|
|
tool: FunctionTool,
|
|
run_context: ContextWrapper[AstrAgentContext],
|
|
**tool_args,
|
|
):
|
|
event = run_context.context.event
|
|
if not event:
|
|
raise ValueError("Event must be provided for local function tools.")
|
|
|
|
is_override_call = False
|
|
for ty in type(tool).mro():
|
|
if "call" in ty.__dict__ and ty.__dict__["call"] is not FunctionTool.call:
|
|
is_override_call = True
|
|
break
|
|
|
|
# 检查 tool 下有没有 run 方法
|
|
if not tool.handler and not hasattr(tool, "run") and not is_override_call:
|
|
raise ValueError("Tool must have a valid handler or override 'run' method.")
|
|
|
|
awaitable = None
|
|
method_name = ""
|
|
if tool.handler:
|
|
awaitable = tool.handler
|
|
method_name = "decorator_handler"
|
|
elif is_override_call:
|
|
awaitable = tool.call
|
|
method_name = "call"
|
|
elif hasattr(tool, "run"):
|
|
awaitable = getattr(tool, "run")
|
|
method_name = "run"
|
|
if awaitable is None:
|
|
raise ValueError("Tool must have a valid handler or override 'run' method.")
|
|
|
|
wrapper = call_local_llm_tool(
|
|
context=run_context,
|
|
handler=awaitable,
|
|
method_name=method_name,
|
|
**tool_args,
|
|
)
|
|
while True:
|
|
try:
|
|
resp = await asyncio.wait_for(
|
|
anext(wrapper),
|
|
timeout=run_context.tool_call_timeout,
|
|
)
|
|
if resp is not None:
|
|
if isinstance(resp, mcp.types.CallToolResult):
|
|
yield resp
|
|
else:
|
|
text_content = mcp.types.TextContent(
|
|
type="text",
|
|
text=str(resp),
|
|
)
|
|
yield mcp.types.CallToolResult(content=[text_content])
|
|
else:
|
|
# NOTE: Tool 在这里直接请求发送消息给用户
|
|
# TODO: 是否需要判断 event.get_result() 是否为空?
|
|
# 如果为空,则说明没有发送消息给用户,并且返回值为空,将返回一个特殊的 TextContent,其内容如"工具没有返回内容"
|
|
if res := run_context.context.event.get_result():
|
|
if res.chain:
|
|
try:
|
|
await event.send(
|
|
MessageChain(
|
|
chain=res.chain,
|
|
type="tool_direct_result",
|
|
)
|
|
)
|
|
except Exception as e:
|
|
logger.error(
|
|
f"Tool 直接发送消息失败: {e}",
|
|
exc_info=True,
|
|
)
|
|
yield None
|
|
except asyncio.TimeoutError:
|
|
raise Exception(
|
|
f"tool {tool.name} execution timeout after {run_context.tool_call_timeout} seconds.",
|
|
)
|
|
except StopAsyncIteration:
|
|
break
|
|
|
|
@classmethod
|
|
async def _execute_mcp(
|
|
cls,
|
|
tool: FunctionTool,
|
|
run_context: ContextWrapper[AstrAgentContext],
|
|
**tool_args,
|
|
):
|
|
res = await tool.call(run_context, **tool_args)
|
|
if not res:
|
|
return
|
|
yield res
|
|
|
|
|
|
async def call_local_llm_tool(
|
|
context: ContextWrapper[AstrAgentContext],
|
|
handler: T.Callable[
|
|
...,
|
|
T.Awaitable[MessageEventResult | mcp.types.CallToolResult | str | None]
|
|
| T.AsyncGenerator[MessageEventResult | CommandResult | str | None, None],
|
|
],
|
|
method_name: str,
|
|
*args,
|
|
**kwargs,
|
|
) -> T.AsyncGenerator[T.Any, None]:
|
|
"""执行本地 LLM 工具的处理函数并处理其返回结果"""
|
|
ready_to_call = None # 一个协程或者异步生成器
|
|
|
|
trace_ = None
|
|
|
|
event = context.context.event
|
|
|
|
try:
|
|
if method_name == "run" or method_name == "decorator_handler":
|
|
ready_to_call = handler(event, *args, **kwargs)
|
|
elif method_name == "call":
|
|
ready_to_call = handler(context, *args, **kwargs)
|
|
else:
|
|
raise ValueError(f"未知的方法名: {method_name}")
|
|
except ValueError as e:
|
|
logger.error(f"调用本地 LLM 工具时出错: {e}", exc_info=True)
|
|
except TypeError:
|
|
logger.error("处理函数参数不匹配,请检查 handler 的定义。", exc_info=True)
|
|
except Exception as e:
|
|
trace_ = traceback.format_exc()
|
|
logger.error(f"调用本地 LLM 工具时出错: {e}\n{trace_}")
|
|
|
|
if not ready_to_call:
|
|
return
|
|
|
|
if inspect.isasyncgen(ready_to_call):
|
|
_has_yielded = False
|
|
try:
|
|
async for ret in ready_to_call:
|
|
# 这里逐步执行异步生成器, 对于每个 yield 返回的 ret, 执行下面的代码
|
|
# 返回值只能是 MessageEventResult 或者 None(无返回值)
|
|
_has_yielded = True
|
|
if isinstance(ret, (MessageEventResult, CommandResult)):
|
|
# 如果返回值是 MessageEventResult, 设置结果并继续
|
|
event.set_result(ret)
|
|
yield
|
|
else:
|
|
# 如果返回值是 None, 则不设置结果并继续
|
|
# 继续执行后续阶段
|
|
yield ret
|
|
if not _has_yielded:
|
|
# 如果这个异步生成器没有执行到 yield 分支
|
|
yield
|
|
except Exception as e:
|
|
logger.error(f"Previous Error: {trace_}")
|
|
raise e
|
|
elif inspect.iscoroutine(ready_to_call):
|
|
# 如果只是一个协程, 直接执行
|
|
ret = await ready_to_call
|
|
if isinstance(ret, (MessageEventResult, CommandResult)):
|
|
event.set_result(ret)
|
|
yield
|
|
else:
|
|
yield ret
|