feat: Removed 'as' from workflow mapping output declaration

Author: Alan Christie

tests/test_decoder.py

@@ -317,37 +317,36 @@ def test_get_workflow_outputs_for_step_with_name_step1():
     # Arrange
 
     # Act
-    outputs = decoder.get_workflow_output_values_for_step(
+    has_outputs = decoder.workflow_step_has_outputs(
         _SIMPLE_PYTHON_MOLPROPS_WITH_OPTIONS_WORKFLOW, "step1"
     )
 
     # Assert
-    assert not outputs
+    assert not has_outputs
 
 
 def test_get_workflow_outputs_for_step_with_name_step2():
     # Arrange
 
     # Act
-    outputs = decoder.get_workflow_output_values_for_step(
+    has_outputs = decoder.workflow_step_has_outputs(
         _SIMPLE_PYTHON_MOLPROPS_WITH_OPTIONS_WORKFLOW, "step2"
     )
 
     # Assert
-    assert len(outputs) == 1
-    assert "clustered-molecules.smi" in outputs
+    assert has_outputs
 
 
 def test_get_workflow_outputs_for_step_with_unkown_step_name():
     # Arrange
 
     # Act
-    outputs = decoder.get_workflow_output_values_for_step(
+    has_outputs = decoder.workflow_step_has_outputs(
         _SIMPLE_PYTHON_MOLPROPS_WITH_OPTIONS_WORKFLOW, "unknown"
     )
 
     # Assert
-    assert not outputs
+    assert not has_outputs
 
 
 def test_get_step_input_variable_names_when_duplicates():

tests/test_test_api_adapter.py

@@ -450,7 +450,6 @@ def test_basic_realise():
     # Act
     response, _ = utaa.realise_outputs(
         running_workflow_step_id="r-workflow-step-00000000-0000-0000-0000-000000000001",
-        outputs=["a.txt"],
     )
 
     # Assert

tests/wapi_adapter.py

@@ -398,8 +398,7 @@ def get_running_workflow_step_outputs(
         return {"outputs": []}, HTTPStatus.OK
 
     def realise_outputs(
-        self, *, running_workflow_step_id: str, outputs: list[str, str]
+        self, *, running_workflow_step_id: str
     ) -> tuple[dict[str, Any], int]:
         del running_workflow_step_id
-        del outputs
         return {}, HTTPStatus.OK

tests/workflow-definitions/duplicate-step-output-variable-names.yaml

@@ -11,7 +11,6 @@ variable-mapping:
     from:
       step: step-2
       output: outputFile
-    as: clustered-molecules.smi
 
 steps:
 

tests/workflow-definitions/duplicate-workflow-variable-names.yaml

@@ -11,7 +11,6 @@ variable-mapping:
     from:
       step: step2
       output: outputFile
-    as: clustered-molecules.smi
 
 steps:
 

tests/workflow-definitions/replicate-using-undeclared-input.yaml

@@ -11,7 +11,6 @@ variable-mapping:
     from:
       step: step2
       output: outputFile
-    as: clustered-molecules.smi
 
 steps:
 

tests/workflow-definitions/simple-python-molprops-with-options.yaml

@@ -61,7 +61,6 @@ variable-mapping:
     from:
       step: step2
       output: outputFile
-    as: clustered-molecules.smi
   options:
   - name: rdkitPropertyName
     default: name

tests/workflow-definitions/simple-python-molprops.yaml

@@ -11,7 +11,6 @@ variable-mapping:
     from:
       step: step2
       output: outputFile
-    as: clustered-molecules.smi
 
 steps:
 

tests/workflow-definitions/simple-python-parallel.yaml

@@ -11,7 +11,6 @@ variable-mapping:
     from:
       step: final-step
       output: outputFile
-    as: clustered-molecules.smi
 
 
 steps:

workflow/decoder.py

@@ -132,22 +132,14 @@ def get_workflow_job_input_names_for_step(
     return inputs
 
 
-def get_workflow_output_values_for_step(
-    definition: dict[str, Any], name: str
-) -> list[str]:
-    """Given a Workflow definition and a step name we return a list of workflow
-    out variable names the step creates. To do this we iterate through the workflows's
-    outputs to find those that are declared 'from' our step."""
+def workflow_step_has_outputs(definition: dict[str, Any], name: str) -> bool:
+    """Given a Workflow definition and a step name we return a boolean
+    that is true if the step produces outputs."""
     wf_outputs = definition.get("variable-mapping", {}).get("outputs", {})
-    outputs: list[str] = []
-    outputs.extend(
-        output["as"]
+    return any(
+        "from" in output and "step" in output["from"] and output["from"]["step"] == name
         for output in wf_outputs
-        if "from" in output
-        and "step" in output["from"]
-        and output["from"]["step"] == name
     )
-    return outputs
 
 
 def set_variables_from_options_for_step(