Неправильная обработка результата списочного метода в call

Fixes #173

Author: leshchenko1979

fast_bitrix24/mult_request.py

@@ -1,4 +1,5 @@
 from asyncio import FIRST_COMPLETED, ensure_future, wait
+from beartype.typing import Dict, List, Union
 
 from more_itertools import chunked
 from tqdm import tqdm
@@ -20,7 +21,7 @@ def __init__(
         self.real_start = real_start
         self.mute = mute
 
-        self.results = []
+        self.results = None
         self.task_iterator = self.generate_a_task()
         self.tasks = set()
 
@@ -44,10 +45,10 @@ def generate_a_task(self):
         for batch in batches:
             yield ensure_future(self.srh.single_request("batch", batch))
 
-    def batch_command_label(self, i, item):
+    def batch_command_label(self, i: int, item) -> str:
         return f"cmd{i:010}"
 
-    async def run(self):
+    async def run(self) -> Union[Dict, List]:
         self.top_up_tasks()
 
         with self.get_pbar() as pbar:
@@ -64,7 +65,7 @@ async def run(self):
 
         return self.results
 
-    def top_up_tasks(self):
+    def top_up_tasks(self) -> None:
         """Добавляем в self.tasks столько задач, сколько свободных слотов для
         запросов есть сейчас в self.srh."""
 
@@ -75,7 +76,7 @@ def top_up_tasks(self):
             except StopIteration:
                 break
 
-    def process_done_tasks(self, done) -> int:
+    def process_done_tasks(self, done: list) -> int:
         """Извлечь результаты из списка законченных задач
         и вернуть кол-во извлеченных элементов."""
 
@@ -84,7 +85,9 @@ def process_done_tasks(self, done) -> int:
             batch_response = done_task.result()
             extracted = ServerResponseParser(batch_response).extract_results()
 
-            if isinstance(extracted, list):
+            if self.results is None:
+                self.results = extracted
+            elif isinstance(extracted, list):
                 self.results.extend(extracted)
             elif isinstance(extracted, dict):
                 self.results.update(extracted)
@@ -120,7 +123,6 @@ class MultipleServerRequestHandlerPreserveIDs(MultipleServerRequestHandler):
     def __init__(self, bitrix, method, item_list, ID_field):
         super().__init__(bitrix, method, item_list)
         self.ID_field = ID_field
-        self.results = {}
 
     def batch_command_label(self, i, item):
         return item[self.ID_field]

fast_bitrix24/user_request.py

@@ -241,7 +241,13 @@ async def run(self):
         if is_single_item:
             self.item_list = [self.item_list]
 
-        results = tuple((await super().run()).values())
+        raw_results = await super().run()
+
+        if isinstance(raw_results, dict):
+            results = tuple(raw_results.values())
+        else:
+            # бывают случаи, чт возвращается список
+            results = raw_results
 
         return results[0] if is_single_item else results
 

tests/real_responses/batch_list_empty.py

@@ -0,0 +1,28 @@
+response = {
+    "result": {
+        "result": {"order0000000000": []},
+        "result_error": [],
+        "result_total": {"order0000000000": 0},
+        "result_next": [],
+        "result_time": {
+            "order0000000000": {
+                "start": 1654094027.205917,
+                "finish": 1654094027.270924,
+                "duration": 0.06500720977783203,
+                "processing": 0.06493496894836426,
+                "date_start": "2022-06-01T17:33:47+03:00",
+                "date_finish": "2022-06-01T17:33:47+03:00",
+                "operating": 0,
+            }
+        },
+    },
+    "time": {
+        "start": 1654094027.096381,
+        "finish": 1654094027.27095,
+        "duration": 0.17456912994384766,
+        "processing": 0.06515002250671387,
+        "date_start": "2022-06-01T17:33:47+03:00",
+        "date_finish": "2022-06-01T17:33:47+03:00",
+        "operating": 0,
+    },
+}

tests/test_server_responses.py

@@ -65,3 +65,14 @@ def test_call_several_success(bx_dummy):
     assert isinstance(results, tuple)
     assert len(results) == 3
     assert isinstance(results[0], dict)
+
+
+def test_call_list_empty(bx_dummy):
+    from tests.real_responses.batch_list_empty import response
+
+    bx_dummy.srh = MockSRH(response)
+    results = bx_dummy.call(
+        "crm.lead.list", ({"filter": {"PHONE": "+0000877578564"}, "select": ["ID"]},)
+    )
+    assert isinstance(results, list)
+    assert len(results) == 0