catch some exceptions

Author: FilomenoSanchez

parsers/distogramparser.py

@@ -32,7 +32,7 @@ def DistogramParser(input, input_format=None):
             output.append((tuple(contact[:2]), *contact[2:]))
 
     if not output:
-        raise InvalidFormat('Unable to parse contacts')
+        raise InvalidFormat('Unable to parse CASPRR_MODE_2 file')
     else:
         unique_contacts = unique_by_key(output, key=itemgetter(0))
         output = [(*contact[0], *contact[1:]) for contact in unique_contacts]

parsers/npzparser.py

@@ -7,6 +7,8 @@
 
 
 def parse_array(array):
+    # Bin #0 corresponds with d>20A
+    # Bins #1 ~ #36 correspond with 2A<d<20A in increments of 0.5A
     contacts = np.sum(array[:, :, 1:13], axis=-1)
     L = contacts.shape[0]
     BINS = [np.sum(array[:, :, x:x+4], axis=-1) for x in range(1, 37, 4)]
@@ -18,23 +20,25 @@ def parse_array(array):
             for i in range(L) for j in range(i + 5, L)]
 
 
-def NpzParser(input, input_format):
+def NpzParser(input, input_format=None):
     output = []
     content_type, content_string = input.split(',')
-    decoded = base64.b64decode(content_string)
-    archive = np.load(io.BytesIO(decoded), allow_pickle=True)
-    array = archive['dist']
-    # Bin #0 corresponds with d>20A
-    # Bins #1 ~ #36 correspond with 2A<d<20A in increments of 0.5A
-    tmp_output = parse_array(array)
+    try:
+        decoded = base64.b64decode(content_string)
+        archive = np.load(io.BytesIO(decoded), allow_pickle=True)
+        array = archive['dist']
+        tmp_output = parse_array(array)
+    except (OSError, KeyError, IndexError) as e:
+        raise InvalidFormat('Unable to parse distance NPZ file')
+
 
     for contact in tmp_output:
         # contact = [res_1, res_2, raw_score, distance_bin, distance_score]
         contact[:2] = sorted(contact[:2], reverse=True)
         output.append((tuple(contact[:2]), *contact[2:]))
 
     if not output:
-        raise InvalidFormat('Unable to parse contacts')
+        raise InvalidFormat('Unable to parse NPZ file')
     else:
         unique_contacts = unique_by_key(output, key=itemgetter(0))
         output = [(*contact[0], *contact[1:]) for contact in unique_contacts]