dycw-utilities 0.166.18__tar.gz → 0.166.19__tar.gz

{dycw_utilities-0.166.18 → dycw_utilities-0.166.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.166.18
+Version: 0.166.19
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.166.18 → dycw_utilities-0.166.19}/pyproject.toml

@@ -246,7 +246,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.166.18"
+version = "0.166.19"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -279,7 +279,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.166.18"
+current_version = "0.166.19"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.166.18 → dycw_utilities-0.166.19}/src/tests/test_pydantic_settings.py

@@ -66,30 +66,6 @@ class TestCustomBaseSettings:
         settings = load_settings(Settings)
         assert settings.x == 1
 
-    def test_toml_section_str(self, *, tmp_path: Path) -> None:
-        file = tmp_path.joinpath("settings.toml")
-        _ = file.write_text(tomlkit.dumps({"outer": {"x": 1}}))
-
-        class Settings(CustomBaseSettings):
-            toml_files: ClassVar[Sequence[PathLikeOrWithSection]] = [(file, "outer")]
-            x: int
-
-        settings = load_settings(Settings)
-        assert settings.x == 1
-
-    def test_toml_section_nested(self, *, tmp_path: Path) -> None:
-        file = tmp_path.joinpath("settings.toml")
-        _ = file.write_text(tomlkit.dumps({"outer": {"middle": {"x": 1}}}))
-
-        class Settings(CustomBaseSettings):
-            toml_files: ClassVar[Sequence[PathLikeOrWithSection]] = [
-                (file, ["outer", "middle"])
-            ]
-            x: int
-
-        settings = load_settings(Settings)
-        assert settings.x == 1
-
     def test_yaml(self, *, tmp_path: Path) -> None:
         file = tmp_path.joinpath("settings.yaml")
         _ = file.write_text(yaml.dump({"x": 1}))
@@ -101,30 +77,6 @@ class TestCustomBaseSettings:
         settings = load_settings(Settings)
         assert settings.x == 1
 
-    def test_yaml_section_str(self, *, tmp_path: Path) -> None:
-        file = tmp_path.joinpath("settings.yaml")
-        _ = file.write_text(yaml.dump({"outer": {"x": 1}}))
-
-        class Settings(CustomBaseSettings):
-            yaml_files: ClassVar[Sequence[PathLikeOrWithSection]] = [(file, "outer")]
-            x: int
-
-        settings = load_settings(Settings)
-        assert settings.x == 1
-
-    def test_yaml_section_nested(self, *, tmp_path: Path) -> None:
-        file = tmp_path.joinpath("settings.yaml")
-        _ = file.write_text(yaml.dump({"outer": {"middle": {"x": 1}}}))
-
-        class Settings(CustomBaseSettings):
-            yaml_files: ClassVar[Sequence[PathLikeOrWithSection]] = [
-                (file, ["outer", "middle"])
-            ]
-            x: int
-
-        settings = load_settings(Settings)
-        assert settings.x == 1
-
     def test_env_var(self) -> None:
         class Settings(CustomBaseSettings):
             x: int

{dycw_utilities-0.166.18 → dycw_utilities-0.166.19}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.166.18"
+__version__ = "0.166.19"

{dycw_utilities-0.166.18 → dycw_utilities-0.166.19}/src/utilities/pydantic_settings.py

@@ -24,7 +24,8 @@ if TYPE_CHECKING:
     from utilities.types import MaybeSequenceStr, PathLike
 
 
-type PathLikeOrWithSection = PathLike | tuple[PathLike, MaybeSequenceStr]
+type PathLikeWithSection = tuple[PathLike, MaybeSequenceStr]
+type PathLikeOrWithSection = PathLike | PathLikeWithSection
 
 
 class CustomBaseSettings(BaseSettings):
@@ -61,36 +62,18 @@ class CustomBaseSettings(BaseSettings):
         /,
     ) -> Iterator[PydanticBaseSettingsSource]:
         yield env_settings
-        for json in cls.json_files:
-            match json:
-                case Path() | str():
-                    yield JsonConfigSettingsSource(settings_cls, json_file=json)
-                case Path() | str() as file, str() | list() | tuple() as section:
-                    yield JsonConfigSectionSettingsSource(
-                        settings_cls, json_file=file, section=section
-                    )
-                case never:
-                    assert_never(never)
-        for toml in cls.toml_files:
-            match toml:
-                case Path() | str():
-                    yield TomlConfigSettingsSource(settings_cls, toml_file=toml)
-                case Path() | str() as file, str() | list() | tuple() as section:
-                    yield TomlConfigSectionSettingsSource(
-                        settings_cls, toml_file=file, section=section
-                    )
-                case never:
-                    assert_never(never)
-        for yaml in cls.yaml_files:
-            match yaml:
-                case Path() | str():
-                    yield YamlConfigSettingsSource(settings_cls, yaml_file=yaml)
-                case Path() | str() as file, str() | list() | tuple() as section:
-                    yield YamlConfigSectionSettingsSource(
-                        settings_cls, yaml_file=file, section=section
-                    )
-                case never:
-                    assert_never(never)
+        for file, section in map(_ensure_section, cls.json_files):
+            yield JsonConfigSectionSettingsSource(
+                settings_cls, json_file=file, section=section
+            )
+        for file, section in map(_ensure_section, cls.toml_files):
+            yield TomlConfigSectionSettingsSource(
+                settings_cls, toml_file=file, section=section
+            )
+        for file, section in map(_ensure_section, cls.yaml_files):
+            yield YamlConfigSectionSettingsSource(
+                settings_cls, yaml_file=file, section=section
+            )
 
 
 def load_settings[T: BaseSettings](cls: type[T], /) -> T:
@@ -115,11 +98,7 @@ class JsonConfigSectionSettingsSource(JsonConfigSettingsSource):
 
     @override
     def __call__(self) -> dict[str, Any]:
-        return reduce(
-            lambda acc, el: acc.get(el, {}),
-            always_iterable(self.section),
-            super().__call__(),
-        )
+        return _get_section(super().__call__(), self.section)
 
 
 class TomlConfigSectionSettingsSource(TomlConfigSettingsSource):
@@ -136,11 +115,7 @@ class TomlConfigSectionSettingsSource(TomlConfigSettingsSource):
 
     @override
     def __call__(self) -> dict[str, Any]:
-        return reduce(
-            lambda acc, el: acc.get(el, {}),
-            always_iterable(self.section),
-            super().__call__(),
-        )
+        return _get_section(super().__call__(), self.section)
 
 
 class YamlConfigSectionSettingsSource(YamlConfigSettingsSource):
@@ -164,11 +139,23 @@ class YamlConfigSectionSettingsSource(YamlConfigSettingsSource):
 
     @override
     def __call__(self) -> dict[str, Any]:
-        return reduce(
-            lambda acc, el: acc.get(el, {}),
-            always_iterable(self.section),
-            super().__call__(),
-        )
+        return _get_section(super().__call__(), self.section)
+
+
+def _ensure_section(file: PathLikeOrWithSection, /) -> PathLikeWithSection:
+    match file:
+        case Path() | str():
+            return file, []
+        case Path() | str() as path, str() | list() | tuple() as section:
+            return path, section
+        case never:
+            assert_never(never)
+
+
+def _get_section(
+    mapping: dict[str, Any], section: MaybeSequenceStr, /
+) -> dict[str, Any]:
+    return reduce(lambda acc, el: acc.get(el, {}), always_iterable(section), mapping)
 
 
 __all__ = [

dycw_utilities-0.166.19/src/utilities/pydantic_settings_sops.py

@@ -0,0 +1,62 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, ClassVar, override
+
+from pydantic_settings.sources import DEFAULT_PATH
+from pydantic_settings_sops import SOPSConfigSettingsSource
+
+from utilities.pydantic_settings import (
+    CustomBaseSettings,
+    _ensure_section,
+    _get_section,
+)
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator, Sequence
+
+    from pydantic_settings import BaseSettings, PydanticBaseSettingsSource
+    from pydantic_settings.sources import PathType
+
+    from utilities.types import MaybeSequenceStr, PathLike
+
+
+class SopsBaseSettings(CustomBaseSettings):
+    """Base settings for loading secrets using `sops/age`."""
+
+    # paths
+    secret_files: ClassVar[Sequence[PathLike]] = ()
+
+    @classmethod
+    @override
+    def _yield_base_settings_sources(
+        cls,
+        settings_cls: type[BaseSettings],
+        env_settings: PydanticBaseSettingsSource,
+        /,
+    ) -> Iterator[PydanticBaseSettingsSource]:
+        yield from super()._yield_base_settings_sources(settings_cls, env_settings)
+        for file, section in map(_ensure_section, cls.secret_files):
+            yield SOPSConfigSectionSettingsSource(
+                settings_cls, json_file=file, section=section
+            )
+
+
+class SOPSConfigSectionSettingsSource(SOPSConfigSettingsSource):
+    @override
+    def __init__(
+        self,
+        settings_cls: type[BaseSettings],
+        json_file: PathType | None = DEFAULT_PATH,
+        yaml_file: PathType | None = DEFAULT_PATH,
+        *,
+        section: MaybeSequenceStr,
+    ) -> None:
+        super().__init__(settings_cls, json_file=json_file, yaml_file=yaml_file)  # pyright: ignore[reportArgumentType]
+        self.section = section
+
+    @override
+    def __call__(self) -> dict[str, Any]:
+        return _get_section(super().__call__(), self.section)
+
+
+__all__ = ["SOPSConfigSectionSettingsSource", "SopsBaseSettings"]

dycw_utilities-0.166.18/src/utilities/pydantic_settings_sops.py

@@ -1,39 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, ClassVar, override
-
-from pydantic_settings_sops import SOPSConfigSettingsSource
-
-from utilities.pydantic_settings import CustomBaseSettings
-
-if TYPE_CHECKING:
-    from collections.abc import Iterator, Sequence
-
-    from pydantic_settings import BaseSettings, PydanticBaseSettingsSource
-
-    from utilities.types import PathLike
-
-
-class SopsBaseSettings(CustomBaseSettings):
-    """Base settings for loading secrets using `sops/age`."""
-
-    # paths
-    secret_files: ClassVar[Sequence[PathLike]] = ()
-
-    @classmethod
-    @override
-    def _yield_base_settings_sources(
-        cls,
-        settings_cls: type[BaseSettings],
-        env_settings: PydanticBaseSettingsSource,
-        /,
-    ) -> Iterator[PydanticBaseSettingsSource]:
-        yield from super()._yield_base_settings_sources(settings_cls, env_settings)
-        for file in cls.secret_files:
-            yield SOPSConfigSettingsSource(
-                settings_cls,  # pyright: ignore[reportArgumentType],
-                json_file=file,
-            )
-
-
-__all__ = ["SopsBaseSettings"]