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>
229 lines
7.4 KiB
Python
229 lines
7.4 KiB
Python
from __future__ import annotations
|
|
|
|
import enum
|
|
from collections.abc import AsyncGenerator, Awaitable, Callable
|
|
from dataclasses import dataclass, field
|
|
from typing import Any, Generic, Literal, TypeVar, overload
|
|
|
|
from .filter import HandlerFilter
|
|
from .star import star_map
|
|
|
|
T = TypeVar("T", bound="StarHandlerMetadata")
|
|
|
|
|
|
class StarHandlerRegistry(Generic[T]):
|
|
def __init__(self):
|
|
self.star_handlers_map: dict[str, StarHandlerMetadata] = {}
|
|
self._handlers: list[StarHandlerMetadata] = []
|
|
|
|
def append(self, handler: StarHandlerMetadata):
|
|
"""添加一个 Handler,并保持按优先级有序"""
|
|
if "priority" not in handler.extras_configs:
|
|
handler.extras_configs["priority"] = 0
|
|
|
|
self.star_handlers_map[handler.handler_full_name] = handler
|
|
self._handlers.append(handler)
|
|
self._handlers.sort(key=lambda h: -h.extras_configs["priority"])
|
|
|
|
def _print_handlers(self):
|
|
for handler in self._handlers:
|
|
print(handler.handler_full_name)
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.OnAstrBotLoadedEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.OnPlatformLoadedEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.AdapterMessageEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[
|
|
StarHandlerMetadata[Callable[..., Awaitable[Any] | AsyncGenerator[Any]]]
|
|
]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.OnLLMRequestEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.OnLLMResponseEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.OnDecoratingResultEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.OnCallingFuncToolEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[
|
|
StarHandlerMetadata[Callable[..., Awaitable[Any] | AsyncGenerator[Any]]]
|
|
]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: Literal[EventType.OnAfterMessageSentEvent],
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
|
|
|
|
@overload
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: EventType,
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[
|
|
StarHandlerMetadata[Callable[..., Awaitable[Any] | AsyncGenerator[Any]]]
|
|
]: ...
|
|
|
|
def get_handlers_by_event_type(
|
|
self,
|
|
event_type: EventType,
|
|
only_activated=True,
|
|
plugins_name: list[str] | None = None,
|
|
) -> list[StarHandlerMetadata]:
|
|
handlers = []
|
|
for handler in self._handlers:
|
|
# 过滤事件类型
|
|
if handler.event_type != event_type:
|
|
continue
|
|
# 过滤启用状态
|
|
if only_activated:
|
|
plugin = star_map.get(handler.handler_module_path)
|
|
if not (plugin and plugin.activated):
|
|
continue
|
|
# 过滤插件白名单
|
|
if plugins_name is not None and plugins_name != ["*"]:
|
|
plugin = star_map.get(handler.handler_module_path)
|
|
if not plugin:
|
|
continue
|
|
if (
|
|
plugin.name not in plugins_name
|
|
and event_type
|
|
not in (
|
|
EventType.OnAstrBotLoadedEvent,
|
|
EventType.OnPlatformLoadedEvent,
|
|
)
|
|
and not plugin.reserved
|
|
):
|
|
continue
|
|
handlers.append(handler)
|
|
return handlers
|
|
|
|
def get_handler_by_full_name(self, full_name: str) -> StarHandlerMetadata | None:
|
|
return self.star_handlers_map.get(full_name, None)
|
|
|
|
def get_handlers_by_module_name(
|
|
self,
|
|
module_name: str,
|
|
) -> list[StarHandlerMetadata]:
|
|
return [
|
|
handler
|
|
for handler in self._handlers
|
|
if handler.handler_module_path == module_name
|
|
]
|
|
|
|
def clear(self):
|
|
self.star_handlers_map.clear()
|
|
self._handlers.clear()
|
|
|
|
def remove(self, handler: StarHandlerMetadata):
|
|
self.star_handlers_map.pop(handler.handler_full_name, None)
|
|
self._handlers = [h for h in self._handlers if h != handler]
|
|
|
|
def __iter__(self):
|
|
return iter(self._handlers)
|
|
|
|
def __len__(self):
|
|
return len(self._handlers)
|
|
|
|
|
|
star_handlers_registry = StarHandlerRegistry() # type: ignore
|
|
|
|
|
|
class EventType(enum.Enum):
|
|
"""表示一个 AstrBot 内部事件的类型。如适配器消息事件、LLM 请求事件、发送消息前的事件等
|
|
|
|
用于对 Handler 的职能分组。
|
|
"""
|
|
|
|
OnAstrBotLoadedEvent = enum.auto() # AstrBot 加载完成
|
|
OnPlatformLoadedEvent = enum.auto() # 平台加载完成
|
|
|
|
AdapterMessageEvent = enum.auto() # 收到适配器发来的消息
|
|
OnLLMRequestEvent = enum.auto() # 收到 LLM 请求(可以是用户也可以是插件)
|
|
OnLLMResponseEvent = enum.auto() # LLM 响应后
|
|
OnDecoratingResultEvent = enum.auto() # 发送消息前
|
|
OnCallingFuncToolEvent = enum.auto() # 调用函数工具
|
|
OnAfterMessageSentEvent = enum.auto() # 发送消息后
|
|
|
|
|
|
H = TypeVar("H", bound=Callable[..., Any])
|
|
|
|
|
|
@dataclass
|
|
class StarHandlerMetadata(Generic[H]):
|
|
"""描述一个 Star 所注册的某一个 Handler。"""
|
|
|
|
event_type: EventType
|
|
"""Handler 的事件类型"""
|
|
|
|
handler_full_name: str
|
|
'''格式为 f"{handler.__module__}_{handler.__name__}"'''
|
|
|
|
handler_name: str
|
|
"""Handler 的名字,也就是方法名"""
|
|
|
|
handler_module_path: str
|
|
"""Handler 所在的模块路径。"""
|
|
|
|
handler: H
|
|
"""Handler 的函数对象,应当是一个异步函数"""
|
|
|
|
event_filters: list[HandlerFilter]
|
|
"""一个适配器消息事件过滤器,用于描述这个 Handler 能够处理、应该处理的适配器消息事件"""
|
|
|
|
desc: str = ""
|
|
"""Handler 的描述信息"""
|
|
|
|
extras_configs: dict = field(default_factory=dict)
|
|
"""插件注册的一些其他的信息, 如 priority 等"""
|
|
|
|
def __lt__(self, other: StarHandlerMetadata):
|
|
"""定义小于运算符以支持优先队列"""
|
|
return self.extras_configs.get("priority", 0) < other.extras_configs.get(
|
|
"priority",
|
|
0,
|
|
)
|