Final small fix for EI-CoreBioinformatics#154

lucventurini · Mar 22, 2019 · 00d4bd8 · 00d4bd8
1 parent 2a62165
commit 00d4bd8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Mikado/loci/abstractlocus.py b/Mikado/loci/abstractlocus.py
@@ -1228,6 +1228,9 @@ def _calculate_score(self, param):
                     if not rhasattr(self.transcripts[tid], metric_key):
                         raise KeyError("Asked for an invalid metric in filter: {}".format(metric_key))
                     metric_to_evaluate = rgetattr(self.transcripts[tid], metric_key)
+                    if "external" in metric_key:
+                        metric_to_evaluate = metric_to_evaluate[0]
+
                 check = self.evaluate(metric_to_evaluate, self.json_conf["scoring"][param]["filter"])
                 if not check:
                     del metrics[tid]

diff --git a/Mikado/loci/locus.py b/Mikado/loci/locus.py
@@ -386,6 +386,9 @@ def __check_as_requirements(self, transcript: Transcript) -> bool:
         for key in self.json_conf["as_requirements"]["parameters"]:
             value = rgetattr(transcript,
                              self.json_conf["as_requirements"]["parameters"][key]["name"])
+            if "external" in key:
+                value = value[0]
+
             evaluated[key] = self.evaluate(
                 value,
                 self.json_conf["as_requirements"]["parameters"][key])