Merge pull request #121 from sanders41/except

Refactor to simplify code

Author: sanders41

meilisearch_python_async/_http_requests.py

@@ -14,7 +14,7 @@
 from meilisearch_python_async.errors import MeiliSearchApiError, MeiliSearchCommunicationError
 
 
-class _HttpRequests:
+class HttpRequests:
     def __init__(self, http_client: AsyncClient) -> None:
         self.http_client = http_client
 
@@ -40,11 +40,7 @@ async def _send_request(
             response.raise_for_status()
             return response
 
-        except RemoteProtocolError as err:
-            raise MeiliSearchCommunicationError(str(err)) from err
-        except ConnectError as err:
-            raise MeiliSearchCommunicationError(str(err)) from err
-        except ConnectTimeout as err:
+        except (ConnectError, ConnectTimeout, RemoteProtocolError) as err:
             raise MeiliSearchCommunicationError(str(err)) from err
         except HTTPError as err:
             raise MeiliSearchApiError(str(err), response) from err

meilisearch_python_async/client.py

@@ -5,7 +5,7 @@
 
 from httpx import AsyncClient
 
-from meilisearch_python_async._http_requests import _HttpRequests
+from meilisearch_python_async._http_requests import HttpRequests
 from meilisearch_python_async.errors import MeiliSearchApiError
 from meilisearch_python_async.index import Index
 from meilisearch_python_async.models.client import ClientStats, Keys
@@ -31,7 +31,7 @@ def __init__(self, url: str, api_key: str | None = None, *, timeout: int | None
         self._http_client = AsyncClient(
             base_url=url, timeout=timeout, headers=self._set_headers(api_key)
         )
-        self._http_requests = _HttpRequests(self._http_client)
+        self._http_requests = HttpRequests(self._http_client)
 
     async def __aenter__(self) -> Client:
         return self

meilisearch_python_async/index.py

@@ -13,7 +13,7 @@
 import aiofiles
 from httpx import AsyncClient
 
-from meilisearch_python_async._http_requests import _HttpRequests
+from meilisearch_python_async._http_requests import HttpRequests
 from meilisearch_python_async.errors import (
     InvalidDocumentError,
     MeiliSearchApiError,
@@ -61,7 +61,7 @@ def __init__(
         self._documents_url = f"{self._base_url_with_uid}/documents"
         self._stats_url = f"{self._base_url_with_uid}/stats"
         self._settings_url = f"{self._base_url_with_uid}/settings"
-        self._http_requests = _HttpRequests(http_client)
+        self._http_requests = HttpRequests(http_client)
 
     def __str__(self) -> str:
         return f"{type(self).__name__}(uid={self.uid}, primary_key={self.primary_key}, created_at={self.created_at}, updated_at={self.updated_at})"
@@ -115,12 +115,13 @@ async def delete_if_exists(self) -> bool:
         """
         try:
             await self.delete()
-            return True
         except MeiliSearchApiError as error:
             if error.code != "index_not_found":
                 raise
             return False
 
+        return True
+
     async def update(self, primary_key: str) -> Index:
         """Update the index primary key.
 
@@ -241,7 +242,7 @@ async def create(
             payload = {"primaryKey": primary_key, "uid": uid}
 
         url = "indexes"
-        response = await _HttpRequests(http_client).post(url, payload)
+        response = await HttpRequests(http_client).post(url, payload)
         index_dict = response.json()
         return cls(
             http_client=http_client,

tests/test_index.py

@@ -3,7 +3,7 @@
 import pytest
 from httpx import Response
 
-from meilisearch_python_async._http_requests import _HttpRequests
+from meilisearch_python_async._http_requests import HttpRequests
 from meilisearch_python_async.errors import MeiliSearchApiError, MeiliSearchTimeoutError
 from meilisearch_python_async.index import Index
 from meilisearch_python_async.models.settings import MeiliSearchSettings
@@ -517,7 +517,7 @@ async def test_delete_if_exists_error(test_client, index_uid, monkeypatch):
     async def mock_response(*args, **kwargs):
         raise MeiliSearchApiError("test", Response(status_code=404))
 
-    monkeypatch.setattr(_HttpRequests, "_send_request", mock_response)
+    monkeypatch.setattr(HttpRequests, "_send_request", mock_response)
     with pytest.raises(MeiliSearchApiError):
         await test_client.index(index_uid).delete_if_exists()
 
@@ -547,6 +547,6 @@ async def test_delete_index_if_exists_error(test_client, index_uid, monkeypatch)
     async def mock_response(*args, **kwargs):
         raise MeiliSearchApiError("test", Response(status_code=404))
 
-    monkeypatch.setattr(_HttpRequests, "_send_request", mock_response)
+    monkeypatch.setattr(HttpRequests, "_send_request", mock_response)
     with pytest.raises(MeiliSearchApiError):
         await test_client.delete_index_if_exists(index_uid)