Simple error handler

Author: bidoubiwa

meilisearch/_httprequests.py

@@ -1,4 +1,6 @@
 import requests
+from meilisearch.meilisearch_api_error import MeiliSearchApiError
+from meilisearch.meilisearch_communication_error import MeiliSearchCommunicationError
 
 class HttpRequests:
 
@@ -14,41 +16,52 @@ def __init__(self, config):
 
 
     def get(self, path):
-        request = requests.get(
-            self.config.url + '/' + path,
-            headers=self.headers,
-        )
-        return self.__validate(request)
+        try:
+            request = requests.get(
+                self.config.url + '/' + path,
+                headers=self.headers,
+            )
+            return self.__validate(request)
+        except requests.exceptions.ConnectionError as err:
+            raise MeiliSearchCommunicationError(err) from None
 
     def post(self, path, body=None):
         if body is None:
             body = {}
-        request = requests.post(
-            self.config.url + '/' + path,
-            headers=self.headers,
-            json=body
-        )
-        return self.__validate(request)
-
+        try:
+            request = requests.post(
+                self.config.url + '/' + path,
+                headers=self.headers,
+                json=body
+            )
+            return self.__validate(request)
+        except requests.exceptions.ConnectionError as err:
+            raise MeiliSearchCommunicationError(err) from None
     def put(self, path, body=None):
         if body is None:
             body = {}
-        request = requests.put(
-            self.config.url + '/' + path,
-            headers=self.headers,
-            json=body
-        )
-        return self.__validate(request)
+        try:
+            request = requests.put(
+                self.config.url + '/' + path,
+                headers=self.headers,
+                json=body
+            )
+            return self.__validate(request)
+        except requests.exceptions.ConnectionError as err:
+            raise MeiliSearchCommunicationError(err) from None
 
     def delete(self, path, body=None):
         if body is None:
             body = {}
-        request = requests.delete(
-            self.config.url + '/' + path,
-            headers=self.headers,
-            json=body
-        )
-        return self.__validate(request)
+        try:
+            request = requests.delete(
+                self.config.url + '/' + path,
+                headers=self.headers,
+                json=body
+            )
+            return self.__validate(request)
+        except requests.exceptions.ConnectionError as err:
+            raise MeiliSearchCommunicationError(err) from None
 
     @staticmethod
     def __to_json(request):
@@ -61,7 +74,5 @@ def __validate(request):
         try:
             request.raise_for_status()
             return HttpRequests.__to_json(request)
-        except requests.exceptions.HTTPError as err:
-            raise Exception(err)
-        except requests.exceptions.ConnectionError as err:
-            raise Exception(err)
+        except requests.exceptions.HTTPError:
+            raise MeiliSearchApiError(request.status_code, request.text) from None

meilisearch/meilisearch_api_error.py

@@ -0,0 +1,16 @@
+import json
+
+class MeiliSearchApiError(Exception):
+    """Error from MeiliSearch API"""
+    def __init__(self, status_code, text):
+        self.status_code = status_code
+        try:
+            self.message = json.loads(text)["message"]
+        except:
+            self.message = None
+        super().__init__(self.message)
+
+    def __str__(self):
+        if self.message is not None:
+            message = f'-> {self.message}'
+        return f'HTTP status: {self.status_code} {message}'

meilisearch/meilisearch_communication_error.py

@@ -0,0 +1,5 @@
+class MeiliSearchCommunicationError(Exception):
+    """Error when communicating with MeiliSearch"""
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)