Improved error handling

Author: bidoubiwa

meilisearch/_httprequests.py

@@ -74,5 +74,5 @@ def __validate(request):
         try:
             request.raise_for_status()
             return HttpRequests.__to_json(request)
-        except requests.exceptions.HTTPError:
-            raise MeiliSearchApiError(request.status_code, request.text) from None
+        except requests.exceptions.HTTPError as err:
+            raise MeiliSearchApiError(err, request) from None

meilisearch/meilisearch_api_error.py

@@ -2,15 +2,13 @@
 
 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
+    def __init__(self, error, request):
+        self.status_code = request.status_code
+        if request.text:
+            self.message = f'HTTP status: {self.status_code} -> {json.loads(request.text)["message"]}'
+        else:
+            self.message = error
         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}'
+        return f'MeiliSearchApiError, {self.message}'

meilisearch/meilisearch_communication_error.py

@@ -3,3 +3,6 @@ class MeiliSearchCommunicationError(Exception):
     def __init__(self, message):
         self.message = message
         super().__init__(self.message)
+
+    def __str__(self):
+        return f'MeiliSearchCommunicationError, {self.message}'