0.2.1:

- Allow callbacks for file defaults

Author: spacemanspiff2007

readme.md

@@ -152,6 +152,9 @@ sub.cancel()
 ```
 
 # Changelog
+#### 0.2.1 (25.03.2022)
+- Allow callbacks for file defaults
+
 #### 0.2.0 (25.03.2022)
 - Switched to new and more flexible API
 - File default and config default are now separated
@@ -173,6 +176,5 @@ sub.cancel()
 - Use json representation of values to get native yaml data types
 - Use enum values instead of enum types
 
-
 #### 0.0.1 (14.09.2021)
 - Initial release

setup.py

@@ -42,9 +42,10 @@ def load_req() -> typing.List[str]:
     description="Easy application configuration with yaml files",
     keywords=[
         'yaml',
-        'openhab',
-        'habapp',
-        'home automation'
+        'configuration',
+        'pydantic',
+        'settings',
+        'config'
     ],
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -55,15 +56,16 @@ def load_req() -> typing.List[str]:
     package_dir={'': 'src'},
     packages=find_packages('src', exclude=['tests*']),
     install_requires=load_req(),
+    python_requires='>=3.8',
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Natural Language :: English",
         "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Software Development :: Libraries"
     ],

src/easyconfig/__version__.py

@@ -1 +1 @@
-__version__ = '0.2.0'
+__version__ = '0.2.1'

src/easyconfig/config_objs/app_config.py

@@ -1,13 +1,15 @@
+from inspect import isfunction
 from pathlib import Path
-from typing import Any, Dict, Optional, Tuple, TypeVar, Union
+from typing import Any, Callable, Dict, Optional, Tuple, TypeVar, Union
 
 from pydantic import BaseModel, Extra
 from typing_extensions import Self
 
 from easyconfig.__const__ import MISSING, MISSING_TYPE
-from .object_config import ConfigObj
 from easyconfig.yaml import cmap_from_model, CommentedMap, write_aligned_yaml, yaml_rt
 
+from .object_config import ConfigObj
+
 
 class AppConfig(ConfigObj):
     def __init__(self, model: BaseModel, path: Tuple[str, ...] = ('__root__',),
@@ -59,13 +61,18 @@ def load_config_file(self, path: Union[Path, str] = None):
 
 
 def create_app_config(model: TYPE_WRAPPED,
-                      file_values: Union[MISSING_TYPE, None, BaseModel, Dict[str, Any]] = MISSING,
+                      file_values: Union[MISSING_TYPE, None, BaseModel, Dict[str, Any],
+                                         Callable[[], Union[BaseModel, Dict[str, Any]]]] = MISSING,
                       validate_file_values=True) -> TYPE_WRAPPED:
 
     # Implicit default
     if file_values is MISSING:
         file_values = model
 
+    # if it's a callback we get the values
+    if isfunction(file_values):
+        file_values = file_values()
+
     # Validate default
     if file_values is not None:
         if isinstance(file_values, dict):

src/easyconfig/config_objs/object_config.py

@@ -107,6 +107,10 @@ def _set_values(self, obj: BaseModel) -> bool:
     def __repr__(self):
         return f'<{self.__class__.__name__} {".".join(self._obj_path)}>'
 
+    def __getattr__(self, item):
+        # delegate call to model
+        return getattr(self._last_model, item)
+
     # ------------------------------------------------------------------------------------------------------------------
     # Match class signature with the Mixin Classes
     # ------------------------------------------------------------------------------------------------------------------

tests/test_config_objs/test_app_creation.py

@@ -13,3 +13,17 @@ class SimpleModel(BaseModel):
 
     with pytest.raises(ValidationError):
         create_app_config(SimpleModel(), {'aaaa': 'asdf'})
+
+
+def test_callback():
+    class SimpleModel(BaseModel):
+        a: int = Field(5, alias='aaa')
+
+    def get_default():
+        return SimpleModel(aaa=999)
+
+    a = create_app_config(SimpleModel(), get_default)
+    assert a._file_defaults.a == 999
+
+    a = create_app_config(SimpleModel(), lambda: {'aaa': 999})
+    assert a._file_defaults.a == 999

tests/test_config_objs/test_config_obj.py

@@ -32,3 +32,18 @@ class SimpleModel(BaseModel):
         o.from_orm()
 
     assert str(e.value) == 'Call "load_config_dict" or "load_config_file" on the app config instance!'
+
+
+def test_attr_access():
+    test_list = []
+
+    class SimpleModel(BaseModel):
+        a: int = 5
+
+        def append(self):
+            test_list.append(True)
+
+    o = ConfigObj.from_model(SimpleModel())
+    o.append()
+
+    assert test_list == [True]

tests/test_pydantic/test_field_access.py

@@ -26,7 +26,6 @@ class UserModel(MyModel):
 
 
 def test_get_model_desc():
-
     assert list(UserModel.__fields__.keys()) == ['val_int', 'val_f', 'val_str', ]
 
     for field in UserModel.__fields__.values():