🎨 isort

pyproject.toml

@@ -42,4 +42,20 @@ dev = [
     "nonebot-adapter-telegram>=0.1.0b10",
 ]
 [tool.pdm.build]
-includes = ["src/nonebot_plugin_alconna"]
+includes = ["src/nonebot_plugin_alconna"]
+
+[tool.black]
+line-length = 88
+target-version = ["py38", "py39", "py310", "py311"]
+include = '\.pyi?$'
+extend-exclude = '''
+'''
+
+[tool.isort]
+profile = "black"
+line_length = 88
+length_sort = false
+skip_gitignore = true
+force_sort_within_sections = true
+src_paths = ["nonebot", "tests"]
+extra_standard_library = ["typing_extensions"]

src/nonebot_plugin_alconna/__init__.py

@@ -1,24 +1,24 @@
+from nonebot.plugin import PluginMetadata
+
+from .argv import MessageArgv as MessageArgv
 from .consts import ALCONNA_RESULT as ALCONNA_RESULT
 from .matcher import on_alconna as on_alconna
 from .model import CommandResult as CommandResult
 from .model import Match as Match
 from .model import Query as Query
-from .params import AlcResult as AlcResult
 from .params import AlcMatches as AlcMatches
+from .params import AlcResult as AlcResult
 from .params import AlconnaDuplication as AlconnaDuplication
 from .params import AlconnaMatch as AlconnaMatch
 from .params import AlconnaMatches as AlconnaMatches
 from .params import AlconnaQuery as AlconnaQuery
 from .params import AlconnaResult as AlconnaResult
+from .params import Check as Check
 from .params import assign as assign
 from .params import match_path as match_path
 from .params import match_value as match_value
-from .params import Check as Check
 from .rule import alconna as alconna
 from .rule import set_output_converter as set_output_converter
-from .argv import MessageArgv as MessageArgv
-
-from nonebot.plugin import PluginMetadata
 
 __plugin_meta__ = PluginMetadata(
     name="Alconna 插件",

src/nonebot_plugin_alconna/adapters/bilibili.py

@@ -1,6 +1,6 @@
-from nonebot.adapters.billibili.message import Message, BaseMessage
+from arclet.alconna import argv_config, set_default_argv_type
+from nonebot.adapters.billibili.message import BaseMessage, Message
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
 
 
 class BiliMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/console.py

@@ -1,10 +1,11 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nonebot.adapters.console.message import MessageSegment, Message, BaseMessage
+from arclet.alconna import argv_config, set_default_argv_type
+from nonebot.adapters.console.message import BaseMessage
 from nonebot.adapters.console.message import Emoji as _Emoji
-from nonebot.adapters.console.message import Markup as _Markup
 from nonebot.adapters.console.message import Markdown as _Markdown
+from nonebot.adapters.console.message import Markup as _Markup
+from nonebot.adapters.console.message import Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class ConsoleMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/ding.py

@@ -1,7 +1,7 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nonebot.adapters.ding.message import MessageSegment, Message, BaseMessage
+from arclet.alconna import argv_config, set_default_argv_type
+from nonebot.adapters.ding.message import BaseMessage, Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class DingMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/feishu.py

@@ -1,13 +1,9 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nepattern import (
-    BasePattern,
-    PatternModel,
-    UnionPattern,
-)
+from arclet.alconna import argv_config, set_default_argv_type
+from nepattern import BasePattern, PatternModel, UnionPattern
 from nepattern.main import INTEGER
-from nonebot.adapters.feishu.message import MessageSegment, BaseMessage, Message
+from nonebot.adapters.feishu.message import BaseMessage, Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class FeishuMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/github.py

@@ -1,6 +1,6 @@
-from nonebot.adapters.github.message import Message, BaseMessage
+from arclet.alconna import argv_config, set_default_argv_type
+from nonebot.adapters.github.message import BaseMessage, Message
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
 
 
 class GHMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/kook.py

@@ -1,7 +1,7 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nonebot.adapters.kaiheila.message import MessageSegment, Message, BaseMessage
+from arclet.alconna import argv_config, set_default_argv_type
+from nonebot.adapters.kaiheila.message import BaseMessage, Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class KookMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/minecraft.py

@@ -1,7 +1,7 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
+from arclet.alconna import argv_config, set_default_argv_type
+from nonebot.adapters.minecraft.message import BaseMessage, Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from nonebot.adapters.minecraft.message import MessageSegment, Message, BaseMessage
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class MinecraftMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/mirai.py

@@ -1,14 +1,9 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nepattern import (
-    URL,
-    BasePattern,
-    PatternModel,
-    UnionPattern,
-)
+from arclet.alconna import argv_config, set_default_argv_type
+from nepattern import URL, BasePattern, PatternModel, UnionPattern
 from nepattern.main import INTEGER
-from nonebot.adapters.mirai2.message import MessageSegment, BaseMessage, MessageChain
+from nonebot.adapters.mirai2.message import BaseMessage, MessageChain, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class MiraiMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/ntchat.py

@@ -1,7 +1,7 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nonebot.adapters.ntchat.message import MessageSegment, BaseMessage, Message
+from arclet.alconna import argv_config, set_default_argv_type
+from nonebot.adapters.ntchat.message import BaseMessage, Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class WXMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/onebot11.py

@@ -1,14 +1,9 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nepattern import (
-    URL,
-    BasePattern,
-    PatternModel,
-    UnionPattern,
-)
+from arclet.alconna import argv_config, set_default_argv_type
+from nepattern import URL, BasePattern, PatternModel, UnionPattern
 from nepattern.main import INTEGER
-from nonebot.adapters.onebot.v11.message import MessageSegment, BaseMessage, Message
+from nonebot.adapters.onebot.v11.message import BaseMessage, Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class Ob11MessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/onebot12.py

@@ -1,13 +1,9 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nepattern import (
-    BasePattern,
-    PatternModel,
-    UnionPattern,
-)
+from arclet.alconna import argv_config, set_default_argv_type
+from nepattern import BasePattern, PatternModel, UnionPattern
 from nepattern.main import INTEGER, URL
-from nonebot.adapters.onebot.v12.message import MessageSegment, BaseMessage, Message
+from nonebot.adapters.onebot.v12.message import BaseMessage, Message, MessageSegment
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class Ob12MessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/qqguild.py

@@ -1,22 +1,19 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nepattern import (
-    BasePattern,
-    PatternModel,
-    UnionPattern,
-)
+from arclet.alconna import argv_config, set_default_argv_type
+from nepattern import BasePattern, PatternModel, UnionPattern
 from nepattern.main import INTEGER, URL
-from nonebot.adapters.qqguild.message import MessageSegment, Message, BaseMessage
-from nonebot.adapters.qqguild.message import Emoji as _Emoji
-from nonebot.adapters.qqguild.message import MentionUser as _MentionUser
-from nonebot.adapters.qqguild.message import MentionChannel as _MentionChannel
-from nonebot.adapters.qqguild.message import MentionEveryone as _MentionEveryone
+from nonebot.adapters.qqguild.message import Ark as _Ark
 from nonebot.adapters.qqguild.message import Attachment as _Attachment
+from nonebot.adapters.qqguild.message import BaseMessage
 from nonebot.adapters.qqguild.message import Embed as _Embed
-from nonebot.adapters.qqguild.message import Ark as _Ark
+from nonebot.adapters.qqguild.message import Emoji as _Emoji
 from nonebot.adapters.qqguild.message import LocalImage as _LocalImage
+from nonebot.adapters.qqguild.message import MentionChannel as _MentionChannel
+from nonebot.adapters.qqguild.message import MentionEveryone as _MentionEveryone
+from nonebot.adapters.qqguild.message import MentionUser as _MentionUser
+from nonebot.adapters.qqguild.message import Message, MessageSegment
 from nonebot.adapters.qqguild.message import Reference as _Reference
 from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class QQGuildMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/adapters/telegram.py

@@ -1,9 +1,15 @@
-from nonebot_plugin_alconna.typings import SegmentPattern
-from nonebot_plugin_alconna.argv import MessageArgv
-from arclet.alconna import set_default_argv_type, argv_config
-from nonebot.adapters.telegram.message import MessageSegment, Message, BaseMessage
-from nonebot.adapters.telegram.message import Entity, File, UnCombinFile
+from arclet.alconna import argv_config, set_default_argv_type
 from nepattern import UnionPattern
+from nonebot.adapters.telegram.message import (
+    BaseMessage,
+    Entity,
+    File,
+    Message,
+    MessageSegment,
+    UnCombinFile,
+)
+from nonebot_plugin_alconna.argv import MessageArgv
+from nonebot_plugin_alconna.typings import SegmentPattern
 
 
 class TelegramMessageArgv(MessageArgv):

src/nonebot_plugin_alconna/argv.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from arclet.alconna.argv import set_default_argv_type, argv_config
 from arclet.alconna._internal._argv import Argv
-
+from arclet.alconna.argv import argv_config, set_default_argv_type
 from nonebot.adapters import Message
 
 

src/nonebot_plugin_alconna/consts.py

@@ -1,5 +1,6 @@
-from typing import Literal
 from pathlib import Path
+from typing import Literal
+
 from tarina import lang
 
 lang.load(Path(__file__).parent / "i18n")

src/nonebot_plugin_alconna/matcher.py

@@ -7,8 +7,8 @@
 from nonebot.rule import Rule
 from nonebot.typing import T_RuleChecker
 
-from .rule import alconna
 from .model import CompConfig
+from .rule import alconna
 from .typings import TConvert
 
 

src/nonebot_plugin_alconna/matcher.pyi

@@ -8,9 +8,8 @@ from nonebot.matcher import Matcher
 from nonebot.permission import Permission
 from nonebot.rule import Rule
 from nonebot.typing import T_Handler, T_PermissionChecker, T_RuleChecker, T_State
-from nonebot_plugin_alconna.typings import TConvert
 from nonebot_plugin_alconna.model import CompConfig
-
+from nonebot_plugin_alconna.typings import TConvert
 
 def on_alconna(
     command: Alconna | str,

src/nonebot_plugin_alconna/model.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass, field
-from typing import Generic, TypeVar, Optional, TypedDict
+from typing import Generic, Optional, TypedDict, TypeVar
 from typing_extensions import NotRequired
 
-from arclet.alconna import Arparma, Empty, Alconna
+from arclet.alconna import Alconna, Arparma, Empty
 from arclet.alconna.duplication import Duplication
 
 T = TypeVar("T")

src/nonebot_plugin_alconna/params.py

@@ -1,4 +1,4 @@
-from typing import Optional, Type, TypeVar, overload, Any, Callable
+from typing import Any, Callable, Optional, Type, TypeVar, overload
 from typing_extensions import Annotated
 
 from arclet.alconna import Arparma, Duplication, Empty

src/nonebot_plugin_alconna/rule.py

@@ -1,24 +1,24 @@
 import asyncio
-from typing import ClassVar, Optional, Union, Dict
+import traceback
+from typing import ClassVar, Dict, Optional, Union
 
 from arclet.alconna import (
     Alconna,
-    Arparma,
+    AllParam,
     Args,
+    Arparma,
+    CommandMeta,
     CompSession,
-    AllParam,
     command_manager,
     output_manager,
-    CommandMeta
 )
-import traceback
 from arclet.alconna.exceptions import SpecialOptionTriggered
 from nonebot import get_driver
 from nonebot.adapters import Bot, Event, Message
 from nonebot.internal.matcher import matchers
 from nonebot.internal.rule import Rule as Rule
-from nonebot.plugin.on import on_message
 from nonebot.params import EventMessage
+from nonebot.plugin.on import on_message
 from nonebot.typing import T_State
 from nonebot.utils import is_coroutine_callable, run_sync
 from tarina import lang

src/nonebot_plugin_alconna/typings.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
-from typing import Callable, Any, TypeVar, Generic, Literal, Awaitable, Union
+from typing import Any, Awaitable, Callable, Generic, Literal, TypeVar, Union
 from typing_extensions import ParamSpec, TypeAlias
+
+from nepattern import BasePattern, MatchFailed, PatternModel
+from nonebot.internal.adapter.message import Message, MessageSegment
 from tarina import lang
-from nepattern import BasePattern, PatternModel, MatchFailed
-from nonebot.internal.adapter.message import MessageSegment, Message
 
 TMS = TypeVar("TMS", bound=MessageSegment)
 P = ParamSpec("P")