diff --git a/src/ingest-pipeline/airflow/dags/celldive_deepcell.py b/src/ingest-pipeline/airflow/dags/celldive_deepcell.py index 38ad2546..4e778ee0 100644 --- a/src/ingest-pipeline/airflow/dags/celldive_deepcell.py +++ b/src/ingest-pipeline/airflow/dags/celldive_deepcell.py @@ -248,7 +248,6 @@ def build_cwltool_cwl_ome_tiff_pyramid(**kwargs): # this is the call to the CWL command = [ *get_cwltool_base_cmd(tmpdir), - "--relax-path-checks", cwl_workflows["ome_tiff_pyramid"], "--ometiff_directory", ".", diff --git a/src/ingest-pipeline/airflow/dags/codex_cytokit.py b/src/ingest-pipeline/airflow/dags/codex_cytokit.py index b52ee22e..9f3c0883 100644 --- a/src/ingest-pipeline/airflow/dags/codex_cytokit.py +++ b/src/ingest-pipeline/airflow/dags/codex_cytokit.py @@ -394,7 +394,6 @@ def build_cwltool_cwl_ome_tiff_pyramid(**kwargs): # this is the call to the CWL command = [ *get_cwltool_base_cmd(tmpdir), - '--relax-path-checks', cwl_workflows['ome_tiff_pyramid'], '--ometiff_directory', '.', diff --git a/src/ingest-pipeline/airflow/dags/cwl/portal-containers b/src/ingest-pipeline/airflow/dags/cwl/portal-containers index 8270e467..bc491575 160000 --- a/src/ingest-pipeline/airflow/dags/cwl/portal-containers +++ b/src/ingest-pipeline/airflow/dags/cwl/portal-containers @@ -1 +1 @@ -Subproject commit 8270e467fe979d373df0cd448e7d38bd3bd85728 +Subproject commit bc491575d5c9ddf7cddc20e03280ffd3b2c4fc7b diff --git a/src/ingest-pipeline/airflow/dags/cwl/salmon-rnaseq b/src/ingest-pipeline/airflow/dags/cwl/salmon-rnaseq index 0e913979..baee233e 160000 --- a/src/ingest-pipeline/airflow/dags/cwl/salmon-rnaseq +++ b/src/ingest-pipeline/airflow/dags/cwl/salmon-rnaseq @@ -1 +1 @@ -Subproject commit 0e913979ac4a989a482211dfdf6fe204d26b05ab +Subproject commit baee233e49bd9dd305c47c5d6e3c1278b2a36074 diff --git a/src/ingest-pipeline/airflow/dags/mibi_deepcell.py b/src/ingest-pipeline/airflow/dags/mibi_deepcell.py index 1f968177..1e7fbd91 100644 --- a/src/ingest-pipeline/airflow/dags/mibi_deepcell.py +++ b/src/ingest-pipeline/airflow/dags/mibi_deepcell.py @@ -241,7 +241,6 @@ def build_cwltool_cwl_ome_tiff_pyramid(**kwargs): # this is the call to the CWL command = [ *get_cwltool_base_cmd(tmpdir), - '--relax-path-checks', cwl_workflows['ome_tiff_pyramid'], '--ometiff_directory', '.', diff --git a/src/ingest-pipeline/airflow/dags/multiome.py b/src/ingest-pipeline/airflow/dags/multiome.py index ab7635f5..7ee3591a 100644 --- a/src/ingest-pipeline/airflow/dags/multiome.py +++ b/src/ingest-pipeline/airflow/dags/multiome.py @@ -123,7 +123,6 @@ def build_cwltool_cmd1(**kwargs): command = [ *get_cwltool_base_cmd(tmpdir), - "--relax-path-checks", "--outdir", tmpdir / "cwl_out", "--parallel", diff --git a/src/ingest-pipeline/airflow/dags/pas_ftu_segmentation.py b/src/ingest-pipeline/airflow/dags/pas_ftu_segmentation.py index 4bc9bb50..d49e6441 100644 --- a/src/ingest-pipeline/airflow/dags/pas_ftu_segmentation.py +++ b/src/ingest-pipeline/airflow/dags/pas_ftu_segmentation.py @@ -144,7 +144,6 @@ def build_cwltool_cwl_ome_tiff_pyramid(**kwargs): # this is the call to the CWL command = [ *get_cwltool_base_cmd(tmpdir), - "--relax-path-checks", cwl_workflows["ome_tiff_pyramid"], "--ometiff_directory", ".", diff --git a/src/ingest-pipeline/airflow/dags/phenocycler_deepcell.py b/src/ingest-pipeline/airflow/dags/phenocycler_deepcell.py index 98f65d21..c354be72 100644 --- a/src/ingest-pipeline/airflow/dags/phenocycler_deepcell.py +++ b/src/ingest-pipeline/airflow/dags/phenocycler_deepcell.py @@ -241,7 +241,6 @@ def build_cwltool_cwl_ome_tiff_pyramid(**kwargs): # this is the call to the CWL command = [ *get_cwltool_base_cmd(tmpdir), - "--relax-path-checks", cwl_workflows["ome_tiff_pyramid"], "--ometiff_directory", ".", diff --git a/src/ingest-pipeline/airflow/dags/salmon_rnaseq.py b/src/ingest-pipeline/airflow/dags/salmon_rnaseq.py index b657900a..08e3f4f6 100644 --- a/src/ingest-pipeline/airflow/dags/salmon_rnaseq.py +++ b/src/ingest-pipeline/airflow/dags/salmon_rnaseq.py @@ -105,7 +105,6 @@ def build_cwltool_cmd1(**kwargs): command = [ *get_cwltool_base_cmd(tmpdir), - "--relax-path-checks", "--outdir", tmpdir / "cwl_out", "--parallel", diff --git a/src/ingest-pipeline/airflow/dags/utils.py b/src/ingest-pipeline/airflow/dags/utils.py index 0277d334..672e38a2 100644 --- a/src/ingest-pipeline/airflow/dags/utils.py +++ b/src/ingest-pipeline/airflow/dags/utils.py @@ -1235,6 +1235,7 @@ def get_cwltool_base_cmd(tmpdir: Path) -> List[str]: # are created as *subdirectories* of 'cwl-tmp' and 'cwl-out-tmp'. "--tmpdir-prefix={}/".format(tmpdir / "cwl-tmp"), "--tmp-outdir-prefix={}/".format(tmpdir / "cwl-out-tmp"), + "--relax-path-checks", ] diff --git a/src/ingest-pipeline/airflow/dags/visium.py b/src/ingest-pipeline/airflow/dags/visium.py index e138826b..d3f39124 100644 --- a/src/ingest-pipeline/airflow/dags/visium.py +++ b/src/ingest-pipeline/airflow/dags/visium.py @@ -105,7 +105,6 @@ def build_cwltool_cmd1(**kwargs): command = [ *get_cwltool_base_cmd(tmpdir), - "--relax-path-checks", "--outdir", tmpdir / "cwl_out", "--parallel", @@ -122,10 +121,10 @@ def build_cwltool_cmd1(**kwargs): command.append(data_dir / "raw/fastq/") command.append("--img_dir") - command.append(data_dir / "lab_processed/images/") + command.append(data_dir) command.append("--metadata_dir") - command.append(data_dir / "raw/") + command.append(data_dir) return join_quote_command_str(command) @@ -175,7 +174,6 @@ def build_cwltool_cmd4(**kwargs): # this is the call to the CWL command = [ *get_cwltool_base_cmd(tmpdir), - "--relax-path-checks", cwl_workflows[3], "--ometiff_directory", data_dir / "lab_processed/images/", diff --git a/src/ingest-pipeline/airflow/dags/workflow_map.yml b/src/ingest-pipeline/airflow/dags/workflow_map.yml index d62dfb45..3c05f4fc 100644 --- a/src/ingest-pipeline/airflow/dags/workflow_map.yml +++ b/src/ingest-pipeline/airflow/dags/workflow_map.yml @@ -66,7 +66,7 @@ workflow_map: 'assay_type': 'sciATACseq' 'workflow': 'sc_atac_seq_sci' - 'collection_type': 'generic_metadatatsv' - 'assay_type': 'bulk RNA' + 'assay_type': 'bulk-RNA' 'workflow': 'salmon_rnaseq_bulk' - 'collection_type': 'generic_metadatatsv' 'assay_type': 'sciRNAseq'