Skip to content

Commit

Permalink
fix nan query error
Browse files Browse the repository at this point in the history
  • Loading branch information
tdayris committed Jun 10, 2024
1 parent 176a73b commit e49b7f2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 3.6.2

## Fix:

* Protect against nan values in genome queries

# 3.6.1

## Features:
Expand Down
19 changes: 9 additions & 10 deletions workflow/rules/common.smk
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,15 @@ def lookup_genomes(
"""
Run lookup function with default parameters in order to search user-provided sequence/annotation files
"""
query: str = (
"species == '{wildcards.species}' & build == '{wildcards.build}' & release == '{wildcards.release}'".format(
query: str = "species == '{wildcards.species}' & build == '{wildcards.build}' & release == '{wildcards.release}'".format(
wildcards=wildcards
)
)
return getattr(lookup(query=query, within=genomes), key, default)

query_result: str | float = getattr(lookup(query=query, within=genomes), key, default)
if query_result != query_result:
# Then the result of the query is nan
return default
return query_result


def get_dna_fasta(
Expand All @@ -139,11 +142,9 @@ def get_dna_fasta(
"""
Return path to the final DNA fasta sequences
"""
default: str = (
"reference/sequences/{wildcards.species}.{wildcards.build}.{wildcards.release}/{wildcards.species}.{wildcards.build}.{wildcards.release}.dna.fasta".format(
default: str = "reference/sequences/{wildcards.species}.{wildcards.build}.{wildcards.release}/{wildcards.species}.{wildcards.build}.{wildcards.release}.dna.fasta".format(
wildcards=wildcards
)
)
return lookup_genomes(wildcards, key="dna_fasta", default=default, genomes=genomes)


Expand All @@ -153,11 +154,9 @@ def get_cdna_fasta(
"""
Return path to the final cDNA fasta sequences
"""
default: str = (
"reference/sequences/{wildcards.species}.{wildcards.build}.{wildcards.release}/{wildcards.species}.{wildcards.build}.{wildcards.release}.cdna.fasta".format(
default: str = "reference/sequences/{wildcards.species}.{wildcards.build}.{wildcards.release}/{wildcards.species}.{wildcards.build}.{wildcards.release}.cdna.fasta".format(
wildcards=wildcards
)
)
return lookup_genomes(wildcards, key="cdna_fasta", default=default, genomes=genomes)


Expand Down

0 comments on commit e49b7f2

Please sign in to comment.