Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nextstrain_profiles/nextstrain-gisaid/builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ auspice_json_prefix: ncov_gisaid

# Define custom rules for pre- or post-standard workflow processing of data.
custom_rules:
- workflow/snakemake_rules/prefilter.smk
- workflow/snakemake_rules/export_for_nextstrain.smk

# These parameters are only used by the `export_for_nextstrain` rule and shouldn't need to be modified.
Expand All @@ -25,7 +26,7 @@ files:

inputs:
- name: gisaid
metadata: "s3://nextstrain-ncov-private/metadata.tsv.zst"
metadata: "data/prefiltered_metadata.tsv"
aligned: "s3://nextstrain-ncov-private/aligned.fasta.zst"
skip_sanitize_metadata: true

Expand Down
3 changes: 3 additions & 0 deletions workflow/snakemake_rules/main_workflow.smk
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ rule subsample:
params:
group_by = _get_specific_subsampling_setting("group_by", optional=True),
group_by_weights = _get_specific_subsampling_setting("group_by_weights", optional=True),
# only set this if using group_by_weights
output_group_by_weights = lambda wildcards: f"--output-group-by-sizes results/{wildcards.build_name}/sizes-{wildcards.subsample}.tsv" if _get_subsampling_settings(wildcards).get("group_by_weights", False) else "",
sequences_per_group = _get_specific_subsampling_setting("seq_per_group", optional=True),
subsample_max_sequences = _get_specific_subsampling_setting("max_sequences", optional=True),
sampling_scheme = _get_specific_subsampling_setting("sampling_scheme", optional=True),
Expand Down Expand Up @@ -330,6 +332,7 @@ rule subsample:
{params.sequences_per_group} \
{params.subsample_max_sequences} \
{params.sampling_scheme} \
{params.output_group_by_weights} \
--output-strains {output.strains} 2>&1 | tee {log}
"""

Expand Down
28 changes: 28 additions & 0 deletions workflow/snakemake_rules/prefilter.smk
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
rule download_metadata:
params:
metadata_url="s3://nextstrain-ncov-private/metadata.tsv.zst",
output:
metadata="data/metadata.tsv.zst",
shell:
r"""
aws s3 cp {params.metadata_url} {output.metadata}
"""

rule filter_metadata:
input:
metadata="data/metadata.tsv.zst",
include = config["files"]["include"],
output:
metadata="data/prefiltered_metadata.tsv",
params:
max_sequences=500000,
group_by="division year month",
shell:
r"""
augur filter \
--metadata {input.metadata} \
--subsample-max-sequences {params.max_sequences} \
--include {input.include} \
--group-by {params.group_by} \
--output-metadata {output.metadata}
"""
Loading