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

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

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

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

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=zjtoeFc-ojZa5CJiIUK9ZCv9HTNHqODG_fmFppulLvA,61
+utilities/__init__.py,sha256=eLNz3cP1mG4UANDG5gmXTTw10EMSDNNxdbNlerf7XNk,61
 utilities/aeventkit.py,sha256=ddoleSwW9zdc2tjX5Ge0pMKtYwV_JMxhHYOxnWX2AGM,12609
 utilities/altair.py,sha256=nHdpWt8ZwdUwRQN970MvHd5bRWokNqzHcZQEdSHKRuE,9033
 utilities/asyncio.py,sha256=PUedzQ5deqlSECQ33sam9cRzI9TnygHz3FdOqWJWPTM,15288
@@ -53,7 +53,7 @@ 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=xcm8TUa3Ok3kWuC7RojwKNimiO333iugbw1doqcKv7Q,3375
+utilities/pydantic_settings.py,sha256=CWrTtzupGxpSsImjDCuVtQ2HcGmF8nHA4W4hGq8WvXY,5688
 utilities/pydantic_settings_sops.py,sha256=LWI3NTQP8hSaGkoRbahyqaalF0HuBg7o63-p7boHgpQ,1119
 utilities/pyinstrument.py,sha256=hnXaL-4HE7wWBI5JKaPfYTpsrXe68YiuZKahHV0VJn8,841
 utilities/pytest.py,sha256=Pu8jmeNQq659uQmZsmFj6lb0sHMDsNN3fcd6M21J-ww,7723
@@ -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.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,,
+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,,

utilities/__init__.py

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

utilities/pydantic_settings.py

@@ -31,9 +31,9 @@ class CustomBaseSettings(BaseSettings):
     """Base settings for loading JSON files."""
 
     # paths
-    json_files: ClassVar[Sequence[PathLike]] = []
+    json_files: ClassVar[Sequence[PathLikeOrWithSection]] = []
     toml_files: ClassVar[Sequence[PathLikeOrWithSection]] = []
-    yaml_files: ClassVar[Sequence[PathLike]] = []
+    yaml_files: ClassVar[Sequence[PathLikeOrWithSection]] = []
 
     # config
     model_config: ClassVar[SettingsConfigDict] = SettingsConfigDict(
@@ -61,20 +61,36 @@ class CustomBaseSettings(BaseSettings):
         /,
     ) -> Iterator[PydanticBaseSettingsSource]:
         yield env_settings
-        for file in cls.json_files:
-            yield JsonConfigSettingsSource(settings_cls, json_file=file)
-        for path_or_pair in cls.toml_files:
-            match path_or_pair:
-                case Path() | str() as file:
-                    yield TomlConfigSettingsSource(settings_cls, toml_file=file)
+        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 file in cls.yaml_files:
-            yield YamlConfigSettingsSource(settings_cls, yaml_file=file)
+        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)
 
 
 def load_settings[T: BaseSettings](cls: type[T], /) -> T:
@@ -82,6 +98,30 @@ def load_settings[T: BaseSettings](cls: type[T], /) -> T:
     return cls()
 
 
+class JsonConfigSectionSettingsSource(JsonConfigSettingsSource):
+    @override
+    def __init__(
+        self,
+        settings_cls: type[BaseSettings],
+        json_file: PathType | None = DEFAULT_PATH,
+        json_file_encoding: str | None = None,
+        *,
+        section: MaybeSequenceStr,
+    ) -> None:
+        super().__init__(
+            settings_cls, json_file=json_file, json_file_encoding=json_file_encoding
+        )
+        self.section = section
+
+    @override
+    def __call__(self) -> dict[str, Any]:
+        return reduce(
+            lambda acc, el: acc.get(el, {}),
+            always_iterable(self.section),
+            super().__call__(),
+        )
+
+
 class TomlConfigSectionSettingsSource(TomlConfigSettingsSource):
     @override
     def __init__(
@@ -103,4 +143,38 @@ class TomlConfigSectionSettingsSource(TomlConfigSettingsSource):
         )
 
 
-__all__ = ["CustomBaseSettings", "TomlConfigSectionSettingsSource", "load_settings"]
+class YamlConfigSectionSettingsSource(YamlConfigSettingsSource):
+    @override
+    def __init__(
+        self,
+        settings_cls: type[BaseSettings],
+        yaml_file: PathType | None = DEFAULT_PATH,
+        yaml_file_encoding: str | None = None,
+        yaml_config_section: str | None = None,
+        *,
+        section: MaybeSequenceStr,
+    ) -> None:
+        super().__init__(
+            settings_cls,
+            yaml_file=yaml_file,
+            yaml_file_encoding=yaml_file_encoding,
+            yaml_config_section=yaml_config_section,
+        )
+        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",
+    "JsonConfigSectionSettingsSource",
+    "TomlConfigSectionSettingsSource",
+    "YamlConfigSectionSettingsSource",
+    "load_settings",
+]