dycw-utilities 0.166.16__py3-none-any.whl → 0.166.17__py3-none-any.whl

{dycw_utilities-0.166.16.dist-info → dycw_utilities-0.166.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.166.16
+Version: 0.166.17
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -18,13 +18,13 @@ Requires-Dist: pytest-cov<6.3,>=6.2.1; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'
 Requires-Dist: pytest-lazy-fixtures<1.4,>=1.3.4; extra == 'test'
 Requires-Dist: pytest-randomly<3.17,>=3.16.0; extra == 'test'
-Requires-Dist: pytest-regressions<2.9,>=2.8.2; extra == 'test'
+Requires-Dist: pytest-regressions<2.9,>=2.8.3; extra == 'test'
 Requires-Dist: pytest-repeat<0.10,>=0.9.4; extra == 'test'
 Requires-Dist: pytest-rerunfailures<16.1,>=16.0.1; extra == 'test'
 Requires-Dist: pytest-rng<1.1,>=1.0.0; extra == 'test'
 Requires-Dist: pytest-timeout<2.5,>=2.4.0; extra == 'test'
 Requires-Dist: pytest-xdist<3.9,>=3.8.0; extra == 'test'
-Requires-Dist: pytest<8.5,>=8.4.1; extra == 'test'
+Requires-Dist: pytest<8.5,>=8.4.2; extra == 'test'
 Requires-Dist: testbook<0.5,>=0.4.2; extra == 'test'
 Description-Content-Type: text/markdown
 

{dycw_utilities-0.166.16.dist-info → dycw_utilities-0.166.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=FemsKd9UtEJaP-BgHzGaJoLRpH-_mhv6Y7fl8XXOKCY,61
+utilities/__init__.py,sha256=zjtoeFc-ojZa5CJiIUK9ZCv9HTNHqODG_fmFppulLvA,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=oUosQ7KExpXTC1PioIc4bju6C6Yj6gMZQLBpOKRL4Xc,2166
-utilities/pydantic_settings_sops.py,sha256=3RGZbRgfJjAxveMUNpdf7TNBtGuEBYZZ5_TkIxf1mNE,1194
+utilities/pydantic_settings.py,sha256=xcm8TUa3Ok3kWuC7RojwKNimiO333iugbw1doqcKv7Q,3375
+utilities/pydantic_settings_sops.py,sha256=LWI3NTQP8hSaGkoRbahyqaalF0HuBg7o63-p7boHgpQ,1119
 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.16.dist-info/METADATA,sha256=mRIYx_yS0XbJdgF91-6wfLFf0a8T4bRtJC_v3cLoFO4,1702
-dycw_utilities-0.166.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.166.16.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
-dycw_utilities-0.166.16.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.166.16.dist-info/RECORD,,
+dycw_utilities-0.166.17.dist-info/METADATA,sha256=ubc8X0TWb00B1HdApe5jrnnYdi2B8hpaCodXZwX1HoM,1702
+dycw_utilities-0.166.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.166.17.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
+dycw_utilities-0.166.17.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.166.17.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.166.16"
+__version__ = "0.166.17"

utilities/pydantic_settings.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, ClassVar, override
+from functools import reduce
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, ClassVar, assert_never, override
 
 from pydantic_settings import (
     BaseSettings,
@@ -10,22 +12,28 @@ from pydantic_settings import (
     TomlConfigSettingsSource,
     YamlConfigSettingsSource,
 )
+from pydantic_settings.sources import DEFAULT_PATH
 
 from utilities.iterables import always_iterable
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
+    from collections.abc import Iterator, Sequence
 
-    from utilities.types import MaybeIterable, PathLike
+    from pydantic_settings.sources import PathType
+
+    from utilities.types import MaybeSequenceStr, PathLike
+
+
+type PathLikeOrWithSection = PathLike | tuple[PathLike, MaybeSequenceStr]
 
 
 class CustomBaseSettings(BaseSettings):
     """Base settings for loading JSON files."""
 
     # paths
-    json_files: ClassVar[MaybeIterable[PathLike]] = ()
-    toml_files: ClassVar[MaybeIterable[PathLike]] = ()
-    yaml_files: ClassVar[MaybeIterable[PathLike]] = ()
+    json_files: ClassVar[Sequence[PathLike]] = []
+    toml_files: ClassVar[Sequence[PathLikeOrWithSection]] = []
+    yaml_files: ClassVar[Sequence[PathLike]] = []
 
     # config
     model_config: ClassVar[SettingsConfigDict] = SettingsConfigDict(
@@ -53,11 +61,19 @@ class CustomBaseSettings(BaseSettings):
         /,
     ) -> Iterator[PydanticBaseSettingsSource]:
         yield env_settings
-        for file in always_iterable(cls.json_files):
+        for file in cls.json_files:
             yield JsonConfigSettingsSource(settings_cls, json_file=file)
-        for file in always_iterable(cls.toml_files):
-            yield TomlConfigSettingsSource(settings_cls, toml_file=file)
-        for file in always_iterable(cls.yaml_files):
+        for path_or_pair in cls.toml_files:
+            match path_or_pair:
+                case Path() | str() as file:
+                    yield TomlConfigSettingsSource(settings_cls, toml_file=file)
+                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 file in cls.yaml_files:
             yield YamlConfigSettingsSource(settings_cls, yaml_file=file)
 
 
@@ -66,4 +82,25 @@ def load_settings[T: BaseSettings](cls: type[T], /) -> T:
     return cls()
 
 
-__all__ = ["CustomBaseSettings", "load_settings"]
+class TomlConfigSectionSettingsSource(TomlConfigSettingsSource):
+    @override
+    def __init__(
+        self,
+        settings_cls: type[BaseSettings],
+        toml_file: PathType | None = DEFAULT_PATH,
+        *,
+        section: MaybeSequenceStr,
+    ) -> None:
+        super().__init__(settings_cls, toml_file=toml_file)
+        self.section = section
+
+    @override
+    def __call__(self) -> dict[str, Any]:
+        return reduce(
+            lambda acc, el: acc.get(el, {}),
+            always_iterable(self.section),
+            super().__call__(),
+        )
+
+
+__all__ = ["CustomBaseSettings", "TomlConfigSectionSettingsSource", "load_settings"]

utilities/pydantic_settings_sops.py

@@ -4,22 +4,21 @@ from typing import TYPE_CHECKING, ClassVar, override
 
 from pydantic_settings_sops import SOPSConfigSettingsSource
 
-from utilities.iterables import always_iterable
 from utilities.pydantic_settings import CustomBaseSettings
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
+    from collections.abc import Iterator, Sequence
 
     from pydantic_settings import BaseSettings, PydanticBaseSettingsSource
 
-    from utilities.types import MaybeIterable, PathLike
+    from utilities.types import PathLike
 
 
 class SopsBaseSettings(CustomBaseSettings):
     """Base settings for loading secrets using `sops/age`."""
 
     # paths
-    secret_files: ClassVar[MaybeIterable[PathLike]] = ()
+    secret_files: ClassVar[Sequence[PathLike]] = ()
 
     @classmethod
     @override
@@ -30,7 +29,7 @@ class SopsBaseSettings(CustomBaseSettings):
         /,
     ) -> Iterator[PydanticBaseSettingsSource]:
         yield from super()._yield_base_settings_sources(settings_cls, env_settings)
-        for file in always_iterable(cls.secret_files):
+        for file in cls.secret_files:
             yield SOPSConfigSettingsSource(
                 settings_cls,  # pyright: ignore[reportArgumentType],
                 json_file=file,