Rename timeout_seconds to connection_timeout_seconds

Author: kishorenc

examples/alias_operations.py

@@ -9,7 +9,7 @@
     'port': '8108',
     'protocol': 'http'
   }],
-  'timeout_seconds': 2
+  'connection_timeout_seconds': 2
 })
 
 # Create a collection

examples/collection_operations.py

@@ -15,7 +15,7 @@
         'port': '8108',
         'protocol': 'http'
     }],
-    'timeout_seconds': 2
+    'connection_timeout_seconds': 2
 })
 
 # Create a collection

examples/curation_operations.py

@@ -9,7 +9,7 @@
     'port': '8108',
     'protocol': 'http'
   }],
-  'timeout_seconds': 2
+  'connection_timeout_seconds': 2
 })
 
 # Create a collection

examples/index_and_search.py

@@ -9,25 +9,25 @@
 
 
 client = typesense.Client({
-    'api_key': 'abcd',
+    'api_key': 'esdSJsadjadskSAksdjsdnasw',
     'nodes': [
         {
-            'host': 'localhost',
-            'port': '8108',
-            'protocol': 'http'
+            'host': 'tempest2-1.a1.typesense.net',
+            'port': '443',
+            'protocol': 'https'
         },
         {
-            'host': 'localhost',
-            'port': '7108',
-            'protocol': 'http'
+            'host': 'tempest2-2.a1.typesense.net',
+            'port': '443',
+            'protocol': 'https'
         },
         {
-            'host': 'localhost',
-            'port': '6108',
-            'protocol': 'http'
+            'host': 'tempest2-3.a1.typesense.net',
+            'port': '443',
+            'protocol': 'https'
         }
     ],
-    'timeout_seconds': 2
+    'connection_timeout_seconds': 10
 })
 
 schema = {
@@ -55,6 +55,7 @@
     for json_line in infile:
         book_documents.append(json.loads(json_line))
 
+print('')
 print(client.collections['books'].documents.create_many(book_documents))
 
 i = 0

typesense/api_call.py

@@ -84,8 +84,8 @@ def make_request(self, fn, endpoint, as_json, **kwargs):
                 if 0 < r.status_code < 500:
                     node.healthy = True
 
-                # We should raise a custom exception if status code is not 200 or 201
-                if r.status_code not in [200, 201]:
+                # We should raise a custom exception if status code is not 20X
+                if 200 <= r.status_code < 300:
                     error_message = r.json().get('message', 'API error.')
                     # Raised exception will be caught and retried only if it's a 50X
                     raise ApiCall.get_exception(r.status_code)(r.status_code, error_message)
@@ -104,16 +104,16 @@ def get(self, endpoint, params=None, as_json=True):
         params = params or {}
         return self.make_request(requests.get, endpoint, as_json,
                                  params=params,
-                                 timeout=self.config.timeout_seconds)
+                                 timeout=self.config.connection_timeout_seconds)
 
     def post(self, endpoint, body):
         return self.make_request(requests.post, endpoint, True,
-                                 data=body, timeout=self.config.timeout_seconds)
+                                 data=body, timeout=self.config.connection_timeout_seconds)
 
     def put(self, endpoint, body):
         return self.make_request(requests.put, endpoint, True,
-                                 data=body, timeout=self.config.timeout_seconds)
+                                 data=body, timeout=self.config.connection_timeout_seconds)
 
     def delete(self, endpoint):
         return self.make_request(requests.delete, endpoint, True,
-                                 timeout=self.config.timeout_seconds)
+                                 timeout=self.config.connection_timeout_seconds)

typesense/configuration.py

@@ -28,7 +28,7 @@ def __init__(self, config_dict):
             )
 
         self.api_key = config_dict.get('api_key', '')
-        self.timeout_seconds = config_dict.get('timeout_seconds', 3.0)
+        self.connection_timeout_seconds = config_dict.get('connection_timeout_seconds', 3.0)
         self.num_retries = config_dict.get('num_retries', 3)
         self.retry_interval_seconds = config_dict.get('retry_interval_seconds', 1.0)
         self.healthcheck_interval_seconds = config_dict.get('healthcheck_interval_seconds', 60)