✨ add bot send and exception catch

Author: yanyongyu

codegen/templates/event.py.jinja

@@ -10,6 +10,7 @@ from nonebot.utils import escape_tag
 from nonebot.adapters import Event as BaseEvent
 
 from .message import Message
+from .utils import get_attr_or_item
 
 
 class Event(BaseEvent):
@@ -26,7 +27,7 @@ class Event(BaseEvent):
     @overrides(BaseEvent)
     def get_event_name(self) -> str:
         return self.name + (
-            f".{action}" if (action := getattr(self.payload, "action", None)) else ""
+            f".{action}" if (action := get_attr_or_item(self.payload, "action")) else ""
         )
 
     @overrides(BaseEvent)
@@ -35,12 +36,12 @@ class Event(BaseEvent):
             f"{self.__class__.__name__} "
             + (
                 f"from sender {sender.login}"
-                if (sender := getattr(self.payload, "sender", None))
+                if (sender := get_attr_or_item(self.payload, "sender"))
                 else ""
             )
             + (
                 f"in repository {repo.full_name}"
-                if (repo := getattr(self.payload, "repository", None))
+                if (repo := get_attr_or_item(self.payload, "repository"))
                 else ""
             )
         )
@@ -51,7 +52,7 @@ class Event(BaseEvent):
 
     @overrides(BaseEvent)
     def get_user_id(self) -> str:
-        if sender := getattr(self.payload, "sender", None):
+        if sender := get_attr_or_item(self.payload, "sender"):
             return sender.login
         raise ValueError("Event has no context!")
 

nonebot/adapters/github/adapter.py

@@ -2,10 +2,11 @@
 import asyncio
 import inspect
 from functools import partial
-from typing import Any, Union, Optional, cast
+from typing import Any, Union, Callable, Optional, cast
 
 from nonebot.typing import overrides
-from githubkit.webhooks import parse, verify
+from githubkit.webhooks import verify
+from githubkit.exception import RequestFailed
 from nonebot.drivers import (
     URL,
     Driver,
@@ -20,7 +21,9 @@
 from .utils import log
 from .event import Event, events
 from .bot import Bot, OAuthBot, GitHubBot
+from .message import Message, MessageSegment
 from .config import Config, OAuthApp, GitHubApp
+from .exception import ActionFailed, NetworkError
 
 
 class Adapter(BaseAdapter):
@@ -101,7 +104,13 @@ async def _call_api(self, bot: Bot, api: str, **data: Any) -> Any:
             func = getattr(func, part)
         if not inspect.isroutine(func) or not inspect.iscoroutinefunction(func):
             raise TypeError(f"{api} is invalid.")
-        return await func(**data)
+
+        try:
+            return await func(**data)
+        except RequestFailed as e:
+            raise ActionFailed(e.response) from None
+        except Exception as e:
+            raise NetworkError from e
 
     @classmethod
     def payload_to_event(
@@ -129,3 +138,11 @@ def payload_to_event(
             return Event.parse_obj(
                 {"id": event_id, "name": event_name, "payload": event_payload}
             )
+
+    @classmethod
+    def custom_send(
+        cls,
+        send_func: Callable[[Bot, Event, Union[str, Message, MessageSegment]], Any],
+    ):
+        """自定义 Bot 的回复函数。"""
+        Bot.send_handler = send_func

nonebot/adapters/github/bot.py

@@ -1,7 +1,7 @@
 import re
 from typing_extensions import Self
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any, Dict, List, Union, Optional, Generator
+from typing import TYPE_CHECKING, Any, Dict, List, Union, Callable, Optional, Generator
 
 from nonebot.typing import overrides
 from githubkit.utils import UNSET, Unset
@@ -10,10 +10,10 @@
 
 from nonebot.adapters import Bot as BaseBot
 
-from .event import Event
-from .utils import APIContext
-from .message import MessageSegment
 from .config import OAuthApp, GitHubApp
+from .message import Message, MessageSegment
+from .event import Event, CommitCommentCreated
+from .utils import APIContext, get_attr_or_item
 
 if TYPE_CHECKING:
     from githubkit.rest import RestNamespace
@@ -70,8 +70,47 @@ def _check_nickname(bot: "Bot", event: Event) -> None:
             message[0] = MessageSegment.markdown(text[m.end() :])
 
 
+async def send(
+    bot: "Bot", event: Event, message: Union[str, Message, MessageSegment]
+) -> Any:
+    msg = message if isinstance(message, Message) else Message(message)
+    if isinstance(event, CommitCommentCreated):
+        return await bot.rest.repos.async_create_commit_comment(
+            owner=event.payload.repository.owner.login,
+            repo=event.payload.repository.name,
+            commit_sha=event.payload.comment.commit_id,
+            body=msg.extract_plain_text(),
+        )
+
+    owner: Optional[str] = None
+    repo: Optional[str] = None
+    if repository := get_attr_or_item(event.payload, "repository"):
+        owner_user = get_attr_or_item(repository, "owner")
+        owner = get_attr_or_item(owner_user, "login")
+        repo = get_attr_or_item(repository, "name")
+
+    number: Optional[int] = None
+    if issue := get_attr_or_item(event.payload, "issue"):
+        number = get_attr_or_item(issue, "number")
+    elif pull_request := get_attr_or_item(event.payload, "pull_request"):
+        number = get_attr_or_item(pull_request, "number")
+
+    if owner and repo and number:
+        return await bot.rest.issues.async_create_comment(
+            owner=owner, repo=repo, issue_number=number, body=msg.extract_plain_text()
+        )
+
+    raise RuntimeError(
+        f"Cannot guess reply target for event type {event.__class__.__name__}"
+    )
+
+
 class Bot(BaseBot):
 
+    send_handler: Callable[
+        ["Bot", Event, Union[str, Message, MessageSegment]], Any
+    ] = send
+
     if TYPE_CHECKING:
         rest: RestNamespace
 
@@ -98,8 +137,10 @@ async def handle_event(self, event: Event) -> None:
         await handle_event(self, event)
 
     @overrides(BaseBot)
-    async def send(self, event: Event, message):
-        ...
+    async def send(
+        self, event: Event, message: Union[str, Message, MessageSegment]
+    ) -> Any:
+        return await self.__class__.send_handler(self, event, message)
 
 
 class OAuthBot(Bot):

nonebot/adapters/github/event.py

@@ -380,6 +380,7 @@
 from nonebot.adapters import Event as BaseEvent
 
 from .message import Message
+from .utils import get_attr_or_item
 
 
 class Event(BaseEvent):
@@ -396,7 +397,7 @@ def get_type(self) -> str:
     @overrides(BaseEvent)
     def get_event_name(self) -> str:
         return self.name + (
-            f".{action}" if (action := getattr(self.payload, "action", None)) else ""
+            f".{action}" if (action := get_attr_or_item(self.payload, "action")) else ""
         )
 
     @overrides(BaseEvent)
@@ -405,12 +406,12 @@ def get_event_description(self) -> str:
             f"{self.__class__.__name__} "
             + (
                 f"from sender {sender.login}"
-                if (sender := getattr(self.payload, "sender", None))
+                if (sender := get_attr_or_item(self.payload, "sender"))
                 else ""
             )
             + (
                 f"in repository {repo.full_name}"
-                if (repo := getattr(self.payload, "repository", None))
+                if (repo := get_attr_or_item(self.payload, "repository"))
                 else ""
             )
         )
@@ -421,7 +422,7 @@ def get_message(self) -> Message:
 
     @overrides(BaseEvent)
     def get_user_id(self) -> str:
-        if sender := getattr(self.payload, "sender", None):
+        if sender := get_attr_or_item(self.payload, "sender"):
             return sender.login
         raise ValueError("Event has no context!")
 

nonebot/adapters/github/exception.py

@@ -0,0 +1,34 @@
+"""OneBot v11 错误类型。
+
+FrontMatter:
+    sidebar_position: 8
+    description: onebot.v11.exception 模块
+"""
+
+from githubkit.exception import RequestFailed
+from nonebot.exception import AdapterException
+from nonebot.exception import ActionFailed as BaseActionFailed
+from nonebot.exception import NetworkError as BaseNetworkError
+from nonebot.exception import NoLogException as BaseNoLogException
+from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable
+
+
+class GitHubAdapterException(AdapterException):
+    def __init__(self):
+        super().__init__("GitHub")
+
+
+class NetworkError(BaseNetworkError, GitHubAdapterException):
+    """网络错误。"""
+
+
+class ApiNotAvailable(BaseApiNotAvailable, GitHubAdapterException):
+    pass
+
+
+class ActionFailed(RequestFailed, BaseActionFailed, GitHubAdapterException):
+    def __repr__(self) -> str:
+        return (
+            f"<ActionFailed: {self.response.raw_request.method} "
+            f"{self.response.raw_request.url}, status_code: {self.response.status_code}>"
+        )

nonebot/adapters/github/utils.py

@@ -1,4 +1,5 @@
 import re
+import contextlib
 from typing import TYPE_CHECKING, Any, Tuple
 
 from nonebot.utils import logger_wrapper
@@ -13,6 +14,11 @@ def escape(content: str) -> str:
     return re.sub(r"\\|`|\*|_|{|}|\[|\]|\(|\)|#|\+|-|\.|!", r"\\\1", content)
 
 
+def get_attr_or_item(obj: Any, attr: str) -> Any:
+    with contextlib.suppress(TypeError):
+        return getattr(obj, attr, None) or obj[attr]
+
+
 class APIContext:
     __slots__ = ("bot", "parts")