✨ add validator compat

nonebot/adapters/github/adapter.py

@@ -153,8 +153,8 @@ def payload_to_event(
             )
         except Exception as 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}
+            return type_validate_python(
+                Event, {"id": event_id, "name": event_name, "payload": event_payload}
             )
 
     @classmethod

nonebot/adapters/github/compat.py

@@ -0,0 +1,15 @@
+from typing import Literal
+
+from nonebot.compat import PYDANTIC_V2
+
+__all__ = ("field_validator",)
+
+if PYDANTIC_V2:
+    from pydantic import field_validator as field_validator
+else:
+    from pydantic import validator
+
+    def field_validator(
+        __field: str, *fields: str, mode: Literal["before", "after"] = "after"
+    ):
+        return validator(__field, *fields, pre=mode == "before", allow_reuse=True)

nonebot/adapters/github/config.py

@@ -1,6 +1,8 @@
 from typing import Any, List, Union, Optional
 
-from pydantic import Field, BaseModel, validator
+from pydantic import Field, BaseModel
+
+from .compat import field_validator
 
 
 class OAuthApp(BaseModel):
@@ -24,7 +26,8 @@ class GitHubApp(BaseModel):
     def id(self) -> str:
         return self.app_id
 
-    @validator("private_key", pre=True)
+    @field_validator("private_key", mode="before")
+    @classmethod
     def concat_key(cls, value: object) -> Any:
         return "\n".join(value) if isinstance(value, list) else value