✨ add event parsing

Author: yanyongyu

codegen/__init__.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from itertools import chain
 from dataclasses import dataclass
-from typing import List, Union, get_args, get_origin
+from typing import Dict, List, Union, get_args, get_origin
 
 from jinja2 import Environment, PackageLoader
 from githubkit.webhooks.models import GitHubWebhookModel
@@ -38,16 +38,21 @@ def pascal_case(*names: str) -> str:
 def build_event():
     imports: List[str] = []
     events: List[Data] = []
+    event_types: Dict[str, Union[str, Dict[str, str]]] = {}
     for event, types in webhook_action_types.items():
         if not isinstance(types, dict):
             imports.append(f"{types.__name__} as {types.__name__}Payload")
             events.append(Data(types.__name__, f"{types.__name__}Payload"))
+            event_types[event] = types.__name__
             continue
 
+        action_types: Dict[str, str] = {}
+        event_types[event] = action_types
         for action, type in types.items():
             if inspect.isclass(type) and issubclass(type, GitHubWebhookModel):
                 imports.append(f"{type.__name__} as {type.__name__}Payload")
                 events.append(Data(type.__name__, f"{type.__name__}Payload"))
+                action_types[action] = type.__name__
             else:
                 assert get_origin(type) is Union
                 imports.extend(model.__name__ for model in get_args(type))
@@ -57,12 +62,14 @@ def build_event():
                         f"Union[{', '.join(model.__name__ for model in get_args(type))}]",
                     )
                 )
+                action_types[action] = pascal_case(event, action)
 
     env = Environment(loader=PackageLoader("codegen"))
     template = env.get_template("event.py.jinja")
     event_text = template.render(
         imports=imports,
         events=events,
+        types=event_types,
         message_events=MESSAGE_EVENTS,
         has_message_events=HAS_MESSAGE_EVENTS,
     )

codegen/templates/event.py.jinja

@@ -87,3 +87,17 @@ class {{ event.class_name }}(Event):
 
     {% endif %}
 {% endfor %}
+
+events = {
+    {% for event, types in types.items() %}
+    {% if types is mapping %}
+    "{{ event }}": {
+        {% for action, type in types.items() %}
+        "{{ action }}": {{ type }},
+        {% endfor %}
+    },
+    {% else %}
+    "{{ event }}": {{ types }},
+    {% endif %}
+    {% endfor %}
+}

nonebot/adapters/github/adapter.py

@@ -1,4 +1,6 @@
+import json
 import asyncio
+import inspect
 from functools import partial
 from typing import Any, Union, Optional, cast
 
@@ -16,7 +18,7 @@
 from nonebot.adapters import Adapter as BaseAdapter
 
 from .utils import log
-from .event import Event
+from .event import Event, events
 from .bot import Bot, OAuthBot, GitHubBot
 from .config import Config, OAuthApp, GitHubApp
 
@@ -96,8 +98,25 @@ async def _handle_webhook(
     def payload_to_event(
         cls, event_id: str, event_name: str, payload: Union[str, bytes]
     ) -> Optional[Event]:
+        event_payload = json.loads(payload)
         try:
-            payload_event = parse(event_name, payload)
-            # TODO
+            types = events.get(event_name)
+            if isinstance(types, dict):
+                if action := event_payload.get("action"):
+                    return types[action].parse_obj(
+                        {"id": event_id, "name": event_name, "payload": event_payload}
+                    )
+                else:
+                    raise ValueError(
+                        f"Payload missing action, either of {', '.join(types)}."
+                    )
+            elif types is None:
+                raise ValueError(f"Unknown event type {event_name}.")
+            return types.parse_obj(
+                {"id": event_id, "name": event_name, "payload": event_payload}
+            )
         except Exception as e:
-            log("ERROR", f"Failed to parse webhook payload {event_id}", e)
+            log("WARNING", f"Failed to parse webhook payload {event_id}", e)
+            return Event.parse_obj(
+                {"id": event_id, "name": event_name, "payload": event_payload}
+            )