tweaks (07625e4c) · Commits · csst-cicd / csst-dag

csst_dag/dag/_base_dag.py

+7 −18

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ from astropy import table

		from .._dfs import DFS, dfs
		from ..hash import generate_sha1_from_time
		from ._dispatcher import Dispatcher
		from ._dispatcher import Dispatcher, override_common_keys


		DAG_CONFIG_DIR = os.path.join(
		@@ -108,10 +108,10 @@ class BaseDAG:
		)
		task_list = self.dispatcher(filtered_plan_basis, filtered_data_basis)
		dag_run_list = []
		for task in task_list:
		for this_task in task_list:
		dag_run = self.gen_dag_run(
		dag_group_run=dag_group_run,
		**task,
		**this_task["task"],
		)
		dag_run_list.append(dag_run)

		@@ -187,21 +187,10 @@ class BaseDAG:
		"""
		# copy template
		dag_run = self.dag_run_template.copy()

		# update dag_group_run info
		for k, v in dag_group_run.items():
		assert (
		k in self.dag_run_template.keys()
		), f"{k} not in {self.dag_run_template.keys()}"
		dag_run[k] = v

		# update dag_run info
		for k, v in dag_run_kwargs.items():
		assert (
		k in self.dag_run_template.keys()
		), f"{k} not in {self.dag_run_template.keys()}"
		dag_run[k] = v

		# 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)
		return dag_run

		@staticmethod

+1 −0