experimaestro 1.8.3__py3-none-any.whl → 1.8.5__py3-none-any.whl

experimaestro/core/objects/config.py

@@ -339,6 +339,9 @@ class ConfigInformation:
                     try:
                         if argument.generator:
                             if not isinstance(argument.generator, Generator):
+                                # Don't set if already set
+                                if config.__xpm__.values.get(k) is not None:
+                                    continue
                                 value = argument.generator()
                             else:
                                 sig = inspect.signature(argument.generator)
@@ -800,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/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/tests/test_identifier.py

@@ -38,6 +38,11 @@ class C(Config):
     b: Param[int]
 
 
+class CField(Config):
+    a: Param[int] = field(default_factory=lambda: 1)
+    b: Param[int]
+
+
 class D(Config):
     a: Param[A]
 
@@ -79,6 +84,10 @@ def test_param_default():
     assert_equal(C(a=1, b=2), C(b=2))
 
 
+def test_identifier_default_field():
+    assert_equal(CField(a=1, b=2), CField(b=2))
+
+
 def test_param_inner_eq():
     assert_equal(D(a=A(a=1)), D(a=A(a=1)))
 

experimaestro/tests/test_param.py

@@ -290,6 +290,26 @@ def test_default_mismatch():
         A.__getxpmtype__().getArgument("x")
 
 
+# --- Handling default with field
+
+
+def test_param_default_set():
+    """Test that the default setting is well set"""
+
+    class A0(Config):
+        x: Param[int] = 2
+
+    assert A0().instance().x == 2
+    assert A0(x=3).instance().x == 3
+
+    class A(Config):
+        x: Param[int] = field(default_factory=lambda: 2)
+
+    assert A().instance().x == 2
+
+    assert A(x=3).instance().x == 3
+
+
 # --- Handling help annotations
 
 

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)

{experimaestro-1.8.3.dist-info → experimaestro-1.8.5.dist-info}/METADATA

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

{experimaestro-1.8.3.dist-info → experimaestro-1.8.5.dist-info}/RECORD

@@ -17,9 +17,9 @@ experimaestro/core/callbacks.py,sha256=59JfeUgWcCCdIQ3pvh-xNnoRp9BX8f4iOAkgm16wB
 experimaestro/core/context.py,sha256=41jvgudz4sgMDWrqOhPbgFRJHa3klWKvS3l_L661er0,2600
 experimaestro/core/identifier.py,sha256=JadBAdW2fOIgoTyMRtKI_RY9SXQP2B1vq1rUcV465Hs,10214
 experimaestro/core/objects/__init__.py,sha256=ucJY5e17QQ1Kc-GYXeL7g8GFj8rP0XB4g2vrl32uhxY,721
-experimaestro/core/objects/config.py,sha256=epISMLkB27N6180K7ZRP30OJYhTKKrmzgB2TtIMXKbg,56762
+experimaestro/core/objects/config.py,sha256=qOUgCmX1NwhRhpTVxgr2sSAqBCMYloUXb5f-NiXgV8Q,56989
 experimaestro/core/objects/config_utils.py,sha256=ZLECGkeIWdzunm8vwWsQhvcSgV1e064BgXbLiZnxSEM,1288
-experimaestro/core/objects/config_walk.py,sha256=FOSsyJlntglWL8DshxwEbQPmNZ3ZE9r5yOvTKkmRTHw,4198
+experimaestro/core/objects/config_walk.py,sha256=gyDMrVPbBMChn7r4em_gQXuqnxASO_JVauEbnJNO8II,4245
 experimaestro/core/objects.pyi,sha256=xvlsRj4u1xsJxbevJl5Ner_HwmxR8x1JlAeIVDJzuy0,6498
 experimaestro/core/serialization.py,sha256=TLMTfU627bs9_1gyY2O5tX_xy1GhePIzleXwi27ffz0,5683
 experimaestro/core/serializers.py,sha256=R_CAMyjjfU1oi-eHU6VlEUixJpFayGqEPaYu7VsD9xA,1197
@@ -121,13 +121,13 @@ experimaestro/tests/test_dependencies.py,sha256=xfWrSkvjT45G4FSCL535m1huLT2ghmyW
 experimaestro/tests/test_experiment.py,sha256=QWF9aHewL9hepagrKKFyfikKn3iiZ_lRRXl1LLttta0,1687
 experimaestro/tests/test_findlauncher.py,sha256=8tjpR8bLMi6Gjs7KpY2t64izZso6bmY7vIivMflm-Bc,2965
 experimaestro/tests/test_forward.py,sha256=9y1zYm7hT_Lx5citxnK7n20cMZ2WJbsaEeY5irCZ9U4,735
-experimaestro/tests/test_identifier.py,sha256=L-r0S0dI9ErOZSmqGOPbbUZBvWJ-uzc3sijoyTPyMYU,13680
+experimaestro/tests/test_identifier.py,sha256=zgfpz5UumQftQTHhdw3nmr044Xd7Ntrh7e2hIAoS_PA,13862
 experimaestro/tests/test_instance.py,sha256=h-8UeoOlNsD-STWq5jbhmxw35CyiwJxtKAaUGmLPgB8,1521
 experimaestro/tests/test_objects.py,sha256=zycxjvWuJAbPR8-q2T3zuBY9xfmlhf1YvtOcrImHxnc,2431
 experimaestro/tests/test_outputs.py,sha256=DYzPk5TT_yLumy8SsQbl-S66ivVxJ-ERFrZ68KQZ4KU,781
-experimaestro/tests/test_param.py,sha256=R6NTuOBXJiL0wnshwG1KRtGtLUijI5WnBzzdg26qiXo,6899
+experimaestro/tests/test_param.py,sha256=7BltCUm9uhtEupJZ-QSaj7MxuXoUl73NjE8NfzJD5BA,7290
 experimaestro/tests/test_progress.py,sha256=wtIGQzlV3ldd_wMng11LinVESchW-1J954mCJNlG28E,7580
-experimaestro/tests/test_serializers.py,sha256=p3WdDsifizn5FDq_jIYTm0Z2AWf62P4B6nnzcVgHoYA,2341
+experimaestro/tests/test_serializers.py,sha256=u3A5JbusN8aW6x6reUIwpU1Fs-avnzTRU7WuTear9Qs,2722
 experimaestro/tests/test_snippets.py,sha256=rojnyDjtmAMnSuDUj6Bv9XEgdP8oQf2nVc132JF8vsM,3081
 experimaestro/tests/test_ssh.py,sha256=KS1NWltiXrJBSStY9d4mwrexeqgNGWmhxuAU_WLQDAU,1449
 experimaestro/tests/test_tags.py,sha256=v_8_7LuEHfY_gfa0JRCUkmgJh8h6RMya_nd5NcPAJPw,2852
@@ -150,8 +150,8 @@ experimaestro/utils/jupyter.py,sha256=JcEo2yQK7x3Cr1tNl5FqGMZOICxCv9DwMvL5xsWdQP
 experimaestro/utils/resources.py,sha256=j-nvsTFwmgENMoVGOD2Ap-UD3WU85WkI0IgeSszMCX4,1328
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-1.8.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.8.3.dist-info/METADATA,sha256=L2btz-EOgp-zccRy5qjyYvmkxp-Q7j9VDyiLOy3OXbc,6170
-experimaestro-1.8.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-experimaestro-1.8.3.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-1.8.3.dist-info/RECORD,,
+experimaestro-1.8.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.8.5.dist-info/METADATA,sha256=0qVBZsnk31ZTq0hrOn9yOW7xTggTuTzqX5j5uZaQ3zA,6170
+experimaestro-1.8.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+experimaestro-1.8.5.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-1.8.5.dist-info/RECORD,,