Skip to content

update request handling in send_request method #8

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

Open
R4wd0g wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update request handling in send_request method #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions nanobot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import http.client
import json
from urllib.parse import urlsplit
from urllib.request import Request, urlopen

import sublime

Expand Down Expand Up @@ -106,14 +107,15 @@ def send_request(
retries=0
):
try:
conn = NanoBot.create_connection(
config['NANO_BOTS_API_ADDRESS'], timeout)
api_address = config['NANO_BOTS_API_ADDRESS']
headers = NanoBot.create_headers(config)
json_str = NanoBot.create_json(params)
url = api_address + path

conn.request(method, path, json_str, headers)
response = NanoBot.get_response(conn)
conn.close()
req = Request(url, data=json_str.encode('utf-8') if json_str else None,
headers=headers, method=method)
response_obj = urlopen(req, timeout=timeout)
response = NanoBot.get_response(response_obj)

if thread_callback is not None and thread_event is not None:
if not thread_event.is_set():
Expand Down Expand Up @@ -171,16 +173,15 @@ def create_json(params):
return json.dumps(params)

@staticmethod
def get_response(conn):
response = conn.getresponse()
def get_response(response_obj):
output = {}
if response.status == 200:
if response_obj.status == 200:
try:
output = json.loads(response.read().decode())
except json.JSONDecodeError:
output = json.loads(response_obj.read().decode())
except (ValueError, TypeError):
output = {'output': 'Invalid JSON response.'}
else:
output = {
'output': 'Request failed with status code: {}'.format(
response.status)}
response_obj.status)}
return output