defaults is now a method

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "springs"
-version = "1.4.2"
+version = "1.4.3"
 description = "A set of utilities to create and manage typed configuration files effectively, built on top of OmegaConf."
 authors = [
     {name = "Luca Soldaini", email = "[email protected]" }

src/springs/core.py

@@ -48,7 +48,7 @@ def from_dataclass(config: Any) -> DictConfig:
         return from_none()
 
     if isclass(config) and issubclass(config, FlexyClass):
-        config = config.defaults
+        config = config.defaults()
 
     elif not is_dataclass(config):
         raise TypeError(f"`{config}` is not a dataclass!")

src/springs/flexyclasses.py

@@ -47,7 +47,6 @@ def _unpack_if_dataclass_field(cls, value: Any) -> Any:
         return value
 
     @classmethod
-    @property
     def defaults(cls):
         """The default values for the FlexyClass"""
 
@@ -59,7 +58,7 @@ def __new__(cls, **kwargs):
         # We completely change how the constructor works to allow users
         # to use flexyclasses in the same way they would use a dataclass.
         factory_dict: Dict[str, Any] = {}
-        factory_dict = {**cls.defaults, **kwargs}
+        factory_dict = {**cls.defaults(), **kwargs}
         return field(default_factory=lambda: factory_dict)
 
     @classmethod

tests/test_new_merge.py

@@ -68,7 +68,7 @@ def test_second_override(self):
         self.assertEqual(out.c._target_, "springs.core")
 
     def test_third_override(self):
-        override_dict = {"cn": {"c_1": {**ObjConfig.defaults, "bar": 33}}}
+        override_dict = {"cn": {"c_1": {**ObjConfig.defaults(), "bar": 33}}}
 
         config: DictConfig = OmegaConf.structured(AppCfg)
         out = merge(config, OmegaConf.create(override_dict))