Added pydantic v2 support

Author: mongkok

debug_toolbar/panels/sql.py

@@ -7,7 +7,7 @@
 import sqlparse
 from fastapi import Request, Response
 from fastapi.encoders import jsonable_encoder
-from pydantic.color import Color
+from pydantic_extra_types.color import Color
 from sqlparse import tokens as T
 
 from debug_toolbar.panels import Panel

debug_toolbar/settings.py

@@ -2,11 +2,18 @@
 
 from jinja2 import BaseLoader, ChoiceLoader, Environment, PackageLoader
 from jinja2.ext import Extension
-from pydantic import BaseSettings, Field, IPvAnyAddress, root_validator
-from pydantic.color import Color
+from pydantic import Field, IPvAnyAddress, model_validator
+from pydantic_extra_types.color import Color
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class DebugToolbarSettings(BaseSettings):
+    model_config = SettingsConfigDict(
+        title="Debug Toolbar",
+        env_prefix="DT_",
+        case_sensitive=False,
+    )
+
     DEFAULT_PANELS: t.List[str] = Field(
         [
             "debug_toolbar.panels.versions.VersionsPanel",
@@ -128,11 +135,6 @@ class DebugToolbarSettings(BaseSettings):
         ),
     )
 
-    class Config:
-        title = "Debug Toolbar"
-        env_prefix = "DT_"
-        case_sensitive = True
-
     def __init__(self, **settings: t.Any) -> None:
         super().__init__(**settings)
         loaders = self.JINJA_LOADERS + [PackageLoader("debug_toolbar", "templates")]
@@ -143,6 +145,6 @@ def __init__(self, **settings: t.Any) -> None:
         for extension in self.JINJA_EXTENSIONS:
             self.JINJA_ENV.add_extension(extension)
 
-    @root_validator(pre=True)
-    def ci(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
-        return {k.upper(): v for k, v in values.items()}
+    @model_validator(mode="before")
+    def ci(cls, data: dict):
+        return {k.upper(): v for k, v in data.items()}

debug_toolbar/templates/panels/settings.html

@@ -1,5 +1,5 @@
 {% macro pprint_settings(settings, exclude=None) %}
-{% if settings.__config__.title %}<h4>{{ settings.__config__.title }}</h4>{% endif %}
+{% if settings.model_config.title %}<h4>{{ settings.model_config.title }}</h4>{% endif %}
 
 <table>
   <thead>

debug_toolbar/utils.py

@@ -6,7 +6,7 @@
 
 from fastapi import Request
 from fastapi.routing import APIRoute
-from pydantic.color import Color
+from pydantic_extra_types.color import Color
 from starlette.routing import Match
 
 

docs/src/panels/settings.py

@@ -1,6 +1,7 @@
 from debug_toolbar.middleware import DebugToolbarMiddleware
 from fastapi import FastAPI
-from pydantic import BaseSettings, SecretStr
+from pydantic import SecretStr
+from pydantic_settings import BaseSettings
 
 
 class APISettings(BaseSettings):

pyproject.toml

@@ -45,6 +45,9 @@ dependencies = [
     "fastapi >=0.70.0",
     "anyio >=3.0.0",
     "Jinja2 >=2.9",
+    "pydantic >=2.0",
+    "pydantic-extra-types >=2.0.0",
+    "pydantic-settings >=2.0.0",
     "pyinstrument >=3.0.0",
     "sqlparse >=0.2.0",
 ]