Refactor batch classes and tests

Co-authored-by: sanders41 <[email protected]>

Author: ellnix

meilisearch/models/task.py

@@ -149,10 +149,10 @@ def validate_finished_at(cls, v: str) -> Optional[datetime]:  # pylint: disable=
             return iso_to_date_time(v)
 
 
-class BatchResults:
-    def __init__(self, resp: Dict[str, Any]) -> None:
-        self.results: List[Batch] = [Batch(**batch) for batch in resp["results"]]
-        self.total: int = resp["total"]
-        self.limit: int = resp["limit"]
-        self.from_: int = resp["from"]
-        self.next_: int = resp["next"]
+class BatchResults(CamelBase):
+    results: List[Batch]
+    total: int
+    limit: int
+    from_: int
+    # None means last page
+    next_: Optional[int]

meilisearch/task.py

@@ -48,10 +48,10 @@ def get_batches(self, parameters: Optional[MutableMapping[str, Any]] = None) ->
         if parameters is None:
             parameters = {}
         for param in parameters:
-            if isinstance(parameters[param], list):
+            if isinstance(parameters[param], (list, tuple)):
                 parameters[param] = ",".join(parameters[param])
         batches = self.http.get(f"{self.config.paths.batch}?{parse.urlencode(parameters)}")
-        return BatchResults(batches)
+        return BatchResults(**batches)
 
     def get_batch(self, uid: int) -> Batch:
         """Get one tasks batch.

tests/client/test_client_task_meilisearch.py

@@ -186,12 +186,6 @@ def test_get_batches_with_parameters(client):
 def test_get_batch(client):
     """Tests getting the details of a batch."""
     batches = client.get_batches({"limit": 1})
-    batch = client.get_batch(batches.results[0].uid)
-    batch_dict = batch.__dict__
-    assert "uid" in batch_dict
-    assert "details" in batch_dict
-    assert "stats" in batch_dict
-    assert "duration" in batch_dict
-    assert "started_at" in batch_dict
-    assert "finished_at" in batch_dict
-    assert "progress" in batch_dict
+    uid = batches.results[0].uid
+    batch = client.get_batch(uid)
+    assert batch.uid == uid