Loading csst_dag/dag/_base_dag.py +6 −14 Original line number Diff line number Diff line Loading @@ -111,7 +111,7 @@ class BaseDAG: for this_task in task_list: dag_run = self.gen_dag_run( dag_group_run=dag_group_run, **this_task["task"], dag_run_kwargs=this_task["task"], ) dag_run_list.append(dag_run) Loading Loading @@ -161,19 +161,13 @@ class BaseDAG: priority=priority, ) def gen_dag_run( self, dag_group_run: dict, **dag_run_kwargs: Any, ) -> dict: def gen_dag_run(self, **kwargs) -> dict: """Generate a complete DAG run message. Parameters ---------- dag_group_run : dict Output from gen_dag_group_run() **dag_run_kwargs : Any Additional run-specific parameters kwargs : dict Additional keyword arguments to override. Returns ------- Loading @@ -187,10 +181,8 @@ class BaseDAG: """ # copy template dag_run = self.dag_run_template.copy() # update dag_group_run dag_run = override_common_keys(dag_run, dag_group_run) # update dag_run dag_run = override_common_keys(dag_run, dag_run_kwargs) # update values dag_run = override_common_keys(dag_run, kwargs) return dag_run @staticmethod Loading Loading
csst_dag/dag/_base_dag.py +6 −14 Original line number Diff line number Diff line Loading @@ -111,7 +111,7 @@ class BaseDAG: for this_task in task_list: dag_run = self.gen_dag_run( dag_group_run=dag_group_run, **this_task["task"], dag_run_kwargs=this_task["task"], ) dag_run_list.append(dag_run) Loading Loading @@ -161,19 +161,13 @@ class BaseDAG: priority=priority, ) def gen_dag_run( self, dag_group_run: dict, **dag_run_kwargs: Any, ) -> dict: def gen_dag_run(self, **kwargs) -> dict: """Generate a complete DAG run message. Parameters ---------- dag_group_run : dict Output from gen_dag_group_run() **dag_run_kwargs : Any Additional run-specific parameters kwargs : dict Additional keyword arguments to override. Returns ------- Loading @@ -187,10 +181,8 @@ class BaseDAG: """ # copy template dag_run = self.dag_run_template.copy() # update dag_group_run dag_run = override_common_keys(dag_run, dag_group_run) # update dag_run dag_run = override_common_keys(dag_run, dag_run_kwargs) # update values dag_run = override_common_keys(dag_run, kwargs) return dag_run @staticmethod Loading