🐛 fix: lower log level for echo

Author: ProgramRipper

nonebot_plugin_orm/__init__.py

@@ -8,7 +8,6 @@
 from typing import Any, AsyncGenerator
 
 from nonebot.params import Depends
-from nonebot.log import LoguruHandler
 from nonebot.plugin import PluginMetadata
 import sqlalchemy.ext.asyncio as sa_asyncio
 from sqlalchemy.util import greenlet_spawn
@@ -19,8 +18,8 @@
 
 from . import migrate
 from .model import Model
-from .utils import StreamToLogger
 from .config import Config, plugin_config
+from .utils import LoguruHandler, StreamToLogger
 
 if sys.version_info >= (3, 10):
     from typing import Annotated
@@ -205,17 +204,17 @@ def _init_table():
 def _init_logger():
     log_level = _driver.config.log_level
     if isinstance(log_level, str):
-        log_level = logging.getLevelName(log_level)
+        log_level = logger.level(log_level).no
 
     levels = {"alembic": log_level, "sqlalchemy": log_level}
     if not plugin_config.sqlalchemy_echo:
         levels["sqlalchemy.engine"] = levels["sqlalchemy.pool"] = logging.WARNING
 
     handler = LoguruHandler()
     for name, level in levels.items():
-        logger = logging.getLogger(name)
-        logger.addHandler(handler)
-        logger.setLevel(level)
+        l = logging.getLogger(name)
+        l.addHandler(handler)
+        l.setLevel(level)
 
 
 _init_logger()

nonebot_plugin_orm/utils.py

@@ -44,18 +44,40 @@ def __eq__(self, __o: _T) -> _T:
 return_eq = _ReturnEq()
 
 
+class LoguruHandler(logging.Handler):
+    def emit(self, record: logging.LogRecord):
+        try:
+            level = logger.level(record.levelname).name
+            if record.levelno <= logging.INFO:
+                level = {"DEBUG": "TRACE", "INFO": "DEBUG"}.get(level, level)
+        except ValueError:
+            level = record.levelno
+
+        frame, depth = sys._getframe(6), 6
+        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()
+        )
+
+
 class StreamToLogger(StringIO):
-    """Use for startup migrate only"""
+    """Use for startup migrate, AlembicConfig.print_stdout() only"""
 
     def __init__(self, level="INFO"):
         self._level = level
 
-    def write(self, buffer):
+    def write(self, buffer: str):
+        frame, depth = sys._getframe(3), 3
+        while frame and frame.f_code.co_name != "print_stdout":
+            frame = frame.f_back
+            depth += 1
+        depth += 1
+
         for line in buffer.rstrip().splitlines():
-            # depth 0: this function
-            # depth 1: click.echo()
-            # depth 2: click.secho()
-            logger.opt(depth=3).log(self._level, line.rstrip())
+            logger.opt(depth=depth).log(self._level, line.rstrip())
 
     def flush(self):
         pass
@@ -64,9 +86,9 @@ def flush(self):
 def return_progressbar(func: Callable[_P, Iterable[_T]]) -> Callable[_P, Iterable[_T]]:
     log_level = get_driver().config.log_level
     if isinstance(log_level, str):
-        log_level = logging.getLevelName(log_level)
+        log_level = logger.level(log_level).no
 
-    if log_level <= logging.INFO:
+    if log_level <= logger.level("INFO").no:
         return func
 
     @wraps(func)