Merge branch 'bump-meilisearch-v0.30.0' into add_swap_indexes_feature_for_v0.30.0

Author: alallema

meilisearch/client.py

@@ -14,7 +14,7 @@
 from meilisearch.errors import MeiliSearchError
 from meilisearch.index import Index
 from meilisearch.models.task import TaskInfo
-from meilisearch.task import get_task, get_tasks, wait_for_task
+from meilisearch.task import cancel_tasks, get_task, get_tasks, wait_for_task
 
 
 class Client:
@@ -463,6 +463,27 @@ def get_task(self, uid: int) -> dict[str, Any]:
         """
         return get_task(self.config, uid)
 
+    def cancel_tasks(self, parameters: dict[str, Any]) -> TaskInfo:
+        """Cancel a list of enqueued or processing tasks.
+
+        Parameters
+        ----------
+        parameters (optional):
+            parameters accepted by the cancel tasks route:https://docs.meilisearch.com/reference/api/tasks.html#cancel-tasks.
+
+        Returns
+        -------
+        task_info:
+            TaskInfo instance containing information about a task to track the progress of an asynchronous process.
+            https://docs.meilisearch.com/reference/api/tasks.html#get-one-task
+
+        Raises
+        ------
+        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(self.config, parameters=parameters)
+
     def wait_for_task(
         self,
         uid: int,

meilisearch/models/task.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Union
 
 from camel_converter.pydantic_base import CamelBase
 
@@ -11,7 +11,8 @@ class Task(CamelBase):
     status: str
     type: str
     details: Dict[str, Any]
-    error: Optional[Dict[str, Any]]
+    error: Union[Dict[str, Any], None]
+    canceled_by: Union[int, None]
     duration: str
     enqueued_at: str
     started_at: str

meilisearch/task.py

@@ -8,6 +8,7 @@
 from meilisearch._httprequests import HttpRequests
 from meilisearch.config import Config
 from meilisearch.errors import MeiliSearchTimeoutError
+from meilisearch.models.task import TaskInfo
 
 
 def get_tasks(
@@ -67,6 +68,37 @@ def get_task(config: Config, uid: int) -> dict[str, Any]:
     return http.get(f"{config.paths.task}/{uid}")
 
 
+def cancel_tasks(config: Config, parameters: dict[str, Any]) -> TaskInfo:
+    """Cancel a list of enqueued or processing tasks.
+
+    Parameters
+    ----------
+    config:
+        Config object containing permission and location of Meilisearch.
+    parameters (optional):
+        parameters accepted by the cancel tasks https://docs.meilisearch.com/reference/api/tasks.html#cancel-task.
+
+    Returns
+    -------
+    task_info:
+        TaskInfo instance containing information about a task to track the progress of an asynchronous process.
+        https://docs.meilisearch.com/reference/api/tasks.html#get-one-task
+
+    Raises
+    ------
+    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
+    """
+    http = HttpRequests(config)
+    if parameters is None:
+        parameters = {}
+    for param in parameters:
+        if isinstance(parameters[param], list):
+            parameters[param] = ",".join(parameters[param])
+    response = http.post(f"{config.paths.task}/cancel?{parse.urlencode(parameters)}")
+    return TaskInfo(**response)
+
+
 def wait_for_task(
     config: Config,
     uid: int,

tests/client/test_client_task_meilisearch.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from meilisearch.models.task import TaskInfo
 from tests import common
 
 
@@ -91,3 +92,42 @@ def test_get_task_inexistent(client):
     """Tests getting a task that does not exists."""
     with pytest.raises(Exception):
         client.get_task("abc")
+
+
+@pytest.fixture
+def create_tasks(empty_index, small_movies):
+    """Ensures there are some tasks present for testing."""
+    index = empty_index()
+    index.update_ranking_rules(["type", "exactness"])
+    index.reset_ranking_rules()
+    index.add_documents(small_movies)
+    index.add_documents(small_movies)
+
+
+@pytest.mark.usefixtures("create_tasks")
+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.type == "taskCancelation"
+    assert "uids" in tasks["results"][0]["details"]["originalFilter"]
+    assert "uids=1%2C2" in tasks["results"][0]["details"]["originalFilter"]
+
+
+@pytest.mark.usefixtures("create_tasks")
+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.type == "taskCancelation"
+    assert "statuses=enqueued%2Cprocessing" in tasks["results"][0]["details"]["originalFilter"]

tests/index/test_index_search_meilisearch.py

@@ -6,6 +6,8 @@ def test_basic_search(index_with_documents):
     response = index_with_documents().search("How to Train Your Dragon")
     assert isinstance(response, dict)
     assert response["hits"][0]["id"] == "166428"
+    assert response["estimatedTotalHits"] is not None
+    assert "hitsPerPage" is not response
 
 
 def test_basic_search_with_empty_params(index_with_documents):
@@ -413,3 +415,29 @@ def test_custom_search_params_with_matching_strategy_last(index_with_documents):
 
     assert isinstance(response, dict)
     assert len(response["hits"]) > 1
+
+
+def test_custom_search_params_with_pagination_parameters(index_with_documents):
+    """Tests search with matching strategy param set to last"""
+    response = index_with_documents().search("", {"hitsPerPage": 1, "page": 1})
+
+    assert isinstance(response, dict)
+    assert len(response["hits"]) == 1
+    assert response["hitsPerPage"] == 1
+    assert response["page"] == 1
+    assert response["totalPages"] is not None
+    assert response["totalHits"] is not None
+    assert "estimatedTotalHits" is not response
+
+
+def test_custom_search_params_with_pagination_parameters_at_zero(index_with_documents):
+    """Tests search with matching strategy param set to last"""
+    response = index_with_documents().search("", {"hitsPerPage": 0, "page": 0})
+
+    assert isinstance(response, dict)
+    assert len(response["hits"]) == 0
+    assert response["hitsPerPage"] == 0
+    assert response["page"] == 0
+    assert response["totalPages"] is not None
+    assert response["totalHits"] is not None
+    assert "estimatedTotalHits" is not response