aury-boot 0.0.19__py3-none-any.whl → 0.0.21__py3-none-any.whl

aury/boot/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.19'
-__version_tuple__ = version_tuple = (0, 0, 19)
+__version__ = version = '0.0.21'
+__version_tuple__ = version_tuple = (0, 0, 21)
 
 __commit_id__ = commit_id = None

aury/boot/application/app/base.py

@@ -11,8 +11,10 @@ from contextlib import asynccontextmanager
 import sys
 from typing import Any, ClassVar
 
-from fastapi import FastAPI, Request, status
+from fastapi import FastAPI, HTTPException, Request, status
+from fastapi.exceptions import RequestValidationError
 from fastapi.responses import JSONResponse
+from starlette.exceptions import HTTPException as StarletteHTTPException
 from starlette.middleware import Middleware as StarletteMiddleware
 
 from aury.boot.application.config import BaseConfig
@@ -279,8 +281,11 @@ class FoundationApp(FastAPI):
             **kwargs,
         )
 
-        # 异常处理
-        self.add_exception_handler(Exception, global_exception_handler)
+        # 异常处理：显式注册以覆盖 FastAPI/Starlette 默认处理器，确保统一响应格式
+        self.add_exception_handler(RequestValidationError, global_exception_handler)  # 422
+        self.add_exception_handler(HTTPException, global_exception_handler)  # 4xx/5xx
+        self.add_exception_handler(StarletteHTTPException, global_exception_handler)  # Starlette 异常
+        self.add_exception_handler(Exception, global_exception_handler)  # 其他未处理异常
 
         # 设置路由
         self.setup_routes()

aury/boot/application/config/settings.py

@@ -507,10 +507,9 @@ class MessageQueueSettings(BaseModel):
     - Task: 基于 Dramatiq，用于异步任务处理（API + Worker 模式）
     - MQ: 通用消息队列，用于服务间通信、事件驱动架构
     
-    支持的后端（通过 Kombu）：
+    支持的后端：
     - Redis: redis://localhost:6379/0
     - RabbitMQ: amqp://guest:guest@localhost:5672//
-    - Amazon SQS: sqs://
     """
     
     enabled: bool = Field(

aury/boot/application/errors/handlers.py

@@ -174,6 +174,7 @@ class ValidationErrorHandler(ErrorHandler):
     """验证异常处理器。
     
     处理 Pydantic ValidationError 和 FastAPI RequestValidationError。
+    返回 422 Unprocessable Entity（符合 FastAPI 规范）。
     """
     
     def can_handle(self, exception: Exception) -> bool:
@@ -182,24 +183,38 @@ class ValidationErrorHandler(ErrorHandler):
     
     async def handle(self, exception: Exception, request: Request) -> JSONResponse:
         """处理验证异常。"""
-        logger.warning(f"数据验证失败: {exception}")
-        
         errors = []
         for error in exception.errors():
+            # 构建友好的字段路径：跳过 body 前缀
+            loc = error.get("loc", ())
+            # FastAPI 会在 loc 前加 'body'/'query'/'path' 等，保留第一个作为来源
+            source = str(loc[0]) if loc else ""
+            field_path = ".".join(str(part) for part in loc[1:]) if len(loc) > 1 else str(loc[0]) if loc else ""
+            
             errors.append({
-                "field": ".".join(str(loc) for loc in error["loc"]),
-                "message": error["msg"],
-                "type": error["type"],
+                "field": field_path,
+                "source": source,  # body / query / path / header
+                "message": error.get("msg", ""),
+                "type": error.get("type", ""),
+                "input": error.get("input"),  # 实际输入值（便于调试）
             })
         
+        # 详细日志：方便开发调试
+        error_summary = "; ".join(
+            f"{e['source']}.{e['field']}({e['type']}): {e['message']}" for e in errors
+        )
+        logger.warning(
+            f"参数校验失败 [{request.method} {request.url.path}]: {error_summary}"
+        )
+        
         response = ResponseBuilder.fail(
-            message="数据验证失败",
-            code=400,
+            message="参数校验失败",
+            code=422,
             errors=errors,
         )
         
         return JSONResponse(
-            status_code=status.HTTP_400_BAD_REQUEST,
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             content=response.model_dump(mode="json"),
         )
 

aury/boot/commands/pkg.py

@@ -97,16 +97,16 @@ MODULES: dict[str, ModuleInfo] = {
     "tasks": ModuleInfo(
         name="tasks",
         desc="Dramatiq 任务队列",
-        usage="TaskManager 异步任务时需要",
+        usage="TaskManager 异步任务时需要（默认使用 Redis Broker）",
         category=Category.TASK,
-        deps=["dramatiq", "kombu", "dramatiq-kombu-broker"],
+        deps=["dramatiq", "redis"],
     ),
     "rabbitmq": ModuleInfo(
         name="rabbitmq",
         desc="RabbitMQ 消息队列后端",
         usage="TaskManager/EventBus 使用 RabbitMQ 时需要（需配合 tasks）",
         category=Category.TASK,
-        deps=["amqp"],
+        deps=["pika"],
     ),
     # 调度器
     "scheduler": ModuleInfo(

aury/boot/commands/templates/project/aury_docs/08-scheduler.md.tpl

@@ -1,6 +1,6 @@
 # 定时任务（Scheduler）
 
-基于 APScheduler，完全透传原生 API。
+基于 APScheduler，支持两种触发器语法：字符串模式和原生对象模式。
 
 ## 基本用法
 
@@ -9,31 +9,38 @@
 ```python
 """定时任务模块。"""
 
-from apscheduler.triggers.cron import CronTrigger
-from apscheduler.triggers.interval import IntervalTrigger
-
 from aury.boot.common.logging import logger
 from aury.boot.infrastructure.scheduler import SchedulerManager
 
 scheduler = SchedulerManager.get_instance()
 
 
-@scheduler.scheduled_job(IntervalTrigger(seconds=60))
+# === 字符串模式（推荐，简洁）===
+@scheduler.scheduled_job("interval", seconds=60)
 async def every_minute():
     """每 60 秒执行。"""
     logger.info("定时任务执行中...")
 
 
-@scheduler.scheduled_job(CronTrigger(hour=0, minute=0))
+@scheduler.scheduled_job("cron", hour=0, minute=0)
 async def daily_task():
     """每天凌晨执行。"""
     logger.info("每日任务执行中...")
 
 
-@scheduler.scheduled_job(CronTrigger(day_of_week="mon", hour=9))
+@scheduler.scheduled_job("cron", day_of_week="mon", hour=9)
 async def weekly_report():
     """每周一 9 点执行。"""
     logger.info("周报任务执行中...")
+
+
+# === 原生对象模式（完整功能）===
+from apscheduler.triggers.cron import CronTrigger
+
+@scheduler.scheduled_job(CronTrigger.from_crontab("0 2 * * *"))
+async def crontab_task():
+    """每天凌晨 2 点执行（使用 crontab 表达式）。"""
+    logger.info("每日任务执行中...")
 ```
 
 启用方式：配置 `SCHEDULER__ENABLED=true`，框架自动加载 `{package_name}/schedules/` 模块。
@@ -50,40 +57,57 @@ SCHEDULER__MISFIRE_GRACE_TIME=60                 # 错过容忍时间(秒)
 SCHEDULER__JOBSTORE_URL=redis://localhost:6379/0 # 分布式存储（可选）
 ```
 
-## 触发器类型
+## 触发器语法
 
-### CronTrigger - 定时触发
+支持两种语法：
 
-```python
-from apscheduler.triggers.cron import CronTrigger
+| 语法 | 适用场景 | 示例 |
+|------|---------|------|
+| 字符串模式 | 日常使用，简洁 | `"cron", hour="*", minute=0` |
+| 原生对象 | crontab 表达式、复杂配置 | `CronTrigger.from_crontab("0 * * * *")` |
 
+### cron - 定时触发
+
+```python
+# === 字符串模式 ===
 # 每天凌晨 2:30
-CronTrigger(hour=2, minute=30)
+@scheduler.scheduled_job("cron", hour=2, minute=30)
 
 # 每小时整点
-CronTrigger(hour="*", minute=0)
+@scheduler.scheduled_job("cron", hour="*", minute=0)
 
 # 工作日 9:00
-CronTrigger(day_of_week="mon-fri", hour=9)
+@scheduler.scheduled_job("cron", day_of_week="mon-fri", hour=9)
 
 # 每月 1 号
-CronTrigger(day=1, hour=0)
+@scheduler.scheduled_job("cron", day=1, hour=0)
+
+# === 原生对象模式 ===
+from apscheduler.triggers.cron import CronTrigger
 
 # 使用 crontab 表达式
-CronTrigger.from_crontab("0 2 * * *")  # 每天 2:00
+@scheduler.scheduled_job(CronTrigger.from_crontab("0 2 * * *"))  # 每天 2:00
 ```
 
-### IntervalTrigger - 间隔触发
+**cron 参数**：`year`, `month`, `day`, `week`, `day_of_week`, `hour`, `minute`, `second`, `start_date`, `end_date`, `timezone`, `jitter`
+
+### interval - 间隔触发
 
 ```python
+# === 字符串模式 ===
+@scheduler.scheduled_job("interval", seconds=30)   # 每 30 秒
+@scheduler.scheduled_job("interval", minutes=5)    # 每 5 分钟
+@scheduler.scheduled_job("interval", hours=1)      # 每小时
+@scheduler.scheduled_job("interval", days=1)       # 每天
+
+# === 原生对象模式 ===
 from apscheduler.triggers.interval import IntervalTrigger
 
-IntervalTrigger(seconds=30)   # 每 30 秒
-IntervalTrigger(minutes=5)    # 每 5 分钟
-IntervalTrigger(hours=1)      # 每小时
-IntervalTrigger(days=1)       # 每天
+@scheduler.scheduled_job(IntervalTrigger(hours=1, jitter=60))  # 每小时，随机抖动 60 秒
 ```
 
+**interval 参数**：`weeks`, `days`, `hours`, `minutes`, `seconds`, `start_date`, `end_date`, `timezone`, `jitter`
+
 ### DateTrigger - 一次性触发
 
 ```python
@@ -91,9 +115,31 @@ from apscheduler.triggers.date import DateTrigger
 from datetime import datetime, timedelta
 
 # 10 秒后执行
-DateTrigger(run_date=datetime.now() + timedelta(seconds=10))
+scheduler.add_job(my_task, DateTrigger(run_date=datetime.now() + timedelta(seconds=10)))
 ```
 
+## 条件加载
+
+通过 `enabled` 参数控制任务是否注册：
+
+```python
+from config import settings
+
+# 根据配置开关决定是否启用
+@scheduler.scheduled_job("cron", hour=2, enabled=settings.ENABLE_REPORT)
+async def daily_report():
+    """仅在 ENABLE_REPORT=true 时注册。"""
+    ...
+
+# 区分环境
+@scheduler.scheduled_job("interval", minutes=5, enabled=settings.ENV == "production")
+async def prod_only_task():
+    """仅生产环境执行。"""
+    ...
+```
+
+`enabled=False` 时任务不会注册，日志记录：`任务已禁用，跳过注册: xxx`
+
 ## 多实例支持
 
 支持不同业务线使用独立的调度器实例：
@@ -136,7 +182,11 @@ scheduler = SchedulerManager.get_instance(
 ## 任务管理
 
 ```python
-# 添加任务
+# 添加任务（字符串模式）
+scheduler.add_job(my_task, "cron", hour=2, minute=0, id="my_task")
+
+# 添加任务（原生对象模式）
+from apscheduler.triggers.cron import CronTrigger
 scheduler.add_job(my_task, CronTrigger(hour=2), id="my_task")
 
 # 获取任务
@@ -150,7 +200,10 @@ scheduler.resume_job("my_task")
 # 移除
 scheduler.remove_job("my_task")
 
-# 重新调度
+# 重新调度（字符串模式）
+scheduler.reschedule_job("my_task", "cron", hour=3)
+
+# 重新调度（原生对象模式）
 scheduler.reschedule_job("my_task", CronTrigger(hour=3))
 ```
 

aury/boot/commands/templates/project/modules/schedules.py.tpl

@@ -4,18 +4,35 @@
 
 框架会自动发现并加载本模块，无需在 main.py 中手动导入。
 也可通过 SCHEDULER_SCHEDULE_MODULES 环境变量指定自定义模块。
+
+触发器支持两种语法：
+- 字符串模式（推荐）：@scheduler.scheduled_job("cron", hour="*", minute=0)
+- 原生对象模式：@scheduler.scheduled_job(CronTrigger(hour="*"))
 """
 
-# from apscheduler.triggers.cron import CronTrigger
-# from apscheduler.triggers.interval import IntervalTrigger
-#
 # from aury.boot.common.logging import logger
 # from aury.boot.infrastructure.scheduler import SchedulerManager
 #
 # scheduler = SchedulerManager.get_instance()
 #
 #
-# @scheduler.scheduled_job(IntervalTrigger(seconds=60))
+# # === 字符串模式（推荐，简洁）===
+# @scheduler.scheduled_job("interval", seconds=60)
 # async def example_job():
 #     """示例定时任务，每 60 秒执行一次。"""
 #     logger.info("定时任务执行中...")
+#
+#
+# @scheduler.scheduled_job("cron", hour="*", minute=0)
+# async def hourly_job():
+#     """每小时整点执行。"""
+#     logger.info("整点任务执行")
+#
+#
+# # === 原生对象模式（完整功能）===
+# # from apscheduler.triggers.cron import CronTrigger
+# #
+# # @scheduler.scheduled_job(CronTrigger.from_crontab("0 2 * * *"))
+# # async def daily_job():
+# #     """每天凌晨 2 点执行（使用 crontab 表达式）。"""
+# #     logger.info("每日任务执行")

aury/boot/infrastructure/scheduler/manager.py

@@ -7,6 +7,7 @@
 - 自动设置日志上下文（调度器任务日志自动写入 scheduler_xxx.log）
 - 支持多个命名实例
 - 支持 APScheduler 完整配置（jobstores、executors、job_defaults、timezone）
+- 支持两种触发器语法：字符串模式和原生对象模式
 """
 
 from __future__ import annotations
@@ -14,20 +15,32 @@ from __future__ import annotations
 import asyncio
 from collections.abc import Callable
 from functools import wraps
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
 from aury.boot.common.logging import logger, set_service_context
 
 # 延迟导入 apscheduler（可选依赖）
 try:
     from apscheduler.schedulers.asyncio import AsyncIOScheduler
+    from apscheduler.triggers.base import BaseTrigger
+    from apscheduler.triggers.cron import CronTrigger
+    from apscheduler.triggers.interval import IntervalTrigger
     _APSCHEDULER_AVAILABLE = True
 except ImportError:
     _APSCHEDULER_AVAILABLE = False
     if TYPE_CHECKING:
         from apscheduler.schedulers.asyncio import AsyncIOScheduler
+        from apscheduler.triggers.base import BaseTrigger
+        from apscheduler.triggers.cron import CronTrigger
+        from apscheduler.triggers.interval import IntervalTrigger
     else:
         AsyncIOScheduler = None
+        BaseTrigger = None
+        CronTrigger = None
+        IntervalTrigger = None
+
+# 触发器类型别名
+TriggerType = Literal["cron", "interval"]
 
 
 class SchedulerManager:
@@ -39,6 +52,16 @@ class SchedulerManager:
     - job_defaults: 任务默认配置（coalesce/max_instances/misfire_grace_time）
     - timezone: 时区
     
+    触发器支持两种语法：
+    
+    1. 字符串模式（简洁）:
+        @scheduler.scheduled_job("cron", hour="*", minute=0)
+        @scheduler.scheduled_job("interval", seconds=60)
+        
+    2. 原生对象模式（完整功能）:
+        @scheduler.scheduled_job(CronTrigger(hour="*"))
+        @scheduler.scheduled_job(IntervalTrigger(seconds=60))
+    
     使用示例:
         from apscheduler.triggers.cron import CronTrigger
         from apscheduler.triggers.interval import IntervalTrigger
@@ -57,11 +80,16 @@ class SchedulerManager:
             timezone="Asia/Shanghai",
         )
         
-        # 注册任务
-        @scheduler.scheduled_job(IntervalTrigger(seconds=60))
+        # 字符串模式注册任务
+        @scheduler.scheduled_job("interval", seconds=60)
         async def my_task():
             ...
         
+        # 原生对象模式
+        @scheduler.scheduled_job(CronTrigger.from_crontab("0 * * * *"))
+        async def hourly_task():
+            ...
+        
         # 启动调度器
         scheduler.start()
     """
@@ -200,46 +228,88 @@ class SchedulerManager:
             raise RuntimeError("调度器未初始化，请先调用 initialize()")
         return self._scheduler
     
+    def _build_trigger(self, trigger: TriggerType | BaseTrigger, **trigger_kwargs: Any) -> BaseTrigger:
+        """构建触发器对象。
+        
+        Args:
+            trigger: 触发器类型字符串（"cron"/"interval"）或原生触发器对象
+            **trigger_kwargs: 触发器参数（仅字符串模式时有效）
+            
+        Returns:
+            APScheduler 触发器对象
+        """
+        # 如果已经是触发器对象，直接返回
+        if isinstance(trigger, BaseTrigger):
+            return trigger
+        
+        # 字符串模式，构建触发器
+        if trigger == "cron":
+            return CronTrigger(**trigger_kwargs)
+        elif trigger == "interval":
+            return IntervalTrigger(**trigger_kwargs)
+        else:
+            raise ValueError(f"不支持的触发器类型: {trigger}，支持 'cron' 或 'interval'")
+    
     def add_job(
         self,
         func: Callable,
-        trigger: Any,
+        trigger: TriggerType | BaseTrigger,
         *,
         id: str | None = None,
         **kwargs: Any,
     ) -> None:
         """添加任务。
         
-        直接使用 APScheduler 原生 trigger 对象，不做任何封装。
+        支持两种触发器语法：
+        
+        1. 字符串模式：trigger 为 "cron" 或 "interval"，触发器参数通过 kwargs 传递
+        2. 原生对象模式：trigger 为 APScheduler 触发器对象
         
         Args:
             func: 任务函数
-            trigger: APScheduler 触发器对象，如：
-                - IntervalTrigger(seconds=60)
-                - CronTrigger(hour="*")
-                - CronTrigger.from_crontab("0 * * * *")
+            trigger: 触发器类型或触发器对象
+                - 字符串: "cron" 或 "interval"
+                - 对象: CronTrigger(...) 或 IntervalTrigger(...)
             id: 任务ID（可选，默认使用函数完整路径）
-            **kwargs: 其他 APScheduler add_job 参数
+            **kwargs: 触发器参数（字符串模式）或其他 APScheduler add_job 参数（对象模式）
         
         示例:
-            from apscheduler.triggers.cron import CronTrigger
-            from apscheduler.triggers.interval import IntervalTrigger
-            
-            # 每小时执行
-            scheduler.add_job(my_task, CronTrigger(hour="*"))
+            # === 字符串模式 ===
+            # 每小时整点执行
+            scheduler.add_job(my_task, "cron", hour="*", minute=0)
             
             # 每 30 分钟执行
-            scheduler.add_job(my_task, IntervalTrigger(minutes=30))
+            scheduler.add_job(my_task, "interval", minutes=30)
             
             # 每天凌晨 2 点执行
-            scheduler.add_job(my_task, CronTrigger(hour=2, minute=0))
+            scheduler.add_job(my_task, "cron", hour=2, minute=0)
+            
+            # 每周一 9:00 执行
+            scheduler.add_job(my_task, "cron", day_of_week="mon", hour=9, minute=0)
+            
+            # === 原生对象模式 ===
+            from apscheduler.triggers.cron import CronTrigger
+            from apscheduler.triggers.interval import IntervalTrigger
             
             # 使用 crontab 表达式
             scheduler.add_job(my_task, CronTrigger.from_crontab("0 2 * * *"))
+            
+            # 原生触发器对象
+            scheduler.add_job(my_task, IntervalTrigger(seconds=60))
         """
         if not self._initialized:
             raise RuntimeError("调度器未初始化")
         
+        # 分离触发器参数和其他 add_job 参数
+        if isinstance(trigger, str):
+            # 字符串模式：需要从 kwargs 中分离触发器参数
+            trigger_params, job_params = self._separate_trigger_params(trigger, kwargs)
+            trigger_obj = self._build_trigger(trigger, **trigger_params)
+        else:
+            # 对象模式：kwargs 全部是 add_job 参数
+            trigger_obj = trigger
+            job_params = kwargs
+        
         # 包装任务函数，自动设置日志上下文
         wrapped_func = self._wrap_with_context(func)
 
@@ -247,12 +317,52 @@ class SchedulerManager:
         job_id = id or f"{func.__module__}.{func.__name__}"
         self._scheduler.add_job(
             func=wrapped_func,
-            trigger=trigger,
+            trigger=trigger_obj,
             id=job_id,
-            **kwargs,
+            **job_params,
         )
         
-        logger.info(f"任务已注册: {job_id} | 触发器: {type(trigger).__name__}")
+        logger.info(f"任务已注册: {job_id} | 触发器: {type(trigger_obj).__name__}")
+    
+    def _separate_trigger_params(
+        self,
+        trigger_type: str,
+        kwargs: dict[str, Any]
+    ) -> tuple[dict[str, Any], dict[str, Any]]:
+        """分离触发器参数和 add_job 参数。
+        
+        Args:
+            trigger_type: 触发器类型
+            kwargs: 混合参数
+            
+        Returns:
+            (trigger_params, job_params) 元组
+        """
+        # CronTrigger 支持的参数
+        cron_params = {
+            "year", "month", "day", "week", "day_of_week",
+            "hour", "minute", "second", "start_date", "end_date",
+            "timezone", "jitter"
+        }
+        # IntervalTrigger 支持的参数
+        interval_params = {
+            "weeks", "days", "hours", "minutes", "seconds",
+            "start_date", "end_date", "timezone", "jitter"
+        }
+        
+        # 根据触发器类型选择参数集
+        trigger_param_names = cron_params if trigger_type == "cron" else interval_params
+        
+        trigger_params: dict[str, Any] = {}
+        job_params: dict[str, Any] = {}
+        
+        for key, value in kwargs.items():
+            if key in trigger_param_names:
+                trigger_params[key] = value
+            else:
+                job_params[key] = value
+        
+        return trigger_params, job_params
     
     def _wrap_with_context(self, func: Callable) -> Callable:
         """包装任务函数，自动设置 scheduler 日志上下文。"""
@@ -339,19 +449,35 @@ class SchedulerManager:
     def reschedule_job(
         self,
         job_id: str,
-        trigger: Any,
+        trigger: TriggerType | BaseTrigger,
+        **trigger_kwargs: Any,
     ) -> None:
         """重新调度任务。
         
+        支持两种触发器语法：
+        
+        1. 字符串模式：trigger 为 "cron" 或 "interval"，触发器参数通过 kwargs 传递
+        2. 原生对象模式：trigger 为 APScheduler 触发器对象
+        
         Args:
             job_id: 任务ID
-            trigger: APScheduler 触发器对象
+            trigger: 触发器类型或触发器对象
+            **trigger_kwargs: 触发器参数（仅字符串模式时有效）
+        
+        示例:
+            # 字符串模式
+            scheduler.reschedule_job("my_job", "cron", hour="*/2")
+            scheduler.reschedule_job("my_job", "interval", minutes=15)
+            
+            # 原生对象模式
+            scheduler.reschedule_job("my_job", CronTrigger(hour="*/2"))
         """
         if not self._scheduler:
             raise RuntimeError("调度器未初始化")
         
-        self._scheduler.reschedule_job(job_id, trigger=trigger)
-        logger.info(f"任务已重新调度: {job_id} | 触发器: {type(trigger).__name__}")
+        trigger_obj = self._build_trigger(trigger, **trigger_kwargs)
+        self._scheduler.reschedule_job(job_id, trigger=trigger_obj)
+        logger.info(f"任务已重新调度: {job_id} | 触发器: {type(trigger_obj).__name__}")
     
     def pause_job(self, job_id: str) -> None:
         """暂停单个任务。
@@ -392,7 +518,16 @@ class SchedulerManager:
         
         self._scheduler.start()
         self._started = True
-        logger.info("调度器已启动")
+        
+        # 打印已加载的任务列表
+        jobs = self._scheduler.get_jobs()
+        if jobs:
+            logger.info(f"调度器已启动，共加载 {len(jobs)} 个定时任务:")
+            for job in jobs:
+                next_run = job.next_run_time.strftime("%Y-%m-%d %H:%M:%S") if job.next_run_time else "已暂停"
+                logger.info(f"  - {job.id} | 触发器: {type(job.trigger).__name__} | 下次执行: {next_run}")
+        else:
+            logger.info("调度器已启动，无定时任务")
     
     def shutdown(self) -> None:
         """关闭调度器。"""
@@ -414,40 +549,66 @@ class SchedulerManager:
     
     def scheduled_job(
         self,
-        trigger: Any,
+        trigger: TriggerType | BaseTrigger,
         *,
         id: str | None = None,
+        enabled: bool = True,
         **kwargs: Any,
     ) -> Callable[[Callable], Callable]:
         """任务注册装饰器。
         
+        支持两种触发器语法：
+        
+        1. 字符串模式（推荐，简洁）:
+            @scheduler.scheduled_job("cron", hour="*", minute=0)
+            @scheduler.scheduled_job("interval", seconds=60)
+        
+        2. 原生对象模式（完整功能）:
+            @scheduler.scheduled_job(CronTrigger(hour="*"))
+            @scheduler.scheduled_job(IntervalTrigger(seconds=60))
+        
         使用示例:
-            from apscheduler.triggers.cron import CronTrigger
-            from apscheduler.triggers.interval import IntervalTrigger
-            
             scheduler = SchedulerManager.get_instance()
             
-            @scheduler.scheduled_job(IntervalTrigger(seconds=60))
+            # === 字符串模式 ===
+            @scheduler.scheduled_job("interval", seconds=60)
             async def my_task():
-                print("Task executed")
+                print("每分钟执行")
             
-            @scheduler.scheduled_job(CronTrigger(hour="*"))
+            @scheduler.scheduled_job("cron", hour="*", minute=0)
             async def hourly_task():
-                print("Hourly task")
+                print("每小时整点执行")
+            
+            # === 条件加载 ===
+            @scheduler.scheduled_job("cron", hour=2, enabled=settings.ENABLE_REPORT)
+            async def daily_report():
+                print("每日报告")
+            
+            # === 原生对象模式 ===
+            from apscheduler.triggers.cron import CronTrigger
             
             @scheduler.scheduled_job(CronTrigger.from_crontab("0 0 * * *"))
             async def daily_task():
-                print("Daily task")
+                print("每天 0 点执行")
         
         Args:
-            trigger: APScheduler 触发器对象
-            id: 任务ID
-            **kwargs: 其他 APScheduler add_job 参数
+            trigger: 触发器类型或触发器对象
+                - 字符串: "cron" 或 "interval"
+                - 对象: CronTrigger(...) 或 IntervalTrigger(...)
+            id: 任务ID（可选，默认使用函数完整路径）
+            enabled: 是否启用任务，默认 True。设为 False 时跳过注册
+            **kwargs: 触发器参数（字符串模式）或其他 APScheduler add_job 参数
         
         Returns:
             装饰器函数
         """
         def decorator(func: Callable) -> Callable:
+            # enabled=False 时跳过注册
+            if not enabled:
+                job_id = id or f"{func.__module__}.{func.__name__}"
+                logger.debug(f"任务已禁用，跳过注册: {job_id}")
+                return func
+            
             job_config = {
                 "func": func,
                 "trigger": trigger,

aury/boot/infrastructure/tasks/manager.py

@@ -34,16 +34,40 @@ except ImportError:
         CurrentMessage = None
         TimeLimit = None
 
-# 延迟导入 kombu broker（可选依赖）
+# 可选导入 Redis/RabbitMQ broker（不再使用 KombuBroker）
 try:
-    from dramatiq_kombu_broker import KombuBroker
-    _KOMBU_BROKER_AVAILABLE = True
-except ImportError:
-    _KOMBU_BROKER_AVAILABLE = False
-    if TYPE_CHECKING:
-        from dramatiq_kombu_broker import KombuBroker
-    else:
-        KombuBroker = None
+    from dramatiq.brokers.redis import RedisBroker  # type: ignore
+    _REDIS_BROKER_AVAILABLE = True
+except Exception:
+    RedisBroker = None  # type: ignore
+    _REDIS_BROKER_AVAILABLE = False
+
+try:
+    from dramatiq.brokers.rabbitmq import RabbitmqBroker  # type: ignore
+    _RABBIT_BROKER_AVAILABLE = True
+except Exception:
+    RabbitmqBroker = None  # type: ignore
+    _RABBIT_BROKER_AVAILABLE = False
+
+
+def _create_broker(url: str, middleware_list: list) -> Any:
+    """根据 URL 创建 Dramatiq 原生 Broker，并挂载中间件。"""
+    scheme = url.split(":", 1)[0].lower() if url else ""
+    if scheme.startswith("redis"):
+        if not _REDIS_BROKER_AVAILABLE:
+            raise ImportError("未安装 redis 或 dramatiq 的 RedisBroker 不可用，请安装: pip install dramatiq redis")
+        broker = RedisBroker(url=url)  # type: ignore[call-arg]
+        for m in middleware_list:
+            broker.add_middleware(m)
+        return broker
+    if scheme in {"amqp", "amqps"}:
+        if not _RABBIT_BROKER_AVAILABLE:
+            raise ImportError("RabbitMQ broker 不可用，请安装: pip install 'dramatiq[rabbitmq]'")
+        broker = RabbitmqBroker(url=url)  # type: ignore[call-arg]
+        for m in middleware_list:
+            broker.add_middleware(m)
+        return broker
+    raise ValueError(f"不支持的任务队列 URL: {url}")
 
 
 class TaskProxy:
@@ -170,7 +194,7 @@ class TaskManager:
             name: 实例名称
         """
         self.name = name
-        self._broker: Any = None  # KombuBroker | None
+        self._broker: Any = None  # Dramatiq Broker | None
         self._initialized: bool = False
         self._task_config: TaskConfig | None = None
         self._run_mode: TaskRunMode = TaskRunMode.WORKER  # 默认 Worker 模式（调度者）
@@ -255,10 +279,6 @@ class TaskManager:
                 "dramatiq 未安装。请安装可选依赖: pip install 'aury-boot[queue-dramatiq]'"
             )
         
-        if not _KOMBU_BROKER_AVAILABLE:
-            raise ImportError(
-                "dramatiq-kombu-broker 未安装。请安装可选依赖: pip install 'aury-boot[queue-dramatiq-kombu]'"
-            )
         
         try:
             # 使用函数式编程创建默认中间件（如果未提供）
@@ -268,11 +288,11 @@ class TaskManager:
             
             middleware_list = middleware if middleware is not None else create_default_middleware()
             
-            # 使用 KombuBroker，支持多种后端（Redis、RabbitMQ、SQS 等）
-            self._broker = KombuBroker(url=url, middleware=middleware_list)
+            # 使用 Dramatiq 原生 Broker（Redis/RabbitMQ），不再依赖 KombuBroker
+            self._broker = _create_broker(url, middleware_list)
             dramatiq.set_broker(self._broker)
             self._initialized = True
-            logger.info(f"任务管理器初始化完成（使用 Kombu Broker: {url}）")
+            logger.info(f"任务管理器初始化完成（broker={type(self._broker).__name__}, url={url}）")
         except Exception as exc:
             logger.error(f"任务队列初始化失败: {exc}")
             raise

{aury_boot-0.0.19.dist-info → aury_boot-0.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aury-boot
-Version: 0.0.19
+Version: 0.0.21
 Summary: Aury Boot - 基于 FastAPI 生态的企业级 API 开发框架
 Requires-Python: >=3.13
 Requires-Dist: alembic>=1.17.2
@@ -24,13 +24,11 @@ Requires-Dist: sqladmin>=0.16.0; extra == 'admin'
 Provides-Extra: all
 Requires-Dist: aiomysql>=0.3.2; extra == 'all'
 Requires-Dist: aiosqlite>=0.21.0; extra == 'all'
-Requires-Dist: amqp>=5.3.1; extra == 'all'
 Requires-Dist: apscheduler>=3.11.1; extra == 'all'
 Requires-Dist: asyncpg>=0.31.0; extra == 'all'
 Requires-Dist: aury-sdk-storage[aws]>=0.0.1; extra == 'all'
-Requires-Dist: dramatiq-kombu-broker>=0.2.2; extra == 'all'
 Requires-Dist: dramatiq>=1.18.0; extra == 'all'
-Requires-Dist: kombu>=5.6.1; extra == 'all'
+Requires-Dist: pika>=1.3.2; extra == 'all'
 Requires-Dist: redis>=7.1.0; extra == 'all'
 Provides-Extra: dev
 Requires-Dist: mypy>=1.19.0; extra == 'dev'
@@ -53,9 +51,7 @@ Requires-Dist: aiosqlite>=0.21.0; extra == 'recommended'
 Requires-Dist: apscheduler>=3.11.1; extra == 'recommended'
 Requires-Dist: asyncpg>=0.31.0; extra == 'recommended'
 Requires-Dist: aury-sdk-storage[aws]>=0.0.1; extra == 'recommended'
-Requires-Dist: dramatiq-kombu-broker>=0.2.2; extra == 'recommended'
 Requires-Dist: dramatiq>=1.18.0; extra == 'recommended'
-Requires-Dist: kombu>=5.6.1; extra == 'recommended'
 Requires-Dist: redis>=7.1.0; extra == 'recommended'
 Provides-Extra: redis
 Requires-Dist: redis>=7.1.0; extra == 'redis'
@@ -66,9 +62,8 @@ Requires-Dist: apscheduler>=3.11.1; extra == 'scheduler'
 Provides-Extra: sqlite
 Requires-Dist: aiosqlite>=0.21.0; extra == 'sqlite'
 Provides-Extra: tasks
-Requires-Dist: dramatiq-kombu-broker>=0.2.2; extra == 'tasks'
 Requires-Dist: dramatiq>=1.18.0; extra == 'tasks'
-Requires-Dist: kombu>=5.6.1; extra == 'tasks'
+Requires-Dist: redis>=7.1.0; extra == 'tasks'
 Description-Content-Type: text/markdown
 
 # Aury Boot

{aury_boot-0.0.19.dist-info → aury_boot-0.0.21.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aury/boot/__init__.py,sha256=pCno-EInnpIBa1OtxNYF-JWf9j95Cd2h6vmu0xqa_-4,1791
-aury/boot/_version.py,sha256=2t1q5JYEYkNwbHa29phdM-U8VWR1m6EwW48aFKWPj_w,706
+aury/boot/_version.py,sha256=G-x3V64IYobhRYKCOse2hTj6uYLM7_2kyUMOZMY7cf4,706
 aury/boot/application/__init__.py,sha256=0o_XmiwFCeAu06VHggS8I1e7_nSMoRq0Hcm0fYfCywU,3071
 aury/boot/application/adapter/__init__.py,sha256=e1bcSb1bxUMfofTwiCuHBZJk5-STkMCWPF2EJXHQ7UU,3976
 aury/boot/application/adapter/base.py,sha256=Ar_66fiHPDEmV-1DKnqXKwc53p3pozG31bgTJTEUriY,15763
@@ -8,13 +8,13 @@ aury/boot/application/adapter/decorators.py,sha256=yyGu_16bWWUiO36gxCeQWgG0DN19p
 aury/boot/application/adapter/exceptions.py,sha256=Kzm-ytRxdUnSMIcWCSOHPxo4Jh_A6YbyxlOVIUs-5F4,6183
 aury/boot/application/adapter/http.py,sha256=4TADsSzdSRU63307dmmo-2U_JpVP12mwTFy66B5Ps-w,10759
 aury/boot/application/app/__init__.py,sha256=I8FfCKDuDQsGzAK6BevyfdtAwieMUVYu6qgVQzBazpE,830
-aury/boot/application/app/base.py,sha256=wBF7q_kZp5uWUeWy95oElBAsc43xJ4RZ1s6tMGIiCac,17253
+aury/boot/application/app/base.py,sha256=PYYUC_Yz3U885aU2uG5EAbbKOj_oUB4VSYMD_KS5i1s,17789
 aury/boot/application/app/components.py,sha256=-blDjMF87GYFmFyk4DHm2KJDcm27HpMxGpNaEFluwEE,22403
 aury/boot/application/app/middlewares.py,sha256=BXe2H14FHzJUVpQM6DZUm-zfZRXSXIi1QIZ4_3izfHw,3306
 aury/boot/application/app/startup.py,sha256=DHKt3C2G7V5XfFr1SQMl14tNzcuDd9MqUVAxi274HDQ,7873
 aury/boot/application/config/__init__.py,sha256=Dd-myRSBCM18DXXsi863h0cJG5VFrI10xMRtjnvelGo,1894
 aury/boot/application/config/multi_instance.py,sha256=RXSp-xP8-bKMDEhq3SeL7T3lS8-vpRlvBEVBuZVjVK4,6475
-aury/boot/application/config/settings.py,sha256=WILVLfZCMyximKKZ6uuzxa82mcdhPNqa2G5iX90L1Wc,30619
+aury/boot/application/config/settings.py,sha256=o0SAwEpFqoHE7zB3lYyaSCm0cX2NZnTVqUWiSJ-Qdtk,30576
 aury/boot/application/constants/__init__.py,sha256=DCXs13_VVaQWHqO-qpJoZwRd7HIexiirtw_nu8msTXE,340
 aury/boot/application/constants/components.py,sha256=hDRs3YxpnfIFcGaUa1DYqBRwmV2_dceOlcCXabHE3fk,1006
 aury/boot/application/constants/scheduler.py,sha256=S77FBIvHlyruvlabRWZJ2J1YAs2xWXPQI2yuGdGUDNA,471
@@ -23,7 +23,7 @@ aury/boot/application/errors/__init__.py,sha256=aYhGqjHayYr7sv9kM22y0sOo9R-8RK0r
 aury/boot/application/errors/chain.py,sha256=DSLZvPH7oNcxE26j3hiXG_1W7-3fdKyu0QMEEi1c5CY,2306
 aury/boot/application/errors/codes.py,sha256=CBR8umCSNp1zUslwK9tboQ4s753qBwA1OpefaQTPdjE,1431
 aury/boot/application/errors/exceptions.py,sha256=5gHC9cQsuvNpO5V9GlFkb-QqH0xNqQaOKBmTBM5wYEI,7303
-aury/boot/application/errors/handlers.py,sha256=wPYiiDkJGNxJjXL442KhPAg4rLTq-GSISmVEa6nHmiE,11129
+aury/boot/application/errors/handlers.py,sha256=Q9U1YK_tzO2lWtLhJ4Tuq973vyuCm_zElYEO07DoYlk,11948
 aury/boot/application/errors/response.py,sha256=fqOO3bNTnRRjoN3gK0-6xBVAYfSqyPvUbONowAecq9k,3107
 aury/boot/application/interfaces/__init__.py,sha256=EGbiCL8IoGseylLVZO29Lkt3luygG7JknTgtAxeb48U,1438
 aury/boot/application/interfaces/egress.py,sha256=t8FK17V649rsm65uAeBruYr2mhfcqJiIzkS8UPsOzlc,5346
@@ -48,7 +48,7 @@ aury/boot/commands/docker.py,sha256=7mKorZCPZgxH1XFslzo6W-uzpe61hGXz86JKOhOeBlo,
 aury/boot/commands/docs.py,sha256=7VaZyEuezmL28aM9y13ni-y-VYP-eNKff5-qb-9q1RQ,13066
 aury/boot/commands/generate.py,sha256=WZieSXuofxJOC7NBiVGpBigB9NZ4GMcF2F1ReTNun1I,44420
 aury/boot/commands/init.py,sha256=vHg2Zhdoar1ANug9J8pT1tNGdH5S0GO19Rhsy-04mXQ,32262
-aury/boot/commands/pkg.py,sha256=SyHpeSh0vuGVHNmv97-0ZX7AjuSttfZkOs7T86Pq-NQ,14489
+aury/boot/commands/pkg.py,sha256=bw0QPptKscNgQ4I1SfSehTio9Q5KrvxgvkYx4tbZ7Vs,14495
 aury/boot/commands/scheduler.py,sha256=BCIGQcGryXpsYNF-mncP6v5kNoz6DZ10DMzMKVDiXxA,3516
 aury/boot/commands/worker.py,sha256=qAcPdoKpMBLYoi45X_y2-nobuYKxscJpooEB_0HhM4o,4163
 aury/boot/commands/migrate/__init__.py,sha256=W9OhkX8ILdolySofgdP2oYoJGG9loQd5FeSwkniU3qM,455
@@ -76,7 +76,7 @@ aury/boot/commands/templates/project/aury_docs/04-schema.md.tpl,sha256=ZwwKhUbLI
 aury/boot/commands/templates/project/aury_docs/05-api.md.tpl,sha256=oPzda3V6ZPDDEW-5MwyzmsMRuu5mXrsRGEq3lj0M-58,2997
 aury/boot/commands/templates/project/aury_docs/06-exception.md.tpl,sha256=Tv_Q5lsScHzvtcaFWmuQzN4YqvpcWZIdXS8jw99K29E,3340
 aury/boot/commands/templates/project/aury_docs/07-cache.md.tpl,sha256=EQMI7vJIwJT-VdG4p1GMCDEo58DCO1n6V-MvUzGSaS0,3411
-aury/boot/commands/templates/project/aury_docs/08-scheduler.md.tpl,sha256=tmLuQwqUoegV-721pDWC9K4A2pSMZ0BIWR-54gqz5aQ,4448
+aury/boot/commands/templates/project/aury_docs/08-scheduler.md.tpl,sha256=NZpe9j1mNXyornCvTJQ1YmwhMuzL2H0yEGPPc1O2GJ0,6510
 aury/boot/commands/templates/project/aury_docs/09-tasks.md.tpl,sha256=swHOQ_pWPtW8Bsy1arPu2OeIgs1FoKsJ2AsVSYUWPHY,931
 aury/boot/commands/templates/project/aury_docs/10-storage.md.tpl,sha256=mhe0j0S51ndPJLjaQ6yD8OPYBEO02NHumJVbBvz2qkw,4320
 aury/boot/commands/templates/project/aury_docs/11-logging.md.tpl,sha256=bwxFCGQsO9cTEbwqJF1xcjsZKP82HRWhIMRUS0c9_ZI,2435
@@ -99,7 +99,7 @@ aury/boot/commands/templates/project/env_templates/storage.tpl,sha256=x983u0Y2AF
 aury/boot/commands/templates/project/env_templates/third_party.tpl,sha256=w5lcKLYRHrA_iB-FmqMM_0WMs6bvxpf3ZwgicthFxgU,1959
 aury/boot/commands/templates/project/modules/api.py.tpl,sha256=G_IE-UC_pRhN7oOxy3dl_VLmR_omlKmHhWYi-AlyZIQ,471
 aury/boot/commands/templates/project/modules/exceptions.py.tpl,sha256=TKY3XaQU50Z-sDHWi3_Ns-A4v50PFru08H2lzmKxAUw,2646
-aury/boot/commands/templates/project/modules/schedules.py.tpl,sha256=CizmYzeuibWBsa_XxJTycr_WuzLPKtjJE1Vc78Lhdic,752
+aury/boot/commands/templates/project/modules/schedules.py.tpl,sha256=TrIlwYyQUjWagDSytdQgHF1gYKCN4CPeInFLedzmstY,1350
 aury/boot/commands/templates/project/modules/tasks.py.tpl,sha256=w16VsW0K1_ukZe1Md2A_DnNPCAQUTNuo1JYfHOb7ZTI,564
 aury/boot/common/__init__.py,sha256=MhNP3c_nwx8CyDkDF6p1f4DcTZ1CZZScg66FWdbdaZI,629
 aury/boot/common/exceptions/__init__.py,sha256=aS3rIXWc5qNNJbfMs_PNmBlFsyNdKUMErziNMd1yoB8,3176
@@ -176,7 +176,7 @@ aury/boot/infrastructure/mq/backends/rabbitmq.py,sha256=0NWgPKEwtbmI63EVvKINdfXX
 aury/boot/infrastructure/mq/backends/redis.py,sha256=i8KECToIFEZ6CnHyNCk34_xdff5ioK172_knOy6EeUU,5279
 aury/boot/infrastructure/scheduler/__init__.py,sha256=eTRJ5dSPcKvyFvLVtraoQteXTTDDGwIrmw06J2hoNdA,323
 aury/boot/infrastructure/scheduler/exceptions.py,sha256=ROltrhSctVWA-6ulnjuYeHAk3ZF-sykDoesuierYzew,634
-aury/boot/infrastructure/scheduler/manager.py,sha256=xXSFdzliLoFKVsKkpriig5PJjyro9CMT0SQGaMnTAec,16290
+aury/boot/infrastructure/scheduler/manager.py,sha256=OHQOHQlcoN8yFnky4kfuhsEIk39qX6nLZ7xJ51tfg68,23130
 aury/boot/infrastructure/storage/__init__.py,sha256=bA-n3v2S1FX6XsQbLqt0hkgx512MjUn_b8kJo53G6gA,1238
 aury/boot/infrastructure/storage/base.py,sha256=X9aswSMWtKZ6TdG5Rrh6qJpqIVLt1QcFkQAKdyUWPi0,5039
 aury/boot/infrastructure/storage/exceptions.py,sha256=Av1r94bRkeeeDo6vgAD9e_9YA9Ge6D7F2U1qzUs-8FE,622
@@ -185,14 +185,14 @@ aury/boot/infrastructure/tasks/__init__.py,sha256=Ne3VRVj4Y7x51UUkJH8nVrbxucCbal
 aury/boot/infrastructure/tasks/config.py,sha256=qOWjWZ7uZAr2bKc2xx7kdoiWisFqmBqw2uAcaA6Ud6s,747
 aury/boot/infrastructure/tasks/constants.py,sha256=6lo5jGLPItntVKLgrz6uh4tz_F1a-ckEO97MlP5aGcA,836
 aury/boot/infrastructure/tasks/exceptions.py,sha256=v6hlBbfs-oI_HbUZCxR3T8_c-U83s4_I0SvM7GHDUWE,605
-aury/boot/infrastructure/tasks/manager.py,sha256=AGWCZwO3uFQhNZ-reyR2KinlkUsXF8z1bsJ8UmWPcTk,17328
+aury/boot/infrastructure/tasks/manager.py,sha256=CTmqCS1okYBznTe9LEvM_scGmjQ60T-W_OgRWSStgxM,18271
 aury/boot/testing/__init__.py,sha256=WbUSXcICNpr9RvrA2JzxRPcjMuTWDPTKOwXl0l4697U,703
 aury/boot/testing/base.py,sha256=BQOA6V4RIecVJM9t7kto9YxL0Ij_jEsFBdpKceWBe3U,3725
 aury/boot/testing/client.py,sha256=KOg1EemuIVsBG68G5y0DjSxZGcIQVdWQ4ASaHE3o1R0,4484
 aury/boot/testing/factory.py,sha256=8GvwX9qIDu0L65gzJMlrWB0xbmJ-7zPHuwk3eECULcg,5185
 aury/boot/toolkit/__init__.py,sha256=AcyVb9fDf3CaEmJPNkWC4iGv32qCPyk4BuFKSuNiJRQ,334
 aury/boot/toolkit/http/__init__.py,sha256=zIPmpIZ9Qbqe25VmEr7jixoY2fkRbLm7NkCB9vKpg6I,11039
-aury_boot-0.0.19.dist-info/METADATA,sha256=dY0ECLQ3Pse_zl86ktmyqWP_BWWEuX5m72YU9d5Etwk,7981
-aury_boot-0.0.19.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-aury_boot-0.0.19.dist-info/entry_points.txt,sha256=f9KXEkDIGc0BGkgBvsNx_HMz9VhDjNxu26q00jUpDwQ,49
-aury_boot-0.0.19.dist-info/RECORD,,
+aury_boot-0.0.21.dist-info/METADATA,sha256=a7scICE4EqlEjn1ZsnemOzEscg8IySfO6WV6VQKO-_s,7695
+aury_boot-0.0.21.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+aury_boot-0.0.21.dist-info/entry_points.txt,sha256=f9KXEkDIGc0BGkgBvsNx_HMz9VhDjNxu26q00jUpDwQ,49
+aury_boot-0.0.21.dist-info/RECORD,,