Skip to content

Corrected logger format. Improved URL processing #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mec-iS merged 3 commits into from
Mar 6, 2019
Merged

Corrected logger format. Improved URL processing #90

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe0032d
Added a check for trailing slash in url_input.
shravandoda Mar 3, 2019
299aa59
urllib request should be used with a context manager.
shravandoda Mar 3, 2019
2eb8864
Corrected the logger format.
shravandoda Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions hydra_agent/querying_mechanism.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import logging
from hydra_agent.hydra_graph import InitialGraph
import urllib.request
from urllib.parse import urljoin
import json
from hydra_python_core import doc_maker
from urllib.error import URLError, HTTPError
Expand All @@ -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):
"""
Expand Down Expand Up @@ -685,7 +685,9 @@ def main():
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)
Expand Down