aury-boot 0.0.7__tar.gz → 0.0.9__tar.gz

{aury_boot-0.0.7 → aury_boot-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aury-boot
-Version: 0.0.7
+Version: 0.0.9
 Summary: Aury Boot - 基于 FastAPI 生态的企业级 API 开发框架
 Requires-Python: >=3.13
 Requires-Dist: alembic>=1.17.2

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.7'
-__version_tuple__ = version_tuple = (0, 0, 7)
+__version__ = version = '0.0.9'
+__version_tuple__ = version_tuple = (0, 0, 9)
 
 __commit_id__ = commit_id = None

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/application/app/base.py

@@ -203,6 +203,7 @@ class FoundationApp(FastAPI):
         title: str = "Aury Service",
         version: str = "1.0.0",
         description: str | None = None,
+        intercept_loggers: list[str] | None = None,
         **kwargs: Any,
     ) -> None:
         """初始化应用。
@@ -212,6 +213,9 @@ class FoundationApp(FastAPI):
             title: 应用标题
             version: 应用版本
             description: 应用描述
+            intercept_loggers: 额外需要拦截的标准 logging logger 名称列表，
+                会追加到框架默认列表 (uvicorn, sqlalchemy.engine 等)。
+                也可通过配置 LOG__INTERCEPT_LOGGERS 设置。
             **kwargs: 传递给 FastAPI 的其他参数
         """
         # 加载配置
@@ -223,6 +227,11 @@ class FoundationApp(FastAPI):
         frame = sys._getframe(1)
         self._caller_module = frame.f_globals.get("__name__", "__main__")
 
+        # 合并 intercept_loggers：参数 + 配置
+        merged_intercept = list(config.log.intercept_loggers)
+        if intercept_loggers:
+            merged_intercept.extend(intercept_loggers)
+
         # 初始化日志（必须在其他操作之前）
         setup_logging(
             log_level=config.log.level,
@@ -232,6 +241,7 @@ class FoundationApp(FastAPI):
             retention_days=config.log.retention_days,
             enable_file_rotation=config.log.enable_file_rotation,
             enable_console=config.log.enable_console,
+            intercept_loggers=merged_intercept,
         )
         
         # 注册 access 日志（HTTP 请求日志）

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/application/config/settings.py

@@ -372,6 +372,14 @@ class LogSettings(BaseModel):
         default=False,
         description="是否记录 WebSocket 消息内容（注意性能和敏感数据）"
     )
+    intercept_loggers: list[str] = Field(
+        default_factory=list,
+        description=(
+            "额外需要由 loguru 接管的标准 logging logger 名称列表。"
+            "框架默认已拦截 uvicorn、uvicorn.error、uvicorn.access、sqlalchemy.engine，"
+            "此处配置会追加到默认列表。"
+        ),
+    )
 
 
 class ServiceSettings(BaseModel):

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/commands/templates/project/env_templates/log.tpl

@@ -16,3 +16,5 @@
 # LOG__ENABLE_FILE_ROTATION=true
 # 是否输出日志到控制台
 # LOG__ENABLE_CONSOLE=true
+# 额外需要拦截的标准 logging logger (默认已拦截 uvicorn、sqlalchemy.engine)
+# LOG__INTERCEPT_LOGGERS=["my_package", "third_party_lib"]

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/commands/templates/project/env_templates/rpc.tpl

@@ -3,7 +3,7 @@
 # RPC 客户端配置 (RPC_CLIENT__)
 # =============================================================================
 # 服务地址映射 {service_name: url}
-# RPC_CLIENT__SERVICES={"user-service": "http://localhost:8001"}
+# RPC_CLIENT__SERVICES={{"user-service": "http://localhost:8001"}}
 # 默认超时时间（秒）
 # RPC_CLIENT__DEFAULT_TIMEOUT=30
 # 默认重试次数

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/commands/templates/project/env_templates/third_party.tpl

@@ -20,10 +20,10 @@
 # THIRD_PARTY__PAYMENT__API_SECRET=
 # THIRD_PARTY__PAYMENT__TIMEOUT=30
 # THIRD_PARTY__PAYMENT__RETRY_TIMES=3
-# THIRD_PARTY__PAYMENT__METHOD_MODES={"query": "real", "refund": "disabled"}
+# THIRD_PARTY__PAYMENT__METHOD_MODES={{"query": "real", "refund": "disabled"}}
 # THIRD_PARTY__PAYMENT__MOCK_STRATEGY=success
 # THIRD_PARTY__PAYMENT__MOCK_DELAY=0.1
-# THIRD_PARTY__PAYMENT__MOCK_DEFAULT_RESPONSE={"success": true, "mock": true}
+# THIRD_PARTY__PAYMENT__MOCK_DEFAULT_RESPONSE={{"success": true, "mock": true}}
 #
 # ---------- 短信接口示例 (SMS) ----------
 # THIRD_PARTY__SMS__ENABLED=true
@@ -33,11 +33,11 @@
 # THIRD_PARTY__SMS__API_SECRET=xxx
 # THIRD_PARTY__SMS__TIMEOUT=10
 # THIRD_PARTY__SMS__MOCK_STRATEGY=success
-# THIRD_PARTY__SMS__MOCK_DEFAULT_RESPONSE={"code": "OK", "message": "mock sent"}
+# THIRD_PARTY__SMS__MOCK_DEFAULT_RESPONSE={{"code": "OK", "message": "mock sent"}}
 #
 # ---------- 微信接口示例 (WECHAT) ----------
 # THIRD_PARTY__WECHAT__ENABLED=true
 # THIRD_PARTY__WECHAT__MODE=mock
 # THIRD_PARTY__WECHAT__BASE_URL=https://api.weixin.qq.com
 # THIRD_PARTY__WECHAT__TIMEOUT=15
-# THIRD_PARTY__WECHAT__EXTRA={"appid": "wx123", "secret": "xxx"}
+# THIRD_PARTY__WECHAT__EXTRA={{"appid": "wx123", "secret": "xxx"}}

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/commands/templates/project/main.py.tpl

@@ -25,11 +25,15 @@ config = AppConfig()
 #   - HEALTH_CHECK_PATH: 健康检查路径（默认 /api/health）
 #   - HEALTH_CHECK_ENABLED: 是否启用（默认 true）
 #
+# 日志拦截：
+#   框架默认拦截 uvicorn/sqlalchemy.engine，可通过 intercept_loggers 追加额外的 logger
+#
 app = FoundationApp(
     title="{project_name}",
     version="0.1.0",
     description="{project_name} - 基于 Aury Boot",
     config=config,
+    intercept_loggers=[],
 )
 
 # 注册 API 路由

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/common/logging/__init__.py

@@ -44,11 +44,14 @@ from aury.boot.common.logging.format import (
     log_exception,
 )
 from aury.boot.common.logging.setup import (
+    DEFAULT_INTERCEPT_LOGGERS,
     register_log_sink,
+    setup_intercept,
     setup_logging,
 )
 
 __all__ = [
+    "DEFAULT_INTERCEPT_LOGGERS",
     "ServiceContext",
     "format_exception_java_style",
     "get_class_logger",
@@ -63,6 +66,7 @@ __all__ = [
     "register_request_context",
     "set_service_context",
     "set_trace_id",
+    "setup_intercept",
     "setup_logging",
 ]
 

{aury_boot-0.0.7 → aury_boot-0.0.9}/aury/boot/common/logging/setup.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import logging
 import os
 from typing import Any
 
@@ -88,6 +89,70 @@ def register_log_sink(
     logger.debug(f"注册日志 sink: {name} (filter_key={filter_key})")
 
 
+# 默认拦截的标准 logging 日志记录器
+# - uvicorn: Uvicorn 服务器日志
+# - uvicorn.error: Uvicorn 错误日志
+# - sqlalchemy.engine: SQLAlchemy SQL 语句日志
+# 注意：uvicorn.access 不拦截，因为框架有自己的 RequestLoggingMiddleware
+DEFAULT_INTERCEPT_LOGGERS = [
+    "uvicorn",
+    "uvicorn.error",
+    "sqlalchemy.engine",
+]
+
+
+class _InterceptHandler(logging.Handler):
+    """将标准 logging 日志转发到 loguru 的处理器。"""
+
+    def emit(self, record: logging.LogRecord) -> None:
+        # 获取对应的 loguru 级别
+        try:
+            level = logger.level(record.levelname).name
+        except ValueError:
+            level = record.levelno
+
+        # 查找调用者的帧深度
+        frame, depth = logging.currentframe(), 2
+        while frame and frame.f_code.co_filename == logging.__file__:
+            frame = frame.f_back
+            depth += 1
+
+        logger.opt(depth=depth, exception=record.exc_info).log(
+            level, record.getMessage()
+        )
+
+
+def _setup_intercept(logger_names: list[str]) -> None:
+    """让 loguru 接管指定的标准 logging 日志记录器。"""
+    handler = _InterceptHandler()
+    for name in logger_names:
+        std_logger = logging.getLogger(name)
+        std_logger.handlers = [handler]
+        std_logger.setLevel(logging.DEBUG)
+        std_logger.propagate = False
+
+
+def setup_intercept(logger_names: list[str] | None = None) -> None:
+    """拦截标准 logging 日志记录器并转发到 loguru。
+
+    用于独立脚本/CLI 入口点（不使用 FoundationApp 时）。
+    FoundationApp 会自动调用此函数，无需手动调用。
+
+    Args:
+        logger_names: 额外需要拦截的 logger 名称列表，
+            会追加到默认列表 (uvicorn, sqlalchemy.engine 等)。
+
+    使用示例::
+
+        from aury.boot.common.logging import setup_logging, setup_intercept
+
+        setup_logging(log_level="DEBUG")
+        setup_intercept(["my_package", "third_party_lib"])
+    """
+    to_intercept = DEFAULT_INTERCEPT_LOGGERS + (logger_names or [])
+    _setup_intercept(to_intercept)
+
+
 def setup_logging(
     log_level: str = "INFO",
     log_dir: str | None = None,
@@ -97,6 +162,7 @@ def setup_logging(
     retention_days: int = 7,
     rotation_size: str = "50 MB",
     enable_console: bool = True,
+    intercept_loggers: list[str] | None = None,
 ) -> None:
     """设置日志配置。
 
@@ -119,6 +185,8 @@ def setup_logging(
         retention_days: 日志保留天数（默认：7 天）
         rotation_size: 单文件大小上限（默认：50 MB）
         enable_console: 是否输出到控制台
+        intercept_loggers: 额外需要拦截的标准 logging logger 名称列表，
+            会追加到默认列表 (uvicorn, sqlalchemy.engine 等)。
     """
     log_level = log_level.upper()
     log_dir = log_dir or "logs"
@@ -205,10 +273,16 @@ def setup_logging(
             filter=lambda record, c=ctx: record["extra"].get("service") == c,
         )
 
+    # 拦截标准 logging 日志并转发到 loguru
+    to_intercept = DEFAULT_INTERCEPT_LOGGERS + (intercept_loggers or [])
+    _setup_intercept(to_intercept)
+
     logger.info(f"日志系统初始化完成 | 服务: {service_type} | 级别: {log_level} | 目录: {log_dir}")
 
 
 __all__ = [
+    "DEFAULT_INTERCEPT_LOGGERS",
     "register_log_sink",
+    "setup_intercept",
     "setup_logging",
 ]