🎨 按ruff的检查调整程序代码

nonebot_bison/utils/__init__.py

@@ -1,17 +1,16 @@
 import difflib
 import re
 import sys
-from typing import Union
 
 import nonebot
-from bs4 import BeautifulSoup as bs
-from nonebot.log import default_format, logger
 from nonebot.plugin import require
-from nonebot_plugin_saa import Image, MessageSegmentFactory, Text
+from bs4 import BeautifulSoup as bs
+from nonebot.log import logger, default_format
+from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
 
-from ..plugin_config import plugin_config
-from .context import ProcessContext
 from .http import http_client
+from .context import ProcessContext
+from ..plugin_config import plugin_config
 from .scheduler_config import SchedulerConfig, scheduler
 
 __all__ = [
@@ -30,7 +29,7 @@ class Singleton(type):
 
     def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:
-            cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
+            cls._instances[cls] = super().__call__(*args, **kwargs)
         return cls._instances[cls]
 
 
@@ -63,7 +62,7 @@ def html_to_text(html: str, query_dict: dict = {}) -> str:
 
 class Filter:
     def __init__(self) -> None:
-        self.level: Union[int, str] = "DEBUG"
+        self.level: int | str = "DEBUG"
 
     def __call__(self, record):
         module_name: str = record["name"]
@@ -71,9 +70,7 @@ class Filter:
         if module:
             module_name = getattr(module, "__module_name__", module_name)
         record["name"] = module_name.split(".")[0]
-        levelno = (
-            logger.level(self.level).no if isinstance(self.level, str) else self.level
-        )
+        levelno = logger.level(self.level).no if isinstance(self.level, str) else self.level
         nonebot_warning_level = logger.level("WARNING").no
         return (
             record["level"].no >= levelno
@@ -94,11 +91,7 @@ if plugin_config.bison_filter_log:
     )
     config = nonebot.get_driver().config
     logger.success("Muted info & success from nonebot")
-    default_filter.level = (
-        ("DEBUG" if config.debug else "INFO")
-        if config.log_level is None
-        else config.log_level
-    )
+    default_filter.level = ("DEBUG" if config.debug else "INFO") if config.log_level is None else config.log_level
 
 
 def text_similarity(str1, str2) -> float:

nonebot_bison/utils/context.py

@@ -1,6 +1,6 @@
 from base64 import b64encode
 
-from httpx import AsyncClient, Response
+from httpx import Response, AsyncClient
 
 
 class ProcessContext:
@@ -33,8 +33,13 @@ class ProcessContext:
         res = []
         for req in self.reqs:
             if self._should_print_content(req):
-                log_content = f"{req.request.url} {req.request.headers} | [{req.status_code}] {req.headers} {req.text}"
+                log_content = (
+                    f"{req.request.url} {req.request.headers} | [{req.status_code}] {req.headers} {req.text}"
+                )
             else:
-                log_content = f"{req.request.url} {req.request.headers} | [{req.status_code}] {req.headers} b64encoded: {b64encode(req.content[:50]).decode()}"
+                log_content = (
+                    f"{req.request.url} {req.request.headers} | [{req.status_code}] {req.headers} "
+                    f"b64encoded: {b64encode(req.content[:50]).decode()}"
+                )
             res.append(log_content)
         return res

nonebot_bison/utils/http.py

@@ -1,5 +1,3 @@
-import functools
-
 import httpx
 
 from ..plugin_config import plugin_config
@@ -10,7 +8,6 @@ http_args = {
 http_headers = {"user-agent": plugin_config.bison_ua}
 
 
-@functools.wraps(httpx.AsyncClient)
 def http_client(*args, **kwargs):
     if headers := kwargs.get("headers"):
         new_headers = http_headers.copy()
@@ -18,7 +15,4 @@ def http_client(*args, **kwargs):
         kwargs["headers"] = new_headers
     else:
         kwargs["headers"] = http_headers
-    return httpx.AsyncClient(*args, **kwargs)
-
-
-http_client = functools.partial(http_client, **http_args)
+    return httpx.AsyncClient(*args, **kwargs, **http_args)

nonebot_bison/utils/scheduler_config.py

@@ -1,4 +1,4 @@
-from typing import Literal, Type
+from typing import Literal
 
 from httpx import AsyncClient
 
@@ -7,7 +7,6 @@ from .http import http_client
 
 
 class SchedulerConfig:
-
     schedule_type: Literal["date", "interval", "cron"]
     schedule_setting: dict
     name: str
@@ -25,9 +24,7 @@ class SchedulerConfig:
         return self.default_http_client
 
 
-def scheduler(
-    schedule_type: Literal["date", "interval", "cron"], schedule_setting: dict
-) -> Type[SchedulerConfig]:
+def scheduler(schedule_type: Literal["date", "interval", "cron"], schedule_setting: dict) -> type[SchedulerConfig]:
     return type(
         "AnonymousScheduleConfig",
         (SchedulerConfig,),