fix: added ExpressionTool and updated code

Author: Stellatsuu

src/dirac_cwl/submission_models.py

@@ -186,40 +186,34 @@ def validate_production(cls, values):
 # Temporary code, waiting on cwltool PR: https://github.com/common-workflow-language/cwltool/pull/2179.
 
 
-def validate_resource_requirements(task):
+def validate_resource_requirements(task: CommandLineTool | Workflow | ExpressionTool):
     """
-    Validate ResourceRequirements of a task (CommandLineTool, Workflow, WorkflowStep, WorkflowStep.run).
+    Validate ResourceRequirements of a task (CommandLineTool, ExpressionTool, Workflow, WorkflowStep).
 
     :param task: The task to validate
     """
-    cwl_req = _get_resource_requirement(task)
+    req = _get_resource_requirement(task)
 
-    # Validate Workflow/CLT requirements.
-    if cwl_req:
-        _validate_resource_requirement(cwl_req)
+    # Validate Workflow/CommandLineTool/ExpressionTool requirements.
+    if req:
+        _validate_resource_requirement(req)
 
     # Validate WorkflowStep requirements.
-    if not isinstance(task, CommandLineTool) and task.steps:
+    if isinstance(task, Workflow) and task.steps:
         for step in task.steps:
             step_req = _get_resource_requirement(step)
             if step_req:
                 _validate_resource_requirement(step_req)
 
             # Validate run requirements for each step if they exist.
             if step.run:
-                if isinstance(step.run, Workflow):
-                    # Validate nested Workflow requirements, if any.
-                    validate_resource_requirements(task=step.run)
-
-                step_run_req = _get_resource_requirement(step.run)
-                if step_run_req:
-                    _validate_resource_requirement(step_run_req)
+                validate_resource_requirements(task=step.run)
 
 
 def _validate_resource_requirement(requirement):
     """Validate a ResourceRequirement.
 
-    Verify that resourceMin is not higher than resourceMax (CommandLineTool, Workflow, WorkflowStep, WorkflowStep.run)
+    Verify that resourceMin is not higher than resourceMax (CommandLineTool, ExpressionTool, Workflow, WorkflowStep)
 
     :param requirement: The current ResourceRequirement to validate.
     :raises ValueError: If the requirement is invalid.
@@ -235,7 +229,7 @@ def _validate_resource_requirement(requirement):
 
 
 def _get_resource_requirement(
-    cwl_object: Workflow | CommandLineTool | WorkflowStep,
+    cwl_object: Workflow | CommandLineTool | ExpressionTool | WorkflowStep,
 ) -> ResourceRequirement | None:
     """
     Extract the resource requirement from the current cwl_object.

test/test_resource_requirements.py

@@ -3,7 +3,7 @@
 from typing import List, Optional
 
 import pytest
-from cwl_utils.parser.cwl_v1_2 import CommandLineTool, ResourceRequirement, Workflow, WorkflowStep
+from cwl_utils.parser.cwl_v1_2 import CommandLineTool, ExpressionTool, ResourceRequirement, Workflow, WorkflowStep
 
 from dirac_cwl.submission_models import JobSubmissionModel, ProductionSubmissionModel, TransformationSubmissionModel
 
@@ -55,6 +55,20 @@ def create_step(
     )
 
 
+def create_expressiontool(
+    requirements: Optional[list] = None,
+    inputs: Optional[list] = None,
+    outputs: Optional[list] = None,
+) -> CommandLineTool:
+    """Create an ExpressionTool with the given requirements, inputs, and outputs."""
+    return ExpressionTool(
+        expression="",
+        requirements=requirements or [],
+        inputs=inputs or [],
+        outputs=outputs or [],
+    )
+
+
 def assert_submission_fails(task):
     """Assert that submission fails with ValueError for Job and Transformation models with bad resource requirements.
 
@@ -86,17 +100,30 @@ def test_bad_min_max_resource_reqs(bad_min_max_reqs):
     clt = create_commandlinetool(requirements=[bad_min_max_reqs])
     assert_submission_fails(clt)
 
+    # ExpressionTool with bad minmax reqs
+    expression_tool = create_expressiontool(requirements=[bad_min_max_reqs])
+    assert_submission_fails(expression_tool)
+
     # WorkflowStep.run with bad minmax reqs
     step_bad_run = create_step(run=clt)
     workflow = create_workflow(steps=[step_bad_run])
     assert_submission_fails(workflow)
 
+    step_bad_run = create_step(run=expression_tool)
+    workflow = create_workflow(steps=[step_bad_run])
+    assert_submission_fails(workflow)
+
     # WorkflowStep with bad minmax reqs
     clt = create_commandlinetool()
     step = create_step(run=clt, requirements=[bad_min_max_reqs])
     workflow = create_workflow(steps=[step])
     assert_submission_fails(workflow)
 
+    expression_tool = create_commandlinetool()
+    step = create_step(run=expression_tool, requirements=[bad_min_max_reqs])
+    workflow = create_workflow(steps=[step])
+    assert_submission_fails(workflow)
+
     # Workflow with bad minmax reqs
     workflow = create_workflow(requirements=[bad_min_max_reqs])
     assert_submission_fails(workflow)