✨ upgrade to pydantic v2

Author: yanyongyu

nonebot_plugin_sentry/__init__.py

@@ -1,6 +1,7 @@
 import sentry_sdk
-from nonebot import logger, get_driver
+from nonebot.compat import model_dump
 from nonebot.plugin import PluginMetadata
+from nonebot import logger, get_driver, get_plugin_config
 
 from .config import Config
 
@@ -15,12 +16,11 @@
 )
 
 driver = get_driver()
-global_config = driver.config
-config = Config(**global_config.dict())
+config = get_plugin_config(Config)
 
 
 def init_sentry(config: Config):
-    sentry_config = {key[7:]: value for key, value in config.dict().items()}
+    sentry_config = {key[7:]: value for key, value in model_dump(config).items()}
     sentry_sdk.init(**sentry_config)
 
 

nonebot_plugin_sentry/compat.py

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

nonebot_plugin_sentry/config.py

@@ -1,32 +1,44 @@
 from typing import Any, Dict, List, Optional
 
 from nonebot import get_driver
+from pydantic import Field, BaseModel
 from sentry_sdk.integrations import Integration
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 from sentry_sdk.integrations.loguru import LoguruIntegration
-from pydantic import Extra, Field, BaseModel, validator, root_validator
+
+from .compat import field_validator, model_validator
 
 driver = get_driver()
 
 
 class Config(BaseModel):
     sentry_dsn: Optional[str] = None
     sentry_environment: str = driver.env
-    sentry_integrations: List[Integration] = Field(default_factory=list)
+    sentry_integrations: List[Integration] = Field(
+        default_factory=lambda: [LoguruIntegration()]
+    )
 
     # [FIXED] https://github.com/getsentry/sentry-python/issues/653
     # sentry_default_integrations: bool = False
 
-    class Config:
-        extra = Extra.allow
-        arbitrary_types_allowed = True
+    if PYDANTIC_V2:
+        model_config: ConfigDict = ConfigDict(
+            extra="allow", arbitrary_types_allowed=True
+        )
+    else:
+
+        class Config:
+            extra = "allow"
+            arbitrary_types_allowed = True
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def filter_sentry_configs(cls, values: Dict[str, Any]):
         return {
             key: value for key, value in values.items() if key.startswith("sentry_")
         }
 
-    @validator("sentry_integrations", allow_reuse=True, always=True)
+    @field_validator("sentry_integrations", mode="after")
     def validate_integrations(cls, v: List[Integration]):
         ids = {i.identifier for i in v}
         if LoguruIntegration.identifier not in ids: