diff --git a/ingest/rules/nextclade.smk b/ingest/rules/nextclade.smk index 39148ca..6f37fe7 100644 --- a/ingest/rules/nextclade.smk +++ b/ingest/rules/nextclade.smk @@ -62,6 +62,7 @@ rule join_metadata_and_nextclade: metadata="data/subset_metadata.tsv", output: metadata="results/metadata.tsv", + nextclade_metadata=temp("results/nextclade_metadata.csv"), params: metadata_id_field=config["curate"]["output_id_field"], nextclade_id_field=config["nextclade"]["id_field"], @@ -75,13 +76,15 @@ rule join_metadata_and_nextclade: --field-map {params.nextclade_field_map:q} \ --output-metadata - \ | tsv-select --header --fields {params.nextclade_fields:q} \ - | tsv-join -H \ - --filter-file - \ - --key-fields {params.nextclade_id_field} \ - --data-fields {params.metadata_id_field} \ - --append-fields '*' \ - --write-all ? \ - {input.metadata} \ - | tsv-select -H --exclude {params.nextclade_id_field} \ - > {output.metadata} - """ + > {output.nextclade_metadata:q} + + augur merge \ + --metadata \ + metadata={input.metadata:q} \ + nextclade={output.nextclade_metadata:q} \ + --metadata-id-columns \ + metadata={params.metadata_id_field:q} \ + nextclade={params.nextclade_id_field:q} \ + --output-metadata {output.metadata:q} \ + --no-source-columns + """