X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4b037a38dbe848a77224dd05dd035736b5d0c0c1..5fc627d22b47723289251e1e1d9dc45c0e1bd49e:/sdk/cwl/arvados_cwl/__init__.py diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py index 7a951e93ca..a22b075ce4 100644 --- a/sdk/cwl/arvados_cwl/__init__.py +++ b/sdk/cwl/arvados_cwl/__init__.py @@ -183,7 +183,7 @@ class ArvCwlRunner(object): for v in obj: self.check_writable(v) - def make_output_collection(self, name, outputObj): + def make_output_collection(self, name, outputObj, tagsString): outputObj = copy.deepcopy(outputObj) files = [] @@ -234,6 +234,11 @@ class ArvCwlRunner(object): final.api_response()["name"], final.manifest_locator()) + final_uuid = final.manifest_locator() + tags = tagsString.split(',') + for tag in tags: + self.api.links().create(body={"head_uuid": final_uuid, "link_class": "tag", "name": tag}).execute() + self.final_output_collection = final def set_crunch_output(self): @@ -390,7 +395,7 @@ class ArvCwlRunner(object): else: if self.output_name is None: self.output_name = "Output of %s" % (shortname(tool.tool["id"])) - self.make_output_collection(self.output_name, self.final_output) + self.make_output_collection(self.output_name, self.final_output, kwargs.get("output_tags", "")) self.set_crunch_output() if self.final_status != "success": @@ -448,6 +453,7 @@ def arg_parser(): # type: () -> argparse.ArgumentParser parser.add_argument("--project-uuid", type=str, metavar="UUID", help="Project that will own the workflow jobs, if not provided, will go to home project.") parser.add_argument("--output-name", type=str, help="Name to use for collection that stores the final output.", default=None) + parser.add_argument("--output-tags", type=str, help="Tags for the final output collection separated by commas, e.g., '--output-tags tag0,tag1,tag2'.", default=None) parser.add_argument("--ignore-docker-for-reuse", action="store_true", help="Ignore Docker image version when deciding whether to reuse past jobs.", default=False) @@ -469,7 +475,7 @@ def arg_parser(): # type: () -> argparse.ArgumentParser parser.add_argument("--api", type=str, default=None, dest="work_api", - help="Select work submission API, one of 'jobs' or 'containers'.") + help="Select work submission API, one of 'jobs' or 'containers'. Default is 'jobs' if that API is available, otherwise 'containers'.") parser.add_argument("--compute-checksum", action="store_true", default=False, help="Compute checksum of contents while collecting outputs",