Skip to content

Commit

Permalink
Merge pull request #3 from corneliusroemer/fix-2
Browse files Browse the repository at this point in the history
fix: download latest alias_key.json using request
  • Loading branch information
corneliusroemer committed Aug 31, 2022
2 parents 539d197 + 823fc45 commit c3d4724
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions src/pango_aliasor/aliasor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ def __init__(self, alias_file=None):
import json

if alias_file is None:
import importlib.resources
import urllib.request, json

with importlib.resources.open_text("pango_designation", "alias_key.json") as file:
file = json.load(file)
with urllib.request.urlopen(
"https://raw.githubusercontent.com/cov-lineages/pango-designation/master/pango_designation/alias_key.json"
) as data:
file = json.load(data)

else:
with open(alias_file) as file:
Expand All @@ -22,18 +24,18 @@ def __init__(self, alias_file=None):

self.realias_dict = {v: k for k, v in self.alias_dict.items()}

def compress(self,name):
name_split = name.split('.')
def compress(self, name):
name_split = name.split(".")
levels = len(name_split) - 1
num_indirections = (levels -1) // 3
num_indirections = (levels - 1) // 3
if num_indirections <= 0:
return name
alias = ".".join(name_split[0:(3*num_indirections + 1)])
ending = ".".join(name_split[(3*num_indirections + 1):])
return self.realias_dict[alias] + '.' + ending
alias = ".".join(name_split[0 : (3 * num_indirections + 1)])
ending = ".".join(name_split[(3 * num_indirections + 1) :])
return self.realias_dict[alias] + "." + ending

def uncompress(self,name):
name_split = name.split('.')
def uncompress(self, name):
name_split = name.split(".")
letter = name_split[0]
try:
unaliased = self.alias_dict[letter]
Expand All @@ -42,7 +44,9 @@ def uncompress(self,name):
if len(name_split) == 1:
return name
if len(name_split) == 2:
return unaliased + '.' + name_split[1]
return unaliased + "." + name_split[1]
else:
return unaliased + '.' + ".".join(name_split[1:])
return unaliased + "." + ".".join(name_split[1:])


# %%

0 comments on commit c3d4724

Please sign in to comment.