⬆️ upgrade

Author: RF-Tar-Railt

pyproject.toml

@@ -7,7 +7,7 @@ authors = [
 dependencies = [
     "tarina<0.7,>=0.6.3",
     "nepattern<1.0,>=0.7.4",
-    "arclet-alconna<2.0,>=1.8.31",
+    "arclet-alconna<2.0,>=1.8.33",
     "arclet-alconna-tools>=0.7.10",
     "importlib-metadata>=4.13.0",
     "nonebot2>=2.3.0",
@@ -112,3 +112,4 @@ format = { composite = ["isort ./src/ ./example/ ./tests/","black ./src/ ./examp
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"

src/nonebot_plugin_alconna/uniseg/message.py

@@ -12,6 +12,7 @@
 from tarina import lang
 from tarina.lang.model import LangItem
 from tarina.context import ContextModel
+from nonebot.compat import custom_validation
 from nonebot.exception import FinishedException
 from nonebot.internal.adapter import Bot, Event, Message
 from nonebot.internal.matcher import current_bot, current_event
@@ -1473,6 +1474,7 @@ def load(cls: "type[UniMessage[Segment]]", data: Union[str, list[dict[str, Any]]
         return cls(get_segment_class(seg_data["type"]).load(seg_data) for seg_data in _data)
 
 
+@custom_validation
 @dataclass
 class Receipt:
     bot: Bot
@@ -1608,3 +1610,13 @@ async def finish(
     ):
         await self.send(message, fallback, at_sender, reply_to, delay, **kwargs)
         raise FinishedException
+
+    @classmethod
+    def __get_validators__(cls):
+        yield cls._validate
+
+    @classmethod
+    def _validate(cls, value) -> Self:
+        if isinstance(value, cls):
+            return value
+        raise ValueError(f"Type {type(value)} can not be converted to {cls}")

src/nonebot_plugin_alconna/uniseg/utils/saa.py

@@ -2,7 +2,7 @@
 from typing import Any
 
 from nonebot import require
-from nonebot.compat import model_dump
+from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump
 from nonebot.internal.matcher import current_bot, current_event
 
 from nonebot_plugin_alconna.uniseg.message import Text, AtAll, Receipt, UniMessage
@@ -55,8 +55,12 @@ class UnisegMessageId(MessageId):
     adapter_name: str
     message_id: Any
 
-    class Config:
-        arbitrary_types_allowed = True
+    if PYDANTIC_V2:
+        model_config = ConfigDict(arbitrary_types_allowed=True)
+    else:
+
+        class Config:
+            arbitrary_types_allowed = True
 
 
 class UnisegReceipt(SaaReceipt):
@@ -66,8 +70,12 @@ class UnisegReceipt(SaaReceipt):
     async def revoke(self):
         return await self.data.recall()
 
-    class Config:
-        arbitrary_types_allowed = True
+    if PYDANTIC_V2:
+        model_config = ConfigDict(arbitrary_types_allowed=True)
+    else:
+
+        class Config:
+            arbitrary_types_allowed = True
 
     @property
     def raw(self) -> Receipt:

tests/conftest.py

@@ -24,7 +24,7 @@ def pytest_configure(config: pytest.Config):
 
 
 @pytest.fixture(scope="session", autouse=True)
-def load_bot():
+def after_nonebot_init(after_nonebot_init: None):
     # 加载适配器
     driver = nonebot.get_driver()
     driver.register_adapter(QQAdapter)
@@ -34,4 +34,5 @@ def load_bot():
     driver.register_adapter(SatoriAdapter)
 
     nonebot.require("nonebot_plugin_alconna")
+    nonebot.require("nonebot_plugin_filehost")
     return None

tests/test_target_scope.py

@@ -64,6 +64,8 @@ async def test_bots(app: App):
         ctx.should_call_api("post_messages", {"channel_id": "789", "msg_id": "", "event_id": None, "content": "test"})
         await target3.send(UniMessage("test"))
 
+    await asyncio.sleep(0.05)
+
 
 @pytest.mark.asyncio()
 async def test_enable(app: App, mocker: MockerFixture):
@@ -118,3 +120,5 @@ async def test_enable(app: App, mocker: MockerFixture):
     driver = get_driver()
     driver._bot_connection_hook.clear()
     driver._bot_disconnection_hook.clear()
+
+    await asyncio.sleep(0.05)

tests/test_uniseg.py

@@ -1,3 +1,5 @@
+import asyncio
+
 import pytest
 from nonebug import App
 from nonebot import get_adapter
@@ -194,6 +196,7 @@ async def test_uniseg_recv(app: App):
         )
         msg = await UniMessage.generate(event=event2, bot=bot)
         assert msg[UniReply, 0].msg
+    await asyncio.sleep(0.05)
 
 
 @pytest.mark.asyncio()
@@ -238,3 +241,4 @@ async def handle(msg: MsgId):
         )
         target = Target("456", adapter=adapter.get_name())
         await target.send("hello!")
+    await asyncio.sleep(0.05)

tests/test_unmatch.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 import pytest
 from nonebug import App
 from nonebot import get_adapter
@@ -11,14 +9,12 @@
 
 @pytest.mark.asyncio()
 async def test_unmatch(app: App):
-    from nonebot_plugin_alconna import At, Match, UniMessage, on_alconna
+    from nonebot_plugin_alconna import Match, UniMessage, on_alconna
 
-    test_cmd = on_alconna(
-        Alconna("test", Args["target", Union[int, At]]), skip_for_unmatch=False, auto_send_output=True
-    )
+    test_cmd = on_alconna(Alconna("test", Args["target", int]), skip_for_unmatch=False, auto_send_output=True)
 
     @test_cmd.handle()
-    async def tt_h(target: Match[Union[int, At]]):
+    async def tt_h(target: Match[int]):
         await test_cmd.send(UniMessage(["ok\n", str(target.result)]))
 
     async with app.test_matcher(test_cmd) as ctx:
@@ -36,4 +32,4 @@ async def tt_h(target: Match[Union[int, At]]):
         event = fake_group_message_event_v11(message=Message("test abcd"), user_id=123)
         ctx.receive_event(bot, event)
         ctx.should_not_pass_rule()
-        ctx.should_call_send(event, "ParamsUnmatched('参数 abcd 不正确')", bot=bot)
+        ctx.should_call_send(event, "参数 'abcd' 不正确, 其应该符合 'int'", bot=bot)