Fix PR comments

* Correctly identify unions and complex types
* Drop python 3.12 specific syntax

Author: tselepakis

pydantic_settings/sources/base.py

@@ -16,6 +16,7 @@
 from pydantic._internal._utils import is_model_class
 from pydantic.fields import FieldInfo
 from typing_extensions import get_args
+from typing_inspection import typing_objects
 from typing_inspection.introspection import is_union_origin
 
 from ..exceptions import SettingsError
@@ -25,6 +26,7 @@
     _annotation_is_complex,
     _get_alias_names,
     _get_model_fields,
+    _strip_annotated,
     _union_is_complex,
 )
 
@@ -353,7 +355,10 @@ def _extract_field_info(self, field: FieldInfo, field_name: str) -> list[tuple[s
                 field_info.append((v_alias, self._apply_case_sensitive(v_alias), False))
 
         if not v_alias or self.config.get('populate_by_name', False):
-            if is_union_origin(get_origin(field.annotation)) and _union_is_complex(field.annotation, field.metadata):
+            annotation = field.annotation
+            if annotation and typing_objects.is_typealiastype(annotation):
+                annotation = _strip_annotated(annotation.__value__)
+            if is_union_origin(get_origin(annotation)) and _union_is_complex(annotation, field.metadata):
                 field_info.append((field_name, self._apply_case_sensitive(self.env_prefix + field_name), True))
             else:
                 field_info.append((field_name, self._apply_case_sensitive(self.env_prefix + field_name), False))

pyproject.toml

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

tests/conftest.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import os
-import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -100,20 +99,3 @@ 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.
-    """
-    py312_tests = {'test_settings_py312.py'}
-
-    if sys.version_info < (3, 12) and collection_path.name in py312_tests:
-        print(
-            f"\nSkipping collection of '{collection_path.name}' on Python "
-            f'{sys.version_info.major}.{sys.version_info.minor} due to syntax requirements.'
-        )
-        return True
-
-    return None

tests/test_settings.py

@@ -34,7 +34,7 @@
     dataclasses as pydantic_dataclasses,
 )
 from pydantic.fields import FieldInfo
-from typing_extensions import override
+from typing_extensions import TypeAliasType, override
 
 from pydantic_settings import (
     BaseSettings,
@@ -474,6 +474,21 @@ class AnnotatedComplexSettings(BaseSettings):
     ]
 
 
+def test_annotated_with_type(env):
+    """https://github.com/pydantic/pydantic-settings/issues/536.
+
+    PEP 695 type aliases need to be analyzed when determining if an annotation is complex.
+    """
+    MinLenList = TypeAliasType('MinLenList', Annotated[Union[list[str], list[int]], MinLen(2)])
+
+    class AnnotatedComplexSettings(BaseSettings):
+        apples: MinLenList
+
+    env.set('apples', '["russet", "granny smith"]')
+    s = AnnotatedComplexSettings()
+    assert s.apples == ['russet', 'granny smith']
+
+
 def test_set_dict_model(env):
     env.set('bananas', '[1, 2, 3, 3]')
     env.set('CARROTS', '{"a": null, "b": 4}')