b24api 0.3.3__tar.gz → 0.3.5__tar.gz

{b24api-0.3.3/b24api.egg-info → b24api-0.3.5}/PKG-INFO

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

{b24api-0.3.3 → b24api-0.3.5}/b24api/api.py

@@ -2,6 +2,7 @@ import contextlib
 import json
 import logging
 from collections.abc import Generator, Iterable
+from functools import partial
 from itertools import chain, islice
 from operator import itemgetter
 
@@ -22,7 +23,9 @@ class Bitrix24:
         self.client = client
         self.settings = settings
         self.logger = logging.getLogger("b24api")
-        self._call_retry = retry(
+
+        retry_ = partial(
+            retry,
             exceptions=(
                 httpx.ConnectError,
                 httpx.ConnectTimeout,
@@ -34,13 +37,13 @@ class Bitrix24:
             delay=self.settings.retry_delay,
             backoff=self.settings.retry_backoff,
             logger=self.logger,
-        )(self._call)
+        )
+        self._call_retry = retry_()(self._call)
+        self._batch_retry = retry_()(self._batch)
 
     def call(self, request: Request | dict) -> ApiTypes:
         """Call any method (with retries) and return just `result`."""
-        response = self._call_retry(request)
-
-        return response.result
+        return self._call_retry(request).result
 
     def _call(self, request: Request | dict) -> Response:
         """Call any method and return full response."""
@@ -87,10 +90,10 @@ class Bitrix24:
 
         tail_requests = iter(requests)
         while batched_requests := list(islice(tail_requests, batch_size)):
-            for response in self._batch(batched_requests):
+            for response in self._batch_retry(batched_requests):
                 yield response.result
 
-    def _batch(self, requests: Iterable[Request | dict]) -> Generator[Response, None, None]:
+    def _batch(self, requests: Iterable[Request | dict]) -> list[Response]:
         """Call batch of methods and return full responses."""
         commands = {f"_{i}": Request.model_validate(request) for i, request in enumerate(requests)}
         request = Request(
@@ -101,10 +104,10 @@ class Bitrix24:
             },
         )
 
-        result = self.call(request)
-
+        result = self._call(request).result
         result = BatchResult.model_validate(result)
 
+        responses = []
         for i in range(len(commands)):
             key = f"_{i}"
 
@@ -121,13 +124,17 @@ class Bitrix24:
                     f"Expecting `result_time` to contain result for command {{`{key}`: {command}}}. Got: {result}",
                 )
 
-            yield Response(
-                result=result.result[key],
-                time=result.result_time[key],
-                total=result.result_total.get(key, None),
-                next=result.result_next.get(key, None),
+            responses.append(
+                Response(
+                    result=result.result[key],
+                    time=result.result_time[key],
+                    total=result.result_total.get(key, None),
+                    next=result.result_next.get(key, None),
+                ),
             )
 
+        return responses
+
     def list_sequential(
         self,
         request: Request | dict,

{b24api-0.3.3 → b24api-0.3.5}/b24api/entity.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Annotated, Any, Self
 
-from pydantic import BaseModel, BeforeValidator, constr
+from pydantic import BaseModel, BeforeValidator, field_validator
 
 from b24api.error import ApiResponseError, RetryApiResponseError
 from b24api.query import build_query
@@ -45,9 +45,18 @@ class ListRequest(Request):
 class ErrorResponse(BaseModel):
     """API error response."""
 
-    error: constr(to_lower=True)
+    error: str | int
     error_description: str
 
+    @field_validator("error")
+    @classmethod
+    def error_to_lower_str(cls, value: Any) -> Any:  # noqa: ANN401
+        if not isinstance(value, int):
+            value = str(value)
+        if isinstance(value, str):
+            value = value.lower()
+        return value
+
     def raise_error(self, retry_errors: list[str]) -> Self:
         if self.error in retry_errors:
             raise RetryApiResponseError(

{b24api-0.3.3 → b24api-0.3.5/b24api.egg-info}/PKG-INFO

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

{b24api-0.3.3 → b24api-0.3.5}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "b24api"
-version = "0.3.3"
+version = "0.3.5"
 description = "Bitrix24 API"
 readme = "README.md"
 requires-python = ">=3.11"