Sync master/develop

.gitignore

@@ -86,6 +86,13 @@ celerybeat-schedule
 .venv
 venv/
 ENV/
+share
+include
+bin
+
+# pipenv generated filespip 
+Pipfile
+Pipfile.lock
 
 # Spyder project settings
 .spyderproject
@@ -99,3 +106,6 @@ ENV/
 
 # mypy
 .mypy_cache/
+
+#build packages
+src 

.travis.yml

@@ -12,7 +12,7 @@ python:
   - "3.6-dev"  # 3.6 development branch
   - "3.7-dev"
 install:
-  - pip install -e git+https://github.com/HTTP-APIs/hydrus#egg=hydrus
+  - pip install -e git+https://github.com/HTTP-APIs/hydra-python-core#egg=hydra_python_core
   - pip install -e .
 
 script: python -m unittest discover

hydra_agent/hydra_graph.py

@@ -2,8 +2,7 @@
 from redisgraph import Graph, Node
 import urllib.request
 import json
-from hydrus.hydraspec import doc_maker
-import hydrus
+from hydra_python_core import doc_maker, doc_writer
 from graphviz import Digraph
 from hydra_agent.classes_objects import ClassEndpoints,RequestError
 from hydra_agent.collections_endpoint import CollectionEndpoints
@@ -21,12 +20,12 @@ def get_apistructure(self,entrypoint_node, api_doc):
         for support_property in api_doc.entrypoint.entrypoint.supportedProperty:
             if isinstance(
                     support_property,
-                    hydrus.hydraspec.doc_writer.EntryPointClass):
+                    doc_writer.EntryPointClass):
                 self.class_endpoints[support_property.name] = support_property.id_
 
             if isinstance(
                     support_property,
-                    hydrus.hydraspec.doc_writer.EntryPointCollection):
+                    doc_writer.EntryPointCollection):
                 self.collection_endpoints[support_property.name] = support_property.id_
 
         if len(self.class_endpoints.keys())>0:

hydra_agent/querying_mechanism.py

@@ -3,8 +3,9 @@
 import logging
 from hydra_agent.hydra_graph import InitialGraph
 import urllib.request
+from urllib.parse import urljoin
 import json
-from hydrus.hydraspec import doc_maker
+from hydra_python_core import doc_maker
 from urllib.error import URLError, HTTPError
 from hydra_agent.collections_endpoint import CollectionEndpoints
 from hydra_agent.classes_objects import ClassEndpoints,RequestError
@@ -29,18 +30,17 @@ def load_data(self, url):
         :return: loaded data
         """
         try:
-            response = urllib.request.urlopen(url)
+            with urllib.request.urlopen(url) as response:
+                return json.loads(response.read().decode('utf-8'))
         except HTTPError as e:
-            logger.info('Error code: ', e.code)
+            logger.error('Error Code: {}'.format(e.code))
             return RequestError("error")
         except URLError as e:
-            logger.info('Reason: ', e.reason)
+            logger.error('Reason: {}'.format(e.reason))
             return RequestError("error")
         except ValueError as e:
-            logger.info("value error:", e)
+            logger.error("Value Error: {}".format(e))
             return RequestError("error")
-        else:
-            return json.loads(response.read().decode('utf-8'))
 
     def show_data(self, get_data):
         """
@@ -658,7 +658,7 @@ def query(apidoc, url):
 
     while True:
         print("press exit to quit")
-        query = input(">>>")
+        query = input(">>>").strip()
         if query == "exit":
             break
         elif query == "help":
@@ -672,7 +672,7 @@ def main():
     Take URL as an input and make graph using initilize function.
     :return: call query function for more query.
     """
-    url = input("url>>>")
+    url = input("url>>>").strip()
     if url == "exit":
         print("exit...")
         return 0
@@ -681,11 +681,13 @@ def main():
     while True:
         if isinstance (apidoc, RequestError):
             print("enter right url")
-            url = input("url>>>")
+            url = input("url>>>").strip()
             if url == "exit":
                 print("exit...")
                 return 0
-            apidoc = handle_data.load_data(url + "/vocab")
+            url = url.rstrip('/') + '/'
+            url = urljoin(url, 'vocab')
+            apidoc = handle_data.load_data(url)
         else:
             break
     return query(apidoc, url)

redis_setup.sh

@@ -1,7 +1,7 @@
 
 #It will check, if docker is not installed then install it.
 docker -v
-if [ echo "$?" = "127" ]
+if [ "$?" = "127" ]
 then
 sudo apt-get update
 sudo apt-get install docker

requirements.txt

@@ -2,7 +2,7 @@ rdflib
 rdflib-jsonld
 uritemplate
 httplib2
-redis
+redis==2.10.6
 redisgraph
 graphviz
--e git+https://github.com/HTTP-APIs/hydrus.git#egg=hydrus
+-e git+https://github.com/HTTP-APIs/hydra-python-core.git#egg=hydra_python_core