Merge pull request #89 from SynBioDex/85-fallback_on_lookup_failures

Fix fallback queries

Author: bbartley

test/test_ontology.py

@@ -125,6 +125,14 @@ def test_instances(self):
         ContO = Ontology(path=test_ontology, uri='https://sift.net/container-ontology/container-ontology')
         assert len(ContO['96 well plate'].get_instances()) == 2
 
+    def test_fallback(self):
+        '''Test that fallback to local graph query works when query over network fails.'''
+        ontobee = SO.endpoints[0]
+        SO.endpoints = []
+        self.assertEqual(SO.sequence_feature, 'https://identifiers.org/SO:0000110')
+        SO.endpoints = [ontobee]
+
+
 class TestOLS(unittest.TestCase):
 
     SO_endpoints = SO.endpoints

tyto/tyto.py

@@ -56,29 +56,23 @@ def _handler(self, method_name, exception, *args):
         if self.graph and self.graph.is_loaded():
             method = getattr(self.graph, method_name)
             response = method(self, *args)
-            if response is not None:
-                return response
-            #try:
-            #    response = method(self, *args)
-            #    if response is not None:
-            #        return response
-            #except Exception as x:
-            #    LOGGER.error(x)
+            try:
+                response = method(self, *args)
+                if response is not None:
+                    return response
+            except Exception as x:
+                LOGGER.error(x)
 
         # Try endpoints
         if self.endpoints:
             for e in self.endpoints:
                 method = getattr(e, method_name)
-                response = method(self, *args)
-                if response is not None:
-                    return response
-                #try:
-                #    response = method(self, *args)
-                #    if response is not None:
-                #        return response
-                #except Exception as x:
-                #    LOGGER.error(x)
-                #    raise
+                try:
+                    response = method(self, *args)
+                    if response is not None:
+                        return response
+                except Exception as x:
+                    LOGGER.error(x)
 
         # If the connection fails or nothing found, fall back and load the ontology locally
         if self.graph and not self.graph.is_loaded():