initial implementation of parameter groups

Author: mr-c

cwltool/argparser.py

@@ -1,6 +1,7 @@
 """Command line argument parsing for cwltool."""
 
 import argparse
+import copy
 import os
 import urllib
 from collections.abc import MutableMapping, MutableSequence, Sequence
@@ -10,7 +11,7 @@
 from .process import Process, shortname
 from .resolver import ga4gh_tool_registries
 from .software_requirements import SOFTWARE_REQUIREMENTS_ENABLED
-from .utils import DEFAULT_TMP_PREFIX
+from .utils import DEFAULT_TMP_PREFIX, CWLObjectType
 
 
 def arg_parser() -> argparse.ArgumentParser:
@@ -845,7 +846,7 @@ def __call__(
 
 
 def add_argument(
-    toolparser: argparse.ArgumentParser,
+    toolparser: Union[argparse.ArgumentParser, "argparse._ArgumentGroup"],
     name: str,
     inptype: Any,
     records: list[str],
@@ -962,14 +963,18 @@ def generate_parser(
     toolparser.add_argument("job_order", nargs="?", help="Job input json file")
     namemap["job_order"] = "job_order"
 
-    for inp in tool.tool["inputs"]:
-        name = shortname(inp["id"])
+    inps = copy.deepcopy(tool.tool["inputs"])
+
+    def process_input(
+        inp: CWLObjectType, parser: Union[argparse.ArgumentParser, "argparse._ArgumentGroup"]
+    ) -> None:
+        name = shortname(cast(str, inp["id"]))
         namemap[name.replace("-", "_")] = name
         inptype = inp["type"]
-        description = inp.get("doc", inp.get("label", ""))
+        description = cast(str, inp.get("doc", inp.get("label", "")))
         default = inp.get("default", None)
         add_argument(
-            toolparser,
+            parser,
             name,
             inptype,
             records,
@@ -980,4 +985,27 @@ def generate_parser(
             base_uri,
         )
 
+    if (groups := tool.tool.get("http://commonwl.org/cwltool#groups", None)) is not None:
+        for group_name in groups.keys():
+            group_inputs: list[CWLObjectType] = []
+            for input_name in groups[group_name]["groupMembers"]:
+                new_inps: list[CWLObjectType] = []
+                for inp in inps:
+                    if shortname(inp["id"]) == input_name:
+                        group_inputs.append(inp)
+                    else:
+                        new_inps.append(inp)
+                inps = new_inps
+
+            if len(group_inputs) > 0:
+                group = toolparser.add_argument_group(
+                    title=groups[group_name].get("label", group_name),
+                    description=groups[group_name].get("doc", None),
+                )
+                for inp in group_inputs:
+                    process_input(inp, group)
+
+    for inp in inps:
+        process_input(inp, toolparser)
+
     return toolparser

cwltool/extensions-v1.2.yml

@@ -240,6 +240,7 @@ $graph:
         - Specify the desired method of dealing with loop outputs
         - Default. Propagates only the last computed element to the subsequent steps when the loop terminates.
         - Propagates a single array with all output values to the subsequent steps when the loop terminates.
+
 - name: ShmSize
   type: record
   extends: cwl:ProcessRequirement
@@ -258,3 +259,24 @@ $graph:
         than 0. Unit is optional and can be `b` (bytes), `k` (kilobytes), `m`
         (megabytes), or `g` (gigabytes). If you omit the unit, the default is
         bytes. If you omit the size entirely, the value is `64m`."
+
+- name: Grouping
+  type: record
+  extends: [ sld:Documented ]
+  fields:
+    - name: GroupName
+      type: string
+    - name: groupMembers
+      type: string[]
+      jsonldPredicate:
+        "_type": "@id"
+        "_container": "@list"
+        refScope: 0
+
+- name: groups
+  type:
+    - type: array
+      items: "#Grouping"
+  inVocab: false
+  jsonldPredicate:
+    mapSubject: GroupName

tests/echo-groups.cwl

@@ -0,0 +1,29 @@
+#!/usr/bin/env cwl-runner
+cwlVersion: v1.0
+class: CommandLineTool
+inputs:
+  first:
+    type: string
+    inputBinding: {}
+  second:
+    type: string
+    inputBinding: {}
+outputs:
+  - id: out
+    type: string
+    outputBinding:
+      glob: out.txt
+      loadContents: true
+      outputEval: $(self[0].contents)
+baseCommand: echo
+stdout: out.txt
+
+
+$namespaces:
+  cwltool: "http://commonwl.org/cwltool#"
+
+cwltool:groups:
+  my_groups:
+    groupMembers: [first, second]
+    label: my great inputs
+    doc: "parameters related to the foobar feature"

tests/test_ext.py

@@ -285,3 +285,16 @@ def test_ext_validation_no_namespace_warning() -> None:
         "URI prefix 'cwltool' of 'cwltool:loop' not recognized, are you "
         "missing a $namespaces section?"
     ) not in stderr
+
+
+def test_ext_groups_help() -> None:
+    error_code, stdout, stderr = get_main_output([get_data("tests/echo-groups.cwl"), "--help"])
+    assert error_code == 0
+    assert (
+        """my great inputs:
+  parameters related to the foobar feature
+
+  --first FIRST
+  --second SECOND"""
+        in stdout
+    )