Skip to content

Fixing __str__ issues with MeiliSearchApiError #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions meilisearch/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,23 @@ class MeiliSearchApiError(MeiliSearchError):

def __init__(self, error: str, request: Response) -> None:
self.status_code = request.status_code
self.error_code = None
self.error_link = None

if request.text:
self.message = f'{json.loads(request.text)["message"]}'
self.error_code = f'{json.loads(request.text)["errorCode"]}'
self.error_link = f'{json.loads(request.text)["errorLink"]}'
json_data = json.loads(request.text)
self.message = json_data.get('message')
self.error_code = json_data.get('errorCode')
self.error_link = json_data.get('errorLink')
else:
self.message = error
super().__init__(self.message)

def __str__(self) -> str:
return f'MeiliSearchApiError. Error code: {self.error_code}. Error message: {self.message}. Error documentation: {self.error_link}'
if self.error_code and self.error_link:
return f'MeiliSearchApiError. Error code: {self.error_code}. Error message: {self.message}. Error documentation: {self.error_link}'

return f'MeiliSearchApiError. {self.message}'

class MeiliSearchCommunicationError(MeiliSearchError):
"""Error when connecting to MeiliSearch"""
Expand Down
14 changes: 14 additions & 0 deletions meilisearch/tests/errors/test_api_error_meilisearch.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# pylint: disable=invalid-name

from unittest.mock import patch
import pytest
import requests
import meilisearch
from meilisearch.errors import MeiliSearchApiError
from meilisearch.tests import BASE_URL, MASTER_KEY
Expand All @@ -14,3 +16,15 @@ def test_meilisearch_api_error_wrong_master_key():
client = meilisearch.Client(BASE_URL, MASTER_KEY + '123')
with pytest.raises(MeiliSearchApiError):
client.create_index("some_index")

@patch('requests.post')
def test_meilisearch_api_error_no_error_code(mock_post):
"""Here to test for regressions related to https://github.com/meilisearch/meilisearch-python/issues/305."""

mock_response = requests.models.Response()
mock_response.status_code = 408
mock_post.return_value = mock_response

with pytest.raises(MeiliSearchApiError):
client = meilisearch.Client(BASE_URL, MASTER_KEY + '123')
client.create_index('some_index')