-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This includes one modification to the shared snakemake rules - if a config defines both 'private_sequences' and 'private_metadata' then private data will be merged in. The script which merges them should be replaced by `augur merge` in the future.
- Loading branch information
1 parent
fade79a
commit 8673253
Showing
6 changed files
with
541 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
{ | ||
"title": "Genomic epidemiology of mpox clade I viruses: INRB build", | ||
"maintainers": [ | ||
{"name": "INRB", "url": "https://inrb.net/"}, | ||
{"name": "Nextstrain team", "url": "http://nextstrain.org"} | ||
], | ||
"data_provenance": [ | ||
{ | ||
"name": "INRB, DRC" | ||
}, | ||
{ | ||
"name": "GenBank", | ||
"url": "https://www.ncbi.nlm.nih.gov/genbank/" | ||
} | ||
], | ||
"build_url": "https://github.com/nextstrain/mpox", | ||
"colorings": [ | ||
{ | ||
"key": "region", | ||
"title": "Region", | ||
"type": "categorical" | ||
}, | ||
{ | ||
"key": "country", | ||
"title": "Country", | ||
"type": "categorical" | ||
}, | ||
{ | ||
"key": "division", | ||
"title": "Province", | ||
"type": "categorical" | ||
}, | ||
{ | ||
"key": "location", | ||
"title": "Health Zone", | ||
"type": "categorical" | ||
}, | ||
{ | ||
"key": "source_private", | ||
"title": "INRB (private data)", | ||
"type": "boolean" | ||
}, | ||
{ | ||
"key": "host", | ||
"title": "Host", | ||
"type": "categorical" | ||
}, | ||
{ | ||
"key": "GA_CT_fraction", | ||
"title": "G→A or C→T fraction", | ||
"type": "continuous" | ||
}, | ||
{ | ||
"key": "dinuc_context_fraction", | ||
"title": "NGA/TCN context of G→A/C→T mutations", | ||
"type": "continuous" | ||
}, | ||
{ | ||
"key": "recency", | ||
"title": "Submission Recency", | ||
"type": "categorical" | ||
}, | ||
{ | ||
"key": "date_submitted", | ||
"title": "Release Date", | ||
"type": "categorical" | ||
}, | ||
{ | ||
"key": "date", | ||
"title": "Collection date", | ||
"type": "categorical" | ||
} | ||
], | ||
"geo_resolutions": [ | ||
"region", | ||
"country", | ||
"division", | ||
"location" | ||
], | ||
"display_defaults": { | ||
"geo_resolution": "location", | ||
"color_by": "num_date", | ||
"map_triplicate": false, | ||
"distance_measure": "div", | ||
"transmission_lines": true | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# Custom config file for INRB Clade-I builds. | ||
# This should be used as an additional config on top of the clade-i config, i.e. | ||
# --configfile defaults/clade-i/config.yaml build-configs/inrb/config.yaml | ||
|
||
# Custom INRB footer contents & auspice config | ||
description: "build-configs/inrb/description.md" | ||
auspice_config: "build-configs/inrb/auspice_config.json" | ||
|
||
# INRB builds inject private data, which is itself created by calling `curate_private_data.py` | ||
private_sequences: "data/sequences-private.fasta" | ||
private_metadata: "data/metadata-private.tsv" | ||
|
||
traits: | ||
columns: region country division location | ||
sampling_bias_correction: 3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,265 @@ | ||
from typing import Any | ||
from Bio import SeqIO | ||
import argparse | ||
from openpyxl import load_workbook | ||
from datetime import datetime | ||
from os import path, mkdir | ||
from sys import exit | ||
|
||
Sequences = dict[str, SeqIO.SeqRecord] | ||
Metadata = dict[str, dict[str, str]] | ||
MetadataHeader = list[str] | ||
|
||
# The following seem reasonable to hardcode, as they're central to the current mpox workflows | ||
DATE_COLUMN = 'date' | ||
ACCESSION = 'accession' | ||
REQUIRED_COLUMNS = [ACCESSION, DATE_COLUMN, 'strain'] | ||
LAT_LONG_FNAME = path.join(path.dirname(path.realpath(__file__)), "..", "..", "defaults", "lat_longs.tsv") | ||
GEOGRAPHIC_RENAMINGS = { | ||
"division": { | ||
"Sud Ubangi": "Sud-Ubangi", | ||
"Nord Ubangi": "Nord-Ubangi", | ||
"Mai ndombe": "Maindombe", | ||
"Mai-Ndombe": "Maindombe", | ||
"South Kivu": "Sud Kivu", | ||
"Sud-Kivu": "Sud Kivu", | ||
"Nord-Kivu": "Nord Kivu", | ||
"Mongala ": "Mongala", # note trailing space | ||
}, | ||
"location": { | ||
"Miti-muresa": "Miti-Murhesa", | ||
"Ototi": "Ototo", # Not sure which is correct, but Ototo is in lat-longs file from Eddy | ||
# "Yelenge", - now included in lat-longs file | ||
"Lilanga": "Lilanga-Bobangi", | ||
"Lilanga Bobangi": "Lilanga-Bobangi", | ||
"Nyiragongo": "Nyirangongo", | ||
"Bunyakiru": "Bunyakiri", | ||
"Nyatende": "Nyantende", | ||
"Nyagezi": "Nyangezi", | ||
"Kalamu I": "Kalamu-I", | ||
"Kalamu II": "Kalamu-II", | ||
"Masina I": "Masina-I", | ||
"Masina II": "Masina-II", | ||
"Omendjadji": "Omendjadi", | ||
"Police": "Kokolo", # Eddy WhatsApp 2024-09-13. 24MPX2706V | ||
"NYIRAGONGO": "Nyirangongo", | ||
"KARISIMBI": "Karisimbi", | ||
"GOMA": "Goma", | ||
} | ||
} | ||
|
||
# The following could be better provided via parsing the (S3) metadata here, but I want to keep this script isolated | ||
# from the Snakemake workflow as much as possible | ||
RECOMMENDED_COLUMNS = ['country', 'division', 'location'] | ||
|
||
def parse_args(): | ||
parser = argparse.ArgumentParser( | ||
description="Parse metadata (xlsx format) and sequences (FASTA) for integration into our canonical mpox pipelines", | ||
formatter_class=argparse.ArgumentDefaultsHelpFormatter | ||
) | ||
parser.add_argument('--sequences', type=str, required=True, nargs='+', metavar='FASTA', help="input sequences") | ||
parser.add_argument('--fasta-header-idx', type=int, | ||
help='If FASTA headers are "|" separated, this index (1-based) is the accession') | ||
parser.add_argument('--xlsx', type=str, required=True, help="Metadata file (Excel .xlsx format)") | ||
parser.add_argument('--remap-columns', type=str, nargs='+', default=[], metavar='old:new', required=False, | ||
help="Change column names. Note all column names are converted to lower case.") | ||
return parser.parse_args() | ||
|
||
|
||
def convert(accession: str, k: str, v: Any) -> str: | ||
if k==DATE_COLUMN: | ||
# If we need to attempt to parse a string as a date see | ||
# <https://github.com/inrb-drc/ebola-nord-kivu/blob/ba9b9b48ba1e8db83486d653f3043d9671611594/scripts/add-new-data#L88-L128> | ||
assert type(v)==datetime, f"The provided {DATE_COLUMN!r} for {accession!r} must be encoded as a date within Excel" | ||
return f"{v.year}-{v.month:02}-{v.day:02}" | ||
return str(v) | ||
|
||
|
||
def column_map(names: tuple[str], remap: list[tuple[str, str]]) -> list[tuple[str, str]]: | ||
remap_idx_used = [] | ||
columns = [] | ||
for name in names: | ||
# any matching renames / duplications? | ||
changes = [(idx, name_map) for idx, name_map in enumerate(remap) if name_map[0]==name.lower()] | ||
if len(changes): | ||
for idx, name_map in changes: | ||
remap_idx_used.append(idx) | ||
columns.append((name, name_map[1])) | ||
else: | ||
columns.append((name, name.lower())) | ||
|
||
assert len(set([n[1] for n in columns]))==len(columns), "Requested column names aren't unique!" | ||
|
||
for i,name_map in enumerate(remap): | ||
if i not in remap_idx_used: | ||
print(f"WARNING: You asked to remap column {name_map[0]!r} but that column doesn't exist!") | ||
return columns | ||
|
||
def parse_excel(fname: str, remap: list[tuple[str, str]]) -> tuple[Metadata, MetadataHeader]: | ||
workbook = load_workbook(filename=fname) | ||
worksheet = workbook.active | ||
n_rows = 0 | ||
|
||
rows = worksheet.values # type: ignore | ||
assert rows is not None, f"The metadata file {fname!r} seemed to be empty!" | ||
|
||
existing_column_names: tuple[str] = next(rows) # type: ignore | ||
column_names = column_map(existing_column_names, remap) | ||
|
||
for name in REQUIRED_COLUMNS: | ||
assert name in [c[1] for c in column_names], f"Metadata didn't have an {name!r} column (after column names were remapped)" | ||
for name in RECOMMENDED_COLUMNS: | ||
if name not in [c[1] for c in column_names]: | ||
print(f"Warning: Metadata didn't have an {name!r} column (after column names were remapped) which is recommended ") | ||
|
||
accession_idx = [c[1] for c in column_names].index(ACCESSION) | ||
|
||
metadata: Metadata = {} | ||
for row in rows: | ||
n_rows+=1 | ||
accession = str(row[accession_idx]) | ||
metadata[accession] = {new_name:convert(accession, new_name, row[existing_column_names.index(old_name)]) for old_name,new_name in column_names} | ||
|
||
print(f"Parsed {n_rows} metadata rows (excluding header) from xlsx file") | ||
return (metadata, [c[1] for c in column_names]) | ||
|
||
|
||
def compare_ids(sequences: Sequences, metadata: Metadata) -> tuple[Sequences, Metadata]: | ||
|
||
acc_meta = set(list(metadata.keys())) | ||
acc_seqs = set(list(sequences.keys())) | ||
|
||
meta_not_seqs = acc_meta - acc_seqs | ||
seqs_not_meta = acc_seqs - acc_meta | ||
|
||
if meta_not_seqs: | ||
print(f"WARNING! Metadata contained entries for {meta_not_seqs!r} but these are not present in the provided sequences and will be removed") | ||
metadata = {k:v for k,v in metadata.items() if k not in meta_not_seqs} | ||
|
||
if seqs_not_meta: | ||
print(f"WARNING! Sequences provided for {seqs_not_meta!r} but there is no corresponding metadata. These will be removed") | ||
sequences = {k:v for k,v in sequences.items() if k not in seqs_not_meta} | ||
|
||
return (sequences, metadata) | ||
|
||
def read_lat_longs(): | ||
"""Adapted from augur.utils to avoid this script needing augur to be installed""" | ||
coordinates = {} | ||
# TODO: make parsing of tsv files more robust while allow for whitespace delimiting for backwards compatibility | ||
def add_line_to_coordinates(line): | ||
if line.startswith('#') or line.strip() == "": | ||
return | ||
fields = line.strip().split() if not '\t' in line else line.strip().split('\t') | ||
if len(fields) == 4: | ||
geo_field, loc = fields[0].lower(), fields[1].lower() | ||
lat, long = float(fields[2]), float(fields[3]) | ||
coordinates[(geo_field, loc)] = { | ||
"latitude": lat, | ||
"longitude": long | ||
} | ||
else: | ||
print("WARNING: geo-coordinate file contains invalid line. Please make sure not to mix tabs and spaces as delimiters (use only tabs):",line) | ||
with open(LAT_LONG_FNAME) as fh: | ||
for line in fh: | ||
add_line_to_coordinates(line) | ||
return coordinates | ||
|
||
|
||
def curate_metadata(metadata: Metadata) -> Metadata: | ||
lat_longs = read_lat_longs() | ||
logs = set() | ||
errors = set() | ||
|
||
for resolution in ["division", "location"]: | ||
for strain, data in metadata.items(): | ||
original_deme = data[resolution] | ||
if original_deme in GEOGRAPHIC_RENAMINGS[resolution]: | ||
deme = GEOGRAPHIC_RENAMINGS[resolution][original_deme] | ||
logs.add(f"\t'{strain}' {resolution} '{original_deme}' -> '{deme}'") | ||
data[resolution] = deme | ||
|
||
if (resolution, data[resolution].lower()) not in lat_longs: | ||
errors.add(f"\t{resolution} {data[resolution]}") | ||
|
||
if len(logs): | ||
print("\nThe following metadata changes were made:") | ||
for l in logs: | ||
print(l) | ||
if len(errors): | ||
print("\nERROR! The following geographic locations did not have associated lat-longs. " | ||
"We cannot proceed until this is fixed. There are two potential ways to solve this: " | ||
"\n(1) Within the phylogenetic/defaults/clade-i/lat_longs.tsv file we can add coordinates" | ||
"\n(2) We can change the value in the metadata to match a lat-long which already exists in that file." | ||
"\nHere are the problematic values:" | ||
) | ||
for l in errors: | ||
print(l) | ||
exit(2) | ||
|
||
return metadata | ||
|
||
|
||
def parse_sequences(fnames: list[str], fasta_header_idx: int|None) -> Sequences: | ||
sequences = {} | ||
errors = False | ||
seq_count = 0 | ||
for fname in fnames: | ||
for seq_record in SeqIO.parse(fname, "fasta"): | ||
seq_count+=1 | ||
name = seq_record.id | ||
if fasta_header_idx is not None: | ||
try: | ||
name = name.split('|')[fasta_header_idx-1] # convert 1-based to 0-based | ||
except IndexError: | ||
print("Sequence name {name!r}, when split by '|', did not have enough fields") | ||
seq_record.id = name | ||
seq_record.description = seq_record.id | ||
if name in sequences: | ||
print(f"ERROR - the sequence {name!r} (from {fname!r}) has already been seen!") | ||
errors = True | ||
sequences[name] = seq_record | ||
|
||
assert errors is not True, "Please remove those duplicate sequences!" | ||
print(f"Parsed {seq_count} sequences from FASTA file(s)") | ||
return sequences | ||
|
||
def fname_in_data_dir(fname: str) -> str: | ||
# This assumes the folder structure used in mpox doesn't change... | ||
data_dir = path.normpath(path.join(path.dirname(path.realpath(__file__)), "..", "data")) | ||
if not path.isdir(data_dir): | ||
mkdir(data_dir) | ||
return path.join(data_dir, fname) | ||
|
||
def write_sequences(sequences: Sequences) -> None: | ||
fname = fname_in_data_dir("sequences-private.fasta") | ||
print(f"Writing sequences to {fname}") | ||
SeqIO.write([x for x in sequences.values()], fname, "fasta") | ||
|
||
def write_metadata(metadata: Metadata, header: MetadataHeader) -> None: | ||
fname = fname_in_data_dir("metadata-private.tsv") | ||
print(f"Writing metadata to {fname}") | ||
with open(fname, "w") as fh: | ||
print("\t".join(header), file=fh) | ||
for _, value in metadata.items(): | ||
print("\t".join([value[field] for field in header]), file=fh) | ||
|
||
def parse_remap_columns(arg: list[str]) -> list[tuple[str, str]]: | ||
try: | ||
return [(x[0].lower(),x[1].lower()) for x in [a.split(':') for a in arg]] | ||
except: | ||
print("Error while parsing the remap-columns argument. Each entry must be two column names with a ':' between them.") | ||
print("For instance: \"--remap-columns 'collection date:date' 'province:division'\"") | ||
exit(2) | ||
|
||
if __name__=="__main__": | ||
args = parse_args() | ||
print() | ||
metadata, header = parse_excel(args.xlsx, parse_remap_columns(args.remap_columns)) | ||
sequences = parse_sequences(args.sequences, args.fasta_header_idx) | ||
sequences, metadata = compare_ids(sequences, metadata) | ||
|
||
metadata = curate_metadata(metadata) | ||
|
||
print() | ||
write_sequences(sequences) | ||
write_metadata(metadata, header) |
Oops, something went wrong.