test coverage 100%

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+branch = True
+omit =
+    mavedbconvert/main.py

mavedbconvert/__init__.py

@@ -1,21 +1,17 @@
 import os
 import sys
-import tempfile
 import logging.config
 
 __all__ = [
-    "tests",
     "base",
     "constants",
     "empiric",
     "enrich",
     "enrich2",
     "exceptions",
-    "fasta",
     "utilities",
     "filters",
     "validators",
-    "disable_logging",
     "LOGGER",
 ]
 

mavedbconvert/base.py

@@ -165,10 +165,6 @@ def input_is_tsv(self):
     def input_is_scores_based(self):
         return self.input_type == constants.score_type
 
-    @property
-    def input_is_counts_based(self):
-        return self.input_type == constants.count_type
-
     @property
     def output_directory(self):
         return os.path.normpath(os.path.expanduser(self.dst))
@@ -278,36 +274,27 @@ def validate_against_protein_sequence(self, variant):
             return
 
         variant = utilities.ProteinSubstitutionEvent(variant)
-        zero_based_pos = variant.position - int(self.one_based)
-        if zero_based_pos < 0:
-            raise IndexError(
-                (
-                    "Encountered a negative position in {} with one_based "
-                    "set as {}. Positions might not be one-based."
-                ).format(variant, self.one_based)
-            )
 
-        if zero_based_pos >= len(self.protein_sequence):
+        if variant.position > len(self.protein_sequence):
             raise IndexError(
-                "Position {} (index {}) in {} "
+                "Position {} in {} "
                 "extends beyond the maximum index {} in the translated "
                 "wild-type sequence {} with length {}.".format(
-                    zero_based_pos + int(self.one_based),
-                    zero_based_pos,
+                    variant.position,
                     variant,
                     len(self.protein_sequence) - 1,
                     self.protein_sequence,
                     len(self.protein_sequence),
                 )
             )
 
-        wt_aa = AA_CODES[self.protein_sequence[zero_based_pos]]
+        wt_aa = AA_CODES[self.protein_sequence[variant.position - 1]]
         if variant.ref != wt_aa:
             raise ValueError(
                 "Reference AA '{aa}' at 1-based position {pos} in the "
                 "translated protein sequence {seq} does not match the "
                 "reference AA '{ref}' suggested in variant '{variant}'.".format(
-                    pos=zero_based_pos + 1,
+                    pos=variant.position,
                     aa=wt_aa,
                     variant=variant,
                     ref=variant.ref,

mavedbconvert/constants.py

@@ -1,5 +1,7 @@
 import re
 
+MAX_ERROR_VARIANTS = 5
+
 supported_programs = ("enrich", "enrich2", "empiric")
 extra_na = (
     "None",

mavedbconvert/empiric.py

@@ -4,6 +4,7 @@
 import numpy as np
 from fqfa.constants.translation.table import CODON_TABLE
 from fqfa.constants.iupac.protein import AA_CODES
+from xlrd.biffh import XLRDError
 
 from . import base, utilities, constants, filters, validators, LOGGER
 
@@ -75,12 +76,9 @@ def infer_pro_substitution(wt_aa, mut_aa, codon_pos):
         The HGVS-formatted subsitution event.
     """
 
-    # Normalize ? to X and ??? to Xaa
-    if wt_aa in ("?", "???"):
-        wt_aa = "Xaa"
-    else:
-        wt_aa = AA_CODES[wt_aa.upper()]
+    wt_aa = AA_CODES[wt_aa.upper()]
 
+    # Normalize ? to X and ??? to Xaa
     if mut_aa in ("?", "???"):
         mut_aa = "Xaa"
     else:
@@ -165,14 +163,18 @@ def load_input_file(self):
             logger.info("Skipping last {} row(s).".format(self.skip_footer_rows + 1))
 
         if self.extension in (".xlsx", ".xls"):
-            od = pd.read_excel(
-                self.src,
-                na_values=constants.extra_na,
-                skiprows=self.skip_header_rows,
-                skipfooter=self.skip_footer_rows,
-                sheet_name=self.sheet_name,
-            )
-            if not self.sheet_name:
+            try:
+                od = pd.read_excel(
+                    self.src,
+                    na_values=constants.extra_na,
+                    sheet_name=self.sheet_name,
+                    skiprows=self.skip_header_rows,
+                    skipfooter=self.skip_footer_rows,
+                )
+            except XLRDError:
+                raise ValueError(f"invalid Excel sheet name '{self.sheet_name}'")
+
+            if self.sheet_name is None:
                 self.sheet_name = list(od.keys())[0]
                 if len(od) > 1:
                     logger.warning(
@@ -182,7 +184,9 @@ def load_input_file(self):
                             ", ".join(list(od.keys())), self.sheet_name
                         )
                     )
-            df = od[self.sheet_name]
+                df = od[self.sheet_name]
+            else:
+                df = od
         else:
             sep = "\t"
             if self.ext.lower() == ".csv":

mavedbconvert/enrich.py

@@ -4,7 +4,7 @@
 import pandas as pd
 import numpy as np
 from fqfa.constants.iupac.protein import AA_CODES
-
+from xlrd.biffh import XLRDError
 
 from . import LOGGER, constants, base, utilities, filters, validators
 
@@ -53,12 +53,6 @@ def __init__(
         if not is_coding:
             raise ValueError("Enrich does not support non-coding datasets.")
 
-        if not self.score_column and self.input_type == constants.score_type:
-            raise ValueError(
-                "A score column must be specified if "
-                "the input file is a scores file."
-            )
-
     def load_input_file(self):
         """
         Loads the input file specified at initialization into a dataframe.
@@ -73,14 +67,18 @@ def load_input_file(self):
             logger.info("Skipping last {} row(s).".format(self.skip_footer_rows + 1))
 
         if self.extension in (".xlsx", ".xls"):
-            od = pd.read_excel(
-                self.src,
-                na_values=constants.extra_na,
-                sheet_name=self.sheet_name,
-                skiprows=self.skip_header_rows,
-                skipfooter=self.skip_footer_rows,
-            )
-            if not self.sheet_name:
+            try:
+                od = pd.read_excel(
+                    self.src,
+                    na_values=constants.extra_na,
+                    sheet_name=self.sheet_name,
+                    skiprows=self.skip_header_rows,
+                    skipfooter=self.skip_footer_rows,
+                )
+            except XLRDError:
+                raise ValueError(f"invalid Excel sheet name '{self.sheet_name}'")
+
+            if self.sheet_name is None:
                 self.sheet_name = list(od.keys())[0]
                 if len(od) > 1:
                     logger.warning(
@@ -90,7 +88,9 @@ def load_input_file(self):
                             ", ".join(list(od.keys())), self.sheet_name
                         )
                     )
-            df = od[self.sheet_name]
+                df = od[self.sheet_name]
+            else:
+                df = od
         else:
             sep = "\t"
             if self.ext.lower() == ".csv":
@@ -129,6 +129,8 @@ def parse_row(self, row):
             raise ValueError("'{}' is a malformed SeqID.".format(seq_id))
 
         positions, aa_codes = seq_id.split("-")
+        if len(positions) == 0 or len(aa_codes) == 0:
+            raise ValueError("'{}' is a malformed SeqID.".format(seq_id))
         positions = positions.split(",")
         aa_codes = aa_codes.split(",")
         events = []
@@ -179,18 +181,17 @@ def parse_row(self, row):
             if aa == "?":
                 mut_aa = "???"
             else:
-                mut_aa = AA_CODES[aa.upper()]
+                try:
+                    mut_aa = AA_CODES[aa.upper()]
+                except KeyError as e:
+                    raise KeyError(f"Invalid amino acid {e} in '{seq_id}'")
             if wt_aa == mut_aa:
                 events.append("{wt}{pos}=".format(wt=wt_aa, pos=aa_position))
             else:
                 events.append(
                     "{wt}{pos}{mut}".format(wt=wt_aa, pos=aa_position, mut=mut_aa)
                 )
 
-        if len(events) == 0:
-            raise ValueError(
-                "Could not parse any variant strings from {}".format(seq_id)
-            )
         return utilities.hgvs_pro_from_event_list(events)
 
     def parse_input(self, df):
@@ -254,10 +255,9 @@ def parse_input(self, df):
             data[column] = list(utilities.format_column(column_values, astype))
 
         # Sort column order so 'score' comes right after hgvs columns.
-        if self.input_is_scores_based:
-            mave_columns = (
-                mave_columns[:2] + [constants.mavedb_score_column] + mave_columns[2:]
-            )
+        mave_columns = (
+            mave_columns[:2] + [constants.mavedb_score_column] + mave_columns[2:]
+        )
         mavedb_df = pd.DataFrame(data=data, columns=mave_columns)
         filters.drop_na_rows(mavedb_df)
         filters.drop_na_columns(mavedb_df)