CTADIRAC 3.0.8.dev2__tar.gz → 3.0.8.dev3__tar.gz

{ctadirac-3.0.8.dev2/src/CTADIRAC.egg-info → ctadirac-3.0.8.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTADIRAC
-Version: 3.0.8.dev2
+Version: 3.0.8.dev3
 Summary: CTADIRAC is an extension of the DIRAC interware for dedicated CTA usage.
 Author-email: Luisa Arrabito <arrabito@in2p3.fr>
 License: BSD 3-Clause License

{ctadirac-3.0.8.dev2 → ctadirac-3.0.8.dev3}/src/CTADIRAC/Interfaces/Utilities/CWLTranslator.py

@@ -378,37 +378,44 @@ class CWLTranslator:
         """
         for output in step.run.outputs:
             output_name = output.id.rpartition("#")[2].split("/")[-1]
-            if output.outputBinding.glob:
-                # the glob is an expression we evaluate it
-                glob_exp = (
-                    output.outputBinding.glob
-                    if output.outputBinding.glob.startswith("$(")
-                    else None
-                )
-                if glob_exp:
-                    glob = do_eval(
-                        output.outputBinding.glob,
-                        inputs,
-                        outdir=None,
-                        requirements=[],
-                        tmpdir=None,
-                        resources={},
-                    )
-                    if step.scatter and isinstance(glob, list):
-                        for out in glob:
-                            self.evaluated_steps_outputs[
-                                self.current_step_name
-                            ].setdefault(output_name, []).append(
-                                format_output_by_type(out, output.type_)
-                            )
+            glob = output.outputBinding.glob
+            if glob:
+                if isinstance(glob, str):
+                    # the glob is an expression we evaluate it
+                    glob_exp = glob if glob.startswith("$(") else None
+                    if glob_exp:
+                        eval_glob = do_eval(
+                            glob,
+                            inputs,
+                            outdir=None,
+                            requirements=[],
+                            tmpdir=None,
+                            resources={},
+                        )
+                        if step.scatter and isinstance(eval_glob, list):
+                            for out in eval_glob:
+                                self.evaluated_steps_outputs[
+                                    self.current_step_name
+                                ].setdefault(output_name, []).append(
+                                    format_output_by_type(out, output.type_)
+                                )
+                        else:
+                            self.evaluated_steps_outputs[self.current_step_name][
+                                output_name
+                            ] = format_output_by_type(eval_glob, output.type_)
                     else:
                         self.evaluated_steps_outputs[self.current_step_name][
                             output_name
                         ] = format_output_by_type(glob, output.type_)
-                else:
-                    self.evaluated_steps_outputs[self.current_step_name][
-                        output_name
-                    ] = format_output_by_type(output.outputBinding.glob, output.type_)
+                elif isinstance(glob, list):
+                    self.evaluated_steps_outputs[self.current_step_name].setdefault(
+                        output_name, []
+                    )
+                    for g in glob:
+                        if isinstance(g, str):
+                            self.evaluated_steps_outputs[self.current_step_name][
+                                output_name
+                            ].append(format_output_by_type(g, output.type_))
 
     def _evaluate_expression_tool_outputs(
         self,

{ctadirac-3.0.8.dev2 → ctadirac-3.0.8.dev3}/src/CTADIRAC/Interfaces/Utilities/CWLUtilities.py

@@ -228,7 +228,7 @@ def format_output_by_type(
         if isinstance(out_type, str):
             if out_type in ["boolean", "string", "int"]:
                 return output
-            elif out_type == "File":
+            elif out_type in ["File", "File[]"]:
                 return {"class": "File", "path": output}
         elif isinstance(out_type, OutputArraySchema):
             if out_type.type_ == "File":

{ctadirac-3.0.8.dev2 → ctadirac-3.0.8.dev3}/src/CTADIRAC/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.0.8.dev2'
-__version_tuple__ = version_tuple = (3, 0, 8, 'dev2')
+__version__ = version = '3.0.8.dev3'
+__version_tuple__ = version_tuple = (3, 0, 8, 'dev3')
 
-__commit_id__ = commit_id = 'ge29143644'
+__commit_id__ = commit_id = 'g5cf3cc56a'

{ctadirac-3.0.8.dev2 → ctadirac-3.0.8.dev3/src/CTADIRAC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTADIRAC
-Version: 3.0.8.dev2
+Version: 3.0.8.dev3
 Summary: CTADIRAC is an extension of the DIRAC interware for dedicated CTA usage.
 Author-email: Luisa Arrabito <arrabito@in2p3.fr>
 License: BSD 3-Clause License

{ctadirac-3.0.8.dev2 → ctadirac-3.0.8.dev3}/tests/unit/api/test_cwl_translator.py

@@ -496,6 +496,50 @@ def test_get_scattered_inputs(step, inputs, expected_result):
                 }
             },
         ),
+        (
+            WorkflowStep(
+                id="/some/path#step_1",
+                in_=[],
+                out=[],
+                run=CommandLineTool(
+                    inputs=["input1"],
+                    outputs=[
+                        CommandOutputParameter(
+                            id="/some/path#step_1/output1",
+                            type_="File",
+                            outputBinding=CommandOutputBinding(glob="$(inputs.input1)"),
+                        ),
+                        CommandOutputParameter(
+                            id="/some/path#step_1/output2",
+                            type_="File[]",
+                            outputBinding=CommandOutputBinding(
+                                glob=["file3.txt", "file4.txt"]
+                            ),
+                        ),
+                    ],
+                    baseCommand="echo CLT1",
+                ),
+                scatter="input1",
+            ),
+            {
+                "input1": [
+                    {"class": "File", "path": "file1.txt"},
+                    {"class": "File", "path": "file2.txt"},
+                ],
+            },
+            {
+                "step_1": {
+                    "output1": [
+                        {"class": "File", "path": "file1.txt"},
+                        {"class": "File", "path": "file2.txt"},
+                    ],
+                    "output2": [
+                        {"class": "File", "path": "file3.txt"},
+                        {"class": "File", "path": "file4.txt"},
+                    ],
+                }
+            },
+        ),
     ],
 )
 def test_evaluate_step_outputs(step, inputs, expected_result):