diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 03f875f..2704f62 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,19 +7,19 @@ ci: autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks" repos: - repo: https://github.com/pycqa/isort - rev: 5.13.2 + rev: 8.0.1 hooks: - id: isort stages: [pre-commit] - - repo: https://github.com/psf/black - rev: 25.1.0 + - repo: https://github.com/psf/black-pre-commit-mirror + rev: 26.1.0 hooks: - id: black stages: [pre-commit] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.12.7 + rev: v0.15.4 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/src/nonebot_plugin_alconna/uniseg/adapters/kook/builder.py b/src/nonebot_plugin_alconna/uniseg/adapters/kook/builder.py index 70b86e7..68df9e2 100644 --- a/src/nonebot_plugin_alconna/uniseg/adapters/kook/builder.py +++ b/src/nonebot_plugin_alconna/uniseg/adapters/kook/builder.py @@ -4,6 +4,9 @@ from nonebot.adapters import Bot, Event, Message from nonebot.adapters.kaiheila import Bot as KaiheilaBot from nonebot.adapters.kaiheila.event import MessageEvent +from nonebot.adapters.kaiheila.message import ( + Card, +) from nonebot.adapters.kaiheila.message import ( KMarkdown, Mention, @@ -14,7 +17,6 @@ Quote, ) from nonebot.adapters.kaiheila.message import Audio as AudioSegment -from nonebot.adapters.kaiheila.message import Card from nonebot.adapters.kaiheila.message import File as FileSegment from nonebot.adapters.kaiheila.message import Image as ImageSegment from nonebot.adapters.kaiheila.message import Video as VideoSegment diff --git a/src/nonebot_plugin_alconna/uniseg/target.py b/src/nonebot_plugin_alconna/uniseg/target.py index 27f09c0..40d2eb7 100644 --- a/src/nonebot_plugin_alconna/uniseg/target.py +++ b/src/nonebot_plugin_alconna/uniseg/target.py @@ -77,7 +77,7 @@ def __init__( self.private = private self.source = source self.self_id = self_id - self.extra = extra if extra else {} + self.extra = extra or {} self.selector = None if scope: self.selector = partial(SCOPES[scope], self) diff --git a/tests/test_buttons.py b/tests/test_buttons.py index 0840ca2..ab8c28d 100644 --- a/tests/test_buttons.py +++ b/tests/test_buttons.py @@ -97,6 +97,9 @@ async def _(row: int): async with app.test_matcher(matcher) as ctx: from nonebot.adapters.qq import Adapter, Bot, Message, MessageSegment + from nonebot.adapters.qq.models import ( + Action, + ) from nonebot.adapters.qq.models import ( InlineKeyboard, InlineKeyboardRow, @@ -104,7 +107,6 @@ async def _(row: int): Permission, RenderData, ) - from nonebot.adapters.qq.models import Action from nonebot.adapters.qq.models import Button as QQButton from tests.fake import fake_message_event_guild diff --git a/tests/test_qq.py b/tests/test_qq.py index cefa84a..2556789 100644 --- a/tests/test_qq.py +++ b/tests/test_qq.py @@ -1,6 +1,9 @@ from arclet.alconna import Alconna, Args from nonebot import get_adapter, on_message from nonebot.adapters.qq import Adapter, Bot, Message, MessageSegment +from nonebot.adapters.qq.models import ( + Action, +) from nonebot.adapters.qq.models import ( InlineKeyboard, InlineKeyboardRow, @@ -10,7 +13,6 @@ Permission, RenderData, ) -from nonebot.adapters.qq.models import Action from nonebot.adapters.qq.models import Button as QQButton from nonebug import App import pytest diff --git a/tests/test_uniseg.py b/tests/test_uniseg.py index 58e4a7b..9203100 100644 --- a/tests/test_uniseg.py +++ b/tests/test_uniseg.py @@ -102,14 +102,11 @@ def test_persistence(): {"type": "image", "url": "https://example.com/1.jpg", "sticker": False}, {"type": "text", "text": "hello"}, ] - assert ( - msg.dump(json=True) - == """\ + assert msg.dump(json=True) == """\ [{"type": "at", "flag": "user", "target": "123"}, \ {"type": "at", "flag": "channel", "target": "456"}, \ {"type": "image", "url": "https://example.com/1.jpg", "sticker": false}, \ {"type": "text", "text": "hello"}]""" - ) msg1 = [ {"type": "at", "flag": "user", "target": "456"},