prepare to release

Miskler · Miskler · commit 67db752e891a · 2026-03-24T14:04:18.000+03:00
diff --git a/chizhik_api/__init__.py b/chizhik_api/__init__.py
@@ -1,4 +1,4 @@
 from .manager import ChizhikAPI
 
 __all__ = ["ChizhikAPI"]
-__version__ = "0.2.4"
+__version__ = "0.2.5"
diff --git a/chizhik_api/abstraction.py b/chizhik_api/abstraction.py
@@ -1,4 +1,3 @@
-
 class DeliveryMode:
     """Я хз что это такое"""
 
diff --git a/chizhik_api/endpoints/catalog.py b/chizhik_api/endpoints/catalog.py
@@ -39,30 +39,36 @@ async def tree(self, city_id: Optional[str] = None) -> FetchResponse:
         if city_id:
             url += f"?city_id={city_id}"
         return await self._parent._request(HttpMethod.GET, url)
-    
+
     @autotest
-    async def delivery_tree(self,
-                            store_id: str,
-                            mode: DeliveryMode = DeliveryMode.STORE,
-                            include_restrict: bool = True):
+    async def delivery_tree(
+        self,
+        store_id: str,
+        mode: DeliveryMode = DeliveryMode.STORE,
+        include_restrict: bool = True,
+    ):
         url = f"{self._parent.DELIVERY_API_URL}/catalog/v3/stores/{store_id}/categories?mode={mode}&include_subcategories=1&include_restrict={str(include_restrict).lower()}"
         return await self._parent._request(HttpMethod.GET, url)
 
     @autotest
-    async def delivery_tree_extended(self,
-                                     store_id: str,
-                                     category_alias: str,
-                                     mode: DeliveryMode = DeliveryMode.STORE,
-                                     include_restrict: bool = True):
+    async def delivery_tree_extended(
+        self,
+        store_id: str,
+        category_alias: str,
+        mode: DeliveryMode = DeliveryMode.STORE,
+        include_restrict: bool = True,
+    ):
         url = f"{self._parent.DELIVERY_API_URL}/catalog/v2/stores/{store_id}/categories/{category_alias}/extended?mode={mode}&include_restrict={str(include_restrict).lower()}"
         return await self._parent._request(HttpMethod.GET, url)
 
     @autotest
-    async def delivery_tree_ancestors(self,
-                                      store_id: str,
-                                      category_alias: str,
-                                      mode: DeliveryMode = DeliveryMode.STORE,
-                                      include_restrict: bool = True):
+    async def delivery_tree_ancestors(
+        self,
+        store_id: str,
+        category_alias: str,
+        mode: DeliveryMode = DeliveryMode.STORE,
+        include_restrict: bool = True,
+    ):
         url = f"{self._parent.DELIVERY_API_URL}/catalog/v3/stores/{store_id}/categories/{category_alias}/ancestors?mode={mode}&include_restrict={str(include_restrict).lower()}"
         return await self._parent._request(HttpMethod.GET, url)
 
@@ -85,26 +91,31 @@ async def products_list(
         return await self._parent._request(HttpMethod.GET, url)
 
     @autotest
-    async def delivery_products_list(self,
-                                     store_id: str,
-                                     category_alias: str,
-                                     offset: int = 0,
-                                     limit: int = 499,
-                                     mode: DeliveryMode = DeliveryMode.STORE,
-                                     include_restrict: bool = True):
+    async def delivery_products_list(
+        self,
+        store_id: str,
+        category_alias: str,
+        offset: int = 0,
+        limit: int = 499,
+        mode: DeliveryMode = DeliveryMode.STORE,
+        include_restrict: bool = True,
+    ):
         url = f"{self._parent.DELIVERY_API_URL}/catalog/v2/stores/{store_id}/categories/{category_alias}/products?mode={mode}&include_restrict={str(include_restrict).lower()}&limit={limit}&offset={offset}"
         return await self._parent._request(HttpMethod.GET, url)
 
     @autotest
-    async def delivery_search(self,
-                              store_id: str,
-                              query: str,
-                              limit: int = 12,
-                              mode: DeliveryMode = DeliveryMode.STORE,
-                              include_restrict: bool = True):
+    async def delivery_search(
+        self,
+        store_id: str,
+        query: str,
+        limit: int = 12,
+        mode: DeliveryMode = DeliveryMode.STORE,
+        include_restrict: bool = True,
+    ):
         url = f"{self._parent.DELIVERY_API_URL}/catalog/v3/stores/{store_id}/search?mode={mode}&include_restrict={str(include_restrict).lower()}&q={query}&limit={limit}"
         return await self._parent._request(HttpMethod.GET, url)
 
+
 class ProductService(ApiChild["ChizhikAPI"]):
     """Сервис для работы с товарами в каталоге."""
 
@@ -126,13 +137,15 @@ async def info(
         if city_id:
             url += f"?city_id={city_id}"
         return await self._parent._request(HttpMethod.GET, url)
-    
+
     @autotest
-    async def delivery_info(self,
-                            store_id: str,
-                            product_id: int,
-                            mode: DeliveryMode = DeliveryMode.STORE,
-                            include_restrict: bool = True):
+    async def delivery_info(
+        self,
+        store_id: str,
+        product_id: int,
+        mode: DeliveryMode = DeliveryMode.STORE,
+        include_restrict: bool = True,
+    ):
         # TODO
         url = f"{self._parent.DELIVERY_API_URL}/catalog/v2/stores/{store_id}/products/{product_id}?mode={mode}&include_restrict={str(include_restrict).lower()}"
         return await self._parent._request(HttpMethod.GET, url)
diff --git a/chizhik_api/endpoints/general.py b/chizhik_api/endpoints/general.py
@@ -28,7 +28,11 @@ async def download_image(
             attempts=retry_attempts, start_timeout=3.0, max_timeout=timeout
         )
 
-        px = self._parent.proxy if isinstance(self._parent.proxy, Proxy) else Proxy(self._parent.proxy)
+        px = (
+            self._parent.proxy
+            if isinstance(self._parent.proxy, Proxy)
+            else Proxy(self._parent.proxy)
+        )
         async with RetryClient(retry_options=retry_options) as retry_client:
             async with retry_client.get(
                 url,
diff --git a/chizhik_api/endpoints/geolocation.py b/chizhik_api/endpoints/geolocation.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 from human_requests import ApiChild, ApiParent, api_child_field, autotest
 from human_requests.abstraction import FetchResponse, HttpMethod
@@ -23,7 +23,6 @@ class ClassGeolocation(ApiChild["ChizhikAPI"]):
     Shop: ShopService = api_child_field(lambda parent: ShopService(parent.parent))
     """Сервис для работы с информацией о магазинах."""
 
-
     def __init__(self, parent: "ChizhikAPI"):
         super().__init__(parent)
         ApiParent.__post_init__(self)
@@ -36,6 +35,7 @@ async def cities_list(self, search_name: str, page: int = 1) -> FetchResponse:
             f"{self._parent.API_URL}/v1/geo/cities/?name={search_name}&page={page}",
         )
 
+
 class ShopService(ApiChild["ChizhikAPI"]):
     """Сервис для работы с информацией о магазинах."""
 
@@ -44,7 +44,7 @@ async def all(self) -> FetchResponse:
         """Получить список всех точек магазинов."""
         url = f"{self._parent.API_URL}/v1/shops"
         return await self._parent._request(HttpMethod.GET, url)
-    
+
     @autotest
     async def search(self, query: str) -> FetchResponse:
         """Получить список всех точек магазинов."""
diff --git a/chizhik_api/manager.py b/chizhik_api/manager.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+import asyncio
 from collections import defaultdict
 from dataclasses import dataclass, field
 from typing import Any
-import asyncio
 
 from camoufox.async_api import AsyncCamoufox
 from human_requests import (
@@ -13,13 +13,8 @@
     HumanPage,
     api_child_field,
 )
-from human_requests.network_analyzer.anomaly_sniffer import (
-    HeaderAnomalySniffer,
-    WaitHeader,
-    WaitSource,
-)
 from human_requests.abstraction import FetchResponse, HttpMethod, Proxy
-from playwright.async_api import TimeoutError as PWTimeoutError
+from human_requests.network_analyzer.anomaly_sniffer import HeaderAnomalySniffer
 
 from .endpoints.advertising import ClassAdvertising
 from .endpoints.catalog import ClassCatalog
@@ -104,6 +99,7 @@ async def _warmup(self) -> None:
             await sniffer.start(self.ctx)
 
             collected = {}
+
             def on_request(request):
                 if request.url.startswith(self.API_URL):
                     collected[request.url] = request.headers
@@ -113,11 +109,15 @@ def on_request(request):
             await self.page.goto(self.MAIN_SITE_URL, wait_until="networkidle")
             await self.page.wait_for_selector("next-route-announcer", state="attached")
             await asyncio.sleep(1)
-            await self.page.locator('main a[data-qa^="sidebar-sub-category-"][data-qa$="-link"]').first.click()
-            await self.page.locator('main div[itemtype="https://schema.org/Product"]').first.click()
+            await self.page.locator(
+                'main a[data-qa^="sidebar-sub-category-"][data-qa$="-link"]'
+            ).first.click()
+            await self.page.locator(
+                'main div[itemtype="https://schema.org/Product"]'
+            ).first.click()
             await asyncio.sleep(1)
             await self.page.wait_for_load_state("load")
-            
+
             await self.ctx.unroute("**/api/**", on_request)
             result_sniffer = await sniffer.complete()
 
@@ -127,7 +127,9 @@ def on_request(request):
             # Проходим по всем URL в 'request'
             for _url, headers in result_sniffer["request"].items():
                 for header, values in headers.items():
-                    result[header].update(values)  # добавляем значения, set уберёт дубли
+                    result[header].update(
+                        values
+                    )  # добавляем значения, set уберёт дубли
 
             # Преобразуем set обратно в list
             self.unstandard_headers = {k: list(v)[0] for k, v in result.items()}
diff --git a/tests/api_test.py b/tests/api_test.py
@@ -1,9 +1,17 @@
 from typing import Any
 
 import pytest
-from human_requests import autotest_depends_on, autotest_hook, autotest_params, autotest_data
-from human_requests.autotest import AutotestCallContext, AutotestContext,AutotestDataContext
-
+from human_requests import (
+    autotest_data,
+    autotest_depends_on,
+    autotest_hook,
+    autotest_params,
+)
+from human_requests.autotest import (
+    AutotestCallContext,
+    AutotestContext,
+    AutotestDataContext,
+)
 from PIL import Image
 
 from chizhik_api import ChizhikAPI
@@ -69,25 +77,32 @@ def _capture_first_store_id(
 def _delivery_tree(ctx: AutotestContext):
     return {"store_id": ctx.state["autotest_store_id"]}
 
+
 @autotest_depends_on(ShopService.search)
 @autotest_depends_on(ClassCatalog.delivery_tree)
 @autotest_params(target=ClassCatalog.delivery_tree_extended)
 def _delivery_tree_extended(ctx: AutotestContext):
-    return {"store_id": ctx.state["autotest_store_id"],
-            "category_alias": ctx.state.get("autotest_category_alias")}
+    return {
+        "store_id": ctx.state["autotest_store_id"],
+        "category_alias": ctx.state.get("autotest_category_alias"),
+    }
+
 
 @autotest_depends_on(ShopService.search)
 @autotest_depends_on(ClassCatalog.delivery_tree)
 @autotest_params(target=ClassCatalog.delivery_products_list)
 def _delivery_products_list(ctx: AutotestContext):
-    return {"store_id": ctx.state["autotest_store_id"],
-            "category_alias": ctx.state.get("autotest_category_alias")}
+    return {
+        "store_id": ctx.state["autotest_store_id"],
+        "category_alias": ctx.state.get("autotest_category_alias"),
+    }
+
 
 @autotest_depends_on(ShopService.search)
 @autotest_params(target=ClassCatalog.delivery_search)
 def _delivery_search(ctx: AutotestContext):
-    return {"store_id": ctx.state["autotest_store_id"],
-            "query": "кола"}
+    return {"store_id": ctx.state["autotest_store_id"], "query": "кола"}
+
 
 @autotest_hook(target=ClassCatalog.delivery_products_list)
 def _capture_first_plu(
@@ -100,15 +115,21 @@ def _capture_first_plu(
 
     store_id = data.get("products")
     if not isinstance(store_id, list):
-        pytest.fail("ClassCatalog.delivery_products_list did not return a valid category id.")
+        pytest.fail(
+            "ClassCatalog.delivery_products_list did not return a valid category id."
+        )
 
     ctx.state["autotest_plu"] = store_id[0]["plu"]
 
+
 @autotest_depends_on(ClassCatalog.delivery_tree)
 @autotest_params(target=ProductService.delivery_info)
 def _delivery_info(ctx: AutotestContext):
-    return {"store_id": ctx.state["autotest_store_id"],
-            "product_id": ctx.state.get("autotest_plu")}
+    return {
+        "store_id": ctx.state["autotest_store_id"],
+        "product_id": ctx.state.get("autotest_plu"),
+    }
+
 
 @autotest_hook(target=ClassCatalog.delivery_tree_extended)
 def _capture_first_subcategory_alias(
@@ -125,12 +146,16 @@ def _capture_first_subcategory_alias(
 
     ctx.state["autotest_subcategory_alias"] = store_id[0]["id"]
 
+
 @autotest_depends_on(ShopService.search)
 @autotest_depends_on(ClassCatalog.delivery_tree_extended)
 @autotest_params(target=ClassCatalog.delivery_tree_ancestors)
 def _delivery_tree_ancestors(ctx: AutotestContext):
-    return {"store_id": ctx.state["autotest_store_id"],
-            "category_alias": ctx.state.get("autotest_subcategory_alias")}
+    return {
+        "store_id": ctx.state["autotest_store_id"],
+        "category_alias": ctx.state.get("autotest_subcategory_alias"),
+    }
+
 
 @autotest_depends_on(ClassCatalog.tree)
 @autotest_params(target=ClassCatalog.products_list)
@@ -189,11 +214,11 @@ def _product_info_params(ctx: AutotestCallContext) -> dict[str, int]:
     pytest.fail("ProductService.info depends on Catalog.products_list.")
 
 
-
 @autotest_data(name="unstandard_headers")
 def _unstandard_headers_data(ctx: AutotestDataContext) -> dict[str, Any]:
     return ctx.api.unstandard_headers
 
+
 @autotest_data(name="unstandard_urls")
 def _unstandard_urls_data(ctx: AutotestDataContext) -> dict[str, Any]:
     return ctx.api.unstandard_urls

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`class DeliveryMode:`
`3`	`2`	`"""Я хз что это такое"""`
`4`	`3`