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

nonebot_bison/utils/__init__.py

@@ -1,29 +1,31 @@
+import difflib
 import re
 import sys
-import difflib
+from typing import Any, ClassVar
 
-import nonebot
-from nonebot.plugin import require
 from bs4 import BeautifulSoup as bs
-from nonebot.log import logger, default_format
-from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
+import nonebot
+from nonebot.log import default_format, logger
+from nonebot.plugin import require
+from nonebot_plugin_saa import Image, MessageSegmentFactory, Text
 
-from .site import Site as Site
-from ..plugin_config import plugin_config
-from .image import pic_merge as pic_merge
+from nonebot_bison.plugin_config import plugin_config
+
+from .context import ProcessContext as ProcessContext
 from .http import http_client as http_client
 from .image import capture_html as capture_html
-from .site import ClientManager as ClientManager
-from .image import text_to_image as text_to_image
-from .site import anonymous_site as anonymous_site
-from .context import ProcessContext as ProcessContext
 from .image import is_pics_mergable as is_pics_mergable
+from .image import pic_merge as pic_merge
 from .image import pic_url_to_image as pic_url_to_image
+from .image import text_to_image as text_to_image
+from .site import ClientManager as ClientManager
 from .site import DefaultClientManager as DefaultClientManager
+from .site import Site as Site
+from .site import anonymous_site as anonymous_site
 
 
 class Singleton(type):
-    _instances = {}
+    _instances: ClassVar[dict[Any, Any]] = {}
 
     def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:

nonebot_bison/utils/context.py

@@ -1,6 +1,6 @@
 from base64 import b64encode
 
-from httpx import Response, AsyncClient
+from httpx import AsyncClient, Response
 
 from nonebot_bison.types import Target
 

nonebot_bison/utils/get_bot.py

@@ -1,12 +1,12 @@
 """提供获取 Bot 的方法"""
 
-from typing import Any
 from collections import defaultdict
+from typing import Any
 
 import nonebot
 from nonebot.adapters import Bot
-from nonebot_plugin_saa import PlatformTarget
 from nonebot.adapters.onebot.v11 import Bot as Ob11Bot
+from nonebot_plugin_saa import PlatformTarget
 
 GROUP: dict[int, list[Bot]] = {}
 USER: dict[int, list[Bot]] = {}

nonebot_bison/utils/http.py

@@ -1,6 +1,6 @@
 import httpx
 
-from ..plugin_config import plugin_config
+from nonebot_bison.plugin_config import plugin_config
 
 http_args = {
     "proxies": plugin_config.bison_proxy or None,

nonebot_bison/utils/image.py

@@ -1,16 +1,17 @@
-from io import BytesIO
+from collections.abc import Sequence
 from functools import partial
+from io import BytesIO
 from typing import Literal, TypeGuard
 
-from yarl import URL
-from PIL import Image
 from httpx import AsyncClient
 from nonebot import logger, require
-from PIL.Image import Image as PILImage
-from nonebot_plugin_saa import Text as SaaText
 from nonebot_plugin_saa import Image as SaaImage
+from nonebot_plugin_saa import Text as SaaText
+from PIL import Image
+from PIL.Image import Image as PILImage
+from yarl import URL
 
-from ..plugin_config import plugin_config
+from nonebot_bison.plugin_config import plugin_config
 
 
 async def pic_url_to_image(data: str | bytes, http_client: AsyncClient) -> PILImage:
@@ -96,7 +97,7 @@ async def pic_merge(pics: list[str | bytes], http_client: AsyncClient) -> list[s
     return pics
 
 
-def is_pics_mergable(imgs: list) -> TypeGuard[list[str | bytes]]:
+def is_pics_mergable(imgs: Sequence) -> TypeGuard[list[str | bytes]]:
     if any(not isinstance(img, str | bytes) for img in imgs):
         return False
 

nonebot_bison/utils/site.py

@@ -1,18 +1,19 @@
-import json
-from typing import Literal
-from json import JSONDecodeError
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 from datetime import datetime, timedelta
+import json
+from json import JSONDecodeError
+from typing import Literal
 
 import httpx
 from httpx import AsyncClient
 from nonebot.log import logger
 
-from ..types import Target
-from ..config import config
+from nonebot_bison.config import config
+from nonebot_bison.config.db_model import Cookie
+from nonebot_bison.types import Target
+
 from .http import http_client
-from ..config.db_model import Cookie
 
 
 class ClientManager(ABC):