almost complite testing

Author: Miskler

main.py

@@ -7,7 +7,7 @@ async def main():
     async with PyaterochkaAPI(headless=False) as API:
         # RUS: Выводит активные предложения магазина
         # ENG: Outputs active offers of the store
-        pprint((await API.Catalog.tree(sap_code_store_id="35XY", subcategories=False)).json())
+        tree = (await API.Catalog.tree(sap_code_store_id="35XY", subcategories=False)).json()
 
 import asyncio
 asyncio.run(main())

pyaterochka_api/__init__.py

@@ -1,5 +1,5 @@
 from .manager import PyaterochkaAPI
-from .enums import PurchaseMode
+from .enums import PurchaseMode, Sorting
 
 __version__ = "0.2.0.1"
-__all__ = ['PyaterochkaAPI', 'PurchaseMode']
+__all__ = ['PyaterochkaAPI', 'PurchaseMode', 'Sorting']

pyaterochka_api/endpoints/catalog.py

@@ -45,16 +45,16 @@ async def tree(self,
         """
 
         request_url = f"{self._parent.CATALOG_URL}/catalog/v2/stores/{sap_code_store_id}/categories?mode={mode.value}&include_restrict={include_restrict}&include_subcategories={1 if subcategories else 0}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
 
     async def tree_extended(self,
                             sap_code_store_id: str,
                             category_id: str,
                             include_restrict: bool = True,
                             mode: PurchaseMode = PurchaseMode.STORE) -> FetchResponse:
         """Расширенное представление категории и её подкатегорий."""
-        request_url = f"{self._parent.CATALOG_URL}/api/catalog/v2/stores/{sap_code_store_id}/categories/{category_id}/extended?mode={mode.value}&include_restrict={str(include_restrict).lower()}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        request_url = f"{self._parent.CATALOG_URL}/catalog/v2/stores/{sap_code_store_id}/categories/{category_id}/extended?mode={mode.value}&include_restrict={str(include_restrict).lower()}"
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
 
     async def search(self,
                      sap_code_store_id: str,
@@ -64,8 +64,8 @@ async def search(self,
                      limit: int = 12) -> FetchResponse:
         """Поиск по товарам И категориям."""
         q = urllib.parse.quote(query)
-        request_url = f"{self._parent.CATALOG_URL}/api/catalog/v3/stores/{sap_code_store_id}/search?mode={mode.value}&include_restrict={str(include_restrict).lower()}&q={q}&limit={limit}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        request_url = f"{self._parent.CATALOG_URL}/catalog/v3/stores/{sap_code_store_id}/search?mode={mode.value}&include_restrict={str(include_restrict).lower()}&q={q}&limit={limit}"
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
 
     async def products_list(
             self,
@@ -84,7 +84,7 @@ async def products_list(
         Args:
             category_id (str): The ID of the (sub)category.
             mode (PurchaseMode, optional): The purchase mode to use. Defaults to PurchaseMode.STORE.
-            sap_code_store_id (str, optional): The store ID (official name in API is "sap_code") to use. Defaults to "{self.DEFAULT_STORE_ID}". This lib not support search ID stores.
+            sap_code_store_id (str, optional): The store ID (official name in API is "sap_code") to use. This lib not support search ID stores.
             limit (int, optional): The maximum number of products to retrieve. Defaults to 30. Must be between 1 and 499.
 
         Returns:
@@ -107,7 +107,7 @@ async def products_list(
             encoded_brands = [f'brands={urllib.parse.quote(brand)}' for brand in brands]
             request_url += "&" + '&&'.join(encoded_brands)
 
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
 
     async def products_line(
             self,
@@ -118,8 +118,8 @@ async def products_line(
             order_by: Sorting = Sorting.POPULARITY
         ) -> FetchResponse:
         """Рекомендованные товары \"что интересного?\"."""
-        request_url = f"https://5d.5ka.ru/api/catalog/v1/stores/{sap_code_store_id}/categories/{category_id}/products_line?mode={mode.value}&include_restrict={str(include_restrict).lower()}&order_by={order_by.value}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        request_url = f"{self._parent.CATALOG_URL}/catalog/v1/stores/{sap_code_store_id}/categories/{category_id}/products_line?mode={mode.value}&include_restrict={str(include_restrict).lower()}&order_by={order_by.value}"
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
 
 
 class ProductService:
@@ -147,4 +147,4 @@ async def info(
         """
 
         request_url = f"{self._parent.CATALOG_URL}/catalog/v2/stores/{sap_code_store_id}/products/{plu_id}?mode={mode.value}&include_restrict={str(include_restrict).lower()}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)

pyaterochka_api/endpoints/geolocation.py

@@ -32,12 +32,12 @@ async def find_store(self, longitude: float, latitude: float) -> FetchResponse:
         """
 
         request_url = f"{self._parent.CATALOG_URL}/orders/v1/orders/stores/?lon={longitude}&lat={latitude}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
 
     async def suggest(self, query: str) -> FetchResponse:
         """Начинайте вводить адрес, он предложит точные варианты"""
         request_url = f"{self._parent.CATALOG_URL}/maps/suggest/?text={urllib.parse.quote(query)}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)
 
     async def geocode(self,
                       country: str = "Россия",
@@ -51,4 +51,4 @@ async def geocode(self,
         string = urllib.parse.quote(", ".join(tup))
 
         request_url = f"{self._parent.MAIN_SITE_URL}/api/maps/geocode/?geocode={string}"
-        return await self._parent._request(method=HttpMethod.GET, url=request_url)
+        return await self._parent._request(method=HttpMethod.GET, url=request_url, add_unstandard_headers=True)

pyaterochka_api/manager.py

@@ -4,7 +4,7 @@
 from dataclasses import dataclass, field
 from typing import Any
 import json
-
+from collections import defaultdict
 from camoufox.async_api import AsyncCamoufox
 from human_requests import HumanBrowser, HumanContext, HumanPage
 from human_requests.abstraction import FetchResponse, HttpMethod, Proxy
@@ -50,7 +50,7 @@ class PyaterochkaAPI:
     page: HumanPage = field(init=False, repr=False)
     """Внутренний страница сессии браузера"""
 
-    unstandard_headers: dict[str, str] = {}
+    unstandard_headers: dict[str, str] = field(init=False, repr=False)
     """Список нестандартных заголовков пойманных при инициализации"""
 
     Geolocation: ClassGeolocation = field(init=False)
@@ -116,8 +116,17 @@ async def _warmup(self) -> None:
             timeout_ms=self.timeout_ms
         )
 
-        result = await sniffer.complete()
-        self.unstandard_headers = result.get("https://5d.5ka.ru")
+        result_sniffer = await sniffer.complete()
+        # Результат: {заголовок: [уникальные значения]}
+        result = defaultdict(set)
+
+        # Проходим по всем URL в 'request'
+        for _url, headers in result_sniffer['request'].items():
+            for header, values in headers.items():
+                result[header].update(values)  # добавляем значения, set уберёт дубли
+
+        # Преобразуем set обратно в list
+        self.unstandard_headers = {k: list(v) for k, v in result.items()}
 
     async def __aexit__(self, *exc):
         """Выход из контекстного менеджера с закрытием сессии."""

pyproject.toml

@@ -53,3 +53,5 @@ version = {attr = "pyaterochka_api.__version__"}
 pythonpath = ["."]
 testpaths = ["tests"]
 python_files = ["*_test.py", "*_tests.py"]
+anyio_mode = "auto"
+addopts = "-v --tb=short --disable-warnings"