fixing issues with attr.NOTHING vs None

Author: djarecka

pydra/engine/helpers_file.py

@@ -494,7 +494,7 @@ def template_update(inputs, map_copyfiles=None):
     fields = attr_fields(inputs)
     # TODO: Create a dependency graph first and then traverse it
     for fld in fields:
-        if getattr(inputs, fld.name) is not None:
+        if getattr(inputs, fld.name) is not attr.NOTHING:
             continue
         if fld.metadata.get("output_file_template"):
             if fld.type is str:

pydra/engine/specs.py

@@ -373,7 +373,9 @@ def _field_metadata(self, fld, inputs, output_dir):
 class ContainerSpec(ShellSpec):
     """Refine the generic command-line specification to container execution."""
 
-    image: ty.Union[File, str] = attr.ib(metadata={"help_string": "image"})
+    image: ty.Union[File, str] = attr.ib(
+        metadata={"help_string": "image", "mandatory": True}
+    )
     """The image to be containerized."""
     container: ty.Union[File, str, None] = attr.ib(
         metadata={"help_string": "container"}

pydra/engine/task.py

@@ -463,7 +463,7 @@ def container_check(self, container_type):
             raise AttributeError(
                 f"Container type should be {container_type}, but {self.inputs.container} given"
             )
-        if self.inputs.image is None:
+        if self.inputs.image is attr.NOTHING:
             raise AttributeError("Container image is not specified")
 
     def bind_paths(self, ind=None):

pydra/engine/tests/test_shelltask.py

@@ -458,6 +458,7 @@ def test_shell_cmd_inputspec_3c(plugin, results_function):
                 "text",
                 attr.ib(
                     type=str,
+                    default=None,
                     metadata={"position": 1, "help_string": "text", "mandatory": False},
                 ),
             )

pydra/engine/tests/test_task.py

@@ -352,11 +352,9 @@ def test_shell_cmd(tmpdir):
 
 def test_container_cmds(tmpdir):
     containy = DockerTask(name="containy", executable="pwd")
-    with pytest.raises(AttributeError):
-        containy.cmdline
-    containy.inputs.container = "docker"
-    with pytest.raises(AttributeError):
+    with pytest.raises(AttributeError) as excinfo:
         containy.cmdline
+    assert "not specified" in str(excinfo.value)
     containy.inputs.image = "busybox"
     assert containy.cmdline