b24api 0.6.0__tar.gz → 0.7.0__tar.gz

{b24api-0.6.0/b24api.egg-info → b24api-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: b24api
-Version: 0.6.0
+Version: 0.7.0
 Summary: Bitrix24 API
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{b24api-0.6.0 → b24api-0.7.0}/b24api/async_api.py

@@ -2,6 +2,7 @@ from collections.abc import AsyncGenerator, AsyncIterable, Iterable
 from itertools import batched, islice
 from typing import Any
 
+from aioitertools.itertools import batched as abatched
 from aioitertools.itertools import chain as achain
 from httpx import AsyncClient
 from tenacity import AsyncRetrying
@@ -48,7 +49,8 @@ class AsyncBitrix24(BaseBitrix24):
 
     async def batch(
         self,
-        requests: Iterable[Request | dict | tuple[Request | dict, Any]],
+        requests: Iterable[Request | dict | tuple[Request | dict, Any]]
+        | AsyncIterable[Request | dict | tuple[Request | dict, Any]],
         *,
         batch_size: int | None = None,
         list_method: bool = False,
@@ -57,20 +59,34 @@ class AsyncBitrix24(BaseBitrix24):
         """Call unlimited sequence of methods within batches and return `result` from responses."""
         batch_size = batch_size or self.settings.batch_size
 
-        for batched_requests in batched(requests, batch_size):
-            if with_payload:
-                batched_requests, batched_payloads = zip(*batched_requests, strict=True)
-            else:
-                batched_payloads = None
+        if isinstance(requests, AsyncIterable):
+            async for batched_requests_ in abatched(requests, batch_size):
+                async for item in self._batch_common_body(batched_requests_, list_method, with_payload):
+                    yield item
+        else:
+            for batched_requests_ in batched(requests, batch_size):
+                async for item in self._batch_common_body(batched_requests_, list_method, with_payload):
+                    yield item
 
-            batched_responses = await self.retry(self._batch, batched_requests)
+    async def _batch_common_body(
+        self,
+        requests: tuple[Request | dict | tuple[Request | dict, Any], ...],
+        list_method: bool = False,
+        with_payload: bool = False,
+    ) -> AsyncGenerator[ApiTypes | tuple[ApiTypes, Any]]:
+        if with_payload:
+            batched_requests, batched_payloads = zip(*requests, strict=True)
+        else:
+            batched_requests, batched_payloads = requests, None
+
+        batched_responses = await self.retry(self._batch, batched_requests)
 
-            for i, response in enumerate(batched_responses):
-                result = response.list_result if list_method else response.result
-                if with_payload:
-                    yield result, batched_payloads[i]
-                else:
-                    yield result
+        for i, response in enumerate(batched_responses):
+            result = response.list_result if list_method else response.result
+            if with_payload:
+                yield result, batched_payloads[i]
+            else:
+                yield result
 
     async def list_sequential(
         self,

{b24api-0.6.0 → b24api-0.7.0}/b24api/base_api.py

@@ -200,14 +200,14 @@ class BatchedNoCountHelper:
 
 
 class ReferenceNoCountHelper:
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         request: ListRequest | dict,
         updates: Iterable[dict | tuple[dict, Any]] | AsyncIterable[dict | tuple[dict, Any]],
         id_key: str,
         list_size: int,
         batch_size: int,
-        with_payload: bool,
+        with_payload: bool,  # noqa: FBT001
     ) -> None:
         request = ListRequest.model_validate(request)
 
@@ -278,12 +278,12 @@ class ReferenceNoCountHelper:
         body_results: list[ApiTypes | tuple[ApiTypes, Any]],
     ) -> tuple[ListRequest | tuple[ListRequest, Any], ...]:
         requests = []
-        for body_request, body_result in zip(body_requests, body_results, strict=True):
+        for body_request_, body_result_ in zip(body_requests, body_results, strict=True):
             if self.with_payload:
-                body_request, body_payload = body_request
-                body_result, _ = body_result
+                body_request, body_payload = body_request_
+                body_result, _ = body_result_
             else:
-                body_payload = None
+                body_request, body_result, body_payload = body_request_, body_result_, None
 
             id_from = f">{self.id_key}"
 
@@ -304,7 +304,6 @@ class ReferenceNoCountHelper:
     ) -> Generator[ApiTypes | tuple[ApiTypes, Any]]:
         if self.with_payload:
             for result, payload in results:
-                result = zip(result, [payload] * len(result), strict=False)
-                yield from result
+                yield from zip(result, [payload] * len(result), strict=False)
         else:
             yield from chain.from_iterable(results)

{b24api-0.6.0 → b24api-0.7.0}/b24api/entity.py

@@ -130,7 +130,7 @@ class BatchResult(BaseModel):
 
     @field_validator("result", "result_time", "result_error", "result_total", "result_next", mode="before")
     @classmethod
-    def php_dict(cls, value: Any) -> Any:
+    def php_dict(cls, value: Any) -> Any:  # noqa: ANN401
         if isinstance(value, list) and not value:
             return {}
         return value

{b24api-0.6.0 → b24api-0.7.0}/b24api/sync_api.py

@@ -56,11 +56,11 @@ class SyncBitrix24(BaseBitrix24):
         """Call unlimited sequence of methods within batches and return `result` from responses."""
         batch_size = batch_size or self.settings.batch_size
 
-        for batched_requests in batched(requests, batch_size):
+        for batched_requests_ in batched(requests, batch_size):
             if with_payload:
-                batched_requests, batched_payloads = zip(*batched_requests, strict=True)
+                batched_requests, batched_payloads = zip(*batched_requests_, strict=True)
             else:
-                batched_payloads = None
+                batched_requests, batched_payloads = batched_requests_, None
 
             batched_responses = self.retry(self._batch, batched_requests)
 

{b24api-0.6.0 → b24api-0.7.0/b24api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: b24api
-Version: 0.6.0
+Version: 0.7.0
 Summary: Bitrix24 API
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown