complite catalog

Author: Miskler

main.py

@@ -1,12 +1,13 @@
 from pyaterochka_api import PyaterochkaAPI
+from pprint import pprint
 
 async def main():
     # RUS: Использование проксирования опционально. Вы можете создать несколько агентов с разными прокси для ускорения парса.
     # ENG: Proxy usage is optional. You can create multiple agents with different proxies for faster parsing.
     async with PyaterochkaAPI(headless=False) as API:
         # RUS: Выводит активные предложения магазина
         # ENG: Outputs active offers of the store
-        print(f"Active offers output: {(await API.Catalog.tree(sap_code_store_id="35XY")).json()!s:.100s}...\n")
+        pprint((await API.Catalog.tree(sap_code_store_id="35XY", subcategories=False)).json())
 
 import asyncio
 asyncio.run(main())

pyaterochka_api/endpoints/catalog.py

@@ -1,10 +1,10 @@
 """Работа с каталогом"""
 
-from typing import TYPE_CHECKING
-
+from typing import TYPE_CHECKING, Optional
+import urllib.parse
 from human_requests.abstraction import FetchResponse, HttpMethod
 
-from ..enums import PurchaseMode
+from ..enums import PurchaseMode, Sorting
 if TYPE_CHECKING:
     from ..manager import PyaterochkaAPI
 
@@ -47,10 +47,34 @@ 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)
 
+    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)
+
+    async def search(self,
+                     sap_code_store_id: str,
+                     query: str,
+                     include_restrict: bool = True,
+                     mode: PurchaseMode = PurchaseMode.STORE,
+                     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)
+
     async def products_list(
             self,
             category_id: str,
             sap_code_store_id: str,
+            price_min: Optional[int] = None,
+            price_max: Optional[int] = None,
+            brands: list[str] = [],
+            include_restrict: bool = True,
             mode: PurchaseMode = PurchaseMode.STORE,
             limit: int = 30
     ) -> FetchResponse:
@@ -74,7 +98,27 @@ async def products_list(
         if limit < 1 or limit >= 500:
             raise ValueError("Limit must be between 1 and 499")
 
-        request_url = f"{self._parent.CATALOG_URL}/catalog/v2/stores/{sap_code_store_id}/categories/{category_id}/products?mode={mode.value}&limit={limit}"
+        request_url = f"{self._parent.CATALOG_URL}/catalog/v2/stores/{sap_code_store_id}/categories/{category_id}/products?mode={mode.value}&limit={limit}&include_restrict={str(include_restrict).lower()}"
+        if price_min:
+            request_url += "&price_min="+str(price_min)
+        if price_max:
+            request_url += "&price_max="+str(price_max)
+        if len(brands) > 0:
+            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)
+
+    async def products_line(
+            self,
+            category_id: str,
+            sap_code_store_id: str,
+            include_restrict: bool = True,
+            mode: PurchaseMode = PurchaseMode.STORE,
+            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)
 
 

pyaterochka_api/enums.py

@@ -4,3 +4,15 @@
 class PurchaseMode(Enum):
     STORE    = "store"
     DELIVERY = "delivery"
+
+class Sorting(Enum):
+    PRICE_DESC = "price_desc"
+    """Сначала дороже"""
+    PRICE_ASC = "price_asc"
+    """Сначала дешевле"""
+    DISCOUNT_DESC = "discount_desc"
+    """По размеру скидки"""
+    RATING_DESC = "rating_desc"
+    """Сначала с высоким рейтингом"""
+    POPULARITY = "popularity"
+    """Сначала популярные"""