fixed tests

Author: sanderegg

packages/common-library/src/common_library/serialization.py

@@ -11,7 +11,7 @@ def model_dump_with_secrets(
 ) -> dict[str, Any]:
     data = settings_obj.model_dump(**pydantic_export_options)
 
-    for field_name in settings_obj.model_fields:
+    for field_name in settings_obj.__class__.model_fields:
         if field_name not in data:
             continue
 
@@ -29,7 +29,9 @@ def model_dump_with_secrets(
             data[field_name] = str(field_data)
 
         elif isinstance(field_data, dict):
-            possible_pydantic_model = settings_obj.model_fields[field_name].annotation
+            possible_pydantic_model = settings_obj.__class__.model_fields[
+                field_name
+            ].annotation
             # NOTE: data could be a dict which does not represent a pydantic model or a union of models
             with contextlib.suppress(AttributeError, ValidationError):
                 data[field_name] = model_dump_with_secrets(

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

@@ -27,7 +27,7 @@ def print_as_envfile(
 ):
     exclude_unset = pydantic_export_options.get("exclude_unset", False)
 
-    for name, field in settings_obj.model_fields.items():
+    for name, field in settings_obj.__class__.model_fields.items():
         auto_default_from_env = (
             field.json_schema_extra is not None
             and field.json_schema_extra.get("auto_default_from_env", False)

packages/settings-library/tests/test_base.py

@@ -108,7 +108,7 @@ class M2(BaseCustomSettings):
 
 
 def test_create_settings_class(
-    create_settings_class: Callable[[str], type[BaseCustomSettings]]
+    create_settings_class: Callable[[str], type[BaseCustomSettings]],
 ):
     M = create_settings_class("M1")
 
@@ -337,8 +337,8 @@ def test_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)
+    # with pytest.raises(TypeError):
+    issubclass(dict[str, str], BaseSettings)
 
     # here reproduces the problem with our settings that ANE and PC had
     class SettingsClassThatFailed(BaseCustomSettings):