Re-add complex types

.pre-commit-config.yaml

@@ -0,0 +1,21 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: trailing-whitespace
+      #   - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.0
+    hooks:
+      - id: pyupgrade
+        args: [--py38-plus]
+
+  - repo: https://github.com/pycqa/flake8
+    rev: "6.0.0"
+    hooks:
+      - id: flake8

README.md

@@ -88,8 +88,11 @@ Google Cloud SQL database connections from within Google Cloud Run are supported
 Alternatively you can set all your databases at once, by using the `DATABASES` setting (either in a `PydanticSettings` sub-class or via the `DJANGO_DATABASES` environment variable:
 
 ```python
+from pydantic_settings import PydanticSettings, types
+
+
 def MySettings(PydanticSettings):
-    DATABASES = {"default": "sqlite:///db.sqlite3"}  # type: ignore
+    DATABASES: types.DATABASES = {"default": "sqlite:///db.sqlite3"}  # type: ignore
 ```
 
 It is also possible to configure additional database connections with environment variables in the same way as the default `DATABASE_URL` configuration by using a `Field` that has a `configure_database` argument that points to the database alias in the `DATABASES` dictionary.

pydantic_settings/cache.py

@@ -1,5 +1,5 @@
 import re
-from typing import Dict
+from typing import Any, Dict
 from urllib.parse import parse_qs
 
 from django import VERSION
@@ -71,17 +71,17 @@ def is_redis_scheme(self) -> bool:
 def parse(dsn: CacheDsn) -> dict:
     """Parses a cache URL."""
     backend = CACHE_ENGINES[dsn.scheme]
-    config = {"BACKEND": backend}
+    config: dict[str, Any] = {"BACKEND": backend}
 
-    options = {}
+    options: dict[str, Any] = {}
     if dsn.scheme in REDIS_PARSERS:
         options["PARSER_CLASS"] = REDIS_PARSERS[dsn.scheme]
 
     cache_args = dsn.query_args.copy()
 
     # File based
     if dsn.host is None:
-        path = dsn.path
+        path = dsn.path or ""
 
         if dsn.scheme in FILE_UNIX_PREFIX:
             path = "unix:" + path

pydantic_settings/database.py

@@ -1,13 +1,16 @@
 import re
 import urllib.parse
-from typing import Dict, Optional, Pattern, Tuple, cast
+from typing import TYPE_CHECKING, Pattern, Tuple, Union, cast
 from urllib.parse import quote_plus
 
 from pydantic import AnyUrl
 from pydantic.validators import constr_length_validator, str_validator
 
 from pydantic_settings.models import DatabaseModel
 
+if TYPE_CHECKING:
+    from pydantic.networks import Parts
+
 _cloud_sql_regex_cache = None
 
 
@@ -26,11 +29,12 @@
 }
 
 
-def cloud_sql_regex() -> Pattern[str]:
+def cloud_sql_regex() -> Pattern:
     global _cloud_sql_regex_cache
     if _cloud_sql_regex_cache is None:
         _cloud_sql_regex_cache = re.compile(
-            r"(?:(?P<scheme>[a-z][a-z0-9+\-.]+)://)?"  # scheme https://tools.ietf.org/html/rfc3986#appendix-A
+            # scheme https://tools.ietf.org/html/rfc3986#appendix-A
+            r"(?:(?P<scheme>[a-z][a-z0-9+\-.]+)://)?"
             r"(?:(?P<user>[^\s:/]*)(?::(?P<password>[^\s/]*))?@)?"  # user info
             r"(?P<path>/[^\s?#]*)?",  # path
             re.IGNORECASE,
@@ -64,19 +68,17 @@ def validate(cls, value, field, config):
         return super().validate(value, field, config)
 
     @classmethod
-    def validate_host(
-        cls, parts: Dict[str, str]
-    ) -> Tuple[Optional[str], Optional[str], str, bool]:
-        host = None
+    def validate_host(cls, parts: "Parts") -> Tuple[str, Union[str, None], str, bool]:
+        host: str | None = None
         for f in ("domain", "ipv4", "ipv6"):
-            host = parts[f]
+            host = cast(Union[str, None], parts.get(f))
             if host:
                 break
 
         if host is None:
-            return None, None, "file", False
+            return None, None, "file", False  # type: ignore
 
-        if host.startswith("%2F"):
+        if host and host.startswith("%2F"):
             return host, None, "socket", False
 
         return super().validate_host(parts)

pydantic_settings/default.py

@@ -3,7 +3,7 @@
 from pydantic import root_validator
 
 from pydantic_settings.models import DatabaseModel, TemplateBackendModel
-from pydantic_settings.settings import DatabaseModel, PydanticSettings
+from pydantic_settings.settings import PydanticSettings
 
 
 class DjangoDefaultProjectSettings(PydanticSettings):
@@ -12,7 +12,9 @@ class DjangoDefaultProjectSettings(PydanticSettings):
     generates for new projects.
     """
 
-    DATABASES: Dict[str, DatabaseModel] = {"default": "sqlite:///db.sqlite3"}  # type: ignore
+    DATABASES: Dict[str, DatabaseModel] = {
+        "default": "sqlite:///db.sqlite3",  # type: ignore
+    }
 
     TEMPLATES: List[TemplateBackendModel] = [
         TemplateBackendModel.parse_obj(data)
@@ -54,7 +56,8 @@ class DjangoDefaultProjectSettings(PydanticSettings):
 
     AUTH_PASSWORD_VALIDATORS: List[dict] = [
         {
-            "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+            "NAME": "django.contrib.auth.password_validation"
+            ".UserAttributeSimilarityValidator",
         },
         {
             "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",

pydantic_settings/sentry.py

@@ -2,8 +2,8 @@
 
 import sentry_sdk
 from pydantic import AnyUrl
+from pydantic.config import BaseConfig
 from pydantic.fields import ModelField
-from pydantic.main import BaseConfig
 from sentry_sdk.integrations.django import DjangoIntegration
 
 from .settings import PydanticSettings