configaroo 0.1.3__py3-none-any.whl → 0.2.1__py3-none-any.whl

configaroo/__init__.py

@@ -1,10 +1,17 @@
 """Bouncy configuration handling"""
 
-from configaroo.configuration import Configuration  # noqa
-from configaroo.exceptions import (  # noqa
+from configaroo.configuration import Configuration
+from configaroo.exceptions import (
     ConfigarooException,
     MissingEnvironmentVariableError,
     UnsupportedLoaderError,
 )
 
-__version__ = "0.1.3"
+__all__ = [
+    "Configuration",
+    "ConfigarooException",
+    "MissingEnvironmentVariableError",
+    "UnsupportedLoaderError",
+]
+
+__version__ = "0.2.1"

configaroo/configuration.py

@@ -5,13 +5,15 @@ import os
 import re
 from collections import UserDict
 from pathlib import Path
-from typing import Any, Self, Type
+from typing import Any, Self, Type, TypeVar
 
 from pydantic import BaseModel
 
 from configaroo import loaders
 from configaroo.exceptions import MissingEnvironmentVariableError
 
+ModelT = TypeVar("ModelT", bound=BaseModel)
+
 
 class Configuration(UserDict):
     """A Configuration is a dict-like structure with some conveniences"""
@@ -24,12 +26,11 @@ class Configuration(UserDict):
         envs: dict[str, str] | None = None,
         env_prefix: str = "",
         extra_dynamic: dict[str, Any] | None = None,
-        model: Type[BaseModel] | None = None,
     ) -> Self:
         """Read a Configuration from a file"""
         config_dict = loaders.from_file(file_path, loader=loader)
         return cls(config_dict).initialize(
-            envs=envs, env_prefix=env_prefix, extra_dynamic=extra_dynamic, model=model
+            envs=envs, env_prefix=env_prefix, extra_dynamic=extra_dynamic
         )
 
     def initialize(
@@ -37,18 +38,17 @@ class Configuration(UserDict):
         envs: dict[str, str] | None = None,
         env_prefix: str = "",
         extra_dynamic: dict[str, Any] | None = None,
-        model: Type[BaseModel] | None = None,
     ) -> Self:
         """Initialize a configuration.
 
-        The initialization adds environment variables, parses dynamic values,
-        validates against a Pydantic model, and converts value types using the
-        same model.
+        The initialization adds environment variables and parses dynamic values.
         """
         self = self if envs is None else self.add_envs(envs, prefix=env_prefix)
-        self = self.parse_dynamic(extra_dynamic)
-        self = self if model is None else self.validate(model).convert(model)
-        return self
+        return self.parse_dynamic(extra_dynamic)
+
+    def with_model(self, model: Type[ModelT]) -> ModelT:
+        """Apply a pydantic model to a configuration."""
+        return self.validate_model(model).convert_model(model)
 
     def __getitem__(self, key: str) -> Any:
         """Make sure nested sections have type Configuration"""
@@ -108,18 +108,20 @@ class Configuration(UserDict):
                 )
         return self
 
-    def parse_dynamic(self, extra: dict[str, Any] | None = None) -> Self:
+    def parse_dynamic(
+        self, extra: dict[str, Any] | None = None, _include_self: bool = True
+    ) -> Self:
         """Parse dynamic values of the form {section.key}"""
         cls = type(self)
         variables = (
-            self.to_flat_dict()
+            (self.to_flat_dict() if _include_self else {})
             | {"project_path": _find_pyproject_toml()}
             | ({} if extra is None else extra)
         )
-        return cls(
+        parsed = cls(
             {
                 key: (
-                    value.parse_dynamic(extra=variables)
+                    value.parse_dynamic(extra=variables, _include_self=False)
                     if isinstance(value, Configuration)
                     else _incomplete_format(value, variables)
                     if isinstance(value, str)
@@ -128,16 +130,19 @@ class Configuration(UserDict):
                 for key, value in self.items()
             }
         )
+        if parsed == self:
+            return parsed
+        # Continue parsing until no more replacements are made.
+        return parsed.parse_dynamic(extra=extra, _include_self=_include_self)
 
-    def validate(self, model: Type[BaseModel]) -> Self:
+    def validate_model(self, model: Type[BaseModel]) -> Self:
         """Validate the configuration against the given model."""
         model.model_validate(self.data)
         return self
 
-    def convert(self, model: Type[BaseModel]) -> Self:
+    def convert_model(self, model: Type[ModelT]) -> ModelT:
         """Convert data types to match the given model"""
-        cls = type(self)
-        return cls(model(**self.data).model_dump())
+        return model(**self.data)
 
     def to_dict(self) -> dict[str, Any]:
         """Dump the configuration into a Python dictionary"""

{configaroo-0.1.3.dist-info → configaroo-0.2.1.dist-info}/METADATA

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

configaroo-0.2.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+configaroo/__init__.py,sha256=-rsRqALc9-loy4qWJQHYE6QG0rZ1gwYjIUPy72DbsZg,371
+configaroo/configuration.py,sha256=a39w6uHJMrc8pDbHZJX0dr8DVZ6gMFbFSLUlEPCMCdw,7779
+configaroo/exceptions.py,sha256=1h-6hV7VqqKaRFnu539pjsO0ESSNDibt2kUeF7jAM2M,374
+configaroo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+configaroo/loaders/__init__.py,sha256=-6GAR4g7vYW7Zagq9Ev479kpkfY7kbvDl4JPXd4wQQ0,756
+configaroo/loaders/json.py,sha256=6gs_ZegUEe70vb6uSJfKBos7UjfuJnyWgPE_kjDQISw,258
+configaroo/loaders/toml.py,sha256=ZVbHutZ7V-Z_jf2aHjV18jwaqCXumlr06j48rojHcBM,264
+configaroo-0.2.1.dist-info/licenses/LICENSE,sha256=2cbzsB4lU8qOO8fO1XVNJD7XPxzPhaWXm6U9DenSc0s,1089
+configaroo-0.2.1.dist-info/METADATA,sha256=0Od55T9MEvRBhi4JHllAU2S0U9NBl0T99yA2Axsf0wk,1789
+configaroo-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+configaroo-0.2.1.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
+configaroo-0.2.1.dist-info/RECORD,,

{configaroo-0.1.3.dist-info → configaroo-0.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

configaroo-0.1.3.dist-info/RECORD

@@ -1,12 +0,0 @@
-configaroo/__init__.py,sha256=aiOAkxMR9x3VgmQI9ppQ8uzx-gHGvZ-AjQabE1HpZ2E,255
-configaroo/configuration.py,sha256=PJLWR2mA_bYM7iuRXqfBQ_rnZoughNCFA5kAEjjZz8A,7591
-configaroo/exceptions.py,sha256=1h-6hV7VqqKaRFnu539pjsO0ESSNDibt2kUeF7jAM2M,374
-configaroo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-configaroo/loaders/__init__.py,sha256=-6GAR4g7vYW7Zagq9Ev479kpkfY7kbvDl4JPXd4wQQ0,756
-configaroo/loaders/json.py,sha256=6gs_ZegUEe70vb6uSJfKBos7UjfuJnyWgPE_kjDQISw,258
-configaroo/loaders/toml.py,sha256=ZVbHutZ7V-Z_jf2aHjV18jwaqCXumlr06j48rojHcBM,264
-configaroo-0.1.3.dist-info/licenses/LICENSE,sha256=2cbzsB4lU8qOO8fO1XVNJD7XPxzPhaWXm6U9DenSc0s,1089
-configaroo-0.1.3.dist-info/METADATA,sha256=kv0NQFHsskjUQBuDGe56FdZOUh4FtUWYzbZ3Y5fvju4,1789
-configaroo-0.1.3.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-configaroo-0.1.3.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
-configaroo-0.1.3.dist-info/RECORD,,