dycw-utilities 0.166.14__tar.gz → 0.166.15__tar.gz

{dycw_utilities-0.166.14 → dycw_utilities-0.166.15}/PKG-INFO

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

{dycw_utilities-0.166.14 → dycw_utilities-0.166.15}/pyproject.toml

@@ -103,7 +103,7 @@ memory-profiler = [
   "memory-profiler >=0.61.0, <0.62",
 ]
 more-itertools = [
-  "more-itertools >=10.7.0, <10.8",
+  "more-itertools >=10.8.0, <10.9",
 ]
 numpy = [
   "numpy >=2.3.1, <2.4",
@@ -152,6 +152,10 @@ pydantic-settings = [
 pydantic-settings-sops = [
   "pydantic-settings-sops",
 ]
+pydantic-settings-test = [
+  "pyyaml",
+  "tomlkit",
+]
 pyinstrument = [
   "pyinstrument >=5.1.0, <5.2",
 ]
@@ -242,7 +246,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.166.14"
+version = "0.166.15"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -275,7 +279,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.166.14"
+current_version = "0.166.15"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.166.14 → dycw_utilities-0.166.15}/src/tests/test_pydantic_settings.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
-from json import dumps
+import json
 from typing import TYPE_CHECKING, ClassVar
 
+import tomlkit
+import yaml
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from utilities.os import temp_environ
@@ -15,18 +17,38 @@ if TYPE_CHECKING:
 
 
 class TestCustomBaseSettings:
-    def test_main(self, *, tmp_path: Path) -> None:
-        file = tmp_path.joinpath("settings.toml")
-        _ = file.write_text(dumps({"x": 1, "y": 2}))
+    def test_json(self, *, tmp_path: Path) -> None:
+        file = tmp_path.joinpath("settings.json")
+        _ = file.write_text(json.dumps({"x": 1}))
 
         class Settings(CustomBaseSettings):
             json_files: ClassVar[MaybeIterable[PathLike]] = file
             x: int
-            y: int
 
         settings = load_settings(Settings)
         assert settings.x == 1
-        assert settings.y == 2
+
+    def test_toml(self, *, tmp_path: Path) -> None:
+        file = tmp_path.joinpath("settings.toml")
+        _ = file.write_text(tomlkit.dumps({"x": 1}))
+
+        class Settings(CustomBaseSettings):
+            toml_files: ClassVar[MaybeIterable[PathLike]] = file
+            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}))
+
+        class Settings(CustomBaseSettings):
+            yaml_files: ClassVar[MaybeIterable[PathLike]] = file
+            x: int
+
+        settings = load_settings(Settings)
+        assert settings.x == 1
 
     def test_env_var(self) -> None:
         class Settings(CustomBaseSettings):

{dycw_utilities-0.166.14 → dycw_utilities-0.166.15}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.166.14"
+__version__ = "0.166.15"

{dycw_utilities-0.166.14 → dycw_utilities-0.166.15}/src/utilities/pydantic_settings.py

@@ -7,6 +7,8 @@ from pydantic_settings import (
     JsonConfigSettingsSource,
     PydanticBaseSettingsSource,
     SettingsConfigDict,
+    TomlConfigSettingsSource,
+    YamlConfigSettingsSource,
 )
 
 from utilities.iterables import always_iterable
@@ -22,6 +24,8 @@ class CustomBaseSettings(BaseSettings):
 
     # paths
     json_files: ClassVar[MaybeIterable[PathLike]] = ()
+    toml_files: ClassVar[MaybeIterable[PathLike]] = ()
+    yaml_files: ClassVar[MaybeIterable[PathLike]] = ()
 
     # config
     model_config: ClassVar[SettingsConfigDict] = SettingsConfigDict(
@@ -51,6 +55,10 @@ class CustomBaseSettings(BaseSettings):
         yield env_settings
         for file in always_iterable(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):
+            yield YamlConfigSettingsSource(settings_cls, yaml_file=file)
 
 
 def load_settings[T: BaseSettings](cls: type[T], /) -> T: