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>
109 lines
3.6 KiB
Python
109 lines
3.6 KiB
Python
import inspect
|
|
import traceback
|
|
import typing as T
|
|
|
|
from astrbot import logger
|
|
from astrbot.core.message.message_event_result import CommandResult, MessageEventResult
|
|
from astrbot.core.platform.astr_message_event import AstrMessageEvent
|
|
from astrbot.core.star.star import star_map
|
|
from astrbot.core.star.star_handler import EventType, star_handlers_registry
|
|
|
|
|
|
async def call_handler(
|
|
event: AstrMessageEvent,
|
|
handler: T.Callable[..., T.Awaitable[T.Any] | T.AsyncGenerator[T.Any, None]],
|
|
*args,
|
|
**kwargs,
|
|
) -> T.AsyncGenerator[T.Any, None]:
|
|
"""执行事件处理函数并处理其返回结果
|
|
|
|
该方法负责调用处理函数并处理不同类型的返回值。它支持两种类型的处理函数:
|
|
1. 异步生成器: 实现洋葱模型,每次 yield 都会将控制权交回上层
|
|
2. 协程: 执行一次并处理返回值
|
|
|
|
Args:
|
|
event (AstrMessageEvent): 事件对象
|
|
handler (Awaitable): 事件处理函数
|
|
|
|
Returns:
|
|
AsyncGenerator[None, None]: 异步生成器,用于在管道中传递控制流
|
|
|
|
"""
|
|
ready_to_call = None # 一个协程或者异步生成器
|
|
|
|
trace_ = None
|
|
|
|
try:
|
|
ready_to_call = handler(event, *args, **kwargs)
|
|
except TypeError:
|
|
logger.error("处理函数参数不匹配,请检查 handler 的定义。", exc_info=True)
|
|
|
|
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
|
|
|
|
|
|
async def call_event_hook(
|
|
event: AstrMessageEvent,
|
|
hook_type: EventType,
|
|
*args,
|
|
**kwargs,
|
|
) -> bool:
|
|
"""调用事件钩子函数
|
|
|
|
Returns:
|
|
bool: 如果事件被终止,返回 True
|
|
#
|
|
|
|
"""
|
|
handlers = star_handlers_registry.get_handlers_by_event_type(
|
|
hook_type,
|
|
plugins_name=event.plugins_name,
|
|
)
|
|
for handler in handlers:
|
|
try:
|
|
assert inspect.iscoroutinefunction(handler.handler)
|
|
logger.debug(
|
|
f"hook({hook_type.name}) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}",
|
|
)
|
|
await handler.handler(event, *args, **kwargs)
|
|
except BaseException:
|
|
logger.error(traceback.format_exc())
|
|
|
|
if event.is_stopped():
|
|
logger.info(
|
|
f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。",
|
|
)
|
|
return True
|
|
|
|
return event.is_stopped()
|