dycw-utilities 0.166.18__py3-none-any.whl → 0.166.20__py3-none-any.whl

{dycw_utilities-0.166.18.dist-info → dycw_utilities-0.166.20.dist-info}/METADATA

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

{dycw_utilities-0.166.18.dist-info → dycw_utilities-0.166.20.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=eLNz3cP1mG4UANDG5gmXTTw10EMSDNNxdbNlerf7XNk,61
+utilities/__init__.py,sha256=wFLNw_MUiq5E5vrdStiHh7DVtvzDz9og48O0o8oqaew,61
 utilities/aeventkit.py,sha256=ddoleSwW9zdc2tjX5Ge0pMKtYwV_JMxhHYOxnWX2AGM,12609
 utilities/altair.py,sha256=nHdpWt8ZwdUwRQN970MvHd5bRWokNqzHcZQEdSHKRuE,9033
 utilities/asyncio.py,sha256=PUedzQ5deqlSECQ33sam9cRzI9TnygHz3FdOqWJWPTM,15288
@@ -53,8 +53,8 @@ utilities/pottery.py,sha256=ggMN72Y7wx7Js8VN6eyNyodpm8TIYqZHGghkDPXIVWk,3949
 utilities/pqdm.py,sha256=idv2seRVP2f6NeSfpeEnT5A-tQezaHZKDyeu16g2-0E,3091
 utilities/psutil.py,sha256=KUlu4lrUw9Zg1V7ZGetpWpGb9DB8l_SSDWGbANFNCPU,2104
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utilities/pydantic_settings.py,sha256=CWrTtzupGxpSsImjDCuVtQ2HcGmF8nHA4W4hGq8WvXY,5688
-utilities/pydantic_settings_sops.py,sha256=LWI3NTQP8hSaGkoRbahyqaalF0HuBg7o63-p7boHgpQ,1119
+utilities/pydantic_settings.py,sha256=bFr9UDrVhdqTl7O_TPutCLdsQ5rUp--nO76-_F8z0bs,5102
+utilities/pydantic_settings_sops.py,sha256=m2uB9wDw1PU2CiSL7KwxulDXT0STjOZTu3Ctc2q7jc0,1943
 utilities/pyinstrument.py,sha256=hnXaL-4HE7wWBI5JKaPfYTpsrXe68YiuZKahHV0VJn8,841
 utilities/pytest.py,sha256=Pu8jmeNQq659uQmZsmFj6lb0sHMDsNN3fcd6M21J-ww,7723
 utilities/pytest_regressions.py,sha256=ocjHTtfOeiGfQAKIei8pKNd61sxN9dawrJJ9gPt2wzA,4097
@@ -91,8 +91,8 @@ utilities/zoneinfo.py,sha256=tdIScrTB2-B-LH0ukb1HUXKooLknOfJNwHk10MuMYvA,3619
 utilities/pytest_plugins/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 utilities/pytest_plugins/pytest_randomly.py,sha256=B1qYVlExGOxTywq2r1SMi5o7btHLk2PNdY_b1p98dkE,409
 utilities/pytest_plugins/pytest_regressions.py,sha256=9v8kAXDM2ycIXJBimoiF4EgrwbUvxTycFWJiGR_GHhM,1466
-dycw_utilities-0.166.18.dist-info/METADATA,sha256=NPBYGvJB7ozKQT3NMI0xHlTtFcCcchzIBb5YmxnoptU,1702
-dycw_utilities-0.166.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.166.18.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
-dycw_utilities-0.166.18.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.166.18.dist-info/RECORD,,
+dycw_utilities-0.166.20.dist-info/METADATA,sha256=3JiFhAm75CwYgZNGBSHz8eGLiY7oUcWdnCiu_T_6XqI,1702
+dycw_utilities-0.166.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.166.20.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
+dycw_utilities-0.166.20.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.166.20.dist-info/RECORD,,

utilities/__init__.py

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

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__ = [

utilities/pydantic_settings_sops.py

@@ -1,24 +1,31 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, ClassVar, override
+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
+from utilities.pydantic_settings import (
+    CustomBaseSettings,
+    PathLikeOrWithSection,
+    _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 PathLike
+    from utilities.types import MaybeSequenceStr
 
 
 class SopsBaseSettings(CustomBaseSettings):
     """Base settings for loading secrets using `sops/age`."""
 
     # paths
-    secret_files: ClassVar[Sequence[PathLike]] = ()
+    secret_files: ClassVar[Sequence[PathLikeOrWithSection]] = []
 
     @classmethod
     @override
@@ -29,11 +36,28 @@ class SopsBaseSettings(CustomBaseSettings):
         /,
     ) -> 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,
+        for file, section in map(_ensure_section, cls.secret_files):
+            yield SOPSConfigSectionSettingsSource(
+                settings_cls, json_file=file, section=section
             )
 
 
-__all__ = ["SopsBaseSettings"]
+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"]