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

tests/sub_manager/test_abort.py

@@ -1,11 +1,11 @@
-import respx
-import pytest
 from httpx import Response
 from nonebug.app import App
 from nonebug_saa import should_send_saa
+import pytest
+import respx
 
-from ..platforms.utils import get_json
-from ..utils import BotReply, fake_admin_user, fake_group_message_event
+from tests.platforms.utils import get_json
+from tests.utils import BotReply, fake_admin_user, fake_group_message_event
 
 
 # 选择platform阶段中止
@@ -55,8 +55,8 @@ async def test_abort_add_on_id(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
 
-    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.platform import platform_manager
+    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.sub_manager import add_sub_matcher, common_platform
 
     ak_list_router = respx.get("https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937")
@@ -103,8 +103,8 @@ async def test_abort_add_on_cats(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
 
-    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.platform import platform_manager
+    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.sub_manager import add_sub_matcher, common_platform
 
     ak_list_router = respx.get("https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937")
@@ -163,8 +163,8 @@ async def test_abort_add_on_tag(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
 
-    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.platform import platform_manager
+    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.sub_manager import add_sub_matcher, common_platform
 
     ak_list_router = respx.get("https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937")
@@ -224,12 +224,12 @@ async def test_abort_add_on_tag(app: App, init_scheduler):
 async def test_abort_del_sub(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11.bot import Bot
     from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+    from nonebot_plugin_saa import MessageFactory, TargetQQGroup
 
     from nonebot_bison.config import config
-    from nonebot_bison.types import Target as T_Target
     from nonebot_bison.platform import platform_manager
     from nonebot_bison.sub_manager import del_sub_matcher
+    from nonebot_bison.types import Target as T_Target
 
     await config.add_subscribe(
         TargetQQGroup(group_id=10000),

tests/sub_manager/test_add.py

@@ -1,12 +1,12 @@
-import respx
-import pytest
 from httpx import Response
 from nonebug.app import App
-from pytest_mock import MockerFixture
 from nonebug_saa import should_send_saa
+import pytest
+from pytest_mock import MockerFixture
+import respx
 
-from ..platforms.utils import get_json
-from ..utils import BotReply, fake_admin_user, fake_group_message_event, add_reply_on_id_input_search
+from tests.platforms.utils import get_json
+from tests.utils import BotReply, add_reply_on_id_input_search, fake_admin_user, fake_group_message_event
 
 
 @pytest.mark.asyncio
@@ -61,13 +61,13 @@ async def test_configurable_at_me_false(app: App, mocker: MockerFixture):
 @pytest.mark.asyncio
 @respx.mock
 async def test_add_with_target(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
+    from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.config import config
-    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.platform import platform_manager
+    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.sub_manager import add_sub_matcher, common_platform
 
     ak_list_router = respx.get("https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937")
@@ -142,8 +142,9 @@ async def test_add_with_target(app: App, init_scheduler):
     sub = subs[0]
     assert sub.target.target == "6279793937"
     assert sub.tags == []
-    assert sub.categories == [platform_manager["weibo"].reverse_category["图文"]] + [
-        platform_manager["weibo"].reverse_category["文字"]
+    assert sub.categories == [
+        platform_manager["weibo"].reverse_category["图文"],
+        platform_manager["weibo"].reverse_category["文字"],
     ]
     assert sub.target.platform_name == "weibo"
     assert sub.target.target_name == "明日方舟Arknights"
@@ -152,13 +153,13 @@ async def test_add_with_target(app: App, init_scheduler):
 @pytest.mark.asyncio
 @respx.mock
 async def test_add_with_target_no_cat(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
+    from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.config import config
-    from nonebot_bison.platform.ncm import NcmArtist
     from nonebot_bison.platform import platform_manager
+    from nonebot_bison.platform.ncm import NcmArtist
     from nonebot_bison.sub_manager import add_sub_matcher, common_platform
 
     ncm_router = respx.get("https://music.163.com/api/artist/albums/32540734")
@@ -207,9 +208,9 @@ async def test_add_with_target_no_cat(app: App, init_scheduler):
 @pytest.mark.asyncio
 @respx.mock
 async def test_add_no_target(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
+    from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
@@ -290,11 +291,11 @@ async def test_platform_name_err(app: App):
 async def test_add_with_get_id(app: App):
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import Text, TargetQQGroup, MessageFactory, SupportedAdapters
+    from nonebot_plugin_saa import MessageFactory, SupportedAdapters, TargetQQGroup, Text
 
     from nonebot_bison.config import config
-    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.platform import platform_manager
+    from nonebot_bison.platform.weibo import Weibo
     from nonebot_bison.sub_manager import add_sub_matcher, common_platform
 
     ak_list_router = respx.get("https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937")
@@ -356,9 +357,9 @@ async def test_add_with_get_id(app: App):
 @pytest.mark.asyncio
 @respx.mock
 async def test_add_with_bilibili_target_parser(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
+    from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
@@ -470,9 +471,9 @@ async def test_add_with_bilibili_target_parser(app: App, init_scheduler):
 @pytest.mark.asyncio
 @respx.mock
 async def test_add_with_bilibili_live_target_parser(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
+    from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
@@ -549,9 +550,9 @@ async def test_add_with_bilibili_live_target_parser(app: App, init_scheduler):
 @pytest.mark.asyncio
 @respx.mock
 async def test_add_with_bilibili_bangumi_target_parser(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
+    from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
@@ -622,9 +623,9 @@ async def test_subscribe_platform_requires_browser(app: App, mocker: MockerFixtu
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message
 
+    from nonebot_bison.platform import platform_manager, unavailable_paltforms
     from nonebot_bison.plugin_config import plugin_config
     from nonebot_bison.sub_manager import add_sub_matcher, common_platform
-    from nonebot_bison.platform import platform_manager, unavailable_paltforms
 
     mocker.patch.object(plugin_config, "bison_use_browser", False)
     mocker.patch.dict(unavailable_paltforms, {"bilibili": "需要启用 bison_use_browser"})

tests/sub_manager/test_add_cookie.py

@@ -1,10 +1,10 @@
 import json
 
-import pytest
 from nonebug.app import App
+import pytest
 from pytest_mock import MockerFixture
 
-from ..utils import BotReply, fake_superuser, fake_admin_user, fake_private_message_event
+from tests.utils import BotReply, fake_admin_user, fake_private_message_event, fake_superuser
 
 
 async def test_add_cookie_rule(app: App, mocker: MockerFixture):
@@ -40,8 +40,8 @@ async def test_add_cookie_target_no_cookie(app: App):
 
     async with app.test_matcher(add_cookie_target_matcher) as ctx:
         bot = ctx.create_bot(base=Bot)
+        from nonebot_plugin_saa import MessageFactory, TargetQQGroup
         from nonebug_saa import should_send_saa
-        from nonebot_plugin_saa import TargetQQGroup, MessageFactory
 
         from nonebot_bison.config import config
         from nonebot_bison.types import Target as T_Target
@@ -89,7 +89,7 @@ async def test_add_cookie(app: App):
     from nonebot.adapters.onebot.v11.message import Message
 
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.sub_manager import common_platform, add_cookie_matcher, add_cookie_target_matcher
+    from nonebot_bison.sub_manager import add_cookie_matcher, add_cookie_target_matcher, common_platform
 
     async with app.test_matcher(add_cookie_matcher) as ctx:
         bot = ctx.create_bot(base=Bot)
@@ -143,8 +143,8 @@ async def test_add_cookie(app: App):
         )
 
     async with app.test_matcher(add_cookie_target_matcher) as ctx:
+        from nonebot_plugin_saa import MessageFactory, TargetQQGroup
         from nonebug_saa import should_send_saa
-        from nonebot_plugin_saa import TargetQQGroup, MessageFactory
 
         from nonebot_bison.config import config
         from nonebot_bison.types import Target as T_Target

tests/sub_manager/test_admin.py

@@ -1,7 +1,7 @@
-import pytest
 from nonebug import App
+import pytest
 
-from ..utils import fake_superuser, fake_group_message_event, fake_private_message_event
+from tests.utils import fake_group_message_event, fake_private_message_event, fake_superuser
 
 
 @pytest.mark.asyncio

tests/sub_manager/test_delete_cookie.py

@@ -1,22 +1,22 @@
 import json
 
-import pytest
 from nonebug.app import App
+import pytest
 
-from ..utils import fake_superuser, fake_private_message_event
+from tests.utils import fake_private_message_event, fake_superuser
 
 
 @pytest.mark.usefixtures("_clear_db")
 async def test_del_cookie(app: App):
-    from nonebug_saa import should_send_saa
     from nonebot.adapters.onebot.v11.bot import Bot
     from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+    from nonebot_plugin_saa import MessageFactory, TargetQQGroup
+    from nonebug_saa import should_send_saa
 
     from nonebot_bison.config import config
     from nonebot_bison.config.db_model import Cookie
-    from nonebot_bison.types import Target as T_Target
     from nonebot_bison.sub_manager import del_cookie_matcher
+    from nonebot_bison.types import Target as T_Target
 
     async with app.test_matcher(del_cookie_matcher) as ctx:
         bot = ctx.create_bot(base=Bot)
@@ -69,15 +69,15 @@ async def test_del_cookie(app: App):
 @pytest.mark.usefixtures("_clear_db")
 @pytest.mark.usefixtures("_patch_weibo_get_cookie_name")
 async def test_del_cookie_err(app: App):
-    from nonebug_saa import should_send_saa
     from nonebot.adapters.onebot.v11.bot import Bot
     from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+    from nonebot_plugin_saa import MessageFactory, TargetQQGroup
+    from nonebug_saa import should_send_saa
 
     from nonebot_bison.config import config
     from nonebot_bison.config.db_model import Cookie
-    from nonebot_bison.types import Target as T_Target
     from nonebot_bison.sub_manager import del_cookie_matcher
+    from nonebot_bison.types import Target as T_Target
 
     async with app.test_matcher(del_cookie_matcher) as ctx:
         bot = ctx.create_bot(base=Bot)

tests/sub_manager/test_no_permission.py

@@ -1,7 +1,7 @@
-import pytest
 from nonebug import App
+import pytest
 
-from ..utils import BotReply, fake_admin_user, fake_group_message_event
+from tests.utils import BotReply, fake_admin_user, fake_group_message_event
 
 
 @pytest.mark.asyncio

tests/sub_manager/test_query_del.py

@@ -1,19 +1,19 @@
-import pytest
 from nonebug.app import App
 from nonebug_saa import should_send_saa
+import pytest
 
-from ..utils import fake_admin_user, fake_group_message_event
+from tests.utils import fake_admin_user, fake_group_message_event
 
 
 @pytest.mark.asyncio
 async def test_query_sub(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11 import Bot, Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+    from nonebot_plugin_saa import MessageFactory, TargetQQGroup
 
-    from nonebot_bison.types import Target
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
     from nonebot_bison.sub_manager import query_sub_matcher
+    from nonebot_bison.types import Target
 
     await config.add_subscribe(
         TargetQQGroup(group_id=10000),
@@ -41,12 +41,12 @@ async def test_query_sub(app: App, init_scheduler):
 @pytest.mark.asyncio
 async def test_query_no_exsits_sub(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11 import Bot, Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+    from nonebot_plugin_saa import MessageFactory, TargetQQGroup
 
-    from nonebot_bison.types import Target
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
     from nonebot_bison.sub_manager import query_sub_matcher
+    from nonebot_bison.types import Target
 
     platform_manager["no_exsits_platform"] = platform_manager["weibo"]
     await config.add_subscribe(
@@ -80,12 +80,12 @@ async def test_query_no_exsits_sub(app: App, init_scheduler):
 async def test_del_sub(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11.bot import Bot
     from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+    from nonebot_plugin_saa import MessageFactory, TargetQQGroup
 
-    from nonebot_bison.types import Target
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
     from nonebot_bison.sub_manager import del_sub_matcher
+    from nonebot_bison.types import Target
 
     await config.add_subscribe(
         TargetQQGroup(group_id=10000),
@@ -129,12 +129,12 @@ async def test_del_sub(app: App, init_scheduler):
 async def test_del_no_exsits_sub(app: App, init_scheduler):
     from nonebot.adapters.onebot.v11.bot import Bot
     from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+    from nonebot_plugin_saa import MessageFactory, TargetQQGroup
 
-    from nonebot_bison.types import Target
     from nonebot_bison.config import config
     from nonebot_bison.platform import platform_manager
     from nonebot_bison.sub_manager import del_sub_matcher
+    from nonebot_bison.types import Target
 
     platform_manager["no_exsits_platform"] = platform_manager["weibo"]
     await config.add_subscribe(