Product.info in progress

Author: Miskler

fixprice_api/endpoints/catalog.py

@@ -2,8 +2,9 @@
 
 from __future__ import annotations
 
-import asyncio
 import json
+from types import MethodType
+from ..tools import AwaitableDict
 
 from playwright.async_api import Response as PWResponse
 from dataclasses import dataclass
@@ -120,12 +121,12 @@ async def info(
         category: str | None = None,
         product_id: int | None = None,
         slug: str | None = None,
-    ) -> dict:
+    ) -> PWResponse:
         """
         Информация СПАРСИВАЕТСЯ (в отличии от других методов).
         Инфо о товаре со страницы типа
         https://fix-price.com/catalog/produkty-i-napitki/p-1902248-shokoladnye-konfety-inis-nickers-135-g
-        
+
         Либо предоставляете url напрямую, например `products[0]["url"]`
 
         Данные карточки лежат в obj["data"][0]["categoryData"]["product"]
@@ -141,33 +142,42 @@ async def info(
             real_url += url
 
         page = await self._parent.ctx.new_page()
-        await page.goto(real_url, wait_until="domcontentloaded")
+        try:
+            resp = await page.goto(real_url, wait_until="domcontentloaded")
+            if resp is None:
+                raise RuntimeError("page.goto() returned None")
 
-        raw_json = await page.evaluate("""
-        () => {
-            const marker = "window.__NUXT__=";
+            raw_json = await page.evaluate("""
+            () => {
+                const marker = "window.__NUXT__=";
 
-            for (const s of document.scripts) {
-                const txt = s.textContent || "";
-                const idx = txt.indexOf(marker);
+                for (const s of document.scripts) {
+                    const txt = s.textContent || "";
+                    const idx = txt.indexOf(marker);
 
-                if (idx !== -1) {
-                    let expr = txt.slice(idx + marker.length).trim();
+                    if (idx !== -1) {
+                        let expr = txt.slice(idx + marker.length).trim();
 
-                    if (expr.endsWith(";")) {
-                        expr = expr.slice(0, -1);
-                    }
+                        if (expr.endsWith(";")) {
+                            expr = expr.slice(0, -1);
+                        }
 
-                    const obj = Function('"use strict"; return (' + expr + ')')();
-                    return JSON.stringify(obj);
+                        const obj = Function('"use strict"; return (' + expr + ')')();
+                        return JSON.stringify(obj);
+                    }
                 }
+
+                return null;
             }
+            """)
 
-            return null;
-        }
-        """)
-        nuxt_data = json.loads(raw_json)["data"][0]["categoryData"]["product"] if raw_json else None
+            nuxt_data = json.loads(raw_json)["data"][0]["categoryData"]["product"] if raw_json else None
+
+            def _json(self):
+                return AwaitableDict(nuxt_data)
+
+            resp.json = MethodType(_json, resp)
 
-        await page.close()
-        
-        return nuxt_data
+            return resp
+        finally:
+            await page.close()

fixprice_api/tools.py

@@ -0,0 +1,24 @@
+
+class AwaitableDict(dict):
+    def __init__(self, data: dict | None):
+        self._data = data
+
+    def __getitem__(self, key):
+        return self._data[key]
+
+    def __iter__(self):
+        return iter(self._data)
+
+    def __len__(self):
+        return len(self._data)
+
+    def __repr__(self):
+        return repr(self._data)
+
+    def get(self, key, default=None):
+        return self._data.get(key, default)
+
+    def __await__(self):
+        async def _wrap():
+            return self._data
+        return _wrap().__await__()

tests/api_test.py

@@ -77,9 +77,9 @@ def _capture_product_id(
     if not isinstance(data, list) or not data:
         pytest.fail("Catalog.products_list returned empty data.")
 
-    for key in ["id", "url"]:
+    for key, type in [("id", int), ("url", str)]:
         value = data[0].get(key)
-        if not isinstance(value, int):
+        if not isinstance(value, type):
             pytest.fail(f"Catalog.products_list did not return a valid {key}.")
         ctx.state[f"autotest_product_{key}"] = value
 
@@ -95,9 +95,9 @@ def _product_balance_params(ctx: AutotestCallContext) -> dict[str, int]:
 
 @autotest_depends_on(ClassCatalog.products_list)
 @autotest_params(target=ProductService.info)
-def _product_info_params(ctx: AutotestCallContext) -> dict[str, int]:
+def _product_info_params(ctx: AutotestCallContext) -> dict[str, str]:
     cached_id = ctx.state.get("autotest_product_url")
-    if isinstance(cached_id, int):
+    if isinstance(cached_id, str):
         return {"url": cached_id}
     pytest.fail("ProductService.info depends on Catalog.products_list.")