版本更新

zhenxun/services/__init__.py

@@ -1,2 +0,0 @@
-from .db_context import *
-from .log import *

zhenxun/services/db_context.py

@@ -4,13 +4,11 @@ from tortoise.models import Model as Model_
 from nonebot.utils import is_coroutine_callable
 
 from zhenxun.configs.config import BotConfig
-from zhenxun.configs.path_config import DATA_PATH
 
 from .log import logger
 
 SCRIPT_METHOD = []
 MODELS: list[str] = []
-DATABASE_SETTING_FILE = DATA_PATH / "database.json"
 
 
 class Model(Model_):

zhenxun/services/log.py

@@ -1,12 +1,13 @@
+from typing import Any, overload
 from datetime import datetime, timedelta
-from typing import Any, Dict, overload
 
 from nonebot import require
 
 require("nonebot_plugin_session")
 from loguru import logger as logger_
-from nonebot.log import default_filter, default_format
 from nonebot_plugin_session import Session
+from nonebot.log import default_filter, default_format
+from nonebot_plugin_uninfo import Session as uninfoSession
 
 from zhenxun.configs.path_config import LOG_PATH
 
@@ -33,8 +34,10 @@ class logger:
     TEMPLATE_A = "Adapter[{}] {}"
     TEMPLATE_B = "Adapter[{}] [<u><c>{}</c></u>]: {}"
     TEMPLATE_C = "Adapter[{}] 用户[<u><e>{}</e></u>] 触发 [<u><c>{}</c></u>]: {}"
-    TEMPLATE_D = "Adapter[{}] 群聊[<u><e>{}</e></u>] 用户[<u><e>{}</e></u>] 触发 [<u><c>{}</c></u>]: {}"
-    TEMPLATE_E = "Adapter[{}] 群聊[<u><e>{}</e></u>] 用户[<u><e>{}</e></u>] 触发 [<u><c>{}</c></u>] [Target](<u><e>{}</e></u>): {}"
+    TEMPLATE_D = "Adapter[{}] 群聊[<u><e>{}</e></u>] 用户[<u><e>{}</e></u>] 触发"
+    " [<u><c>{}</c></u>]: {}"
+    TEMPLATE_E = "Adapter[{}] 群聊[<u><e>{}</e></u>] 用户[<u><e>{}</e></u>] 触发"
+    " [<u><c>{}</c></u>] [Target](<u><e>{}</e></u>): {}"
 
     TEMPLATE_ADAPTER = "Adapter[<m>{}</m>] "
     TEMPLATE_USER = "用户[<u><e>{}</e></u>] "
@@ -75,21 +78,32 @@ class logger:
         platform: str | None = None,
     ): ...
 
+    @overload
     @classmethod
     def info(
         cls,
         info: str,
         command: str | None = None,
         *,
-        session: int | str | Session | None = None,
+        session: uninfoSession | None = None,
+        target: Any = None,
+        platform: str | None = None,
+    ): ...
+
+    @classmethod
+    def info(
+        cls,
+        info: str,
+        command: str | None = None,
+        *,
+        session: int | str | Session | uninfoSession | None = None,
         group_id: int | str | None = None,
         adapter: str | None = None,
         target: Any = None,
         platform: str | None = None,
     ):
         user_id: str | None = session  # type: ignore
-        group_id = None
-        if type(session) == Session:
+        if isinstance(session, Session):
             user_id = session.id1
             adapter = session.bot_type
             if session.id3:
@@ -97,12 +111,18 @@ class logger:
             elif session.id2:
                 group_id = f"{session.id2}"
             platform = platform or session.platform
+        elif isinstance(session, uninfoSession):
+            user_id = session.user.id
+            adapter = session.adapter
+            if session.group:
+                group_id = session.group.id
+            platform = session.basic["scope"]
         template = cls.__parser_template(
             info, command, user_id, group_id, adapter, target, platform
         )
         try:
             logger_.opt(colors=True).info(template)
-        except Exception as e:
+        except Exception:
             logger_.info(template)
 
     @classmethod
@@ -110,7 +130,7 @@ class logger:
         cls,
         info: str,
         command: str,
-        param: Dict[str, Any] | None = None,
+        param: dict[str, Any] | None = None,
         result: str = "",
     ):
         param_str = ""
@@ -149,13 +169,27 @@ class logger:
         e: Exception | None = None,
     ): ...
 
+    @overload
     @classmethod
     def warning(
         cls,
         info: str,
         command: str | None = None,
         *,
-        session: int | str | Session | None = None,
+        session: uninfoSession | None = None,
+        adapter: str | None = None,
+        target: Any = None,
+        platform: str | None = None,
+        e: Exception | None = None,
+    ): ...
+
+    @classmethod
+    def warning(
+        cls,
+        info: str,
+        command: str | None = None,
+        *,
+        session: int | str | Session | uninfoSession | None = None,
         group_id: int | str | None = None,
         adapter: str | None = None,
         target: Any = None,
@@ -163,8 +197,7 @@ class logger:
         e: Exception | None = None,
     ):
         user_id: str | None = session  # type: ignore
-        group_id = None
-        if type(session) == Session:
+        if isinstance(session, Session):
             user_id = session.id1
             adapter = session.bot_type
             if session.id3:
@@ -172,6 +205,12 @@ class logger:
             elif session.id2:
                 group_id = f"{session.id2}"
             platform = platform or session.platform
+        elif isinstance(session, uninfoSession):
+            user_id = session.user.id
+            adapter = session.adapter
+            if session.group:
+                group_id = session.group.id
+            platform = session.basic["scope"]
         template = cls.__parser_template(
             info, command, user_id, group_id, adapter, target, platform
         )
@@ -210,13 +249,26 @@ class logger:
         e: Exception | None = None,
     ): ...
 
+    @overload
     @classmethod
     def error(
         cls,
         info: str,
         command: str | None = None,
         *,
-        session: int | str | Session | None = None,
+        session: uninfoSession | None = None,
+        target: Any = None,
+        platform: str | None = None,
+        e: Exception | None = None,
+    ): ...
+
+    @classmethod
+    def error(
+        cls,
+        info: str,
+        command: str | None = None,
+        *,
+        session: int | str | Session | uninfoSession | None = None,
         group_id: int | str | None = None,
         adapter: str | None = None,
         target: Any = None,
@@ -224,8 +276,7 @@ class logger:
         e: Exception | None = None,
     ):
         user_id: str | None = session  # type: ignore
-        group_id = None
-        if type(session) == Session:
+        if isinstance(session, Session):
             user_id = session.id1
             adapter = session.bot_type
             if session.id3:
@@ -233,6 +284,12 @@ class logger:
             elif session.id2:
                 group_id = f"{session.id2}"
             platform = platform or session.platform
+        elif isinstance(session, uninfoSession):
+            user_id = session.user.id
+            adapter = session.adapter
+            if session.group:
+                group_id = session.group.id
+            platform = session.basic["scope"]
         template = cls.__parser_template(
             info, command, user_id, group_id, adapter, target, platform
         )
@@ -271,13 +328,26 @@ class logger:
         e: Exception | None = None,
     ): ...
 
+    @overload
     @classmethod
     def debug(
         cls,
         info: str,
         command: str | None = None,
         *,
-        session: int | str | Session | None = None,
+        session: uninfoSession | None = None,
+        target: Any = None,
+        platform: str | None = None,
+        e: Exception | None = None,
+    ): ...
+
+    @classmethod
+    def debug(
+        cls,
+        info: str,
+        command: str | None = None,
+        *,
+        session: int | str | Session | uninfoSession | None = None,
         group_id: int | str | None = None,
         adapter: str | None = None,
         target: Any = None,
@@ -285,8 +355,7 @@ class logger:
         e: Exception | None = None,
     ):
         user_id: str | None = session  # type: ignore
-        group_id = None
-        if type(session) == Session:
+        if isinstance(session, Session):
             user_id = session.id1
             adapter = session.bot_type
             if session.id3:
@@ -294,6 +363,12 @@ class logger:
             elif session.id2:
                 group_id = f"{session.id2}"
             platform = platform or session.platform
+        elif isinstance(session, uninfoSession):
+            user_id = session.user.id
+            adapter = session.adapter
+            if session.group:
+                group_id = session.group.id
+            platform = session.basic["scope"]
         template = cls.__parser_template(
             info, command, user_id, group_id, adapter, target, platform
         )