➖ 移除 betterproto 依赖

Author: CMHopeSunshine

nonebot/adapters/villa/adapter.py

@@ -26,8 +26,6 @@
 from .event import (
     Event,
     event_classes,
-    pre_handle_event_websocket,
-    pre_handle_webhook_event,
 )
 from .exception import ApiNotAvailable, DisconnectError, ReconnectError
 from .models import WebsocketInfo
@@ -41,8 +39,8 @@
     Logout,
     LogoutReply,
     Payload,
-    RobotEvent,
     Shutdown,
+    proto_to_event_data,
 )
 from .utils import API, log
 
@@ -113,7 +111,7 @@ async def _handle_http(self, request: Request) -> Response:
                 try:
                     event = parse_obj_as(
                         event_classes,
-                        pre_handle_webhook_event(payload_data),
+                        payload_data,
                     )
                     bot_id = event.bot_id
                     if (bot := self.bots.get(bot_id, None)) is None:
@@ -300,12 +298,12 @@ async def _login(
     ):
         try:
             login = Login(
-                ws_info.uid,
-                str(bot_config.test_villa_id)
+                uid=ws_info.uid,
+                token=str(bot_config.test_villa_id)
                 + f".{bot.bot_secret_encrypt}.{bot.self_id}",
-                ws_info.platform,
-                ws_info.app_id,
-                ws_info.device_id,
+                platform=ws_info.platform,
+                app_id=ws_info.app_id,
+                device_id=ws_info.device_id,
             )
             log("TRACE", f"Sending Login {escape_tag(repr(login))}")
             await ws.send_bytes(login.to_bytes_package(bot._ws_squence))
@@ -359,7 +357,9 @@ async def _heartbeat(self, bot: Bot, ws: WebSocket):
             log("TRACE", f"Heartbeat {timestamp}")
             try:
                 await ws.send_bytes(
-                    HeartBeat(timestamp).to_bytes_package(bot._ws_squence),
+                    HeartBeat(client_timestamp=timestamp).to_bytes_package(
+                        bot._ws_squence,
+                    ),
                 )
                 bot._ws_squence += 1
             except Exception as e:
@@ -390,25 +390,24 @@ async def receive_payload(ws: WebSocket):
         payload = Payload.from_bytes(await ws.receive_bytes())
         if payload.biz_type in {BizType.P_LOGIN, BizType.P_LOGOUT, BizType.P_HEARTBEAT}:
             if payload.biz_type == BizType.P_LOGIN:
-                payload = LoginReply.FromString(payload.body_data)
+                payload = LoginReply.from_proto(payload.body_data)
             elif payload.biz_type == BizType.P_LOGOUT:
-                payload = LogoutReply.FromString(payload.body_data)
+                payload = LogoutReply.from_proto(payload.body_data)
             else:
-                payload = HeartBeatReply.FromString(payload.body_data)
+                payload = HeartBeatReply.from_proto(payload.body_data)
             if payload.code != 0:
                 if isinstance(payload, LogoutReply):
                     log("WARNING", f"Error when logout from server: {payload}")
                     return payload
                 raise ReconnectError(payload)
         elif payload.biz_type == BizType.P_KICK_OFF:
-            payload = KickOff.FromString(payload.body_data)
+            payload = KickOff.from_proto(payload.body_data)
         elif payload.biz_type == BizType.SHUTDOWN:
             payload = Shutdown()
         elif payload.biz_type == BizType.EVENT:
-            event_data = RobotEvent.FromString(payload.body_data)
             return parse_obj_as(
                 event_classes,
-                pre_handle_event_websocket(event_data),
+                proto_to_event_data(payload.body_data),
             )
         else:
             raise ReconnectError

nonebot/adapters/villa/event.py

@@ -1,4 +1,3 @@
-from dataclasses import asdict
 from datetime import datetime
 from enum import IntEnum
 import json
@@ -8,12 +7,11 @@
 from nonebot.adapters import Event as BaseEvent
 from nonebot.utils import escape_tag
 
-import betterproto
 from pydantic import Field, root_validator
 
 from .message import Message, MessageSegment
 from .models import MessageContentInfoGet, QuoteMessage, Robot
-from .payload import RobotEvent
+from .utils import pascal_to_snake
 
 
 class EventType(IntEnum):
@@ -53,6 +51,23 @@ class Event(BaseEvent):
     send_at: int
     """事件回调时间"""
 
+    @root_validator(pre=True)
+    @classmethod
+    def pre_handle(cls, data: Dict[str, Any]):
+        extend_data = data.pop("extend_data")
+        event_type = data["type"] = EventType(data["type"])
+        event_name = event_type.name
+        event_data = extend_data.pop("EventData", extend_data)
+        if (
+            event_name in event_data
+            or (event_name := pascal_to_snake(event_name)) in event_data
+        ):
+            data.update(event_data[event_name])
+        else:
+            raise ValueError(f"Cannot find event data for event type: {event_name}")
+
+        return data
+
     @property
     def bot_id(self) -> str:
         """机器人ID"""
@@ -485,30 +500,6 @@ class ClickMsgComponentEvent(NoticeEvent):
 ]
 
 
-def pre_handle_webhook_event(payload: Dict[str, Any]):
-    if (event_type := EventType._value2member_map_.get(payload["type"])) is None:
-        raise ValueError(
-            f"Unknown event type: {payload['type']} data={escape_tag(str(payload))}",
-        )
-    event_name = event_type.name
-    if event_name not in payload["extend_data"]["EventData"]:
-        raise ValueError("Cannot find event data for event type: {event_name}")
-    payload.update(payload["extend_data"]["EventData"][event_name])
-    payload.pop("extend_data")
-    return payload
-
-
-def pre_handle_event_websocket(payload: RobotEvent):
-    event_data = asdict(payload)
-    event_data.update(
-        event_data["extend_data"][
-            betterproto.Casing.SNAKE(EventType(event_data["type"]).name)
-        ],
-    )
-    event_data.pop("extend_data")
-    return event_data
-
-
 __all__ = [
     "Event",
     "NoticeEvent",

nonebot/adapters/villa/exception.py

@@ -9,7 +9,7 @@
 )
 
 if TYPE_CHECKING:
-    from betterproto import Message
+    from pydantic import BaseModel
 
     from .api import ApiResponse
 
@@ -24,7 +24,7 @@ class NoLogException(BaseNoLogException, VillaAdapterException):
 
 
 class ReconnectError(VillaAdapterException):
-    def __init__(self, payload: Optional["Message"] = None):
+    def __init__(self, payload: Optional["BaseModel"] = None):
         super().__init__()
         self.payload = payload