aury-boot 0.0.20__tar.gz → 0.0.21__tar.gz

{aury_boot-0.0.20 → aury_boot-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aury-boot
-Version: 0.0.20
+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.20 → aury_boot-0.0.21}/aury/boot/_version.py

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

{aury_boot-0.0.20 → aury_boot-0.0.21}/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-0.0.20 → aury_boot-0.0.21}/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-0.0.20 → aury_boot-0.0.21}/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-0.0.20 → aury_boot-0.0.21}/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-0.0.20 → aury_boot-0.0.21}/aury/boot/commands/templates/project/aury_docs/08-scheduler.md.tpl

@@ -118,6 +118,28 @@ from datetime import datetime, timedelta
 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`
+
 ## 多实例支持
 
 支持不同业务线使用独立的调度器实例：

{aury_boot-0.0.20 → aury_boot-0.0.21}/aury/boot/infrastructure/scheduler/manager.py

@@ -518,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:
         """关闭调度器。"""
@@ -543,6 +552,7 @@ class SchedulerManager:
         trigger: TriggerType | BaseTrigger,
         *,
         id: str | None = None,
+        enabled: bool = True,
         **kwargs: Any,
     ) -> Callable[[Callable], Callable]:
         """任务注册装饰器。
@@ -569,9 +579,10 @@ class SchedulerManager:
             async def hourly_task():
                 print("每小时整点执行")
             
-            @scheduler.scheduled_job("cron", day_of_week="mon-fri", hour=9)
-            async def workday_task():
-                print("工作日 9 点执行")
+            # === 条件加载 ===
+            @scheduler.scheduled_job("cron", hour=2, enabled=settings.ENABLE_REPORT)
+            async def daily_report():
+                print("每日报告")
             
             # === 原生对象模式 ===
             from apscheduler.triggers.cron import CronTrigger
@@ -585,12 +596,19 @@ class SchedulerManager:
                 - 字符串: "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-0.0.20 → aury_boot-0.0.21}/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.20 → aury_boot-0.0.21}/pyproject.toml

@@ -53,8 +53,7 @@ s3 = ["aury-sdk-storage[aws]>=0.0.1"]
 # ============ 任务队列 ============
 tasks = [
     "dramatiq>=1.18.0",
-    "kombu>=5.6.1",
-    "dramatiq-kombu-broker>=0.2.2",
+    "redis>=7.1.0",
 ]
 
 # ============ 消息队列后端 ============
@@ -75,8 +74,6 @@ recommended = [
     "asyncpg>=0.31.0",
     "redis>=7.1.0",
     "dramatiq>=1.18.0",
-    "kombu>=5.6.1",
-    "dramatiq-kombu-broker>=0.2.2",
     "apscheduler>=3.11.1",
     "aury-sdk-storage[aws]>=0.0.1",
     "aiosqlite>=0.21.0",
@@ -89,9 +86,7 @@ all = [
     "redis>=7.1.0",
     "aury-sdk-storage[aws]>=0.0.1",
     "dramatiq>=1.18.0",
-    "kombu>=5.6.1",
-    "dramatiq-kombu-broker>=0.2.2",
-    "amqp>=5.3.1",
+    "pika>=1.3.2",  # RabbitMQ
     "apscheduler>=3.11.1",
 ]