🔖 version 0.62.0

Author: RF-Tar-Railt

.pre-commit-config.yaml

@@ -6,20 +6,14 @@ ci:
     autoupdate_schedule: monthly
     autoupdate_commit_msg: ':arrow_up: auto update by pre-commit hooks'
 repos:
-    - repo: https://github.com/pycqa/isort
-      rev: 5.13.2
-      hooks:
-          - id: isort
-            stages: [pre-commit]
-
     - repo: https://github.com/psf/black-pre-commit-mirror
-      rev: 26.1.0
+      rev: 26.3.0
       hooks:
           - id: black
             stages: [pre-commit]
 
     - repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: v0.15.4
+      rev: v0.15.9
       hooks:
           - id: ruff
             args: [--fix, --exit-non-zero-on-fix]

README.md

@@ -39,23 +39,24 @@ include = '\.pyi?$'
 extend-exclude = '''
 '''
 
-[tool.isort]
-profile = "black"
-line_length = 120
-skip_gitignore = true
-force_sort_within_sections = false
-extra_standard_library = ["typing_extensions"]
+#[tool.isort]
+#profile = "black"
+#line_length = 120
+#skip_gitignore = true
+#force_sort_within_sections = false
+#extra_standard_library = ["typing_extensions"]
 
 [tool.ruff]
 line-length = 120
 target-version = "py310"
+respect-gitignore = true
 
 [tool.ruff.lint]
 select = [
     "F", # pyflakes
     "E", # pycodestyle errors
     "W", # pycodestyle warnings
-    # "I",     # isort
+    "I",     # isort
     "N",     # PEP8-naming
     "UP",    # pyupgrade
     "YTT",   # flake8-2020
@@ -148,6 +149,10 @@ ignore = [
 ]
 flake8-quotes = { inline-quotes = "double", multiline-quotes = "double" }
 
+[tool.ruff.lint.isort]
+force-sort-within-sections = false
+extra-standard-library = ["typing_extensions"]
+
 [tool.ruff.lint.flake8-annotations]
 mypy-init-return = true
 
@@ -166,7 +171,7 @@ reportSelfClsParameterName = false
 [tool.pdm.scripts]
 test = "pytest -v -W ignore ./tests/"
 format = { composite = [
-    "isort ./src/ ./example/ ./tests/",
+    "ruff check --select I --fix ./src/ ./example/ ./tests/",
     "black ./src/ ./example/ ./tests/",
     "ruff check ./src/ ./example/ ./tests/",
 ] }
@@ -177,7 +182,6 @@ asyncio_default_fixture_loop_scope = "session"
 
 [dependency-groups]
 dev = [
-    "isort==5.13.2",
     "black>=25.9.0",
     "loguru>=0.7.3",
     "ruff>=0.14.0",
@@ -218,6 +222,7 @@ dev = [
     "pytest-asyncio==0.26.0",
     "nonebot-adapter-bilibili-live>=0.2.4",
     "nonebot-adapter-yunhu>=0.1.6",
+    "nonebot-adapter-vocechat>=0.1.8",
 ]
 test = [
     "nonebug>=0.4.3",

pdm.lock

@@ -141,7 +141,7 @@
 from .uniseg import patch_matcher_send as patch_matcher_send
 from .uniseg import patch_saa as patch_saa
 
-__version__ = "0.61.1"
+__version__ = "0.62.0"
 __supported_adapters__ = set(m.value for m in SupportAdapterModule.__members__.values())  # noqa: C401
 __plugin_meta__ = PluginMetadata(
     name="Alconna 插件",

pyproject.toml

@@ -3,14 +3,14 @@
 import inspect
 import random
 import weakref
+from _weakref import _remove_dead_weakref  # type: ignore
 from collections.abc import Iterable
 from contextlib import contextmanager
 from datetime import datetime, timedelta
 from types import FunctionType
 from typing import TYPE_CHECKING, Any, Callable, ClassVar, Literal, NoReturn, Protocol, TypeVar, cast, overload
 from typing_extensions import Self
 
-from _weakref import _remove_dead_weakref  # type: ignore
 from arclet.alconna import Alconna, Arg, Args, ShortcutArgs, command_manager
 from arclet.alconna.tools import AlconnaFormat
 from arclet.alconna.typing import ShortcutRegWrapper, _AllParamPattern

src/nonebot_plugin_alconna/__init__.py

@@ -64,7 +64,7 @@
 from .tools import image_fetch as image_fetch
 from .tools import reply_fetch as reply_fetch
 
-__version__ = "0.61.1"
+__version__ = "0.62.0"
 
 __plugin_meta__ = PluginMetadata(
     name="Universal Segment 插件",

src/nonebot_plugin_alconna/matcher.py

@@ -3,9 +3,8 @@
 
 from nonebot.adapters import Bot, Event
 from nonebot.adapters.discord.api import SnowflakeType
-from nonebot.adapters.discord.api.model import ActionRow
+from nonebot.adapters.discord.api.model import ActionRow, Channel, MessageGet, TextInput
 from nonebot.adapters.discord.api.model import Button as ButtonModel
-from nonebot.adapters.discord.api.model import Channel, MessageGet, TextInput
 from nonebot.adapters.discord.api.types import ButtonStyle, ChannelType, TextInputStyle
 from nonebot.adapters.discord.bot import Bot as DiscordBot
 from nonebot.adapters.discord.event import DirectMessageCreateEvent, GuildMessageCreateEvent, MessageEvent

src/nonebot_plugin_alconna/uniseg/__init__.py

@@ -1,7 +1,9 @@
 from nonebot.adapters import Bot, Event
-from nonebot.adapters.github.event import CommitCommentCreated  # type: ignore
-from nonebot.adapters.github.event import IssueCommentCreated  # type: ignore
-from nonebot.adapters.github.event import PullRequestReviewCommentCreated  # type: ignore
+from nonebot.adapters.github.event import (
+    CommitCommentCreated,  # type: ignore
+    IssueCommentCreated,  # type: ignore
+    PullRequestReviewCommentCreated,  # type: ignore
+)
 from nonebot.adapters.github.message import Message, MessageSegment  # type: ignore
 
 from nonebot_plugin_alconna.uniseg.constraint import SupportScope

src/nonebot_plugin_alconna/uniseg/adapters/discord/exporter.py

@@ -6,20 +6,20 @@
 from nonebot.adapters.kaiheila import Bot as KaiheilaBot
 from nonebot.adapters.kaiheila.event import MessageEvent
 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 (
+    Card,
     KMarkdown,
     Mention,
     MentionAll,
     MentionHere,
     MentionRole,
     MessageSegment,
     Quote,
+    VirtualMessageSegment,
 )
+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
-from nonebot.adapters.kaiheila.message import VirtualMessageSegment
 
 from nonebot_plugin_alconna.uniseg.builder import MessageBuilder, build
 from nonebot_plugin_alconna.uniseg.constraint import SupportAdapter