applied Ghisvail's review suggestions

Author: tclose

pydra/engine/core.py

@@ -599,7 +599,7 @@ def split(
         if splitter is None and inputs:
             splitter = list(inputs)
         elif splitter:
-            missing = set(self._unwrap_splitter(splitter)) - set(inputs)
+            missing = set(hlpst.unwrap_splitter(splitter)) - set(inputs)
             missing = [m for m in missing if not m.startswith("_")]
             if missing:
                 raise ValueError(
@@ -619,7 +619,7 @@ def split(
             new_inputs = {}
             split_inputs = set(
                 f"{self.name}.{n}" if "." not in n else n
-                for n in self._unwrap_splitter(splitter)
+                for n in hlpst.unwrap_splitter(splitter)
                 if not n.startswith("_")
             )
             for inpt_name, inpt_val in inputs.items():
@@ -643,28 +643,6 @@ def split(
             self.set_state(splitter)
         return self
 
-    @classmethod
-    def _unwrap_splitter(
-        cls, splitter: ty.Union[str, ty.List[str], ty.Tuple[str, ...]]
-    ) -> ty.Iterable[str]:
-        """Unwraps a splitter into a flat list of fields that are split over, i.e.
-        [("a", "b"), "c"] -> ["a", "b", "c"]
-
-        Parameters
-        ----------
-        splitter: str or list[str] or tuple[str, ...]
-            the splitter spec to unwrap
-
-        Returns
-        -------
-        unwrapped : ty.Iterable[str]
-            the field names listed in the splitter
-        """
-        if isinstance(splitter, str):
-            return [splitter]
-        else:
-            return itertools.chain(*(cls._unwrap_splitter(s) for s in splitter))
-
     def combine(
         self,
         combiner: ty.Union[ty.List[str], str],

pydra/engine/helpers_state.py

@@ -337,6 +337,8 @@ def add_name_splitter(
         return _add_name(list(splitter), name)
     elif isinstance(splitter, tuple):
         return tuple(_add_name(list(splitter), name))
+    else:
+        return None
 
 
 def _add_name(mlist, name):
@@ -627,3 +629,25 @@ def inputs_types_to_dict(name, inputs):
     for field in input_names:
         inputs_dict[f"{name}.{field}"] = getattr(inputs, field)
     return inputs_dict
+
+
+def unwrap_splitter(
+    splitter: ty.Union[str, ty.List[str], ty.Tuple[str, ...]]
+) -> ty.Iterable[str]:
+    """Unwraps a splitter into a flat list of fields that are split over, i.e.
+    [("a", "b"), "c"] -> ["a", "b", "c"]
+
+    Parameters
+    ----------
+    splitter: str or list[str] or tuple[str, ...]
+        the splitter spec to unwrap
+
+    Returns
+    -------
+    unwrapped : ty.Iterable[str]
+        the field names listed in the splitter
+    """
+    if isinstance(splitter, str):
+        return [splitter]
+    else:
+        return itertools.chain(*(unwrap_splitter(s) for s in splitter))

pydra/engine/tests/test_helpers.py

@@ -236,9 +236,9 @@ def test_load_and_run_wf(tmpdir):
     """testing load_and_run for pickled task"""
     wf_pkl = Path(tmpdir.join("wf_main.pkl"))
 
-    wf = Workflow(name="wf", input_spec=["x", "y"])
+    wf = Workflow(name="wf", input_spec=["x", "y"], y=10)
     wf.add(multiply(name="mult", x=wf.lzin.x, y=wf.lzin.y))
-    wf.split("x", x=[1, 2], y=10)
+    wf.split("x", x=[1, 2])
 
     wf.set_output([("out", wf.mult.lzout.out)])
 

pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "cloudpickle >=2.0.0",
     "etelemetry >=0.2.2",
     "filelock >=3.0.0",
-    "fileformats >=0.6",
+    "fileformats >=0.8",
     "importlib_resources >=5.7; python_version < '3.11'",
     "typing_extensions >=4.6.3; python_version < '3.10'",
     "typing_utils >=0.1.0; python_version < '3.10'",