configaroo 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

configaroo/__init__.py

@@ -1,6 +1,10 @@
 """Bouncy configuration handling."""
 
-from configaroo.configuration import Configuration, print_configuration
+from configaroo.configuration import (
+    Configuration,
+    find_pyproject_toml,
+    print_configuration,
+)
 from configaroo.exceptions import (
     ConfigarooError,
     MissingEnvironmentVariableError,
@@ -12,7 +16,8 @@ __all__ = [
     "Configuration",
     "MissingEnvironmentVariableError",
     "UnsupportedLoaderError",
+    "find_pyproject_toml",
     "print_configuration",
 ]
 
-__version__ = "0.4.0"
+__version__ = "0.4.2"

configaroo/configuration.py

@@ -6,6 +6,7 @@ import re
 from collections import UserDict
 from collections.abc import Callable
 from pathlib import Path
+from types import UnionType
 from typing import Any, Self, TypeVar
 
 from pydantic import BaseModel
@@ -99,30 +100,6 @@ class Configuration(UserDict[str, Any]):
         cls = type(self)
         return self | {prefix: cls(self.setdefault(prefix, {})).add(rest, value)}
 
-    def add_envs(self, envs: dict[str, str] | None = None, prefix: str = "") -> Self:
-        """Add environment variables to configuration.
-
-        If you don't specify which environment variables to read, you'll
-        automatically add any that matches a top-level value of the
-        configuration.
-        """
-        if envs is None:
-            # Automatically add top-level configuration items
-            envs = {
-                re.sub(r"\W", "_", key).upper(): key
-                for key, value in self.data.items()
-                if isinstance(value, str | int | float)
-            }
-
-        # Read environment variables
-        for env, key in envs.items():
-            env_key = f"{prefix}{env}"
-            if env_value := os.getenv(env_key):
-                self = self.add(key, env_value)  # noqa: PLW0642
-            elif key not in self:
-                raise MissingEnvironmentVariableError(env_key)
-        return self
-
     def parse_dynamic(
         self, extra: dict[str, Any] | None = None, *, _include_self: bool = True
     ) -> Self:
@@ -150,6 +127,60 @@ class Configuration(UserDict[str, Any]):
         # Continue parsing until no more replacements are made.
         return parsed.parse_dynamic(extra=extra, _include_self=_include_self)
 
+    def add_envs(self, envs: dict[str, str] | None = None, prefix: str = "") -> Self:
+        """Add environment variables to configuration.
+
+        If you don't specify which environment variables to read, you'll
+        automatically add any that matches a simple top-level value of the
+        configuration.
+        """
+        if envs is None:
+            # Automatically add top-level configuration items
+            envs = {
+                re.sub(r"\W", "_", key).upper(): key
+                for key, value in self.data.items()
+                if isinstance(value, str | int | float)
+            }
+
+        # Read environment variables
+        for env, key in envs.items():
+            env_key = f"{prefix}{env}"
+            if env_value := os.getenv(env_key):
+                self = self.add(key, env_value)  # noqa: PLW0642
+            elif key not in self:
+                raise MissingEnvironmentVariableError(env_key)
+        return self
+
+    def add_envs_from_model(
+        self,
+        model: type[BaseModel],
+        prefix: str = "",
+        types: type | UnionType = str | bool | int | float,
+    ) -> Self:
+        """Add environment variables to configuration based on the given model.
+
+        Top level string, bool, integer, and float fields from the model are
+        looked for among environment variables.
+        """
+
+        def _get_class_from_annotation(annotation: type) -> type:
+            """Unpack generic annotations and return the underlying class."""
+            return (
+                _get_class_from_annotation(annotation.__origin__)
+                if hasattr(annotation, "__origin__")
+                else annotation
+            )
+
+        envs = {
+            re.sub(r"\W", "_", key).upper(): key
+            for key, field in model.model_fields.items()
+            if (
+                field.annotation is not None
+                and issubclass(_get_class_from_annotation(field.annotation), types)
+            )
+        }
+        return self.add_envs(envs, prefix=prefix)
+
     def validate_model(self, model: type[BaseModel]) -> Self:
         """Validate the configuration against the given model."""
         model.model_validate(self.data)

{configaroo-0.4.0.dist-info → configaroo-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: configaroo
-Version: 0.4.0
+Version: 0.4.2
 Summary: Bouncy handling of configuration files
 Author-email: Geir Arne Hjelle <geirarne@gmail.com>
 Maintainer-email: Geir Arne Hjelle <geirarne@gmail.com>

{configaroo-0.4.0.dist-info → configaroo-0.4.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-configaroo/__init__.py,sha256=zlCtdtE7UWy7SWKYq_NfGX0uUvO8l5-xRj1mB1Bn3Ac,412
-configaroo/configuration.py,sha256=hMo9INlvD3OwjYeK0PJpun8T8x6wfAl8t1ZM2_EaqvY,9823
+configaroo/__init__.py,sha256=rzq0iqqBuc--QB3yBM4dA6LYLAdLuviKwqeUzfcjCs0,477
+configaroo/configuration.py,sha256=1tGBLkyz703txcaGx49kWHMiVYgjTcERnikVQ69Pusc,10928
 configaroo/exceptions.py,sha256=GfLf3CLfHStiQjvdS7ZAtrKF9gmGL_8biFLayue6J0M,772
 configaroo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 configaroo/loaders/__init__.py,sha256=XQrFwCMWzQ71ykaZFPmYysDz12y_elPqxWhUMQCsq3s,1076
 configaroo/loaders/json.py,sha256=fT2Lg4hPM2BuwqrDsP7bcJlepAdmEh2iKU-YVK4KmIA,306
 configaroo/loaders/toml.py,sha256=jw9U78Lf-GMA8QmGIM8xMBqOhPaa8ITSMAhhN1ZNyng,256
-configaroo-0.4.0.dist-info/licenses/LICENSE,sha256=rdeT6Y5bm0MUaERso7HRWpPj37Y1RD5li2lIQaMNJjc,1090
-configaroo-0.4.0.dist-info/METADATA,sha256=6527XCdJ8w6eo3v693VifE-AzR1ZUw4tCGeSEXAomUs,2672
-configaroo-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-configaroo-0.4.0.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
-configaroo-0.4.0.dist-info/RECORD,,
+configaroo-0.4.2.dist-info/licenses/LICENSE,sha256=rdeT6Y5bm0MUaERso7HRWpPj37Y1RD5li2lIQaMNJjc,1090
+configaroo-0.4.2.dist-info/METADATA,sha256=i3TOmbmkG6e85-OGWqNK_sKC6CCBmjhlj8vtbreGVL8,2672
+configaroo-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+configaroo-0.4.2.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
+configaroo-0.4.2.dist-info/RECORD,,