fix: ignored value when using default_factory in field

Author: bpiwowar

docs/connectors/index.md

@@ -1,6 +1,8 @@
 # Connectors
 
-- Localhost connector (default)
+Connectors define how to access a computer (file and process management). There are two types at the moment in experimaestro:
+
+- Localhost connector (by default)
 - SSH (alpha)
 
 

docs/launchers/index.md

@@ -1,14 +1,18 @@
 # Launchers
 
+Launchers, together with the [Connector](../connectors/index.md), specify how a task should be launched.
+There exist two types of launchers at the moment, [direct launcher](#direct) (starting
+a new process) or through [slurm](#slurm)
+
 ## Types
 
-### direct (default)
+### Direct
 
 By default, jobs are launched directly by the scheduler using python scripts.
 
 ::: experimaestro.launchers.direct.DirectLauncher
 
-### Slurm (since 0.8.7)
+### Slurm
 
 The [Slurm](https://slurm.schedmd.com/documentation.html) workload manager launcher is supported.
 It is possible to use different settings for different jobs by using the `config`

src/experimaestro/core/objects/config.py

@@ -339,6 +339,9 @@ def postprocess(self, stub, config: Config, values):
                     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)

src/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)))
 

src/experimaestro/tests/test_param.py

@@ -290,6 +290,26 @@ class A(Config):
         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