experimaestro 1.8.4__tar.gz → 1.8.6__tar.gz

{experimaestro-1.8.4 → experimaestro-1.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: experimaestro
-Version: 1.8.4
+Version: 1.8.6
 Summary: "Experimaestro is a computer science experiment manager"
 License: GPL-3
 Keywords: experiment manager

{experimaestro-1.8.4 → experimaestro-1.8.6}/pyproject.toml

@@ -20,7 +20,7 @@ include = [
     "src/experimaestro/mkdocs/style.css",
     { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
 ]
-version = "1.8.4"
+version = "1.8.6"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -122,7 +122,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.8.4"
+version = "1.8.6"
 changelog_start_rev = "v1.0.0"
 tag_format = "v$major.$minor.$patch$prerelease"
 # update_changelog_on_bump = true

{experimaestro-1.8.4 → experimaestro-1.8.6}/src/experimaestro/core/context.py

@@ -73,7 +73,7 @@ class SerializationContext:
 
 
 class SerializedPathLoader(Protocol):
-    def __call__(path: Union[Path, str, SerializedPath]) -> Path:
+    def __call__(self, path: Union[Path, str, SerializedPath]) -> Path:
         """Get a filesystem path from a relative path
 
         :param path: The relative path

{experimaestro-1.8.4 → experimaestro-1.8.6}/src/experimaestro/core/objects/config.py

@@ -803,6 +803,9 @@ class ConfigInformation:
     def __collect_objects__(value, objects: List[Dict], context: SerializationContext):
         """Serialize all needed configuration objects, looking at sub
         configurations if necessary"""
+        if value is None:
+            return
+
         if isinstance(value, Config):
             value.__xpm__.__get_objects__(objects, context)
         elif isinstance(value, (list, tuple)):

{experimaestro-1.8.4 → experimaestro-1.8.6}/src/experimaestro/core/objects/config_walk.py

@@ -129,6 +129,9 @@ class ConfigWalk:
             self.visited[xid] = processed
             return processed
 
+        if x is None:
+            return None
+
         if isinstance(x, list):
             result = []
             for i, sv in enumerate(x):

{experimaestro-1.8.4 → experimaestro-1.8.6}/src/experimaestro/core/serialization.py

@@ -66,7 +66,8 @@ def save(obj: Any, save_directory: Optional[Path]):
 def get_data_loader(path: Union[str, Path, SerializedPathLoader]):
     if path is None:
 
-        def data_loader():
+        def data_loader(_: Union[str, Path, SerializedPathLoader]):
+            # Just raise an exception
             raise RuntimeError("No serialization path was given")
 
         return data_loader
@@ -170,7 +171,7 @@ def deserialize(
     with data_loader("definition.json").open("rt") as fh:
         content = json.load(fh)
 
-    object, init_tasks = from_state_dict(content, as_instance=as_instance)
+    object, init_tasks = from_state_dict(content, data_loader, as_instance=as_instance)
 
     if as_instance:
         for init_task in init_tasks:

{experimaestro-1.8.4 → experimaestro-1.8.6}/src/experimaestro/tests/test_serializers.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from experimaestro import (
     Config,
     Task,
@@ -78,8 +79,8 @@ class Object2(Config):
 def test_serializers_serialization():
     context = SerializationContext(save_directory=None)
 
-    obj1 = Object1()
-    obj2 = Object2(object=obj1)
+    obj1 = Object1.C()
+    obj2 = Object2.C(object=obj1)
 
     data = state_dict(context, [obj1, obj2])
 
@@ -92,3 +93,21 @@ def test_serializers_serialization():
     assert isinstance(obj1, Object1) and not isinstance(obj1, ConfigMixin)
     assert isinstance(obj2, Object2)
     assert obj2.object is obj1
+
+
+class SubConfig(Config):
+    pass
+
+
+class MultiParamObject(Config):
+    opt_a: Param[Optional[int]]
+
+    x: Param[dict[str, Optional[SubConfig]]]
+
+
+def test_serializers_types():
+    context = SerializationContext(save_directory=None)
+
+    config = MultiParamObject.C(x={"a": None})
+    config.__xpm__.seal(context)
+    state_dict(context, config)