🧑‍💻 使用 Ruff 包办所有格式化和检查 (#663)

nonebot_bison/config/subs_io/nbesf_model/__init__.py

@@ -3,4 +3,4 @@
 from . import v1, v2, v3
 from .base import NBESFBase
 
-__all__ = ["v1", "v2", "v3", "NBESFBase"]
+__all__ = ["NBESFBase", "v1", "v2", "v3"]

nonebot_bison/config/subs_io/nbesf_model/base.py

@@ -1,10 +1,10 @@
 from abc import ABC
 
-from pydantic import BaseModel
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 from nonebot_plugin_saa.registries import AllSupportedPlatformTarget as UserInfo
+from pydantic import BaseModel
 
-from ....types import Tag, Category
+from nonebot_bison.types import Category, Tag
 
 
 class NBESFBase(BaseModel, ABC):

nonebot_bison/config/subs_io/nbesf_model/v1.py

@@ -1,17 +1,18 @@
 """nbesf is Nonebot Bison Enchangable Subscribes File! ver.1"""
 
-from typing import Any
 from functools import partial
+from typing import Any
 
-from nonebot.log import logger
-from pydantic import BaseModel
-from nonebot_plugin_saa import TargetQQGroup, TargetQQPrivate
 from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
+from nonebot.log import logger
+from nonebot_plugin_saa import TargetQQGroup, TargetQQPrivate
+from pydantic import BaseModel, Field
+
+from nonebot_bison.config.db_config import SubscribeDupException, config
+from nonebot_bison.config.subs_io.utils import NBESFParseErr
+from nonebot_bison.types import Category, Tag
 
-from ..utils import NBESFParseErr
-from ....types import Tag, Category
 from .base import NBESFBase, SubReceipt
-from ...db_config import SubscribeDupException, config
 
 # ===== nbesf 定义格式 ====== #
 NBESF_VERSION = 1
@@ -79,7 +80,7 @@ class SubGroup(
     """
 
     version: int = NBESF_VERSION
-    groups: list[SubPack] = []
+    groups: list[SubPack] = Field(default_factory=list)
 
 
 # ======================= #
@@ -108,11 +109,11 @@ async def subs_receipt_gen(nbesf_data: SubGroup):
             try:
                 await config.add_subscribe(receipt.user, **model_dump(receipt, exclude={"user"}))
             except SubscribeDupException:
-                logger.warning(f"！添加订阅条目 {repr(receipt)} 失败: 相同的订阅已存在")
+                logger.warning(f"！添加订阅条目 {receipt!r} 失败: 相同的订阅已存在")
             except Exception as e:
-                logger.error(f"！添加订阅条目 {repr(receipt)} 失败: {repr(e)}")
+                logger.error(f"！添加订阅条目 {receipt!r} 失败: {e!r}")
             else:
-                logger.success(f"添加订阅条目 {repr(receipt)} 成功！")
+                logger.success(f"添加订阅条目 {receipt!r} 成功！")
 
 
 def nbesf_parser(raw_data: Any) -> SubGroup:

nonebot_bison/config/subs_io/nbesf_model/v2.py

@@ -1,17 +1,18 @@
 """nbesf is Nonebot Bison Enchangable Subscribes File! ver.2"""
 
-from typing import Any
 from functools import partial
+from typing import Any
 
-from nonebot.log import logger
-from pydantic import BaseModel
-from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
 from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
+from nonebot.log import logger
+from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
+from pydantic import BaseModel, Field
+
+from nonebot_bison.config.db_config import SubscribeDupException, config
+from nonebot_bison.config.subs_io.utils import NBESFParseErr
+from nonebot_bison.types import Category, Tag
 
-from ..utils import NBESFParseErr
-from ....types import Tag, Category
 from .base import NBESFBase, SubReceipt
-from ...db_config import SubscribeDupException, config
 
 # ===== nbesf 定义格式 ====== #
 NBESF_VERSION = 2
@@ -64,7 +65,7 @@ class SubGroup(NBESFBase):
     """
 
     version: int = NBESF_VERSION
-    groups: list[SubPack] = []
+    groups: list[SubPack] = Field(default_factory=list)
 
 
 # ======================= #
@@ -85,11 +86,11 @@ async def subs_receipt_gen(nbesf_data: SubGroup):
             try:
                 await config.add_subscribe(receipt.user, **model_dump(receipt, exclude={"user"}))
             except SubscribeDupException:
-                logger.warning(f"！添加订阅条目 {repr(receipt)} 失败: 相同的订阅已存在")
+                logger.warning(f"！添加订阅条目 {receipt!r} 失败: 相同的订阅已存在")
             except Exception as e:
-                logger.error(f"！添加订阅条目 {repr(receipt)} 失败: {repr(e)}")
+                logger.error(f"！添加订阅条目 {receipt!r} 失败: {e!r}")
             else:
-                logger.success(f"添加订阅条目 {repr(receipt)} 成功！")
+                logger.success(f"添加订阅条目 {receipt!r} 成功！")
 
 
 def nbesf_parser(raw_data: Any) -> SubGroup:

nonebot_bison/config/subs_io/nbesf_model/v3.py

@@ -1,21 +1,20 @@
 """nbesf is Nonebot Bison Enchangable Subscribes File! ver.2"""
 
-from typing import Any
 from functools import partial
+from typing import Any
 
-from nonebot.log import logger
-from pydantic import BaseModel
-from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
 from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
+from nonebot.log import logger
+from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
+from pydantic import BaseModel, Field
 
-from nonebot_bison.types import Tag
-from nonebot_bison.types import Category
+from nonebot_bison.config.db_config import SubscribeDupException, config
+from nonebot_bison.config.db_model import Cookie as DBCookie
+from nonebot_bison.config.subs_io.utils import NBESFParseErr
+from nonebot_bison.types import Category, Tag
 from nonebot_bison.types import Target as T_Target
 
-from ..utils import NBESFParseErr
 from .base import NBESFBase, SubReceipt
-from ...db_model import Cookie as DBCookie
-from ...db_config import SubscribeDupException, config
 
 # ===== nbesf 定义格式 ====== #
 NBESF_VERSION = 3
@@ -80,8 +79,8 @@ class SubGroup(NBESFBase):
     """
 
     version: int = NBESF_VERSION
-    groups: list[SubPack] = []
-    cookies: list[Cookie] = []
+    groups: list[SubPack] = Field(default_factory=list)
+    cookies: list[Cookie] = Field(default_factory=list)
 
 
 # ======================= #
@@ -103,11 +102,11 @@ async def subs_receipt_gen(nbesf_data: SubGroup):
             try:
                 await config.add_subscribe(receipt.user, **model_dump(receipt, exclude={"user"}))
             except SubscribeDupException:
-                logger.warning(f"！添加订阅条目 {repr(receipt)} 失败: 相同的订阅已存在")
+                logger.warning(f"！添加订阅条目 {receipt!r} 失败: 相同的订阅已存在")
             except Exception as e:
-                logger.error(f"！添加订阅条目 {repr(receipt)} 失败: {repr(e)}")
+                logger.error(f"！添加订阅条目 {receipt!r} 失败: {e!r}")
             else:
-                logger.success(f"添加订阅条目 {repr(receipt)} 成功！")
+                logger.success(f"添加订阅条目 {receipt!r} 成功！")
 
 
 async def magic_cookie_gen(nbesf_data: SubGroup):
@@ -119,9 +118,9 @@ async def magic_cookie_gen(nbesf_data: SubGroup):
             for target in cookie.targets:
                 await config.add_cookie_target(T_Target(target.target), target.platform_name, cookie_id)
         except Exception as e:
-            logger.error(f"！添加 Cookie 条目 {repr(cookie)} 失败: {repr(e)}")
+            logger.error(f"！添加 Cookie 条目 {cookie!r} 失败: {e!r}")
         else:
-            logger.success(f"添加 Cookie 条目 {repr(cookie)} 成功！")
+            logger.success(f"添加 Cookie 条目 {cookie!r} 成功！")
 
 
 def nbesf_parser(raw_data: Any) -> SubGroup:

nonebot_bison/config/subs_io/subs_io.py

@@ -1,19 +1,20 @@
-from typing import cast
 from collections import defaultdict
 from collections.abc import Callable
+from typing import cast
 
-from sqlalchemy import select
-from nonebot.log import logger
-from sqlalchemy.sql.selectable import Select
-from nonebot_plugin_saa import PlatformTarget
 from nonebot.compat import type_validate_python
+from nonebot.log import logger
 from nonebot_plugin_datastore.db import create_session
+from nonebot_plugin_saa import PlatformTarget
+from sqlalchemy import select
 from sqlalchemy.orm.strategy_options import selectinload
+from sqlalchemy.sql.selectable import Select
+
+from nonebot_bison.config import config
+from nonebot_bison.config.db_model import Cookie, CookieTarget, Subscribe, Target, User
 
-from .. import config
-from .utils import NBESFVerMatchErr, row2dict
 from .nbesf_model import NBESFBase, v1, v2, v3
-from ..db_model import User, Cookie, Target, Subscribe, CookieTarget
+from .utils import NBESFVerMatchErr, row2dict
 
 
 async def subscribes_export(selector: Callable[[Select], Select]) -> v3.SubGroup: