✨ add configs for githubkit

Author: yanyongyu

nonebot/adapters/github/adapter.py

@@ -6,7 +6,7 @@
 
 from nonebot.typing import overrides
 from githubkit.webhooks import verify
-from githubkit.exception import RequestFailed
+from githubkit.exception import RequestFailed, RequestTimeout
 from nonebot.drivers import (
     URL,
     Driver,
@@ -23,7 +23,7 @@
 from .bot import Bot, OAuthBot, GitHubBot
 from .message import Message, MessageSegment
 from .config import Config, OAuthApp, GitHubApp
-from .exception import ActionFailed, NetworkError
+from .exception import ActionFailed, NetworkError, ActionTimeout
 
 
 class Adapter(BaseAdapter):
@@ -109,8 +109,10 @@ async def _call_api(self, bot: Bot, api: str, **data: Any) -> Any:
             return await func(**data)
         except RequestFailed as e:
             raise ActionFailed(e.response) from None
+        except RequestTimeout as e:
+            raise ActionTimeout(e.request) from None
         except Exception as e:
-            raise NetworkError from e
+            raise NetworkError(f"API request failed: {e!r}") from e
 
     @classmethod
     def payload_to_event(

nonebot/adapters/github/bot.py

@@ -106,6 +106,7 @@ async def send(
 
 
 class Bot(BaseBot):
+    adapter: "Adapter"
 
     send_handler: Callable[
         ["Bot", Event, Union[str, Message, MessageSegment]], Any
@@ -148,7 +149,11 @@ class OAuthBot(Bot):
     def __init__(self, adapter: "Adapter", app: OAuthApp):
         super().__init__(adapter, app)
         self._github: GitHub[OAuthAppAuthStrategy] = GitHub(
-            OAuthAppAuthStrategy(app.client_id, app.client_secret)
+            OAuthAppAuthStrategy(app.client_id, app.client_secret),
+            base_url=self.adapter.github_config.github_base_url,
+            accept_format=self.adapter.github_config.github_accept_format,
+            previews=self.adapter.github_config.github_previews,
+            timeout=self.config.api_timeout,
         )
 
     @contextmanager
@@ -188,7 +193,11 @@ def __init__(self, adapter: "Adapter", app: GitHubApp):
         self._github: GitHub[AppAuthStrategy] = GitHub(
             AppAuthStrategy(
                 app.app_id, app.private_key, app.client_id, app.client_secret
-            )
+            ),
+            base_url=self.adapter.github_config.github_base_url,
+            accept_format=self.adapter.github_config.github_accept_format,
+            previews=self.adapter.github_config.github_previews,
+            timeout=self.config.api_timeout,
         )
         self._app_slug: Optional[str] = None
 

nonebot/adapters/github/config.py

@@ -30,3 +30,6 @@ class Config(BaseModel, extra=Extra.ignore):
 
     github_apps: List[Union[GitHubApp, OAuthApp]] = Field(default_factory=list)
     """Allowed GitHub App List"""
+    github_base_url: Optional[str] = None
+    github_accept_format: Optional[str] = None
+    github_previews: Optional[List[str]] = None

nonebot/adapters/github/exception.py

@@ -5,11 +5,12 @@
     description: onebot.v11.exception 模块
 """
 
-from githubkit.exception import RequestFailed
+from typing import Optional
+
 from nonebot.exception import AdapterException
+from githubkit.exception import RequestFailed, RequestTimeout
 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
 
 
@@ -19,11 +20,22 @@ def __init__(self):
 
 
 class NetworkError(BaseNetworkError, GitHubAdapterException):
-    """网络错误。"""
+    def __init__(self, msg: Optional[str] = None):
+        super().__init__()
+        self.msg: Optional[str] = msg
+        """错误原因"""
+
+    def __repr__(self):
+        return f"<NetWorkError message={self.msg}>"
+
+
+class ActionTimeout(RequestTimeout, NetworkError):
+    def __repr__(self) -> str:
+        return f"<NetworkError: {self.request.method} {self.request.url}>"
 
 
 class ApiNotAvailable(BaseApiNotAvailable, GitHubAdapterException):
-    pass
+    ...
 
 
 class ActionFailed(RequestFailed, BaseActionFailed, GitHubAdapterException):