make _request_timeout args work as expected; add default timeout

Author: mike-eh2

osisoft/pidevclub/piwebapi/api_client.py

@@ -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:
@@ -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)
 
 
 

osisoft/pidevclub/piwebapi/rest.py

@@ -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`,"