add fix

Author: pcrespov

packages/settings-library/src/settings_library/base.py

@@ -1,6 +1,6 @@
 import logging
 from functools import cached_property
-from typing import Any, Final, get_origin
+from typing import Any, Final
 
 from common_library.pydantic_fields_extension import get_type, is_literal, is_nullable
 from pydantic import ValidationInfo, field_validator
@@ -15,9 +15,9 @@
 
 _logger = logging.getLogger(__name__)
 
-_AUTO_DEFAULT_FACTORY_RESOLVES_TO_NONE_FSTRING: Final[
-    str
-] = "{field_name} auto_default_from_env unresolved, defaulting to None"
+_AUTO_DEFAULT_FACTORY_RESOLVES_TO_NONE_FSTRING: Final[str] = (
+    "{field_name} auto_default_from_env unresolved, defaulting to None"
+)
 
 
 class DefaultFromEnvFactoryError(ValueError):
@@ -133,28 +133,15 @@ def __pydantic_init_subclass__(cls, **kwargs: Any):
         for name, field in cls.model_fields.items():
             auto_default_from_env = _is_auto_default_from_env_enabled(field)
             field_type = get_type(field)
-
-            # Avoids issubclass raising TypeError. SEE test_issubclass_type_error_with_pydantic_models
-            is_not_composed = (
-                get_origin(field_type) is None
-            )  # is not composed as dict[str, Any] or Generic[Base]
             is_not_literal = not is_literal(field)
 
-            if (
-                is_not_literal
-                and is_not_composed
-                and issubclass(field_type, BaseCustomSettings)
-            ):
+            if is_not_literal and issubclass(field_type, BaseCustomSettings):
                 if auto_default_from_env:
                     # Builds a default factory `Field(default_factory=create_settings_from_env(field))`
                     field.default_factory = _create_settings_from_env(name, field)
                     field.default = None
 
-            elif (
-                is_not_literal
-                and is_not_composed
-                and issubclass(field_type, BaseSettings)
-            ):
+            elif is_not_literal and issubclass(field_type, BaseSettings):
                 msg = f"{cls}.{name} of type {field_type} must inherit from BaseCustomSettings"
                 raise ValueError(msg)
 

packages/settings-library/tests/test_base.py

@@ -335,28 +335,34 @@ class SettingsClassExt(SettingsClass):
     }
 
 
-def test_issubclass_type_error_with_pydantic_models():
-    # There is a problem
-    #
-    # TypeError: issubclass() arg 1 must be a class
-    #
-    # SEE https://github.com/pydantic/pydantic/issues/545
-    #
-    # >> issubclass(dict, BaseSettings)
-    # False
-    # >> issubclass(dict[str, str], BaseSettings)
-    # Traceback (most recent call last):
-    # File "<string>", line 1, in <module>
-    # File "/home/crespo/.pyenv/versions/3.10.13/lib/python3.10/abc.py", line 123, in __subclasscheck__
-    #     return _abc_subclasscheck(cls, subclass)
-    # TypeError: issubclass() arg 1 must be a class
-    #
+def test_fixed_issubclass_type_error_with_pydantic_models():
 
     assert not issubclass(dict, BaseSettings)
-
-    # NOTE: this should be fixed by pydantic at some point. When this happens, this test will fail
-    with pytest.raises(TypeError):
-        issubclass(dict[str, str], BaseSettings)
+    assert not issubclass(
+        # FIXED with
+        #
+        # pydantic                 2.11.7
+        # pydantic_core            2.33.2
+        # pydantic-extra-types     2.10.5
+        # pydantic-settings        2.7.0
+        #
+        #
+        # TypeError: issubclass() arg 1 must be a class
+        #
+        # SEE https://github.com/pydantic/pydantic/issues/545
+        #
+        # >> issubclass(dict, BaseSettings)
+        # False
+        # >> issubclass(dict[str, str], BaseSettings)
+        # Traceback (most recent call last):
+        # File "<string>", line 1, in <module>
+        # File "/home/crespo/.pyenv/versions/3.10.13/lib/python3.10/abc.py", line 123, in __subclasscheck__
+        #     return _abc_subclasscheck(cls, subclass)
+        # TypeError: issubclass() arg 1 must be a class
+        #
+        dict[str, str],
+        BaseSettings,
+    )
 
     # here reproduces the problem with our settings that ANE and PC had
     class SettingsClassThatFailed(BaseCustomSettings):