mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-18 02:30:08 +08:00
♻️ refactor(scheduler): 重构定时任务系统并增强功能 (#2009)
检查bot是否运行正常 / bot check (push) Waiting to run
CodeQL Code Security Analysis / Analyze (${{ matrix.language }}) (none, javascript-typescript) (push) Waiting to run
CodeQL Code Security Analysis / Analyze (${{ matrix.language }}) (none, python) (push) Waiting to run
Sequential Lint and Type Check / ruff-call (push) Waiting to run
Sequential Lint and Type Check / pyright-call (push) Blocked by required conditions
Release Drafter / Update Release Draft (push) Waiting to run
Force Sync to Aliyun / sync (push) Waiting to run
Update Version / update-version (push) Waiting to run
检查bot是否运行正常 / bot check (push) Waiting to run
CodeQL Code Security Analysis / Analyze (${{ matrix.language }}) (none, javascript-typescript) (push) Waiting to run
CodeQL Code Security Analysis / Analyze (${{ matrix.language }}) (none, python) (push) Waiting to run
Sequential Lint and Type Check / ruff-call (push) Waiting to run
Sequential Lint and Type Check / pyright-call (push) Blocked by required conditions
Release Drafter / Update Release Draft (push) Waiting to run
Force Sync to Aliyun / sync (push) Waiting to run
Update Version / update-version (push) Waiting to run
* ♻️ refactor(scheduler): 重构定时任务系统并增强功能 - 【模型重命名】将 `ScheduleInfo` 模型及其数据库表重命名为 `ScheduledJob`,以提高语义清晰度。 - 【触发器抽象】引入 `Trigger` 工厂类,提供类型安全的 Cron、Interval 和 Date 触发器配置。 - 【执行策略】新增 `ExecutionPolicy` 模型,允许为定时任务定义重试策略、延迟、异常类型以及成功/失败回调。 - 【任务执行】重构任务执行逻辑,支持 NoneBot 的依赖注入,并根据 `ExecutionPolicy` 处理任务的重试和回调。 - 【临时任务】增加声明式和编程式的临时任务调度能力,支持非持久化任务在运行时动态创建和执行。 - 【管理命令】更新定时任务管理命令 (`schedule_admin`),使其适配新的 `ScheduledJob` 模型和参数验证逻辑。 - 【展示优化】改进定时任务列表和状态展示,使用新的触发器格式化逻辑和参数模型信息。 - 【重试装饰器】为 `Retry.api` 装饰器添加 `on_success` 回调,允许在任务成功执行后触发额外操作。 * 🚨 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>
This commit is contained in:
co-authored by
webjoin111
pre-commit-ci[bot]
parent
67a2560de4
commit
be86e0bb7f
@@ -6,8 +6,10 @@
|
||||
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.utils.manager.priority_manager import PriorityLifecycle
|
||||
from zhenxun.utils.pydantic_compat import model_dump
|
||||
|
||||
from .adapter import APSchedulerAdapter
|
||||
from .job import ScheduleContext
|
||||
from .repository import ScheduleRepository
|
||||
from .service import scheduler_manager
|
||||
|
||||
@@ -29,9 +31,9 @@ async def _load_schedules_from_db():
|
||||
logger.info("正在检查并注册声明式默认任务...")
|
||||
declared_count = 0
|
||||
for task_info in scheduler_manager._declared_tasks:
|
||||
plugin_name = task_info["plugin_name"]
|
||||
group_id = task_info["group_id"]
|
||||
bot_id = task_info["bot_id"]
|
||||
plugin_name = task_info.plugin_name
|
||||
group_id = task_info.group_id
|
||||
bot_id = task_info.bot_id
|
||||
|
||||
query_kwargs = {
|
||||
"plugin_name": plugin_name,
|
||||
@@ -42,12 +44,17 @@ async def _load_schedules_from_db():
|
||||
|
||||
if not exists:
|
||||
logger.info(f"为插件 '{plugin_name}' 注册新的默认定时任务...")
|
||||
|
||||
trigger_config_dict = model_dump(
|
||||
task_info.trigger, exclude={"trigger_type"}
|
||||
)
|
||||
|
||||
schedule = await scheduler_manager.add_schedule(
|
||||
plugin_name=plugin_name,
|
||||
group_id=group_id,
|
||||
trigger_type=task_info["trigger_type"],
|
||||
trigger_config=task_info["trigger_config"],
|
||||
job_kwargs=task_info["job_kwargs"],
|
||||
trigger_type=task_info.trigger.trigger_type,
|
||||
trigger_config=trigger_config_dict,
|
||||
job_kwargs=task_info.job_kwargs,
|
||||
bot_id=bot_id,
|
||||
)
|
||||
if schedule:
|
||||
@@ -60,3 +67,35 @@ async def _load_schedules_from_db():
|
||||
|
||||
if declared_count > 0:
|
||||
logger.info(f"声明式任务检查完成,新注册了 {declared_count} 个默认任务。")
|
||||
|
||||
logger.info("正在调度声明式临时任务...")
|
||||
ephemeral_count = 0
|
||||
for declaration in scheduler_manager._ephemeral_declared_tasks:
|
||||
try:
|
||||
job_id = f"runtime::{declaration.plugin_name}::{declaration.func.__name__}"
|
||||
|
||||
context = ScheduleContext(
|
||||
schedule_id=0,
|
||||
plugin_name=job_id,
|
||||
bot_id=None,
|
||||
group_id=None,
|
||||
job_kwargs={},
|
||||
)
|
||||
|
||||
trigger_config_dict = model_dump(
|
||||
declaration.trigger, exclude={"trigger_type"}
|
||||
)
|
||||
|
||||
APSchedulerAdapter.add_ephemeral_job(
|
||||
job_id=job_id,
|
||||
func=declaration.func,
|
||||
trigger_type=declaration.trigger.trigger_type,
|
||||
trigger_config=trigger_config_dict,
|
||||
context=context,
|
||||
)
|
||||
ephemeral_count += 1
|
||||
except Exception as e:
|
||||
logger.error(f"调度临时任务 '{declaration.plugin_name}' 失败", e=e)
|
||||
|
||||
if ephemeral_count > 0:
|
||||
logger.info(f"临时任务调度完成,共成功加载 {ephemeral_count} 个任务。")
|
||||
|
||||
Reference in New Issue
Block a user