From 2f089af0753c510db3c0ee9c85ade89ddec2113f Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Thu, 20 Apr 2023 11:45:17 -0600
Subject: [PATCH] fix single image carta and downloads for real. really.
---
.../workflow/services/workflow_service.py | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/shared/workspaces/workspaces/workflow/services/workflow_service.py b/shared/workspaces/workspaces/workflow/services/workflow_service.py
index 968276900..31299d055 100644
--- a/shared/workspaces/workspaces/workflow/services/workflow_service.py
+++ b/shared/workspaces/workspaces/workflow/services/workflow_service.py
@@ -436,14 +436,8 @@ class WorkflowService(WorkflowServiceIF):
:param wf_request: the workflow request
:return:
"""
- if (
- (
- "product_locator" in wf_request.argument
- and wf_request.argument["product_locator"] is not None
- and "," in wf_request.argument["product_locator"]
- )
- or ("need_data" in wf_request.argument and wf_request.argument["need_data"] is True)
- or wf_request.workflow_name == "download"
+ if wf_request.workflow_name == "download" or (
+ "need_data" in wf_request.argument and wf_request.argument["need_data"] is True
):
spl_list = wf_request.argument["product_locator"].split(",")
fetcher_string = " --product-locator"
@@ -529,11 +523,9 @@ class WorkflowService(WorkflowServiceIF):
"ramInGb": self.processing_settings.ramInGb,
}
wf_request.argument = merged_args
- wf_request.argument["fetch_args"] = (
+ if arg_list[0] in ["--product", "--carta"]:
self.determine_multiple_productfetch(wf_request)
- if arg_list[0] in ["--product", "--carta"]
- else None
- )
+
return wf_definition.render_templates(wf_request.argument)
else:
logger.error(wf_json.decode())
--
GitLab