mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-28 16:20:56 +08:00
* ♻️ refactor(core): 重构 AI 能力与定时任务调度系统 - 【AI 能力与工具】重构 Capability 注册与管理机制,引入 CapabilityManager 统一管理 - 移除全局能力注册表,改用声明式装饰器 `@capability` 进行解耦注册 - 重构工具解析器链,使用统一的 BaseToolResolver 代替原有的多个特定解析器 - 增强工具查询过滤,支持通配符匹配、工具箱过滤和排除标签 - 【定时任务调度】重构定时任务管理器,引入 SchedulerRegistry 统一管理任务元数据 - 引入 JobConfig 聚合定时任务配置,支持用户维度的定时任务调度 - 重构执行分发器,支持并发限制、串行间隔和随机延迟打散 - 【运行上下文】引入 ScheduledDeps 以支持后台和定时任务环境下的依赖注入 - 优化 RunContext,支持从定时任务上下文快速构造,并提供 emit 辅助方法 - 【日志与监控】引入 AILoggerProxy,实现 AI 各模块的专属日志输出 - 将各模块的全局 logger 替换为对应的模块专属日志代理 - 【其他优化】修复 Pydantic V1 兼容层中 model_validator 的装饰器兼容性问题 - 在非交互式环境(如定时任务)中自动隐藏 HITL 交互工具以节省 Token * ♻️ refactor(core): 优化内部导入路径并提升 Pydantic 兼容性 - 【重构】将 `services/ai` 模块内的绝对导入重构为相对导入,优化包结构 - 【重构】移除不必要的 `if TYPE_CHECKING` 保护,通过 `from __future__ import annotations` 直接导入类型 - 【清理】清理 `core/messages/types.py` 中未使用的 `AssistantContentUnion` 等联合类型定义 - 【优化】在 `utils/pydantic_compat.py` 中新增 `model_rebuild` 兼容函数,统一 Pydantic V1/V2 的模型重建逻辑 - 【优化】将部分函数内部的延迟导入提升至模块顶部,规范代码结构 * ♻️ refactor(imports): 优化导入路径为相对导入并清理冗余导入 - 【重构】将 AI 服务相关模块中的绝对导入路径修改为相对导入,提升模块内聚性与可移植性 - 【清理】移除多处函数内部或类方法中未使用的冗余导入,避免循环引用和资源浪费 - 【格式化】微调部分工具装饰器和返回语句的格式与尾随逗号 * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: webjoin111 <455457521@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
241 lines
8.1 KiB
Python
241 lines
8.1 KiB
Python
from typing import cast
|
|
|
|
from nonebot.adapters import Bot, Event
|
|
from nonebot.params import Depends
|
|
from nonebot.permission import SUPERUSER
|
|
from nonebot_plugin_alconna import (
|
|
AlconnaMatch,
|
|
AlconnaMatches,
|
|
AlconnaQuery,
|
|
Arparma,
|
|
Match,
|
|
Query,
|
|
)
|
|
from nonebot_plugin_uninfo import Uninfo
|
|
|
|
from zhenxun.configs.config import Config
|
|
from zhenxun.models.scheduled_job import ScheduledJob
|
|
from zhenxun.services import scheduler_manager
|
|
from zhenxun.services.scheduler.registry import scheduler_registry
|
|
from zhenxun.services.scheduler.types import BaseTrigger
|
|
from zhenxun.utils.message import MessageUtils
|
|
|
|
from .commands import schedule_cmd
|
|
from .data_source import scheduler_admin_service
|
|
from .dependencies import (
|
|
GetBotId,
|
|
GetCreatorPermissionLevel,
|
|
GetFinalPermission,
|
|
GetTargeter,
|
|
GetTriggerInfo,
|
|
GetValidatedJobKwargs,
|
|
RequireTaskPermission,
|
|
ResolveTargets,
|
|
_parse_trigger_from_arparma,
|
|
)
|
|
|
|
|
|
@schedule_cmd.assign("查看")
|
|
async def handle_view(
|
|
bot: Bot,
|
|
event: Event,
|
|
session: Uninfo,
|
|
page: Match[int] = AlconnaMatch("page"),
|
|
targeter=Depends(GetTargeter),
|
|
):
|
|
"""处理 '查看' 子命令"""
|
|
is_superuser = await SUPERUSER(bot, event)
|
|
current_page = page.result if page.available else 1
|
|
|
|
result = await scheduler_admin_service.get_schedules_view(
|
|
user_id=session.user.id,
|
|
group_id=session.group.id if session.group else None,
|
|
is_superuser=is_superuser,
|
|
filters=targeter._filters,
|
|
page=current_page,
|
|
)
|
|
await MessageUtils.build_message(result).send(reply_to=True)
|
|
|
|
|
|
@schedule_cmd.assign("设置")
|
|
async def handle_set(
|
|
session: Uninfo,
|
|
target_groups: list[str] = Depends(ResolveTargets),
|
|
plugin_name: Match[str] = AlconnaMatch("plugin_name"),
|
|
tag_name: Match[str] = AlconnaMatch("tag_name"),
|
|
jitter: Match[int] = AlconnaMatch("jitter_seconds"),
|
|
spread: Match[int] = AlconnaMatch("spread_seconds"),
|
|
interval: Match[int] = AlconnaMatch("interval_seconds"),
|
|
job_name: Match[str] = AlconnaMatch("job_name"),
|
|
bot_id_to_operate: str = Depends(GetBotId),
|
|
trigger: BaseTrigger = Depends(GetTriggerInfo),
|
|
job_kwargs: dict = Depends(GetValidatedJobKwargs),
|
|
creator_permission_level: int = Depends(GetCreatorPermissionLevel),
|
|
final_permission: int = Depends(GetFinalPermission),
|
|
):
|
|
"""处理 '设置' 子命令"""
|
|
p_name = plugin_name.result
|
|
jitter_val: int | None = jitter.result if jitter.available else None
|
|
spread_val: int | None = spread.result if spread.available else None
|
|
interval_val: int | None = interval.result if interval.available else None
|
|
|
|
is_multi_target = (
|
|
len(target_groups) > 1
|
|
or (
|
|
len(target_groups) == 1 and target_groups[0] == scheduler_manager.ALL_GROUPS
|
|
)
|
|
or tag_name.available
|
|
)
|
|
|
|
if is_multi_target:
|
|
task_meta = scheduler_registry.tasks.get(p_name)
|
|
if jitter_val is None:
|
|
if task_meta and task_meta.get("default_jitter") is not None:
|
|
jitter_val = cast(int | None, task_meta["default_jitter"])
|
|
else:
|
|
jitter_val = Config.get_config(
|
|
"SchedulerManager", "DEFAULT_JITTER_SECONDS"
|
|
)
|
|
if spread_val is None:
|
|
if task_meta and task_meta.get("default_spread") is not None:
|
|
spread_val = cast(int | None, task_meta["default_spread"])
|
|
else:
|
|
spread_val = Config.get_config(
|
|
"SchedulerManager", "DEFAULT_SPREAD_SECONDS"
|
|
)
|
|
|
|
if interval_val is None:
|
|
if task_meta and task_meta.get("default_interval") is not None:
|
|
interval_val = cast(int | None, task_meta["default_interval"])
|
|
else:
|
|
interval_val = Config.get_config(
|
|
"SchedulerManager", "DEFAULT_INTERVAL_SECONDS"
|
|
)
|
|
|
|
result_message = await scheduler_admin_service.set_schedule(
|
|
targets=target_groups,
|
|
creator_permission_level=creator_permission_level,
|
|
plugin_name=p_name,
|
|
trigger=trigger,
|
|
job_kwargs=job_kwargs,
|
|
permission=final_permission,
|
|
bot_id=bot_id_to_operate,
|
|
job_name=job_name.result if job_name.available else None,
|
|
jitter=jitter_val,
|
|
spread=spread_val,
|
|
interval=interval_val,
|
|
created_by=session.user.id,
|
|
)
|
|
await MessageUtils.build_message(result_message).send()
|
|
|
|
|
|
@schedule_cmd.assign("删除")
|
|
async def handle_delete(
|
|
bot: Bot,
|
|
event: Event,
|
|
session: Uninfo,
|
|
targeter=Depends(GetTargeter),
|
|
all_flag: Query[bool] = AlconnaQuery("删除.all.value", False),
|
|
global_flag: Query[bool] = AlconnaQuery("删除.global.value", False),
|
|
):
|
|
"""处理 '删除' 子命令"""
|
|
is_superuser = await SUPERUSER(bot, event)
|
|
result_message = await scheduler_admin_service.perform_bulk_operation(
|
|
operation_name="删除",
|
|
user_id=session.user.id,
|
|
group_id=session.group.id if session.group else None,
|
|
is_superuser=is_superuser,
|
|
targeter=targeter,
|
|
all_flag=all_flag.result,
|
|
global_flag=global_flag.result,
|
|
)
|
|
await schedule_cmd.finish(result_message)
|
|
|
|
|
|
@schedule_cmd.assign("暂停")
|
|
async def handle_pause(
|
|
bot: Bot,
|
|
event: Event,
|
|
session: Uninfo,
|
|
targeter=Depends(GetTargeter),
|
|
all_flag: Query[bool] = AlconnaQuery("暂停.all.value", False),
|
|
global_flag: Query[bool] = AlconnaQuery("暂停.global.value", False),
|
|
):
|
|
"""处理 '暂停' 子命令"""
|
|
is_superuser = await SUPERUSER(bot, event)
|
|
result_message = await scheduler_admin_service.perform_bulk_operation(
|
|
operation_name="暂停",
|
|
user_id=session.user.id,
|
|
group_id=session.group.id if session.group else None,
|
|
is_superuser=is_superuser,
|
|
targeter=targeter,
|
|
all_flag=all_flag.result,
|
|
global_flag=global_flag.result,
|
|
)
|
|
await schedule_cmd.finish(result_message)
|
|
|
|
|
|
@schedule_cmd.assign("恢复")
|
|
async def handle_resume(
|
|
bot: Bot,
|
|
event: Event,
|
|
session: Uninfo,
|
|
targeter=Depends(GetTargeter),
|
|
all_flag: Query[bool] = AlconnaQuery("恢复.all.value", False),
|
|
global_flag: Query[bool] = AlconnaQuery("恢复.global.value", False),
|
|
):
|
|
"""处理 '恢复' 子命令"""
|
|
is_superuser = await SUPERUSER(bot, event)
|
|
result_message = await scheduler_admin_service.perform_bulk_operation(
|
|
operation_name="恢复",
|
|
user_id=session.user.id,
|
|
group_id=session.group.id if session.group else None,
|
|
is_superuser=is_superuser,
|
|
targeter=targeter,
|
|
all_flag=all_flag.result,
|
|
global_flag=global_flag.result,
|
|
)
|
|
await schedule_cmd.finish(result_message)
|
|
|
|
|
|
@schedule_cmd.assign("执行")
|
|
async def handle_trigger(schedule: ScheduledJob = Depends(RequireTaskPermission)):
|
|
"""处理 '执行' 子命令"""
|
|
result_message = await scheduler_admin_service.trigger_schedule_now(schedule)
|
|
await schedule_cmd.finish(result_message)
|
|
|
|
|
|
@schedule_cmd.assign("更新")
|
|
async def handle_update(
|
|
schedule: ScheduledJob = Depends(RequireTaskPermission),
|
|
arp: Arparma = AlconnaMatches(),
|
|
kwargs_str: Match[str] = AlconnaMatch("kwargs_str"),
|
|
):
|
|
"""处理 '更新' 子命令"""
|
|
trigger = _parse_trigger_from_arparma(arp)
|
|
if not trigger and not kwargs_str.available:
|
|
await schedule_cmd.finish(
|
|
"请提供需要更新的时间 (--cron/--interval/--date/--daily) 或参数 (--kwargs)"
|
|
)
|
|
|
|
result_message = await scheduler_admin_service.update_schedule(
|
|
schedule, trigger, kwargs_str.result if kwargs_str.available else None
|
|
)
|
|
await schedule_cmd.finish(result_message)
|
|
|
|
|
|
@schedule_cmd.assign("插件列表")
|
|
async def handle_plugins_list():
|
|
"""处理 '插件列表' 子命令"""
|
|
message = await scheduler_admin_service.get_plugins_list()
|
|
await schedule_cmd.finish(message)
|
|
|
|
|
|
@schedule_cmd.assign("状态")
|
|
async def handle_status(
|
|
schedule: ScheduledJob = Depends(RequireTaskPermission),
|
|
):
|
|
"""处理 '状态' 子命令"""
|
|
message = await scheduler_admin_service.get_schedule_status(schedule.id)
|
|
await schedule_cmd.finish(message)
|