diff --git a/workflows/short-read-mngs/postprocess.wdl b/workflows/short-read-mngs/postprocess.wdl index 7f86269f4..358f631ac 100644 --- a/workflows/short-read-mngs/postprocess.wdl +++ b/workflows/short-read-mngs/postprocess.wdl @@ -304,6 +304,57 @@ task CombineTaxonCounts { } } +task OutputResultsCSV { + input { + String docker_image_id + String s3_wd_uri + File counts_json_file + File lineage_csv + } + command <<< + set -euxo pipefail + gunzip -c "~{lineage_csv}" > "lineage.csv" + + python3 <>> + output { + File result_csv = "result.csv" + } + runtime { + docker: docker_image_id + } +} + task CombineJson { input { String docker_image_id @@ -486,6 +537,8 @@ workflow czid_postprocess { File lineage_db = "s3://czid-public-references/taxonomy/2021-01-22/taxid-lineages.db" File taxon_blacklist = "s3://czid-public-references/taxonomy/2021-01-22/taxon_blacklist.txt" File deuterostome_db = "s3://czid-public-references/taxonomy/2021-01-22/deuterostome_taxids.txt" + File lineage_csv = "s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/versioned-taxid-lineages.csv.gz" + Boolean output_results_csv = false Boolean use_deuterostome_filter = true Boolean use_taxon_whitelist = false Int min_contig_length = 100 @@ -608,6 +661,16 @@ workflow czid_postprocess { ] } + if (output_results_csv) { + call OutputResultsCSV { + input: + docker_image_id = docker_image_id, + s3_wd_uri = s3_wd_uri, + counts_json_file = CombineTaxonCounts.assembly_refined_taxon_counts_with_dcr_json, + lineage_csv = lineage_csv + } + } + call CombineJson { input: docker_image_id = docker_image_id, diff --git a/workflows/short-read-mngs/test/local_test.yml b/workflows/short-read-mngs/test/local_test.yml index bf98cd3d6..744c89648 100644 --- a/workflows/short-read-mngs/test/local_test.yml +++ b/workflows/short-read-mngs/test/local_test.yml @@ -19,10 +19,11 @@ non_host_alignment.accession2taxid_db: s3://czid-public-references/ncbi-indexes- minimap2_local_db_path: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nt diamond_local_db_path: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nr diamond_args: "mid-sensitive" +postprocess.output_results_csv: true postprocess.nt_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nt postprocess.nt_loc_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nt_loc.marisa postprocess.nr_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nr postprocess.nr_loc_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nr_loc.marisa experimental.nt_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nt experimental.nt_loc_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nt_loc.marisa -experimental.nt_info_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nt_info.marisa \ No newline at end of file +experimental.nt_info_db: s3://czid-public-references/ncbi-indexes-prod/2021-01-22/index-generation-2/nt_info.marisa diff --git a/workflows/short-read-mngs/test/local_test_viral.yml b/workflows/short-read-mngs/test/local_test_viral.yml index dad3be785..b69cc3a09 100644 --- a/workflows/short-read-mngs/test/local_test_viral.yml +++ b/workflows/short-read-mngs/test/local_test_viral.yml @@ -18,11 +18,11 @@ host_filter.human_hisat2_index_tar: s3://czid-public-references/host_filter/ercc host_filter.max_input_fragments: 9000 host_filter.max_subsample_fragments: 9000 non_host_alignment.accession2taxid_db: s3://czid-public-references/mini-database/alignment_indexes/2020-08-20-viral/viral_accessions2taxid.marisa -non_host_alignment.alignment_scalability: true minimap2_local_db_path: s3://czid-public-references/test/viral-alignment-indexes/viral_nt diamond_local_db_path: s3://czid-public-references/test/viral-alignment-indexes/viral_nr diamond_args: "mid-sensitive" postprocess.nt_db: s3://czid-public-references/test/viral-alignment-indexes/viral_nt +postprocess.output_results_csv: true postprocess.nt_loc_db: s3://czid-public-references/test/viral-alignment-indexes/viral_nt_loc.marisa postprocess.nr_db: s3://czid-public-references/test/viral-alignment-indexes/viral_nr postprocess.nr_loc_db: s3://czid-public-references/test/viral-alignment-indexes/viral_nr_loc.marisa