Skip to content

Commit ace54cb

Browse files
Ingest output Pathoplexus group URL, surface in phylogenetic
1 parent 7302350 commit ace54cb

File tree

6 files changed

+62
-15
lines changed

6 files changed

+62
-15
lines changed

ingest/defaults/config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ curate:
3232
dataUseTermsRestrictedUntil: restrictedUntil
3333
dataUseTermsUrl: dataUseTerms__url
3434
groupId: Pathoplexus_group_id
35+
groupName: Pathoplexus_group
3536
# TODO: There are more fields I should look into porting
3637
# Standardized strain name regex
3738
# Currently accepts any characters because we do not have a clear standard for strain names
@@ -97,8 +98,9 @@ curate:
9798
'dataUseTerms__url',
9899
'restrictedUntil',
99100
'displayName',
101+
'Pathoplexus_group',
100102
'Pathoplexus_group_id',
101-
'Pathoplexus_group_id__url',
103+
'Pathoplexus_group__url',
102104
'submission_database',
103105
]
104106

ingest/scripts/curate-urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def run(args: argparse.Namespace, records: Iterable[dict]) -> Iterable[dict]:
2727
record['INSDC_accession_version__url'] = f"https://www.ncbi.nlm.nih.gov/nuccore/{insdc_accession_version}" \
2828
if insdc_accession_version \
2929
else ""
30-
record['Pathoplexus_group_id__url'] = f"https://pathoplexus.org/group/{group_id}" \
30+
record['Pathoplexus_group__url'] = f"https://pathoplexus.org/group/{group_id}" \
3131
if group_id \
3232
else ""
3333
record['submission_database'] = "INSDC" if str(group_id) == "1" else "Pathoplexus"

phylogenetic/defaults/clade-i/auspice_config.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,16 @@
105105
"title": "Authors",
106106
"type": "categorical"
107107
},
108+
{
109+
"key": "submission_database",
110+
"title": "Database of original submission",
111+
"type": "categorical"
112+
},
113+
{
114+
"key": "Pathoplexus_group",
115+
"title": "Pathoplexus Group ID",
116+
"type": "categorical"
117+
},
108118
{
109119
"key": "restrictedUntil",
110120
"title": "Restricted Until",
@@ -130,5 +140,12 @@
130140
"distance_measure": "div",
131141
"transmission_lines": false
132142
},
133-
"filters": ["country", "region", "recency", "host", "author"]
143+
"filters": [
144+
"country",
145+
"region",
146+
"recency",
147+
"host",
148+
"author",
149+
"Pathoplexus_group"
150+
]
134151
}

phylogenetic/defaults/hmpxv1/auspice_config.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "Genomic epidemiology of mpox clade IIb viruses",
33
"maintainers": [
4-
{"name": "Nextstrain team", "url": "http://nextstrain.org"}
4+
{ "name": "Nextstrain team", "url": "http://nextstrain.org" }
55
],
66
"data_provenance": [
77
{
@@ -65,8 +65,19 @@
6565
"title": "Collection date",
6666
"type": "categorical"
6767
},
68+
{
69+
"key": "submission_database",
70+
"title": "Database of original submission",
71+
"type": "categorical"
72+
},
73+
{
74+
"key": "Pathoplexus_group",
75+
"title": "Pathoplexus Group ID",
76+
"type": "categorical"
77+
},
6878
{
6979
"key": "restrictedUntil",
80+
7081
"title": "Restricted Until",
7182
"type": "categorical"
7283
},
@@ -76,9 +87,7 @@
7687
"type": "categorical"
7788
}
7889
],
79-
"geo_resolutions": [
80-
"country"
81-
],
90+
"geo_resolutions": ["country"],
8291
"metadata_columns": [
8392
"strain",
8493
"PPX_accession",
@@ -96,6 +105,7 @@
96105
"clade_membership",
97106
"lineage",
98107
"country",
108+
"Pathoplexus_group",
99109
"region",
100110
"recency",
101111
"host",

phylogenetic/defaults/hmpxv1_big/auspice_config.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "Genomic epidemiology of mpox lineage B.1 viruses",
33
"maintainers": [
4-
{"name": "Nextstrain team", "url": "http://nextstrain.org"}
4+
{ "name": "Nextstrain team", "url": "http://nextstrain.org" }
55
],
66
"data_provenance": [
77
{
@@ -70,6 +70,16 @@
7070
"title": "Collection date",
7171
"type": "categorical"
7272
},
73+
{
74+
"key": "submission_database",
75+
"title": "Database of original submission",
76+
"type": "categorical"
77+
},
78+
{
79+
"key": "Pathoplexus_group",
80+
"title": "Pathoplexus Group ID",
81+
"type": "categorical"
82+
},
7383
{
7484
"key": "restrictedUntil",
7585
"title": "Restricted Until",
@@ -81,9 +91,7 @@
8191
"type": "categorical"
8292
}
8393
],
84-
"geo_resolutions": [
85-
"country"
86-
],
94+
"geo_resolutions": ["country"],
8795
"metadata_columns": [
8896
"strain",
8997
"PPX_accession",
@@ -101,6 +109,7 @@
101109
"clade_membership",
102110
"lineage",
103111
"country",
112+
"Pathoplexus_group",
104113
"region",
105114
"recency",
106115
"host",

phylogenetic/defaults/mpxv/auspice_config.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "Genomic epidemiology of mpox viruses across clades",
33
"maintainers": [
4-
{"name": "Nextstrain team", "url": "http://nextstrain.org"}
4+
{ "name": "Nextstrain team", "url": "http://nextstrain.org" }
55
],
66
"data_provenance": [
77
{
@@ -75,6 +75,16 @@
7575
"title": "Collection date",
7676
"type": "categorical"
7777
},
78+
{
79+
"key": "submission_database",
80+
"title": "Database of original submission",
81+
"type": "categorical"
82+
},
83+
{
84+
"key": "Pathoplexus_group",
85+
"title": "Pathoplexus Group",
86+
"type": "categorical"
87+
},
7888
{
7989
"key": "restrictedUntil",
8090
"title": "Restricted Until",
@@ -86,9 +96,7 @@
8696
"type": "categorical"
8797
}
8898
],
89-
"geo_resolutions": [
90-
"country"
91-
],
99+
"geo_resolutions": ["country"],
92100
"metadata_columns": [
93101
"strain",
94102
"PPX_accession",
@@ -106,6 +114,7 @@
106114
"clade_membership",
107115
"lineage",
108116
"country",
117+
"Pathoplexus_group",
109118
"region",
110119
"recency",
111120
"host",

0 commit comments

Comments
 (0)