⬆️ upgrade to pydantic v2

Author: yanyongyu

nonebot/adapters/github/adapter.py

@@ -2,11 +2,11 @@
 import asyncio
 import inspect
 from functools import partial
+from typing_extensions import override
 from typing import Any, Type, Union, Callable, Optional, cast
 
-from pydantic import parse_obj_as
-from nonebot.typing import overrides
 from githubkit.webhooks import verify
+from nonebot.compat import type_validate_python
 from githubkit.exception import GraphQLFailed, RequestFailed, RequestTimeout
 from nonebot.drivers import (
     URL,
@@ -17,6 +17,7 @@
     HTTPServerSetup,
 )
 
+from nonebot import get_plugin_config
 from nonebot.adapters import Adapter as BaseAdapter
 
 from . import event
@@ -33,14 +34,14 @@ def import_event_model(event_name: str) -> Type[Event]:
 
 
 class Adapter(BaseAdapter):
-    @overrides(BaseAdapter)
+    @override
     def __init__(self, driver: Driver, **kwargs: Any):
         super().__init__(driver, **kwargs)
-        self.github_config = Config.parse_obj(dict(self.config))
+        self.github_config = get_plugin_config(Config)
         self._setup()
 
     @classmethod
-    @overrides(BaseAdapter)
+    @override
     def get_name(cls) -> str:
         return "GitHub"
 
@@ -132,7 +133,7 @@ def payload_to_event(
             types = events.get(event_name)
             if isinstance(types, dict):
                 if action := event_payload.get("action"):
-                    return parse_obj_as(
+                    return type_validate_python(
                         import_event_model(types[action]),
                         {
                             "id": event_id,
@@ -146,7 +147,7 @@ def payload_to_event(
                     )
             elif types is None:
                 raise ValueError(f"Unknown event type {event_name}.")
-            return parse_obj_as(
+            return type_validate_python(
                 import_event_model(types),
                 {"id": event_id, "name": event_name, "payload": event_payload},
             )

nonebot/adapters/github/bot.py

@@ -1,7 +1,7 @@
 import re
 from contextvars import ContextVar
-from typing_extensions import Self
 from contextlib import asynccontextmanager
+from typing_extensions import Self, override
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -15,7 +15,6 @@
     AsyncGenerator,
 )
 
-from nonebot.typing import overrides
 from githubkit.utils import UNSET, Unset
 from nonebot.message import handle_event
 from githubkit import (
@@ -138,7 +137,7 @@ async def async_graphql(
             self, query: str, variables: Optional[Dict[str, Any]] = None
         ) -> Dict[str, Any]: ...
 
-    @overrides(BaseBot)
+    @override
     def __init__(self, adapter: "Adapter", app: Union[GitHubApp, OAuthApp]):
         super().__init__(adapter, app.id)
         self.app = app
@@ -157,15 +156,15 @@ def github(self) -> GitHub:
     async def handle_event(self, event: Event) -> None:
         await handle_event(self, event)
 
-    @overrides(BaseBot)
+    @override
     async def send(
         self, event: Event, message: Union[str, Message, MessageSegment]
     ) -> Any:
         return await self.__class__.send_handler(self, event, message)
 
 
 class OAuthBot(Bot[OAuthAppAuthStrategy]):
-    @overrides(Bot)
+    @override
     def __init__(self, adapter: "Adapter", app: OAuthApp):
         super().__init__(adapter, app)
         self._github = GitHub(
@@ -204,14 +203,14 @@ async def as_user(self, token: str) -> AsyncGenerator[Self, None]:
         finally:
             self._ctx_github.set(None)
 
-    @overrides(Bot)
+    @override
     async def handle_event(self, event: Event) -> None:
         _check_nickname(self, event)
         await super().handle_event(event)
 
 
 class GitHubBot(Bot[AppAuthStrategy]):
-    @overrides(Bot)
+    @override
     def __init__(self, adapter: "Adapter", app: GitHubApp):
         super().__init__(adapter, app)
         self._github = GitHub(
@@ -295,7 +294,7 @@ async def as_user(self, token: str) -> AsyncGenerator[Self, None]:
         finally:
             self._ctx_github.set(None)
 
-    @overrides(Bot)
+    @override
     async def handle_event(self, event: Event) -> None:
         _check_at_me(self, event)
         _check_nickname(self, event)

nonebot/adapters/github/config.py

@@ -1,6 +1,6 @@
 from typing import Any, List, Union, Optional
 
-from pydantic import Extra, Field, BaseModel, validator
+from pydantic import Field, BaseModel, validator
 
 
 class OAuthApp(BaseModel):
@@ -29,7 +29,7 @@ def concat_key(cls, value: object) -> Any:
         return "\n".join(value) if isinstance(value, list) else value
 
 
-class Config(BaseModel, extra=Extra.ignore):
+class Config(BaseModel):
     """GitHub Adapter Config"""
 
     github_apps: List[Union[GitHubApp, OAuthApp]] = Field(default_factory=list)

nonebot/adapters/github/message.py

@@ -1,24 +1,23 @@
 from typing import Type, Iterable
-
-from nonebot.typing import overrides
+from typing_extensions import override
 
 from nonebot.adapters import Message as BaseMessage
 from nonebot.adapters import MessageSegment as BaseMessageSegment
 
 
 class MessageSegment(BaseMessageSegment["Message"]):
     @classmethod
-    @overrides(BaseMessageSegment)
+    @override
     def get_message_class(cls) -> Type["Message"]:
         return Message
 
-    @overrides(BaseMessageSegment)
+    @override
     def __str__(self) -> str:
         if self.type == "markdown":
             return self.data["text"]
         return f"<{self.type}:{','.join(f'{k}={v}' for k, v in self.data.items())}>"
 
-    @overrides(BaseMessageSegment)
+    @override
     def is_text(self) -> bool:
         return self.type == "markdown"
 
@@ -29,11 +28,11 @@ def markdown(text: str) -> "MessageSegment":
 
 class Message(BaseMessage[MessageSegment]):
     @classmethod
-    @overrides(BaseMessage)
+    @override
     def get_segment_class(cls) -> Type[MessageSegment]:
         return MessageSegment
 
     @staticmethod
-    @overrides(BaseMessage)
+    @override
     def _construct(msg: str) -> Iterable[MessageSegment]:
         yield MessageSegment.markdown(msg)