Updated outputMethod values

common-workflow-language · Sep 18, 2024 · 650f4c4 · 650f4c4
1 parent 4bb5329
commit 650f4c4
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 32 deletions.
diff --git a/cwltool/checker.py b/cwltool/checker.py
@@ -517,10 +517,10 @@ def is_conditional_step(param_to_step: Dict[str, CWLObjectType], parm_id: str) -
 
 
 def is_all_output_method_loop_step(param_to_step: Dict[str, CWLObjectType], parm_id: str) -> bool:
-    """Check if a step contains a `loop` directive with `all` outputMethod."""
+    """Check if a step contains a `loop` directive with `all_iterations` outputMethod."""
     source_step: Optional[MutableMapping[str, Any]] = param_to_step.get(parm_id)
     if source_step is not None:
-        if source_step.get("loop") is not None and source_step.get("outputMethod") == "all":
+        if source_step.get("loop") is not None and source_step.get("outputMethod") == "all_iterations":
             return True
     return False
 

diff --git a/cwltool/update.py b/cwltool/update.py
@@ -51,7 +51,16 @@ def rewrite_loop_requirements(t: CWLObjectType) -> None:
                                     el["outputSource"] = source
                             s["loop"] = r["loop"]
                         if "outputMethod" in r:
-                            s["outputMethod"] = r["outputMethod"]
+                            if r["outputMethod"] == "all":
+                                s["outputMethod"] = "all_iterations"
+                            elif r["outputMethod"] == "last":
+                                s["outputMethod"] = "last_iterations"
+                            else:
+                                raise SourceLine(
+                                    r, raise_type=ValidationException
+                                ).makeError(  # pragma: no cover
+                                    f"Invalid value {r["outputMethod"]} for `outputMethod`."
+                                )
                         cast(
                             MutableSequence[CWLObjectType],
                             s["requirements"],

diff --git a/cwltool/workflow_job.py b/cwltool/workflow_job.py
@@ -744,7 +744,7 @@ def valueFromFunc(k: str, v: Optional[CWLOutputType]) -> Optional[CWLOutputType]
                     _logger.info("[%s] will be skipped", step.name)
                     if (
                         step.tool.get("loop") is not None
-                        and step.tool.get("outputMethod", "last") == "all"
+                        and step.tool.get("outputMethod", "last_iteration") == "all_iterations"
                     ):
                         callback({k["id"]: [] for k in outputparms}, "skipped")
                     else:
@@ -874,7 +874,7 @@ def _set_empty_output(self, outputMethod: str) -> None:
         for i in self.step.tool["outputs"]:
             if "id" in i:
                 iid = cast(str, i["id"])
-                if outputMethod == "all":
+                if outputMethod == "all_iterations":
                     self.output_buffer[iid] = cast(MutableSequence[Optional[CWLOutputType]], [])
                 else:
                     self.output_buffer[iid] = None
@@ -887,7 +887,7 @@ def job(
     ) -> JobsGeneratorType:
         """Generate a WorkflowJobStep job until the `when` condition evaluates to False."""
         self.joborder = joborder
-        outputMethod = self.step.tool.get("outputMethod", "last")
+        outputMethod = self.step.tool.get("outputMethod", "last_iteration")
 
         callback = functools.partial(
             self.loop_callback,
@@ -953,14 +953,14 @@ def loop_callback(
         self.iteration += 1
         try:
             loop = cast(MutableSequence[CWLObjectType], self.step.tool.get("loop", []))
-            outputMethod = self.step.tool.get("outputMethod", "last")
+            outputMethod = self.step.tool.get("outputMethod", "last_iteration")
             state: Dict[str, Optional[WorkflowStateItem]] = {}
             for i in self.step.tool["outputs"]:
                 if "id" in i:
                     iid = cast(str, i["id"])
                     if iid in jobout:
                         state[iid] = WorkflowStateItem(i, jobout[iid], processStatus)
-                        if outputMethod == "all":
+                        if outputMethod == "all_iterations":
                             if iid not in self.output_buffer:
                                 self.output_buffer[iid] = cast(
                                     MutableSequence[Optional[CWLOutputType]], []

diff --git a/tests/loop/all-output-loop-no-iteration.cwl b/tests/loop/all-output-loop-no-iteration.cwl
@@ -25,4 +25,4 @@ steps:
     when: $(inputs.i1 < 1)
     loop:
       i1: o1
-    outputMethod: all
+    outputMethod: all_iterations
diff --git a/tests/loop/all-output-loop.cwl b/tests/loop/all-output-loop.cwl
@@ -25,4 +25,4 @@ steps:
     when: $(inputs.i1 < 10)
     loop:
       i1: o1
-    outputMethod: all
+    outputMethod: all_iterations
diff --git a/tests/loop/default-value-loop.cwl b/tests/loop/default-value-loop.cwl
@@ -44,4 +44,4 @@ steps:
       i1:
         outputSource: o1
         default: 5
-    outputMethod: all
+    outputMethod: all_iterations
diff --git a/tests/loop/invalid-loop-scatter.cwl b/tests/loop/invalid-loop-scatter.cwl
@@ -26,7 +26,7 @@ steps:
     when: $(inputs.i1 < 10)
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
     in:
       i1: i1
       i2: i2

diff --git a/tests/loop/invalid-loop-when-exception.cwl b/tests/loop/invalid-loop-when-exception.cwl
@@ -29,7 +29,7 @@ steps:
       }
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
     in:
       i1: i1
       i2: i2

diff --git a/tests/loop/invalid-loop-when-exception2.cwl b/tests/loop/invalid-loop-when-exception2.cwl
@@ -33,7 +33,7 @@ steps:
       }
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
     in:
       i1: i1
       i2: i2

diff --git a/tests/loop/invalid-multi-source-loop-no-requirement.cwl b/tests/loop/invalid-multi-source-loop-no-requirement.cwl
@@ -61,4 +61,4 @@ steps:
       i1:
         loopSource: [osmall, obig]
         pickValue: the_only_non_null
-    outputMethod: all
+    outputMethod: all_iterations
diff --git a/tests/loop/invalid-no-loopWhen.cwl b/tests/loop/invalid-no-loopWhen.cwl
@@ -25,7 +25,7 @@ steps:
         ${return {'o1': inputs.i1 + inputs.i2};}
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
     in:
       i1: i1
       i2: i2

diff --git a/tests/loop/invalid-non-boolean-loopWhen.cwl b/tests/loop/invalid-non-boolean-loopWhen.cwl
@@ -26,7 +26,7 @@ steps:
     when: $(inputs.i1)
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
     in:
       i1: i1
       i2: i2

diff --git a/tests/loop/invalid-non-boolean-loopWhen2.cwl b/tests/loop/invalid-non-boolean-loopWhen2.cwl
@@ -26,7 +26,7 @@ steps:
     when: '$(inputs.i1 == 1 ? true : "I am a string")'
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
     in:
       i1: i1
       i2: i2

diff --git a/tests/loop/invalid-value-from-loop-no-requirement.cwl b/tests/loop/invalid-value-from-loop-no-requirement.cwl
@@ -29,4 +29,4 @@ steps:
     loop:
       i1:
         valueFrom: $(inputs.i1 + 1)
-    outputMethod: last
+    outputMethod: last_iteration
diff --git a/tests/loop/loop-inside-loop-all.cwl b/tests/loop/loop-inside-loop-all.cwl
@@ -46,7 +46,7 @@ steps:
           when: $(inputs.i1 <= inputs.i2)
           loop:
             i1: o1
-          outputMethod: all
+          outputMethod: all_iterations
     in:
       i1: i1
       i2: i2
@@ -55,4 +55,4 @@ steps:
     loop:
       i2:
         valueFrom: $(inputs.i2 + 1)
-    outputMethod: all
+    outputMethod: all_iterations
diff --git a/tests/loop/loop-inside-loop.cwl b/tests/loop/loop-inside-loop.cwl
@@ -42,7 +42,7 @@ steps:
           when: $(inputs.i1 <= inputs.i2)
           loop:
             i1: o1
-          outputMethod: last
+          outputMethod: last_iteration
     in:
       i1: i1
       i2: i2
@@ -51,4 +51,4 @@ steps:
     loop:
       i2:
         valueFrom: $(inputs.i2 + 1)
-    outputMethod: all
+    outputMethod: all_iterations
diff --git a/tests/loop/loop-inside-scatter.cwl b/tests/loop/loop-inside-scatter.cwl
@@ -41,7 +41,7 @@ steps:
           when: $(inputs.i1 < 10)
           loop:
             i1: o1
-          outputMethod: last
+          outputMethod: last_iteration
     in:
       i1: i1
       i2: i2

diff --git a/tests/loop/multi-source-loop.cwl b/tests/loop/multi-source-loop.cwl
@@ -62,4 +62,4 @@ steps:
       i1:
         outputSource: [osmall, obig]
         pickValue: the_only_non_null
-    outputMethod: all
+    outputMethod: all_iterations
diff --git a/tests/loop/opt-var-loop.cwl b/tests/loop/opt-var-loop.cwl
@@ -27,4 +27,4 @@ steps:
     when: $(inputs.i1 < 10)
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
diff --git a/tests/loop/scatter-inside-loop.cwl b/tests/loop/scatter-inside-loop.cwl
@@ -46,4 +46,4 @@ steps:
     when: $(inputs.i1[0] < 10)
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
diff --git a/tests/loop/single-var-loop-no-iteration.cwl b/tests/loop/single-var-loop-no-iteration.cwl
@@ -26,4 +26,4 @@ steps:
     when: $(inputs.i1 < 1)
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
diff --git a/tests/loop/single-var-loop.cwl b/tests/loop/single-var-loop.cwl
@@ -26,4 +26,4 @@ steps:
     when: $(inputs.i1 < 10)
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
diff --git a/tests/loop/two-vars-loop-2.cwl b/tests/loop/two-vars-loop-2.cwl
@@ -28,4 +28,4 @@ steps:
     when: $(inputs.i1 < 10)
     loop:
       i1: o1
-    outputMethod: last
+    outputMethod: last_iteration
diff --git a/tests/loop/two-vars-loop.cwl b/tests/loop/two-vars-loop.cwl
@@ -30,4 +30,4 @@ steps:
     loop:
       i1: o1
       i2: o2
-    outputMethod: last
+    outputMethod: last_iteration
diff --git a/tests/loop/value-from-loop.cwl b/tests/loop/value-from-loop.cwl
@@ -30,4 +30,4 @@ steps:
     loop:
       i1:
         valueFrom: $(inputs.i1 + 1)
-    outputMethod: last
+    outputMethod: last_iteration
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ steps: @@
         when: $(inputs.i1 < 10)
         loop:
           i1: o1
-        outputMethod: last
+        outputMethod: last_iteration
         in:
           i1: i1
           i2: i2
@@ Expand Down @@