🐛 version 0.56.2

fix ReplyMerge Ext

Author: RF-Tar-Railt

example/bot.py

@@ -11,8 +11,8 @@
 # driver.register_adapter(SatoriAdapter)
 
 # nonebot.require("nonebot_plugin_alconna")
-# nonebot.load_plugins("plugins")
-nonebot.load_plugin("plugins.demo1")
+nonebot.load_plugins("plugins")
+# nonebot.load_plugin("plugins.demo1")
 
 
 async def _():

example/plugins/demo.py

@@ -1,7 +1,6 @@
 from typing import Union, Literal
 
 from nonebot import require
-from nonebot.internal.adapter import Event
 from nonebot.adapters.onebot.v12 import Bot
 from importlib_metadata import distributions
 from nonebot.adapters.onebot.v12.event import GroupMessageDeleteEvent
@@ -519,41 +518,41 @@ async def preview_h(content: UniMessage):
     await preview.finish("rendering preview:\n" + content)
 
 
-from arclet.alconna.tools.debug import analyse_header
-
-
-class TestExtension1(Extension):
-    @property
-    def priority(self) -> int:
-        return 12
-
-    @property
-    def id(self) -> str:
-        return "test1"
-
-    def post_init(self, alc: Alconna) -> None:
-        def test_func(msg: str):
-            test_res = analyse_header(alc.prefixes, alc.command, msg, raise_exception=False)
-            return test_res and test_res.matched
-
-        self.test_func = test_func
-
-    async def call_llm(self, msg: str):
-        return "calculate " + "".join(c for c in msg if ord(c) < 256)
-
-    async def receive_wrapper(self, bot: Bot, event: Event, command: Alconna, receive: UniMessage) -> UniMessage:
-        msg = receive.extract_plain_text()
-        if self.test_func(msg):
-            return receive
-        output = await self.call_llm(msg)
-        return UniMessage(output)
-
-
-calculate = Command("calculate <expression>", "计算").build(
-    auto_send_output=True, extensions=[TestExtension1()], use_cmd_start=False
-)
-
-
-@calculate.handle()
-async def calculate_h(expression: str):
-    await calculate.finish(expression)
+# from arclet.alconna.tools.debug import analyse_header
+
+#
+# class TestExtension1(Extension):
+#     @property
+#     def priority(self) -> int:
+#         return 12
+#
+#     @property
+#     def id(self) -> str:
+#         return "test1"
+#
+#     def post_init(self, alc: Alconna) -> None:
+#         def test_func(msg: str):
+#             test_res = analyse_header(alc.prefixes, alc.command, msg, raise_exception=False)
+#             return test_res and test_res.matched
+#
+#         self.test_func = test_func
+#
+#     async def call_llm(self, msg: str):
+#         return "calculate " + "".join(c for c in msg if ord(c) < 256)
+#
+#     async def receive_wrapper(self, bot: Bot, event: Event, command: Alconna, receive: UniMessage) -> UniMessage:
+#         msg = receive.extract_plain_text()
+#         if self.test_func(msg):
+#             return receive
+#         output = await self.call_llm(msg)
+#         return UniMessage(output)
+#
+#
+# calculate = Command("calculate <expression>", "计算").build(
+#     auto_send_output=True, extensions=[TestExtension1()], use_cmd_start=False
+# )
+#
+#
+# @calculate.handle()
+# async def calculate_h(expression: str):
+#     await calculate.finish(expression)

src/nonebot_plugin_alconna/__init__.py

@@ -137,7 +137,7 @@
 from .uniseg import SupportAdapterModule as SupportAdapterModule
 from .extension import add_global_extension as add_global_extension
 
-__version__ = "0.56.1"
+__version__ = "0.56.2"
 __supported_adapters__ = set(m.value for m in SupportAdapterModule.__members__.values())  # noqa: C401
 __plugin_meta__ = PluginMetadata(
     name="Alconna 插件",

src/nonebot_plugin_alconna/extension.py

@@ -209,6 +209,17 @@ async def output_converter(self, output_type: OutputType, content: str) -> UniMe
     async def message_provider(
         self, event: Event, state: T_State, bot: Bot, use_origin: bool = False
     ) -> UniMessage | None:
+        exc = None
+        for ext in self.context:
+            if not ext._overrides["message_provider"]:
+                continue
+            try:
+                if (msg1 := await ext.message_provider(event, state, bot, use_origin)) is not None:
+                    return msg1
+            except Exception as e:
+                exc = e
+        if exc is not None:
+            raise exc
         if event.get_type().startswith("message"):
             msg_id = UniMessage.get_message_id(event, bot)
             if use_origin and (uni_msg := unimsg_origin_cache.get(msg_id)) is not None:
@@ -224,18 +235,6 @@ async def message_provider(
                 if use_origin:
                     return ori_uni_msg
             return uni_msg
-        exc = None
-        for ext in self.context:
-            if not ext._overrides["message_provider"]:
-                continue
-            try:
-                if (msg1 := await ext.message_provider(event, state, bot, use_origin)) is not None:
-                    return msg1
-            except Exception as e:
-                exc = e
-        if exc is not None:
-            raise exc
-
         return None
 
     async def receive_wrapper(self, bot: Bot, event: Event, command: Alconna, receive: UniMessage) -> UniMessage:

src/nonebot_plugin_alconna/uniseg/__init__.py

@@ -58,7 +58,7 @@
 from .constraint import SupportAdapterModule as SupportAdapterModule
 from .adapters import alter_get_builder, alter_get_fetcher, alter_get_exporter
 
-__version__ = "0.56.1"
+__version__ = "0.56.2"
 
 __plugin_meta__ = PluginMetadata(
     name="Universal Segment 插件",