Fix handle type alias declared with type statement

Author: tselepakis

pydantic_settings/sources/base.py

@@ -15,7 +15,6 @@
 )
 from pydantic._internal._utils import is_model_class
 from pydantic.fields import FieldInfo
-from typing_extensions import get_args
 from typing_inspection.introspection import is_union_origin
 
 from ..exceptions import SettingsError
@@ -26,6 +25,7 @@
     _get_alias_names,
     _get_model_fields,
     _union_is_complex,
+    get_args,
 )
 
 if TYPE_CHECKING:

pydantic_settings/sources/providers/cli.py

@@ -41,7 +41,6 @@
 from pydantic.dataclasses import is_pydantic_dataclass
 from pydantic.fields import FieldInfo
 from pydantic_core import PydanticUndefined
-from typing_extensions import get_args, get_origin
 from typing_inspection import typing_objects
 from typing_inspection.introspection import is_union_origin
 
@@ -55,6 +54,8 @@
     _get_model_fields,
     _is_function,
     _strip_annotated,
+    get_args,
+    get_origin,
     parse_env_vars,
 )
 from .env import EnvSettingsSource

pydantic_settings/sources/providers/env.py

@@ -10,7 +10,6 @@
 from pydantic._internal._utils import deep_update, is_model_class
 from pydantic.dataclasses import is_pydantic_dataclass
 from pydantic.fields import FieldInfo
-from typing_extensions import get_args, get_origin
 from typing_inspection.introspection import is_union_origin
 
 from ...utils import _lenient_issubclass
@@ -20,6 +19,8 @@
     _annotation_enum_name_to_val,
     _get_model_fields,
     _union_is_complex,
+    get_args,
+    get_origin,
     parse_env_vars,
 )
 

pydantic_settings/sources/utils.py

@@ -2,22 +2,42 @@
 
 from __future__ import annotations as _annotations
 
+import sys
 from collections import deque
 from collections.abc import Mapping, Sequence
 from dataclasses import is_dataclass
 from enum import Enum
 from typing import Any, Optional, cast
 
+import typing_extensions
 from pydantic import BaseModel, Json, RootModel, Secret
 from pydantic._internal._utils import is_model_class
 from pydantic.dataclasses import is_pydantic_dataclass
-from typing_extensions import get_args, get_origin
 from typing_inspection import typing_objects
 
 from ..exceptions import SettingsError
 from ..utils import _lenient_issubclass
 from .types import EnvNoneType
 
+if sys.version_info >= (3, 12):
+    from typing import TypeAliasType
+
+    def get_origin(annotation: Any | None) -> Any | None:
+        if isinstance(annotation, TypeAliasType):
+            annotation = annotation.__value__
+
+        return typing_extensions.get_origin(annotation)
+
+    def get_args(annotation: Any | None) -> Any:
+        if isinstance(annotation, TypeAliasType):
+            annotation = annotation.__value__
+
+        return typing_extensions.get_args(annotation)
+
+else:
+    get_origin = typing_extensions.get_origin
+    get_args = typing_extensions.get_args
+
 
 def _get_env_var_key(key: str, case_sensitive: bool = False) -> str:
     return key if case_sensitive else key.lower()

pydantic_settings/utils.py

@@ -3,8 +3,6 @@
 from pathlib import Path
 from typing import Any, _GenericAlias  # type: ignore [attr-defined]
 
-from typing_extensions import get_origin
-
 _PATH_TYPE_LABELS = {
     Path.is_dir: 'directory',
     Path.is_file: 'file',
@@ -35,6 +33,8 @@ def _lenient_issubclass(cls: Any, class_or_tuple: Any) -> bool:  # pragma: no co
     try:
         return isinstance(cls, type) and issubclass(cls, class_or_tuple)
     except TypeError:
+        from pydantic_settings.sources.utils import get_origin
+
         if get_origin(cls) is not None:
             # Up until Python 3.10, isinstance(<generic_alias>, type) is True
             # (e.g. list[int])

pyproject.toml

@@ -143,6 +143,9 @@ pydocstyle = { convention = 'google' }
 [tool.ruff.format]
 quote-style = 'single'
 
+[tool.ruff.per-file-target-version]
+"tests/test_settings_p312.py" = "py312"
+
 [tool.mypy]
 python_version = '3.10'
 show_error_codes = true

tests/conftest.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -99,3 +100,19 @@ def cli_test_env():
     yield setenv
 
     setenv.clear()
+
+
+def pytest_ignore_collect(collection_path: Path, config) -> bool:
+    """
+    Ignore collection of test files that contain syntax unsupported
+    by the current Python version.
+    """
+    p312_tests = {'test_settings_p312.py'}
+
+    if sys.version_info < (3, 12) and collection_path.name in p312_tests:
+        print(
+            f"\nSkipping collection of '{collection_path.name}' on Python {sys.version_info.major}.{sys.version_info.minor} due to syntax requirements."
+        )
+        return True
+
+    return None

tests/test_settings_p312.py

@@ -0,0 +1,23 @@
+from typing import Annotated
+
+from annotated_types import MinLen
+
+from pydantic_settings import (
+    BaseSettings,
+)
+
+try:
+    import dotenv
+except ImportError:
+    dotenv = None
+
+
+def test_annotated_with_type(env):
+    type MinLenList = Annotated[list[str], MinLen(2)]
+
+    class AnnotatedComplexSettings(BaseSettings):
+        apples: MinLenList
+
+    env.set('apples', '["russet", "granny smith"]')
+    s = AnnotatedComplexSettings()
+    assert s.apples == ['russet', 'granny smith']