Skip to content

Commit 1b6f674

Browse files
authored
Update code base related to error changes (#355)
1 parent eb84ded commit 1b6f674

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

meilisearch/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def delete_index_if_exists(self, uid: str) -> bool:
7272
self.http.delete(f'{self.config.paths.index}/{uid}')
7373
return True
7474
except MeiliSearchApiError as error:
75-
if error.error_code != "index_not_found":
75+
if error.code != "index_not_found":
7676
raise error
7777
return False
7878

@@ -200,7 +200,7 @@ def get_or_create_index(self, uid: str, options: Optional[Dict[str, Any]] = None
200200
try:
201201
index_instance = self.get_index(uid)
202202
except MeiliSearchApiError as err:
203-
if err.error_code != 'index_not_found':
203+
if err.code != 'index_not_found':
204204
raise err
205205
index_instance = self.create_index(uid, options)
206206
return index_instance

meilisearch/errors.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ class MeiliSearchApiError(MeiliSearchError):
1717

1818
def __init__(self, error: str, request: Response) -> None:
1919
self.status_code = request.status_code
20-
self.error_code = None
21-
self.error_link = None
20+
self.code = None
21+
self.link = None
2222

2323
if request.text:
2424
json_data = json.loads(request.text)
2525
self.message = json_data.get('message')
26-
self.error_code = json_data.get('errorCode')
27-
self.error_link = json_data.get('errorLink')
26+
self.code = json_data.get('code')
27+
self.link = json_data.get('link')
2828
else:
2929
self.message = error
3030
super().__init__(self.message)
3131

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

3636
return f'MeiliSearchApiError. {self.message}'
3737

meilisearch/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def delete_if_exists(self) -> bool:
7070
self.delete()
7171
return True
7272
except MeiliSearchApiError as error:
73-
if error.error_code != "index_not_found":
73+
if error.code != "index_not_found":
7474
raise error
7575
return False
7676

meilisearch/tests/errors/test_api_error_meilisearch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test_meilisearch_api_error_wrong_master_key():
1818
client.create_index("some_index")
1919

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

2424
mock_response = requests.models.Response()

0 commit comments

Comments
 (0)