From 895ac0c8acb42c38c3cfc911ea454b9779f1c7a0 Mon Sep 17 00:00:00 2001 From: tmaeno Date: Mon, 9 Sep 2024 12:15:00 +0200 Subject: [PATCH 1/2] to resolve correctly secondary dataset names with types --- pandaserver/workflow/workflow_utils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandaserver/workflow/workflow_utils.py b/pandaserver/workflow/workflow_utils.py index f03d24e9e..7da082aaa 100644 --- a/pandaserver/workflow/workflow_utils.py +++ b/pandaserver/workflow/workflow_utils.py @@ -217,6 +217,7 @@ def short_desc(self): # resolve workload-specific parameters def resolve_params(self, task_template=None, id_map=None, workflow=None): if self.type in ["prun", "junction", "reana"]: + print("********") dict_inputs = self.convert_dict_inputs() if "opt_secondaryDSs" in dict_inputs: # look for secondaryDsTypes if missing @@ -230,9 +231,6 @@ def resolve_params(self, task_template=None, id_map=None, workflow=None): dict_inputs["opt_secondaryDsTypes"].append(parent_node.output_types[0]) added = True break - # use None if not found - dict_inputs["opt_secondaryDsTypes"].append(None) - added = True if not added: # use None if not found dict_inputs["opt_secondaryDsTypes"].append(None) From 3de340039b2c4f22cd74112adbb6be98bdc5c042 Mon Sep 17 00:00:00 2001 From: tmaeno Date: Mon, 9 Sep 2024 12:15:59 +0200 Subject: [PATCH 2/2] to resolve correctly secondary dataset names with types --- pandaserver/workflow/workflow_utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandaserver/workflow/workflow_utils.py b/pandaserver/workflow/workflow_utils.py index 7da082aaa..d2b561bca 100644 --- a/pandaserver/workflow/workflow_utils.py +++ b/pandaserver/workflow/workflow_utils.py @@ -217,7 +217,6 @@ def short_desc(self): # resolve workload-specific parameters def resolve_params(self, task_template=None, id_map=None, workflow=None): if self.type in ["prun", "junction", "reana"]: - print("********") dict_inputs = self.convert_dict_inputs() if "opt_secondaryDSs" in dict_inputs: # look for secondaryDsTypes if missing