fix: updated transformation hoooks group_size

Author: Stellatsuu

src/dirac_cwl_proto/execution_hooks/core.py

@@ -337,4 +337,6 @@ def from_cwl(cls, cwl_object: Any) -> Self:
 class TransformationExecutionHooksHint(ExecutionHooksHint):
     """Extended data manager for transformations."""
 
-    group_size: Optional[int] = Field(default=None, description="Input grouping configuration for transformation jobs")
+    group_size: Optional[Dict[str, int]] = Field(
+        default=None, description="Input grouping configuration for transformation jobs"
+    )

src/dirac_cwl_proto/transformation/__init__.py

@@ -112,7 +112,7 @@ def submit_transformation_router(transformation: TransformationSubmissionModel)
 
     if transformation.input_data:
         nb_files = len(transformation.input_data)
-        group_size = transformation_execution_hooks.group_size or nb_files
+        group_size = (transformation_execution_hooks.group_size or {}).get("input_data") or nb_files
         nb_groups = (nb_files + group_size - 1) // group_size
         logger.info("Creating %s jobs for the transformation with group size of %s...", nb_groups, group_size)
 

test/test_workflows.py

@@ -384,6 +384,8 @@ def test_run_nonblocking_transformation_success(cli_runner, cleanup, cwl_file, i
     assert "Transformation done" in clean_output, f"Failed to run the transformation: {result.stdout}"
 
 
+# TODO: re-enable this test once approval on questions of new Job Grouping
+@pytest.mark.skip(reason="Waiting for approval on new Job Grouping (the tested code is currently commented)")
 @pytest.mark.parametrize(
     "cwl_file, destination_source_input_data",
     [

test/workflows/automatic_job_grouping/job_grouping.cwl

@@ -19,7 +19,8 @@ outputs:
 
 hints:
   - class: dirac:ExecutionHooks
-    group_size: 46 # should create 4 jobs: 46/46/46/12 files
+    group_size:
+      input_data: 46 # should create 4 jobs: 46/46/46/12 files
     output_sandbox: ["result-file"]
 
 steps:

test/workflows/pi/type_dependencies/transformation/metadata-pi_gather.yaml

@@ -1,7 +1,7 @@
 - class: dirac:ExecutionHooks
   hook_plugin: QueryBasedPlugin
   group_size:
-    input-data: 5
+    input_data: 5
   configuration:
     num_points: 100
     query_root: "."