добавлены новые endpoints категорий

Author: Miskler

chizhik_api/abstraction.py

@@ -0,0 +1,5 @@
+
+class DeliveryMode:
+    """Я хз что это такое"""
+
+    STORE = "store"

chizhik_api/endpoints/catalog.py

@@ -9,6 +9,8 @@
 from human_requests import ApiChild, ApiParent, api_child_field, autotest
 from human_requests.abstraction import FetchResponse, HttpMethod
 
+from ..abstraction import DeliveryMode
+
 if TYPE_CHECKING:
     from ..manager import ChizhikAPI  # noqa: F401
 
@@ -37,6 +39,32 @@ 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):
+        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):
+        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):
+        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)
 
     @autotest
     async def products_list(
@@ -56,6 +84,8 @@ async def products_list(
             url += f"&term={urllib.parse.quote(search)}"
         return await self._parent._request(HttpMethod.GET, url)
 
+    async def products_list_v2():
+        url = "https://app.chizhik.club/delivery/api/catalog/v2/stores/HB55/categories/264C39153/products?mode=store&include_restrict=true&limit=499&offset=0"
 
 class ProductService(ApiChild["ChizhikAPI"]):
     """Сервис для работы с товарами в каталоге."""
@@ -78,3 +108,13 @@ 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):
+        # 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)

chizhik_api/manager.py

@@ -45,6 +45,7 @@ class ChizhikAPI(ApiParent):
     browser_opts: dict[str, Any] = field(default_factory=dict)
     """Дополнительные опции для браузера (см. https://camoufox.com/python/installation/)"""
     API_URL: str = "https://app.chizhik.club/api"
+    DELIVERY_API_URL: str = "https://app.chizhik.club/delivery/api"
     """URL для работы с каталогом."""
     MAIN_SITE_URL: str = "https://chizhik.club/catalog/"
     """URL главной страницы сайта."""

tests/__snapshots__/ClassAdvertising.active_inout.schema.json

@@ -6,16 +6,6 @@
   ],
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "background": {
-      "type": "string",
-      "format": "uri"
-    },
-    "banner": {
-      "type": "null"
-    },
-    "description": {
-      "type": "string"
-    },
     "detail": {
       "type": "array",
       "items": {
@@ -38,74 +28,8 @@
         }
       }
     },
-    "end_timestamp": {
-      "type": "string",
-      "format": "date-time"
-    },
-    "image": {
-      "type": "string",
-      "format": "uri"
-    },
-    "is_thematic": {
-      "type": "boolean"
-    },
-    "logo": {
-      "type": "string",
-      "format": "uri"
-    },
-    "pdf": {
-      "type": "string",
-      "format": "uri"
-    },
-    "pdf_data": {
-      "type": "object",
-      "required": [
-        "background_color",
-        "banner",
-        "file",
-        "image",
-        "subtitle",
-        "text_color",
-        "title"
-      ],
-      "properties": {
-        "background_color": {
-          "type": "string"
-        },
-        "banner": {
-          "type": "null"
-        },
-        "file": {
-          "type": "string",
-          "format": "uri"
-        },
-        "image": {
-          "type": "string",
-          "format": "uri"
-        },
-        "subtitle": {
-          "type": "string"
-        },
-        "text_color": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        }
-      }
-    },
     "show": {
       "type": "boolean"
-    },
-    "start_timestamp": {
-      "type": "string",
-      "format": "date-time"
-    },
-    "title": {
-      "type": "string"
-    },
-    "title_color": {
-      "type": "string"
     }
   }
 }