chore(merge): Merge branch 'release/v2' into 'feature/keep-yaml-data'

pyproject.toml

@@ -14,7 +14,7 @@ maintainers = [
   "Helio Chissini de Castro <[email protected]>"
   ]
 name = "yaml-settings-pydantic"
-version = "2.3.1"
+version = "2.3.2"
 description = "A tool to easily load (many) JSON/YAML files as pydantic settings."
 readme = "README.rst"
 keywords = [
@@ -197,7 +197,7 @@ pytest-mypy = "^0.10.3"
 
 
 [tool.bumpver]
-current_version = "2.3.1"
+current_version = "2.3.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "chore(version): Bump version {old_version} -> {new_version}"
 commit          = true

tests/extra/whatever.yaml

@@ -0,0 +1,5 @@
+whatever:
+  the: heck
+  should: be
+  here: dude
+

tests/test_extra.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from yaml_settings_pydantic import (
+    BaseYamlSettings,
+    YamlFileConfigDict,
+    YamlSettingsConfigDict,
+)
+
+WHATEVER = Path(__file__).parent / "extra" / "whatever.yaml"
+
+
+def test_yaml_files_dict_string_keys() -> None:
+    """For now, make sure that this does not fail."""
+
+    class Settings(BaseYamlSettings):
+        the: str
+        should: str
+        here: str
+
+        model_config = YamlSettingsConfigDict(
+            yaml_files={
+                WHATEVER: YamlFileConfigDict(
+                    subpath="whatever",
+                    required=True,
+                )
+            }
+        )
+
+    settings = Settings.model_validate({})
+    assert settings.the == "heck"
+    assert settings.should == "be"
+    assert settings.here == "dude"

yaml_settings_pydantic/__init__.py

@@ -25,6 +25,7 @@
 from yaml_settings_pydantic.settings import BaseYamlSettings, CreateYamlSettings
 
 __version__ = "2.3.1"
+__version__ = "2.3.2"
 
 
 __all__ = (

yaml_settings_pydantic/loader.py

@@ -135,21 +135,21 @@ def validate_yaml_settings_config_files(
 
     # NOTE: If its a string/``Path``, make it into a tuple. If it is anything
     #       else just leave it.
-    values: (
-        tuple[Path, ...]
-        | dict[str, YamlFileConfigDict]
-        | dict[Path, YamlFileConfigDict]
-        | set[Path]
-        | set[str]
-    )
+    values: tuple[Path, ...] | dict[Path, YamlFileConfigDict] | set[Path]
     if isinstance(found_value, Path):
         # logger.debug(f"`{item}` was a PosixPath.")
         values = (found_value,)
     elif isinstance(found_value, str):
         # logger.debug(f"`{item}` was a String.")
         values = (Path(found_value),)
+    elif isinstance(found_value, dict) and any(
+        isinstance(item, str) for item in found_value
+    ):
+        values = {
+            k if isinstance(k, Path) else Path(k): v for k, v in found_value.items()
+        }
     else:
-        values = found_value
+        values = found_value  # type: ignore
 
     keys_invalid = {item for item in values if not isinstance(item, Path)}
     if len(keys_invalid):
@@ -161,12 +161,7 @@ def validate_yaml_settings_config_files(
     # NOTE: Create dictionary if the sequence is not a dictionary.
     files: dict[Path, YamlFileConfigDict]
     if not isinstance(values, dict):
-        files = {
-            (
-                k if isinstance(k, Path) else Path(k)
-            ): DEFAULT_YAML_FILE_CONFIG_DICT.copy()
-            for k in values
-        }
+        files = {k: DEFAULT_YAML_FILE_CONFIG_DICT.copy() for k in values}
     elif any(not isinstance(v, dict) for v in values.values()):
         raise ValueError(f"`{item}` values must have type `dict`.")
     elif not len(values):