🐛 version 0.9.3

fix pyd v2
resolve #14

nonebot/adapters/satori/adapter.py

@@ -5,7 +5,7 @@
 
 from nonebot.utils import escape_tag
 from nonebot.exception import WebSocketClosed
-from nonebot.compat import PYDANTIC_V2, type_validate_python
+from nonebot.compat import PYDANTIC_V2, model_dump, type_validate_python
 from nonebot.drivers import Driver, Request, WebSocket, HTTPClientMixin, WebSocketClientMixin
 
 from nonebot import get_plugin_config
@@ -271,10 +271,10 @@ def payload_to_event(payload: SatoriEvent) -> Event:
         EventClass = EVENT_CLASSES.get(payload.type, None)
         if EventClass is None:
             log("WARNING", f"Unknown payload type: {payload.type}")
-            event = type_validate_python(Event, payload)
+            event = type_validate_python(Event, model_dump(payload))
             event.__type__ = payload.type  # type: ignore
             return event
-        return type_validate_python(EventClass, payload)
+        return type_validate_python(EventClass, model_dump(payload))
 
     @override
     async def _call_api(self, bot: Bot, api: str, **data: Any) -> Any:

nonebot/adapters/satori/bot.py

@@ -167,11 +167,14 @@ def on_ready(self, user: User) -> None:
 
     def get_authorization_header(self) -> Dict[str, str]:
         """获取当前 Bot 的鉴权信息"""
-        return {
+        header = {
             "Authorization": f"Bearer {self.info.token}",
             "X-Self-ID": self.self_id,
             "X-Platform": self.platform,
         }
+        if not self.info.token:
+            del header["Authorization"]
+        return header
 
     async def handle_event(self, event: Event) -> None:
         if isinstance(event, MessageEvent):

nonebot/adapters/satori/event.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Dict, Type, TypeVar, Optional
 
 from nonebot.utils import escape_tag
-from nonebot.compat import PYDANTIC_V2, type_validate_python
+from nonebot.compat import PYDANTIC_V2, model_dump, type_validate_python
 
 from nonebot.adapters import Event as BaseEvent
 
@@ -267,9 +267,9 @@ class MessageCreatedEvent(MessageEvent):
 
     def convert(self):
         if self.channel.type == ChannelType.DIRECT:
-            return type_validate_python(PrivateMessageCreatedEvent, self)
+            return type_validate_python(PrivateMessageCreatedEvent, model_dump(self))
         else:
-            return type_validate_python(PublicMessageCreatedEvent, self)
+            return type_validate_python(PublicMessageCreatedEvent, model_dump(self))
 
 
 @register_event_class
@@ -278,9 +278,9 @@ class MessageDeletedEvent(MessageEvent):
 
     def convert(self):
         if self.channel.type == ChannelType.DIRECT:
-            return type_validate_python(PrivateMessageDeletedEvent, self)
+            return type_validate_python(PrivateMessageDeletedEvent, model_dump(self))
         else:
-            return type_validate_python(PublicMessageDeletedEvent, self)
+            return type_validate_python(PublicMessageDeletedEvent, model_dump(self))
 
 
 @register_event_class
@@ -289,9 +289,9 @@ class MessageUpdatedEvent(MessageEvent):
 
     def convert(self):
         if self.channel.type == ChannelType.DIRECT:
-            return type_validate_python(PrivateMessageUpdatedEvent, self)
+            return type_validate_python(PrivateMessageUpdatedEvent, model_dump(self))
         else:
-            return type_validate_python(PublicMessageUpdatedEvent, self)
+            return type_validate_python(PublicMessageUpdatedEvent, model_dump(self))
 
 
 class PrivateMessageEvent(MessageEvent):
@@ -457,9 +457,9 @@ def get_event_description(self) -> str:
 
     def convert(self):
         if self.channel and self.user and self.channel.type != ChannelType.DIRECT:
-            return type_validate_python(PublicInteractionButtonEvent, self)
+            return type_validate_python(PublicInteractionButtonEvent, model_dump(self))
         if self.user:
-            return type_validate_python(PrivateInteractionButtonEvent, self)
+            return type_validate_python(PrivateInteractionButtonEvent, model_dump(self))
         return self
 
 
@@ -536,9 +536,9 @@ def generate_message(cls, values):
 
     def convert(self):
         if self.channel and self.user and self.channel.type != ChannelType.DIRECT:
-            return type_validate_python(PublicInteractionCommandArgvEvent, self)
+            return type_validate_python(PublicInteractionCommandArgvEvent, model_dump(self))
         if self.user:
-            return type_validate_python(PrivateInteractionCommandArgvEvent, self)
+            return type_validate_python(PrivateInteractionCommandArgvEvent, model_dump(self))
         return self
 
 
@@ -591,9 +591,9 @@ def get_event_description(self) -> str:
 
     def convert(self):
         if self.channel and self.user and self.channel.type != ChannelType.DIRECT:
-            return type_validate_python(PublicInteractionCommandMessageEvent, self)
+            return type_validate_python(PublicInteractionCommandMessageEvent, model_dump(self))
         if self.user:
-            return type_validate_python(PrivateInteractionCommandMessageEvent, self)
+            return type_validate_python(PrivateInteractionCommandMessageEvent, model_dump(self))
         return self
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-adapter-satori"
-version = "0.9.2"
+version = "0.9.3"
 description = "Satori Protocol Adapter for Nonebot2"
 authors = [
     {name = "RF-Tar-Railt",email = "[email protected]"},

tests/test_connection.py

@@ -36,7 +36,7 @@ def identify(json: dict) -> dict:
             },
         }
 
-    await asyncio.sleep(2)
+    await asyncio.sleep(5)
     bots = nonebot.get_bots()
     assert "0" in bots
     await adapter.shutdown()