diff --git a/src/ingest-pipeline/airflow/dags/cwl/portal-containers b/src/ingest-pipeline/airflow/dags/cwl/portal-containers index 00fd6df7..8270e467 160000 --- a/src/ingest-pipeline/airflow/dags/cwl/portal-containers +++ b/src/ingest-pipeline/airflow/dags/cwl/portal-containers @@ -1 +1 @@ -Subproject commit 00fd6df75a4311da4e50cc0173b6d6e50ddaf76d +Subproject commit 8270e467fe979d373df0cd448e7d38bd3bd85728 diff --git a/src/ingest-pipeline/airflow/dags/multiome.py b/src/ingest-pipeline/airflow/dags/multiome.py index b09b0d1d..030ff026 100644 --- a/src/ingest-pipeline/airflow/dags/multiome.py +++ b/src/ingest-pipeline/airflow/dags/multiome.py @@ -43,6 +43,8 @@ "pipeline_name", "assay_rna", "assay_atac", + "assay_azimuth", + "requires_one_atac_metadata_file", ], ) @@ -123,9 +125,12 @@ def build_cwltool_cmd1(**kwargs): command.append(f"--fastq_dir_{component.lower()}") command.append(data_dir / Path(f"raw/fastq/{component}")) - for data_dir in data_dirs: + atac_metadata_files = [find_atac_metadata_file(data_dir) for data_dir in data_dirs] + if params.requires_one_atac_metadata_file: + if (count := len(atac_metadata_files)) != 1: + raise ValueError(f"Need 1 ATAC-seq metadata file, found {count}") command.append("--atac_metadata_file") - command.append(find_atac_metadata_file(data_dir)) + command.append(atac_metadata_files[0]) return join_quote_command_str(command) @@ -150,7 +155,7 @@ def build_cwltool_cmd2(**kwargs): "--secondary-analysis-matrix", "secondary_analysis.h5mu", "--assay", - params.assay_rna, + params.assay_azimuth, ] return join_quote_command_str(command) @@ -339,6 +344,8 @@ def get_simple_multiome_dag_params(assay: str) -> MultiomeSequencingDagParameter pipeline_name=f"multiome-{assay}", assay_rna=assay, assay_atac=assay, + assay_azimuth=assay, + requires_one_atac_metadata_file=False, ) @@ -346,8 +353,10 @@ def get_simple_multiome_dag_params(assay: str) -> MultiomeSequencingDagParameter MultiomeSequencingDagParameters( dag_id="multiome_10x", pipeline_name="multiome-10x", - assay_rna="10x_v3_sn", + assay_rna="multiome_10x", assay_atac="multiome_10x", + assay_azimuth="10x_v3_sn", + requires_one_atac_metadata_file=True, ), get_simple_multiome_dag_params("snareseq"), ]