Modification due to review

Author: alallema

meilisearch/client.py

@@ -14,10 +14,7 @@
 from meilisearch.errors import MeiliSearchError
 from meilisearch.index import Index
 from meilisearch.models.task import TaskInfo
-from meilisearch.task import cancel_tasks as cancel_tasks_func
-from meilisearch.task import get_task as get_task_func
-from meilisearch.task import get_tasks as get_tasks_func
-from meilisearch.task import wait_for_task as wait_for_task_func
+from meilisearch.task import cancel_tasks, get_task, get_tasks, wait_for_task
 
 
 class Client:
@@ -423,7 +420,7 @@ def get_tasks(
         MeiliSearchApiError
             An error containing details about why Meilisearch can't process your request. Meilisearch error codes are described here: https://docs.meilisearch.com/errors/#meilisearch-errors
         """
-        return get_tasks_func(self.config, parameters=parameters)
+        return get_tasks(self.config, parameters=parameters)
 
     def get_task(self, uid: int) -> dict[str, Any]:
         """Get one task.
@@ -443,7 +440,7 @@ def get_task(self, uid: int) -> dict[str, Any]:
         MeiliSearchApiError
             An error containing details about why Meilisearch can't process your request. Meilisearch error codes are described here: https://docs.meilisearch.com/errors/#meilisearch-errors
         """
-        return get_task_func(self.config, uid)
+        return get_task(self.config, uid)
 
     def cancel_tasks(self, parameters: dict[str, Any]) -> TaskInfo:
         """Cancel a list of enqueued or processing tasks.
@@ -464,7 +461,7 @@ def cancel_tasks(self, parameters: dict[str, Any]) -> TaskInfo:
         MeiliSearchApiError
             An error containing details about why Meilisearch can't process your request. Meilisearch error codes are described here: https://docs.meilisearch.com/errors/#meilisearch-errors
         """
-        return cancel_tasks_func(self.config, parameters=parameters)
+        return cancel_tasks(self.config, parameters=parameters)
 
     def wait_for_task(
         self,
@@ -493,7 +490,7 @@ def wait_for_task(
         MeiliSearchTimeoutError
             An error containing details about why Meilisearch can't process your request. Meilisearch error codes are described here: https://docs.meilisearch.com/errors/#meilisearch-errors
         """
-        return wait_for_task_func(self.config, uid, timeout_in_ms, interval_in_ms)
+        return wait_for_task(self.config, uid, timeout_in_ms, interval_in_ms)
 
     def generate_tenant_token(
         self,

meilisearch/index.py

@@ -9,9 +9,7 @@
 from meilisearch.models.document import Document, DocumentsResults
 from meilisearch.models.index import IndexStats
 from meilisearch.models.task import Task, TaskInfo, TaskResults
-from meilisearch.task import get_task as get_task_func
-from meilisearch.task import get_tasks as get_tasks_func
-from meilisearch.task import wait_for_task as wait_for_task_func
+from meilisearch.task import get_task, get_tasks, wait_for_task
 
 
 # pylint: disable=too-many-public-methods
@@ -165,7 +163,7 @@ def get_tasks(self, parameters: dict[str, Any] | None = None) -> TaskResults:
         else:
             parameters = {"indexUids": [self.uid]}
 
-        tasks = get_tasks_func(self.config, parameters=parameters)
+        tasks = get_tasks(self.config, parameters=parameters)
         return TaskResults(tasks)
 
     def get_task(self, uid: int) -> Task:
@@ -186,7 +184,7 @@ def get_task(self, uid: int) -> Task:
         MeiliSearchApiError
             An error containing details about why Meilisearch can't process your request. Meilisearch error codes are described here: https://docs.meilisearch.com/errors/#meilisearch-errors
         """
-        task = get_task_func(self.config, uid)
+        task = get_task(self.config, uid)
         return Task(**task)
 
     def wait_for_task(
@@ -216,7 +214,7 @@ def wait_for_task(
         MeiliSearchTimeoutError
             An error containing details about why Meilisearch can't process your request. Meilisearch error codes are described here: https://docs.meilisearch.com/errors/#meilisearch-errors
         """
-        task = wait_for_task_func(self.config, uid, timeout_in_ms, interval_in_ms)
+        task = wait_for_task(self.config, uid, timeout_in_ms, interval_in_ms)
         return Task(**task)
 
     def get_stats(self) -> IndexStats:

tests/client/test_client_task_meilisearch.py

@@ -97,12 +97,12 @@ def test_get_task_inexistent(client):
 def test_cancel_tasks(client):
     """Tests cancel a task with uid 1."""
     task = client.cancel_tasks({"uids": ["1", "2"]})
+    client.wait_for_task(task.task_uid)
     tasks = client.get_tasks({"types": "taskCancelation"})
 
     assert isinstance(task, TaskInfo)
     assert task.task_uid is not None
     assert task.index_uid is None
-    assert task.status in {"enqueued", "processing", "succeeded"}
     assert task.type == "taskCancelation"
     assert "uids" in tasks["results"][0]["details"]["originalFilter"]
     assert "uids=1%2C2" in tasks["results"][0]["details"]["originalFilter"]
@@ -111,11 +111,11 @@ def test_cancel_tasks(client):
 def test_cancel_every_task(client):
     """Tests cancel every task."""
     task = client.cancel_tasks({"statuses": ["enqueued", "processing"]})
+    client.wait_for_task(task.task_uid)
     tasks = client.get_tasks({"types": "taskCancelation"})
 
     assert isinstance(task, TaskInfo)
     assert task.task_uid is not None
     assert task.index_uid is None
-    assert task.status in {"enqueued", "processing", "succeeded"}
     assert task.type == "taskCancelation"
     assert "statuses=enqueued%2Cprocessing" in tasks["results"][0]["details"]["originalFilter"]