Use common api call object for all resources.

Ensures that meta information about node failures are shared across different resource calls.

Author: kishorenc

typesense/alias.py

@@ -1,12 +1,8 @@
-from .documents import Documents
-from .api_call import ApiCall
-
-
 class Alias(object):
-    def __init__(self, config, name):
+    def __init__(self, config, api_call, name):
         self.config = config
+        self.api_call = api_call
         self.name = name
-        self.api_call = ApiCall(config)
 
     def _endpoint_path(self):
         from .aliases import Aliases

typesense/aliases.py

@@ -1,18 +1,17 @@
 from typesense.alias import Alias
-from .api_call import ApiCall
 
 
 class Aliases(object):
     RESOURCE_PATH = '/aliases'
 
-    def __init__(self, config):
+    def __init__(self, config, api_call):
         self.config = config
-        self.api_call = ApiCall(config)
+        self.api_call = api_call
         self.aliases = {}
 
     def __getitem__(self, name):
         if name not in self.aliases:
-            self.aliases[name] = Alias(self.config, name)
+            self.aliases[name] = Alias(self.config, self.api_call, name)
 
         return self.aliases.get(name)
 

typesense/client.py

@@ -1,10 +1,14 @@
 from .aliases import Aliases
+from .debug import Debug
 from .collections import Collections
 from .configuration import Configuration
+from .api_call import ApiCall
 
 
 class Client(object):
     def __init__(self, config_dict):
         self.config = Configuration(config_dict)
-        self.collections = Collections(self.config)
-        self.aliases = Aliases(self.config)
+        self.api_call = ApiCall(self.config)
+        self.collections = Collections(self.config, self.api_call)
+        self.aliases = Aliases(self.config, self.api_call)
+        self.debug = Debug(self.config, self.api_call)

typesense/collection.py

@@ -1,15 +1,14 @@
 from .overrides import Overrides
 from .documents import Documents
-from .api_call import ApiCall
 
 
 class Collection(object):
-    def __init__(self, config, name):
+    def __init__(self, config, api_call, name):
         self.config = config
         self.name = name
-        self.api_call = ApiCall(config)
-        self.documents = Documents(config, name)
-        self.overrides = Overrides(config, name)
+        self.api_call = api_call
+        self.documents = Documents(config, api_call, name)
+        self.overrides = Overrides(config, api_call, name)
 
     def _endpoint_path(self):
         from .collections import Collections

typesense/collections.py

@@ -1,18 +1,17 @@
-from .api_call import ApiCall
 from .collection import Collection
 
 
 class Collections(object):
     RESOURCE_PATH = '/collections'
 
-    def __init__(self, config):
+    def __init__(self, config, api_call):
         self.config = config
-        self.api_call = ApiCall(config)
+        self.api_call = api_call
         self.collections = {}
 
     def __getitem__(self, collection_name):
         if collection_name not in self.collections:
-            self.collections[collection_name] = Collection(self.config, collection_name)
+            self.collections[collection_name] = Collection(self.config, self.api_call, collection_name)
 
         return self.collections.get(collection_name)
 

typesense/debug.py

@@ -1,9 +1,10 @@
-from .api_call import ApiCall
-
-
 class Debug(object):
-    ENDPOINT_PATH = '/debug'
+    RESOURCE_PATH = '/debug'
+
+    def __init__(self, config, api_call):
+        self.config = config
+        self.api_call = api_call
+        self.collections = {}
 
-    @staticmethod
-    def retrieve():
-        ApiCall.get(Debug.ENDPOINT_PATH, {})
+    def retrieve(self):
+        return self.api_call.get('{0}'.format(Debug.RESOURCE_PATH))

typesense/document.py

@@ -1,12 +1,9 @@
-from .api_call import ApiCall
-
-
 class Document(object):
-    def __init__(self, config, collection_name, document_id):
+    def __init__(self, config, api_call, collection_name, document_id):
         self.config = config
+        self.api_call = api_call
         self.collection_name = collection_name
         self.document_id = document_id
-        self.api_call = ApiCall(config)
 
     def _endpoint_path(self):
         from .documents import Documents

typesense/documents.py

@@ -1,21 +1,20 @@
 import json
 
 from .document import Document
-from .api_call import ApiCall
 
 
 class Documents(object):
     RESOURCE_PATH = 'documents'
 
-    def __init__(self, config, collection_name):
+    def __init__(self, config, api_call, collection_name):
         self.config = config
+        self.api_call = api_call
         self.collection_name = collection_name
-        self.api_call = ApiCall(config)
         self.documents = {}
 
     def __getitem__(self, document_id):
         if document_id not in self.documents:
-            self.documents[document_id] = Document(self.config, self.collection_name, document_id)
+            self.documents[document_id] = Document(self.config, self.api_call, self.collection_name, document_id)
 
         return self.documents[document_id]
 

typesense/override.py

@@ -1,12 +1,9 @@
-from .api_call import ApiCall
-
-
 class Override(object):
-    def __init__(self, config, collection_name, override_id):
+    def __init__(self, config, api_call, collection_name, override_id):
         self.config = config
+        self.api_call = api_call
         self.collection_name = collection_name
         self.override_id = override_id
-        self.api_call = ApiCall(config)
 
     def _endpoint_path(self):
         from .overrides import Overrides

typesense/overrides.py

@@ -1,19 +1,18 @@
 from .override import Override
-from .api_call import ApiCall
 
 
 class Overrides(object):
     RESOURCE_PATH = 'overrides'
 
-    def __init__(self, config, collection_name):
+    def __init__(self, config, api_call, collection_name):
         self.config = config
-        self.api_call = ApiCall(config)
+        self.api_call = api_call
         self.collection_name = collection_name
         self.overrides = {}
 
     def __getitem__(self, override_id):
         if override_id not in self.overrides:
-            self.overrides[override_id] = Override(self.config, self.collection_name, override_id)
+            self.overrides[override_id] = Override(self.config, self.api_call, self.collection_name, override_id)
 
         return self.overrides[override_id]