python-playwright-helper 0.0.2__tar.gz → 0.1.7__tar.gz

{python_playwright_helper-0.0.2 → python_playwright_helper-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_playwright_helper
-Version: 0.0.2
+Version: 0.1.7
 Summary: playwright helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License
@@ -210,8 +210,8 @@ Project-URL: Issues, https://github.com/ckf10000/playwright-helper/issues
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: playwright>=1.56.0; python_version >= "3.12"
-Requires-Dist: playwright-stealth>=2.0.0; python_version >= "3.12"
+Requires-Dist: playwright==1.56.0; python_version >= "3.12"
+Requires-Dist: playwright-stealth==2.0.0; python_version >= "3.12"
 Dynamic: license-file
 
 # playwright-helper

python_playwright_helper-0.1.7/playwright_helper/libs/base_po.py

@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  playwright-helper
+# FileName:     base_po.py
+# Description:  po对象基础类
+# Author:       ASUS
+# CreateDate:   2025/12/13
+# Copyright ©2011-2025. Hunan xxxxxxx Company limited. All rights reserved.
+# ---------------------------------------------------------------------------------------------------------
+"""
+import asyncio
+from logging import Logger
+from typing import List, Any, cast
+from playwright.async_api import Page, Locator, TimeoutError as PlaywrightTimeoutError
+
+
+class BasePo(object):
+    __page: Page
+
+    def __init__(self, page: Page, url: str):
+        self.url = url
+        self.__page = page
+
+    def get_page(self) -> Page:
+        return self.__page
+
+    def is_current_page(self) -> bool:
+        return self.iss_current_page(self.__page, self.url)
+
+    def get_url_domain(self) -> str:
+        if isinstance(self.__page, Page):
+            page_slice: List[str] = self.__page.url.split("/")
+            return f"{page_slice[0]}://{page_slice[2]}"
+        else:
+            raise AttributeError("PO对象中的page属性未被初始化")
+
+    @staticmethod
+    def iss_current_page(page: Page, url: str) -> bool:
+        if isinstance(page, Page):
+            page_url_prefix = page.url.split("?")[0]
+            url_prefix = url.split("?")[0]
+            if page_url_prefix.endswith(url_prefix):
+                return True
+            else:
+                return False
+        else:
+            return False
+
+    @staticmethod
+    async def exists(locator):
+        return await locator.count() > 0
+
+    @staticmethod
+    async def exists_one(locator):
+        return await locator.count() == 1
+
+    async def get_locator(self, selector: str, timeout: float = 3.0) -> Locator:
+        """
+        获取页面元素locator
+        :param selector: 选择器表达式
+        :param timeout: 超时时间（秒）
+        :return: 元素对象
+        :return:
+        """
+        locator = self.__page.locator(selector)
+        try:
+            await locator.first.wait_for(state='visible', timeout=timeout * 1000)
+            return locator
+        except (PlaywrightTimeoutError,):
+            raise PlaywrightTimeoutError(f"元素 '{selector}' 未在 {timeout} 秒内找到")
+        except Exception as e:
+            raise RuntimeError(f"检查元素时发生错误: {str(e)}")
+
+    @staticmethod
+    async def get_sub_locator(locator: Locator, selector: str, timeout: float = 3.0) -> Locator:
+        """
+        获取页面locator的子locator
+        :param locator: 页面Locator对象
+        :param selector: 选择器表达式
+        :param timeout: 超时时间（秒）
+        :return: 元素对象
+        :return:
+        """
+        locator_inner = locator.locator(selector)
+        try:
+            await locator_inner.first.wait_for(state='visible', timeout=timeout * 1000)
+            return locator_inner
+        except (PlaywrightTimeoutError,):
+            raise PlaywrightTimeoutError(f"元素 '{selector}' 未在 {timeout} 秒内找到")
+        except Exception as e:
+            raise RuntimeError(f"检查元素时发生错误: {str(e)}")
+
+    @classmethod
+    async def handle_po_cookie_tip(cls, page: Any, logger: Logger, timeout: float = 3.0, selectors: List[str] = None) -> None:
+        selectors_inner: List[str] = [
+            '//div[@id="isReadedCookie"]/button',
+            '//button[@id="continue-btn"]/span[normalize-space(text())="同意"]'
+        ]
+        if selectors:
+            selectors_inner.extend(selectors)
+        for selector in selectors_inner:
+            try:
+                page_inner = cast(cls, page)
+                cookie: Locator = await cls.get_locator(self=page_inner, selector=selector, timeout=timeout)
+                logger.info(
+                    f'找到页面中存在cookie提示：[本网站使用cookie，用于在您的电脑中储存信息。这些cookie可以使网站正常运行，以及帮助我们改进用户体验。使用本网站，即表示您接受放置这些cookie。]')
+                await cookie.click(button="left")
+                logger.info("【同意】按钮点击完成")
+                await asyncio.sleep(1)
+                return
+            except (Exception,):
+                pass

{python_playwright_helper-0.0.2 → python_playwright_helper-0.1.7}/playwright_helper/libs/executor.py

@@ -15,11 +15,13 @@ import uuid
 import asyncio
 from logging import Logger
 from playwright.async_api import async_playwright
+from playwright_helper.utils.type_utils import RunResult
 from playwright_helper.utils.log_utils import logger as log
 from playwright_helper.libs.browser_pool import BrowserPool
 from playwright_helper.utils.file_handle import get_caller_dir
-from playwright.async_api import Page, Browser, BrowserContext
 from typing import Any, List, Optional, cast, Callable, Literal
+from playwright.async_api import Page, Browser, BrowserContext, TimeoutError as PlaywrightTimeoutError, \
+    Error as PlaywrightError
 
 
 class PlaywrightBrowserExecutor:
@@ -61,7 +63,7 @@ class PlaywrightBrowserExecutor:
     async def _safe_screenshot(self, page: Page, name: str = None):
         try:
             os.makedirs(self.screenshot_dir, exist_ok=True)
-            if name is None:
+            if name is None or "unknown" in name:
                 name = f"error_{int(time.time())}"
             path = os.path.join(self.screenshot_dir, f"{name}.png")
             await page.screenshot(path=path)
@@ -121,12 +123,23 @@ class PlaywrightBrowserExecutor:
         return context
 
     async def _cleanup_context(self, context: BrowserContext):
-        await context.close()
+        if getattr(context, "_closed", False):
+            return
+
+        context._closed = True  # type: ignore
+
+        try:
+            await context.close()
+        except Exception as e:
+            self.logger.debug(f"[Cleanup] ignore close error: {e}")
 
         browser = getattr(context, "_browser", None)
         if browser:
-            self.logger.debug("[Executor] Release browser to pool")
-            await self.browser_pool.release(browser)
+            try:
+                self.logger.debug("[Executor] Release browser to pool")
+                await self.browser_pool.release(browser)
+            except Exception as e:
+                self.logger.error(f"[Cleanup] ignore release error: {e}")
 
     async def _run_callback_chain(self, *, callback: Callable, page: Page, context: BrowserContext, **kwargs) -> Any:
         # Run middlewares before callback
@@ -136,38 +149,75 @@ class PlaywrightBrowserExecutor:
         # Main callback
         return await callback(page=page, logger=self.logger, context=context, **kwargs)
 
-    async def run(self, *, callback: Callable, **kwargs: Any) -> Any:
+    async def run(self, *, callback: Callable, **kwargs: Any) -> RunResult:
         attempt = 0
+        last_error: Optional[Exception] = None
+        task_id: Optional[str] = "unknown"
+        result: Any = None
 
         while attempt <= self.retries:
             page = None
             context: BrowserContext = cast(BrowserContext, None)
             try:
                 context = await self._create_context()
+                task_id = getattr(context, "_task_id", "unknown")
                 page = await context.new_page()
 
                 result = await self._run_callback_chain(
                     callback=callback, page=page, context=context, **kwargs
                 )
-                return result
-
-            except Exception as e:
-                task_id = getattr(context, "_task_id", "unknown")
-                self.logger.error(f"[Task<{task_id}> Attempt {attempt} Failed] {e}")
+                self.logger.info(f"[Task<{task_id}> Success]")
+                return RunResult(
+                    success=True,
+                    attempts=attempt + 1,
+                    task_id=task_id,
+                    error=last_error,
+                    result=result
+                )
+            except (asyncio.CancelledError, KeyboardInterrupt):
+                # ⚠️ 不要当成错误
+                self.logger.warning(f"[Task<{task_id}> Cancelled]")
+
+                # 清理资源
+                if context and self.record_trace:
+                    os.makedirs(self.trace_dir, exist_ok=True)
+                    trace_path = os.path.join(self.trace_dir, f"{task_id}.zip")
+                    await context.tracing.stop(path=trace_path)
+                    self.logger.error(f"[Trace Saved] {trace_path}")
+
+                # ❗关键：不要 raise
+                return RunResult(
+                    success=False,
+                    attempts=attempt + 1,
+                    error=asyncio.CancelledError(),
+                    task_id=task_id,
+                    result=result
+                )
+            except (PlaywrightTimeoutError, PlaywrightError, Exception) as e:
+                last_error = e
+                self.logger.error(f"[Task<{task_id}> Attempt {attempt + 1} Failed] {e}")
                 if page:
-                    await self._safe_screenshot(page, task_id)
+                    await self._safe_screenshot(page=page, name=task_id)
 
-                    if self.record_trace:
-                        os.makedirs(self.trace_dir, exist_ok=True)
-                        trace_path = os.path.join(self.trace_dir, f"{task_id}.zip")
-                        await context.tracing.stop(path=trace_path)
-                        self.logger.error(f"[Trace Saved] {trace_path}")
+                if context and self.record_trace:
+                    os.makedirs(self.trace_dir, exist_ok=True)
+                    trace_path = os.path.join(self.trace_dir, f"{task_id}.zip")
+                    await context.tracing.stop(path=trace_path)
+                    self.logger.error(f"[Trace Saved] {trace_path}")
 
                 attempt += 1
-                if attempt > self.retries:
-                    self.logger.error("[Final Failure]")
-                    raise e
-                await asyncio.sleep(1)
+                if attempt <= self.retries:
+                    await asyncio.sleep(1)
             finally:
                 if context:
                     await self._cleanup_context(context)
+        # 所有重试结束，仍然失败
+        self.logger.error(f"[Task<{task_id}> Final Failure]")
+
+        return RunResult(
+            success=False,
+            attempts=attempt,
+            error=last_error,
+            task_id=task_id,
+            result=result
+        )

{python_playwright_helper-0.0.2 → python_playwright_helper-0.1.7}/playwright_helper/utils/po_utils.py

@@ -15,14 +15,6 @@ from playwright.async_api import Page, Locator
 MouseButton = Literal["left", "middle", "right"]
 
 
-async def exists(locator):
-    return await locator.count() > 0
-
-
-async def exists_one(locator):
-    return await locator.count() == 1
-
-
 async def on_click_locator(locator: Locator, button: MouseButton = "left") -> bool:
     try:
         await locator.click(button=button)

{python_playwright_helper-0.0.2 → python_playwright_helper-0.1.7}/playwright_helper/utils/type_utils.py

@@ -10,7 +10,8 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import re
-from typing import Any, Dict, Tuple, Union
+from dataclasses import dataclass
+from typing import Any, Dict, Tuple, Union, Optional
 
 
 def safe_convert_advanced(value, return_type='auto') -> Any:
@@ -85,6 +86,7 @@ def safe_convert_advanced(value, return_type='auto') -> Any:
     # 所有转换都失败，返回原值
     return value
 
+
 def convert_order_amount_text(amount_text: str) -> Tuple[bool, Union[Dict[str, Any], str]]:
     """
     将页面中的金额文案，解析成字典数据
@@ -108,4 +110,20 @@ def convert_order_amount_text(amount_text: str) -> Tuple[bool, Union[Dict[str, A
             amount = safe_convert_advanced(value=amount_str.replace(",", ""))
         else:
             return False, f"订单金额文案[{amount_text}]解析金额信息有异常"
-    return True, dict(currency=currency, amount=amount)
+    return True, dict(currency=currency, amount=amount)
+
+
+@dataclass
+class RunResult:
+    """
+    success：是否成功
+    attempts：实际尝试次数
+    error：最终失败的异常（有就带，没有就 None）
+    task_id：方便框架层日志关联
+    result: 执行结果
+    """
+    success: bool
+    attempts: int
+    error: Optional[Exception] = None
+    task_id: Optional[str] = None
+    result: Optional[Any] = None

{python_playwright_helper-0.0.2 → python_playwright_helper-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python_playwright_helper"                    # pip包名（不要大写）
-version = "0.0.2"                                    # 版本号
+version = "0.1.7"                                    # 版本号
 description = "playwright helper python package"
 readme = "README.md"
 requires-python = ">=3.12"                    # Python 版本要求
@@ -16,8 +16,8 @@ authors = [
 
 # 运行时依赖
 dependencies = [
-    "playwright>=1.56.0; python_version >= '3.12'",
-    "playwright-stealth>=2.0.0; python_version >= '3.12'",
+    "playwright==1.56.0; python_version >= '3.12'",
+    "playwright-stealth==2.0.0; python_version >= '3.12'",
 ]
 
 [project.urls]

{python_playwright_helper-0.0.2 → python_playwright_helper-0.1.7}/python_playwright_helper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_playwright_helper
-Version: 0.0.2
+Version: 0.1.7
 Summary: playwright helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License
@@ -210,8 +210,8 @@ Project-URL: Issues, https://github.com/ckf10000/playwright-helper/issues
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: playwright>=1.56.0; python_version >= "3.12"
-Requires-Dist: playwright-stealth>=2.0.0; python_version >= "3.12"
+Requires-Dist: playwright==1.56.0; python_version >= "3.12"
+Requires-Dist: playwright-stealth==2.0.0; python_version >= "3.12"
 Dynamic: license-file
 
 # playwright-helper

{python_playwright_helper-0.0.2 → python_playwright_helper-0.1.7}/python_playwright_helper.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 playwright_helper/__init__.py
 playwright_helper/libs/__init__.py
+playwright_helper/libs/base_po.py
 playwright_helper/libs/browser_pool.py
 playwright_helper/libs/executor.py
 playwright_helper/middlewares/__init__.py

python_playwright_helper-0.1.7/python_playwright_helper.egg-info/requires.txt

@@ -0,0 +1,4 @@
+
+[:python_version >= "3.12"]
+playwright==1.56.0
+playwright-stealth==2.0.0

python_playwright_helper-0.0.2/python_playwright_helper.egg-info/requires.txt

@@ -1,4 +0,0 @@
-
-[:python_version >= "3.12"]
-playwright>=1.56.0
-playwright-stealth>=2.0.0