🐛 fix version 0.59.2

change aliases

Author: RF-Tar-Railt

pyproject.toml

@@ -231,7 +231,7 @@ reportShadowedImports = false
 disableBytesTypePromotions = true
 
 [tool.pdm.scripts]
-test = "pytest -v -n 2 -W ignore ./tests/"
+test = "pytest -v -W ignore ./tests/"
 format = { composite = ["isort ./src/ ./example/ ./tests/","black ./src/ ./example/ ./tests/","ruff check ./src/ ./example/ ./tests/"] }
 
 [tool.pytest.ini_options]

src/nonebot_plugin_alconna/extension.py

@@ -261,7 +261,14 @@ def __init__(
 
         _callbacks.add(self._callback)
 
-        finalize(self, _callbacks.remove, self._callback)
+        finalize(self, _callbacks.discard, self._callback)
+
+    def destroy(self) -> None:
+        """销毁当前的扩展执行器，清理相关资源。"""
+        _callbacks.discard(self._callback)
+        self.extensions.clear()
+        self.context.clear()
+        del self._rule
 
     def _callback(self, *append_global_ext: type[Extension] | Extension):
         for _ext in append_global_ext:

src/nonebot_plugin_alconna/matcher.py

@@ -21,6 +21,7 @@
 from nonebot.consts import ARG_KEY, RECEIVE_KEY
 from nonebot.internal.params import DefaultParam
 from nepattern import ANY, STRING, TPattern, AnyString
+from nonebot.internal.matcher.matcher import MatcherMeta
 from _weakref import _remove_dead_weakref  # type: ignore
 from nonebot import require, get_driver, get_plugin_config
 from nonebot.plugin.on import store_matcher, get_matcher_source
@@ -106,18 +107,47 @@ def __get__(self, instance, owner):
 T1 = TypeVar("T1")
 
 
-class AlconnaMatcher(Matcher):
+class AlconnaMatcherMeta(MatcherMeta):
+    if TYPE_CHECKING:
+        _command_path: str
+
+    def __repr__(self) -> str:
+        return (
+            f"{self.__class__.__name__}(type={self.type!r}"
+            + (f", module={self.module_name}" if self.module_name else "")
+            + (f", lineno={self._source.lineno}" if self._source and self._source.lineno is not None else "")
+            + f", command={self._command_path}"
+            + ")"
+        )
+
+
+class AlconnaMatcher(Matcher, metaclass=AlconnaMatcherMeta):
     # command: ClassVar[weakref.ReferenceType[Alconna]]
     basepath: ClassVar[str]
     executor: ClassVar[ExtensionExecutor]
-    _command_path: ClassVar[str]
+    _command_path: ClassVar[str] = ""
     _tests: ClassVar[list[tuple[UniMessage, dict[str, Any] | None, bool]]]
     _rule: ClassVar[AlconnaRule]
 
     @classmethod
     def command(cls) -> Alconna:
         return cls._rule.command()  # type: ignore
 
+    @classmethod
+    def clean(cls) -> None:
+        matchers[cls.priority].remove(cls)
+        cls._rule.destroy()
+        cls.executor.destroy()
+
+    def __repr__(self) -> str:
+        return (
+            f"{self.__class__.__name__}(type={self.type!r}"
+            + (f", module={self.module_name}" if self.module_name else "")
+            + (f", lineno={self._source.lineno}" if self._source and self._source.lineno is not None else "")
+            + f", command={self._command_path}"
+            + ")"
+        )
+
     @classmethod
     @overload
     def shortcut(cls, key: str | TPattern, args: ShortcutArgs | None = None) -> type[Self]:
@@ -969,8 +999,7 @@ def on_alconna(
                 command_manager.delete(command)
                 return _matcher
             if conflict_resolver == "replace":
-                _matcher.destroy()
-                command_manager.delete(exist)
+                _matcher.clean()
                 command_manager.register(command)
             else:
                 exist.formatter.remove(command)
@@ -1033,7 +1062,6 @@ def on_alconna(
     )
     matcher: type[AlconnaMatcher] = cast("type[AlconnaMatcher]", NewMatcher)
     matcher.HANDLER_PARAM_TYPES = params
-    log("TRACE", f"Define new matcher {NewMatcher}")
 
     matchers[priority].append(NewMatcher)
     store_matcher(matcher)
@@ -1044,6 +1072,8 @@ def on_alconna(
     command.meta.extra["matcher.source"] = matcher._source
     command.meta.extra["matcher.position"] = (priority, len(matchers[priority]) - 1)
 
+    log("TRACE", f"Define new matcher {NewMatcher}")
+
     def remove(wr, selfref=weakref.ref(command.meta), _atomic_removal=_remove_dead_weakref):
         self = selfref()
         if self is not None:

src/nonebot_plugin_alconna/rule.py

@@ -144,7 +144,7 @@ def _update(cmd_id: int):
         self.command = weakref.ref(command, lambda _: _update(_.__hash__()))
         if _aliases:
             for alias in _aliases:
-                command.shortcut(alias, prefix=True, compact=False)
+                command.shortcut(alias, prefix=True, compact=None)
         self.skip = skip_for_unmatch
         self.executor = ExtensionExecutor(self, extensions, exclude_ext)
         self.executor.post_init(command)
@@ -198,6 +198,13 @@ async def _waiter_handle(_event: Event, _matcher: Matcher, content: UniMsg):
 
             self._waiter = _waiter_handle
 
+    def destroy(self) -> None:
+        """销毁 Alconna 规则，释放资源。"""
+        self._tasks.clear()
+        if cmd := self.command():
+            command_manager.delete(cmd)
+        self._waiter = None
+
     @property
     def rule(self) -> Rule:
         return Rule(self)

tests/test_aliases.py

@@ -8,7 +8,7 @@
 
 @pytest.mark.asyncio()
 async def test_command(app: App):
-    from nonebot_plugin_alconna import Args, Alconna, on_alconna
+    from nonebot_plugin_alconna import Args, Alconna, CommandMeta, on_alconna
 
     alc = Alconna("weather", Args["city#城市名称", str])
     matcher = on_alconna(alc, aliases={"天气"})
@@ -29,3 +29,25 @@ async def _(city: str):
         event2 = fake_group_message_event_v11(message=Message("天气abcd"), user_id=123)
         ctx.receive_event(bot, event2)
         ctx.should_not_pass_rule()
+
+    matcher.clean()
+
+    alc = Alconna(
+        "weather",
+        Args["city#城市名称", str],
+        meta=CommandMeta(compact=True),
+    )
+    matcher = on_alconna(alc, aliases={"天气"})
+
+    @matcher.handle()
+    async def _(city: str):
+        await matcher.send(city)
+
+    async with app.test_matcher(matcher) as ctx:
+        adapter = get_adapter(Adapter)
+        bot = ctx.create_bot(base=Bot, adapter=adapter)
+        event2 = fake_group_message_event_v11(message=Message("天气abcd"), user_id=123)
+        ctx.receive_event(bot, event2)
+        ctx.should_call_send(event2, "abcd")
+
+    matcher.clean()