Skip to content

make _request_timeout args work as expected; add default timeout #7

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
mike-eh2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make _request_timeout args work as expected; add default timeout #7

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions osisoft/pidevclub/piwebapi/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ def __call_api(self, resource_path, method,
response_data = self.request(method, url,
query_params=query_params,
headers=header_params,
body=body)
body=body,
timeout=_request_timeout)

return_data = response_data
if _preload_content:
Expand Down Expand Up @@ -321,12 +322,13 @@ def call_api(self, resource_path, method,
thread.start()
return thread

def request(self, method, url, query_params=None, headers=None, body=None):
def request(self, method, url, query_params=None, headers=None, body=None, timeout=None):

return self.rest_client.send_request(url, method,
body=body,
query_params=query_params,
headers=headers)
headers=headers,
timeout=timeout)



Expand Down
19 changes: 11 additions & 8 deletions osisoft/pidevclub/piwebapi/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,31 @@ def __init__(self, verifySsl):
self.verifySsl = verifySsl


def send_request(self, url, method, body, headers=None,query_params=None):
def send_request(self, url, method, body, headers=None, query_params=None, timeout=None):

"""
Makes the HTTP request using RESTClient.
"""
if query_params:
url += '?' + urlencode(query_params)

if timeout is None:
timeout = (60, 600) # 1 minute connection timeout; 10 minute response timeout

if method == "GET":
response = requests.get(url, auth=self.auth, headers=headers, verify=self.verifySsl)
response = requests.get(url, auth=self.auth, headers=headers, verify=self.verifySsl, timeout=timeout)
elif method == "HEAD":
response = requests.head(url, auth=self.auth, headers=headers, verify=self.verifySsl)
response = requests.head(url, auth=self.auth, headers=headers, verify=self.verifySsl, timeout=timeout)
elif method == "OPTIONS":
response = requests.options(url, auth=self.auth, headers=headers, verify=self.verifySsl)
response = requests.options(url, auth=self.auth, headers=headers, verify=self.verifySsl, timeout=timeout)
elif method == "POST":
response = requests.post(url, json=body, auth=self.auth, headers=headers, verify=self.verifySsl)
response = requests.post(url, json=body, auth=self.auth, headers=headers, verify=self.verifySsl, timeout=timeout)
elif method == "PUT":
response = requests.put(url, json=body, auth=self.auth, headers=headers, verify=self.verifySsl)
response = requests.put(url, json=body, auth=self.auth, headers=headers, verify=self.verifySsl, timeout=timeout)
elif method == "PATCH":
response = requests.patch(url, json=body, auth=self.auth, headers=headers, verify=self.verifySsl)
response = requests.patch(url, json=body, auth=self.auth, headers=headers, verify=self.verifySsl, timeout=timeout)
elif method == "DELETE":
response = requests.delete(url, auth=self.auth, headers=headers, verify=self.verifySsl)
response = requests.delete(url, auth=self.auth, headers=headers, verify=self.verifySsl, timeout=timeout)
else:
raise ValueError(
"http method must be `GET`, `HEAD`, `OPTIONS`,"
Expand Down