Skip to content

Commit

Permalink
pr feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
hanars committed Aug 17, 2023
1 parent 1bed8af commit 89f9f50
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions hail_search/hail_search_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -717,26 +717,24 @@ def _sort_order(self, ht):
return sort_expressions

def _get_sort_expressions(self, ht, sort):
sort_expressions = []
if sort in self.SORTS:
sort_expressions = self.SORTS[sort](ht)
return self.SORTS[sort](ht)

elif sort in self.PREDICTION_FIELDS_CONFIG:
if sort in self.PREDICTION_FIELDS_CONFIG:
prediction_path = self.PREDICTION_FIELDS_CONFIG[sort]
sort_expressions = [-hl.float64(ht[prediction_path.source][prediction_path.field])]
return [-hl.float64(ht[prediction_path.source][prediction_path.field])]

elif sort == 'in_omim':
sort_expressions = self._omim_sort(ht, hl.set(set(self._sort_metadata)))
if sort == 'in_omim':
return self._omim_sort(ht, hl.set(set(self._sort_metadata)))

elif self._sort_metadata:
sort_expressions = self._gene_rank_sort(ht, hl.dict(self._sort_metadata))
if self._sort_metadata:
return self._gene_rank_sort(ht, hl.dict(self._sort_metadata))

else:
sort_field = next((field for field, config in self.POPULATIONS.items() if config.get('sort') == sort), None)
if sort_field:
sort_expressions = [hl.float64(self.population_expression(ht, sort_field).af)]
sort_field = next((field for field, config in self.POPULATIONS.items() if config.get('sort') == sort), None)
if sort_field:
return [hl.float64(self.population_expression(ht, sort_field).af)]

return sort_expressions
return []

@classmethod
def _omim_sort(cls, r, omim_gene_set):
Expand Down

0 comments on commit 89f9f50

Please sign in to comment.