diff --git a/apps/cli/utilities/aat_wrest/aat_wrest/wrest.py b/apps/cli/utilities/aat_wrest/aat_wrest/wrest.py index c85b8f35ea97afeb505734a6c47c5a1cedd9a645..598e75ffea778bce6fcec4e470b9e380980b485e 100644 --- a/apps/cli/utilities/aat_wrest/aat_wrest/wrest.py +++ b/apps/cli/utilities/aat_wrest/aat_wrest/wrest.py @@ -61,7 +61,6 @@ def determine_wrester(connection: MDDBConnector, args: argparse.Namespace): elif args.stdimg: data = WrestWorkflowMetadata(connection, sdm_id=args.stdimg[0]).wrest_standard_image_info() elif args.restore: - print(args) data = WrestWorkflowMetadata(connection, spl=args.restore).wrest_restore_info() elif args.observation: data = WrestObservationMetadata( diff --git a/shared/workspaces/workspaces/workflow/services/workflow_service.py b/shared/workspaces/workspaces/workflow/services/workflow_service.py index 95e2d1983c888dd6983a85a29cee3ee8e1c475b6..38f58f0b90bd4ab843ab25423e5f3133c49b7dd2 100644 --- a/shared/workspaces/workspaces/workflow/services/workflow_service.py +++ b/shared/workspaces/workspaces/workflow/services/workflow_service.py @@ -235,22 +235,26 @@ class WorkflowService(WorkflowServiceIF): if "calibration" in name: wrest_type = "-sc" argument = wf_request.argument["product_locator"] + argument2 = [] elif "restore" in name: wrest_type = "-r" - argument = [wf_request.argument["product_locator"], wf_request.argument["cal_locator"]] + argument = wf_request.argument["product_locator"] + argument2 = [wf_request.argument["cal_locator"]] elif "imaging" in name: wrest_type = "-si" argument = wf_request.argument["sdmId"] + argument2 = [] else: logger.info(f"No wrester found for workflow {name}. Does it actually require metadata?") return wf_request logger.info(f" workflow {name} has wrest option: {wrest_type}") with subprocess.Popen( - ["aat_wrest", wrest_type, argument], + ["aat_wrest", wrest_type, argument] + argument2, stdout=subprocess.PIPE, ) as wf_metadata: wf_json = wf_metadata.communicate()[0] + logger.info(wf_json.decode()) if "ERROR" not in wf_json.decode(): merged_args = { **json.loads(wf_json),