🐛 Fix: 修改 model_config 的兼容适配 (#18)

Author: he0119

codegen/templates/event.py.jinja

@@ -2,6 +2,7 @@ from typing import Union
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 {% for model in action.payload_types %}
 from githubkit.versions.latest.models import {{ model }}
 {% endfor %}
@@ -32,7 +33,10 @@ class {{ action.class_name }}(Event):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+        class Config:
+            keep_untouched = (cached_property,)
 
     {% endif %}

nonebot/adapters/github/event/__init__.py

@@ -343,6 +343,9 @@
     from .dependabot_alert_auto_dismissed import (
         DependabotAlertAutoDismissed as DependabotAlertAutoDismissed,
     )
+    from .secret_scanning_alert_validated import (
+        SecretScanningAlertValidated as SecretScanningAlertValidated,
+    )
     from .sponsorship_pending_tier_change import (
         SponsorshipPendingTierChange as SponsorshipPendingTierChange,
     )
@@ -674,6 +677,7 @@
         ".secret_scanning_alert_reopened": ("SecretScanningAlertReopened",),
         ".secret_scanning_alert_resolved": ("SecretScanningAlertResolved",),
         ".secret_scanning_alert_revoked": ("SecretScanningAlertRevoked",),
+        ".secret_scanning_alert_validated": ("SecretScanningAlertValidated",),
         ".secret_scanning_alert_location": ("SecretScanningAlertLocationCreated",),
         ".security_advisory_published": ("SecurityAdvisoryPublished",),
         ".security_advisory_updated": ("SecurityAdvisoryUpdated",),

nonebot/adapters/github/event/_types.py

@@ -294,6 +294,7 @@
         "reopened": "SecretScanningAlertReopened",
         "resolved": "SecretScanningAlertResolved",
         "revoked": "SecretScanningAlertRevoked",
+        "validated": "SecretScanningAlertValidated",
     },
     "secret_scanning_alert_location": "SecretScanningAlertLocationCreated",
     "security_advisory": {

nonebot/adapters/github/event/commit_comment.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from githubkit.versions.latest.models import WebhookCommitCommentCreated
 
 from ._base import Event
@@ -23,5 +24,9 @@ def _message(self):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+
+        class Config:
+            keep_untouched = (cached_property,)

nonebot/adapters/github/event/issue_comment_created.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from githubkit.versions.latest.models import WebhookIssueCommentCreated
 
 from ._base import Event
@@ -23,5 +24,9 @@ def _message(self):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+
+        class Config:
+            keep_untouched = (cached_property,)

nonebot/adapters/github/event/issue_comment_deleted.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from githubkit.versions.latest.models import WebhookIssueCommentDeleted
 
 from ._base import Event
@@ -19,5 +20,9 @@ def _message(self):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+
+        class Config:
+            keep_untouched = (cached_property,)

nonebot/adapters/github/event/issue_comment_edited.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from githubkit.versions.latest.models import WebhookIssueCommentEdited
 
 from ._base import Event
@@ -19,5 +20,9 @@ def _message(self):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+
+        class Config:
+            keep_untouched = (cached_property,)

nonebot/adapters/github/event/pull_request_review_comment_created.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from githubkit.versions.latest.models import WebhookPullRequestReviewCommentCreated
 
 from ._base import Event
@@ -23,5 +24,9 @@ def _message(self):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+
+        class Config:
+            keep_untouched = (cached_property,)

nonebot/adapters/github/event/pull_request_review_comment_deleted.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from githubkit.versions.latest.models import WebhookPullRequestReviewCommentDeleted
 
 from ._base import Event
@@ -19,5 +20,9 @@ def _message(self):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+
+        class Config:
+            keep_untouched = (cached_property,)

nonebot/adapters/github/event/pull_request_review_comment_edited.py

@@ -1,6 +1,7 @@
 from functools import cached_property
 from typing_extensions import override
 
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from githubkit.versions.latest.models import WebhookPullRequestReviewCommentEdited
 
 from ._base import Event
@@ -19,5 +20,9 @@ def _message(self):
     def get_message(self):
         return self._message
 
-    class Config:
-        keep_untouched = (cached_property,)
+    if PYDANTIC_V2:
+        model_config = ConfigDict(ignored_types=(cached_property,))
+    else:
+
+        class Config:
+            keep_untouched = (cached_property,)