b24api 0.2.0__tar.gz → 0.3.1__tar.gz

{b24api-0.2.0/b24api.egg-info → b24api-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: b24api
-Version: 0.2.0
+Version: 0.3.1
 Summary: Bitrix24 API
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -10,6 +10,7 @@ Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pydantic-settings>=2.8.1
 Requires-Dist: retry>=0.9.2
+Dynamic: license-file
 
 # API client for Bitrix24
 
@@ -51,6 +52,7 @@ print(list(result))
 ## Gathering full list (faster)
 Applicable to list methods with `start=<offset>` support. 
 Fetches first list chunk with regular call, then fetches other chunks with `batch`.
+Approximately 3 times faster then `list_sequential`. 
 
 ```python
 from b24api import Bitrix24
@@ -63,6 +65,7 @@ print(list(result))
 ## Gathering full list (fastest)
 Applicable to list methods with `filter={<parameters>}` support. 
 Fetches first and last list chunk with batch call, then fetches other chunks with `batch`. Doesn't use counting (`start=-1`).
+Approximately 2 times faster then `list_batched`. 
 
 ```python
 from b24api import Bitrix24

{b24api-0.2.0 → b24api-0.3.1}/README.md

@@ -38,6 +38,7 @@ print(list(result))
 ## Gathering full list (faster)
 Applicable to list methods with `start=<offset>` support. 
 Fetches first list chunk with regular call, then fetches other chunks with `batch`.
+Approximately 3 times faster then `list_sequential`. 
 
 ```python
 from b24api import Bitrix24
@@ -50,6 +51,7 @@ print(list(result))
 ## Gathering full list (fastest)
 Applicable to list methods with `filter={<parameters>}` support. 
 Fetches first and last list chunk with batch call, then fetches other chunks with `batch`. Doesn't use counting (`start=-1`).
+Approximately 2 times faster then `list_batched`. 
 
 ```python
 from b24api import Bitrix24

{b24api-0.2.0 → b24api-0.3.1}/b24api/api.py

@@ -1,4 +1,5 @@
 import contextlib
+import json
 import logging
 from collections.abc import Generator, Iterable
 from itertools import chain, islice
@@ -20,7 +21,7 @@ class Bitrix24:
     def __init__(self, client: HttpxClient, settings: ApiSettings) -> None:
         self.client = client
         self.settings = settings
-        self.logger = logging.getLogger(__name__)
+        self.logger = logging.getLogger("b24api")
         self._call_retry = retry(
             exceptions=(RetryHTTPStatusError, RetryApiResponseError),
             tries=self.settings.retry_tries,
@@ -39,7 +40,7 @@ class Bitrix24:
         """Call any method and return full response."""
         request = Request.model_validate(request)
 
-        self.logger.debug("Sending request", extra={"request": request})
+        self.logger.debug("Sending request: %s", request)
 
         http_response = self.client.post(
             f"{self.settings.webhook_url}{request.method}",
@@ -47,6 +48,9 @@ class Bitrix24:
             json=request.model_dump()["parameters"],
         )
 
+        with contextlib.suppress(httpx.ResponseNotRead, json.JSONDecodeError, ValidationError):
+            ErrorResponse.model_validate(http_response.json()).raise_error(self.settings.retry_errors)
+
         try:
             json_response = http_response.raise_for_status().json()
         except httpx.HTTPStatusError as error:
@@ -63,16 +67,7 @@ class Bitrix24:
 
         response = Response.model_validate(json_response)
 
-        self.logger.debug("Received response", extra={"request": request, "response": response})
-        self.logger.info(
-            "Received response",
-            extra={
-                "method": request.method,
-                "duration": response.time.duration,
-                "processing": response.time.processing,
-                "operating": response.time.operating,
-            },
-        )
+        self.logger.debug("Received response: %s", response)
 
         return response
 
@@ -102,10 +97,6 @@ class Bitrix24:
 
         result = self.call(request)
 
-        for fix_key in ["result_error", "result_total", "result_next"]:
-            if isinstance(result[fix_key], list) and not result[fix_key]:
-                result[fix_key] = dict(result[fix_key])
-
         result = BatchResult.model_validate(result)
 
         for i in range(len(commands)):
@@ -252,7 +243,7 @@ class Bitrix24:
                 body_request.parameters.filter[id_to] = min(start + list_size + 1, min_tail_id)
                 yield body_request
 
-        if max_head_id < min_tail_id:
+        if max_head_id and min_tail_id and max_head_id < min_tail_id:
             body = self.batch(_body_requests(), batch_size)
             body = map(self._fix_list_result, body)
             body = chain.from_iterable(body)

{b24api-0.2.0 → b24api-0.3.1}/b24api/entity.py

@@ -1,7 +1,7 @@
 from datetime import datetime
-from typing import Self
+from typing import Annotated, Any, Self
 
-from pydantic import BaseModel
+from pydantic import BaseModel, BeforeValidator
 
 from b24api.error import ApiResponseError, RetryApiResponseError
 from b24api.query import build_query
@@ -46,7 +46,7 @@ class ErrorResponse(BaseModel):
     """API error response."""
 
     error: str
-    error_description: str | None = None
+    error_description: str
 
     def raise_error(self, retry_errors: list[str]) -> Self:
         if self.error in retry_errors:
@@ -82,11 +82,17 @@ class Response(BaseModel):
     next: int | None = None
 
 
+def _php_dict(value: Any) -> Any:  # noqa: ANN401
+    if isinstance(value, list) and not value:
+        return {}
+    return value
+
+
 class BatchResult(BaseModel):
     """API response `result` structure for `batch` method."""
 
-    result: dict[str, ApiTypes]
-    result_time: dict[str, ResponseTime]
-    result_error: dict[str, ErrorResponse]
-    result_total: dict[str, int]
-    result_next: dict[str, int]
+    result: Annotated[dict[str, ApiTypes], BeforeValidator(_php_dict)]
+    result_time: Annotated[dict[str, ResponseTime], BeforeValidator(_php_dict)]
+    result_error: Annotated[dict[str, ErrorResponse], BeforeValidator(_php_dict)]
+    result_total: Annotated[dict[str, int], BeforeValidator(_php_dict)]
+    result_next: Annotated[dict[str, int], BeforeValidator(_php_dict)]

{b24api-0.2.0 → b24api-0.3.1}/b24api/error.py

@@ -14,7 +14,12 @@ class ApiResponseError(Exception):
         code: str,
         description: str | None,
     ) -> None:
-        message = f"API error [{code}]: {description}"
+        if code and description:
+            message = f"API error [{code}]: {description}"
+        elif code:
+            message = f"API error [{code}]"
+        else:
+            message = f"API error: {description}"
         super().__init__(message)
 
 

{b24api-0.2.0 → b24api-0.3.1/b24api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: b24api
-Version: 0.2.0
+Version: 0.3.1
 Summary: Bitrix24 API
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -10,6 +10,7 @@ Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pydantic-settings>=2.8.1
 Requires-Dist: retry>=0.9.2
+Dynamic: license-file
 
 # API client for Bitrix24
 
@@ -51,6 +52,7 @@ print(list(result))
 ## Gathering full list (faster)
 Applicable to list methods with `start=<offset>` support. 
 Fetches first list chunk with regular call, then fetches other chunks with `batch`.
+Approximately 3 times faster then `list_sequential`. 
 
 ```python
 from b24api import Bitrix24
@@ -63,6 +65,7 @@ print(list(result))
 ## Gathering full list (fastest)
 Applicable to list methods with `filter={<parameters>}` support. 
 Fetches first and last list chunk with batch call, then fetches other chunks with `batch`. Doesn't use counting (`start=-1`).
+Approximately 2 times faster then `list_batched`. 
 
 ```python
 from b24api import Bitrix24

{b24api-0.2.0 → b24api-0.3.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "b24api"
-version = "0.2.0"
+version = "0.3.1"
 description = "Bitrix24 API"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -19,11 +19,9 @@ dependencies = [
 
 [dependency-groups]
 dev = [
-    "mypy>=1.15.0",
     "pytest-env>=1.1.5",
     "pytest-httpx>=0.35.0",
     "pytest-mock>=3.14.0",
-    "ruff>=0.9.9",
 ]
 
 [tool.ruff]