mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-14 21:52:56 +08:00
* ✨ feat(core): 更新群组信息、Markdown 样式与 Pydantic 兼容层 - 【group】添加更新所有群组信息指令,并同步群组控制台数据 - 【markdown】支持合并 Markdown 的 CSS 来源 - 【pydantic-compat】提供 model_validate 兼容函数 * ✨ feat(core): 增强定时任务与群组标签管理,重构调度核心 ✨ 新功能 * **标签 (tags)**: 引入群组标签服务。 * 支持静态标签和动态标签 (基于 Alconna 规则自动匹配群信息)。 * 支持黑名单模式及 `@all` 特殊标签。 * 提供 `tag_manage` 超级用户插件 (list, create, edit, delete 等)。 * 群成员变动时自动失效动态标签缓存。 * **调度 (scheduler)**: 增强定时任务。 * 重构 `ScheduledJob` 模型,支持 `TAG`, `ALL_GROUPS` 等多种目标类型。 * 新增任务别名 (`name`)、创建者、权限、来源等字段。 * 支持一次性任务 (`schedule_once`) 和 Alconna 命令行参数 (`--params-cli`)。 * 新增执行选项 (`jitter`, `spread`) 和并发策略 (`ALLOW`, `SKIP`, `QUEUE`)。 * 支持批量获取任务状态。 ♻️ 重构优化 * **调度器核心**: * 拆分 `service.py` 为 `manager.py` (API) 和 `types.py` (模型)。 * 合并 `adapter.py` / `job.py` 至 `engine.py` (统一调度引擎)。 * 引入 `targeting.py` 模块管理任务目标解析。 * **调度器插件 (scheduler_admin)**: * 迁移命令参数校验逻辑至 `ArparmaBehavior`。 * 引入 `dependencies.py` 和 `data_source.py` 解耦业务逻辑与依赖注入。 * 适配新的任务目标类型展示。 * 🐛 fix(tag): 修复黑名单标签解析逻辑并优化标签详情展示 * ✨ feat(scheduler): 为多目标定时任务添加固定间隔串行执行选项 * ✨ feat(schedulerAdmin): 允许定时任务删除、暂停、恢复命令支持多ID操作 * 🚨 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>
239 lines
8.0 KiB
Python
239 lines
8.0 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.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_info: tuple[str, dict] = 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_manager._registered_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_info=trigger_info,
|
|
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_info = _parse_trigger_from_arparma(arp)
|
|
if not trigger_info and not kwargs_str.available:
|
|
await schedule_cmd.finish(
|
|
"请提供需要更新的时间 (--cron/--interval/--date/--daily) 或参数 (--kwargs)"
|
|
)
|
|
|
|
result_message = await scheduler_admin_service.update_schedule(
|
|
schedule, trigger_info, 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)
|