dp-cli 0.6.0__tar.gz → 0.6.2__tar.gz

{dp_cli-0.6.0 → dp_cli-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dp-cli
-Version: 0.6.0
+Version: 0.6.2
 Summary: A powerful CLI for DrissionPage — browser automation, structured data extraction, network listening and more.
 License: BSD-3-Clause
 Project-URL: Homepage, https://github.com/mofanx/dp-cli
@@ -18,6 +18,11 @@ Requires-Dist: click>=8.0
 Requires-Dist: aiohttp>=3.9
 Requires-Dist: websockets>=12
 Requires-Dist: requests>=2.28
+Provides-Extra: test
+Requires-Dist: pytest>=7.4.0; extra == "test"
+Requires-Dist: pytest-cov>=4.1.0; extra == "test"
+Requires-Dist: pytest-timeout>=2.1.0; extra == "test"
+Requires-Dist: pytest-mock>=3.11.0; extra == "test"
 
 # dp-cli
 
@@ -133,9 +138,12 @@ Every element gets an `[N]` ref usable in any command: `dp click "ref:5"`.
 
 ```bash
 dp snapshot                     # a11y + clickable (default); high + medium markers
-dp snapshot --viewport-only     # clickable probe limited to viewport (faster)
-dp snapshot --include-low       # also surface `?` low-confidence heuristics
-dp snapshot --no-clickables     # a11y tree only (legacy behavior)
+dp snapshot -i                  # interactive mode: only interactive elements
+dp snapshot -s ".main"          # limit to specific area
+dp snapshot -p "data-test"      # custom locator priority
+dp scan --viewport              # only elements currently in viewport
+dp scan --confidence all        # include low-confidence heuristics
+dp scan --confidence high       # only the sure-thing clickables
 ```
 
 ### `dp scan` — fast clickable-only listing
@@ -239,7 +247,7 @@ GPU or Xvfb environment.
 
 ```bash
 # 1. Discover CSS class names via noise-filtered content tree
-dp snapshot --mode content --max-text 40
+dp snapshot -i -s ".main"
 
 # 2. Verify field selectors
 dp query "css:.item-title" --fields "text,loc"
@@ -250,7 +258,7 @@ dp extract "css:.item-card" \
     "price":"css:.item-price",
     "tags":{"selector":"css:.tag","multi":true},
     "url":{"selector":"css:a","attr":"href"}}' \
-  --limit 100 --output csv --filename result.csv
+  --limit 100 -o csv -f result.csv
 ```
 
 ## Project Structure

{dp_cli-0.6.0 → dp_cli-0.6.2}/README.md

@@ -112,9 +112,12 @@ Every element gets an `[N]` ref usable in any command: `dp click "ref:5"`.
 
 ```bash
 dp snapshot                     # a11y + clickable (default); high + medium markers
-dp snapshot --viewport-only     # clickable probe limited to viewport (faster)
-dp snapshot --include-low       # also surface `?` low-confidence heuristics
-dp snapshot --no-clickables     # a11y tree only (legacy behavior)
+dp snapshot -i                  # interactive mode: only interactive elements
+dp snapshot -s ".main"          # limit to specific area
+dp snapshot -p "data-test"      # custom locator priority
+dp scan --viewport              # only elements currently in viewport
+dp scan --confidence all        # include low-confidence heuristics
+dp scan --confidence high       # only the sure-thing clickables
 ```
 
 ### `dp scan` — fast clickable-only listing
@@ -218,7 +221,7 @@ GPU or Xvfb environment.
 
 ```bash
 # 1. Discover CSS class names via noise-filtered content tree
-dp snapshot --mode content --max-text 40
+dp snapshot -i -s ".main"
 
 # 2. Verify field selectors
 dp query "css:.item-title" --fields "text,loc"
@@ -229,7 +232,7 @@ dp extract "css:.item-card" \
     "price":"css:.item-price",
     "tags":{"selector":"css:.tag","multi":true},
     "url":{"selector":"css:a","attr":"href"}}' \
-  --limit 100 --output csv --filename result.csv
+  --limit 100 -o csv -f result.csv
 ```
 
 ## Project Structure

{dp_cli-0.6.0 → dp_cli-0.6.2}/dp_cli/bridge.py

@@ -464,11 +464,29 @@ async def main_async(user_data_dir: Path, host: str, port: int) -> None:
     # 等待终止信号
     stop_evt = asyncio.Event()
     loop = asyncio.get_running_loop()
-    for sig in (signal.SIGINT, signal.SIGTERM):
-        try:
-            loop.add_signal_handler(sig, stop_evt.set)
-        except NotImplementedError:
-            pass
+
+    if sys.platform == 'win32':
+        # Windows ProactorEventLoop 不支持 add_signal_handler。
+        # 改用 signal.signal 拦截 SIGINT / SIGBREAK（来自 CTRL_BREAK_EVENT）。
+        # signal handler 跑在主线程的信号上下文中，必须用 call_soon_threadsafe
+        # 通知 event loop。
+        def _win_signal_handler(signum, frame):
+            loop.call_soon_threadsafe(stop_evt.set)
+
+        for sig_name in ('SIGINT', 'SIGBREAK', 'SIGTERM'):
+            sig = getattr(signal, sig_name, None)
+            if sig is None:
+                continue
+            try:
+                signal.signal(sig, _win_signal_handler)
+            except (ValueError, OSError):
+                pass
+    else:
+        for sig in (signal.SIGINT, signal.SIGTERM):
+            try:
+                loop.add_signal_handler(sig, stop_evt.set)
+            except NotImplementedError:
+                pass
     try:
         await stop_evt.wait()
     finally:

{dp_cli-0.6.0 → dp_cli-0.6.2}/dp_cli/bridge_manager.py

@@ -8,8 +8,10 @@ chrome://inspect 桥接进程生命周期管理
 - start_bridge(user_data_dir): spawn `python -m dp_cli.bridge` 子进程，
   等待其向 stdout 打印 "BRIDGE_READY host=... port=..." 标记后返回 (pid, port)。
 
-- stop_bridge(pid): 向子进程发 SIGTERM；如 2 秒未退出再 SIGKILL。
-- is_bridge_alive(pid): OS 级存在性检查。
+- stop_bridge(pid): 向子进程发终止信号；如 2 秒未退出再强杀。
+  POSIX: SIGTERM → SIGKILL（针对整个进程组）。
+  Windows: CTRL_BREAK_EVENT → taskkill /F /T。
+- is_bridge_alive(pid): OS 级存在性检查（Windows 走 OpenProcess）。
 """
 
 from __future__ import annotations
@@ -22,6 +24,59 @@ import sys
 import time
 from pathlib import Path
 
+IS_WINDOWS = sys.platform == 'win32'
+
+
+def _detach_spawn_kwargs() -> dict:
+    """让 bridge 子进程脱离父进程的信号/控制台分组。
+
+    POSIX: ``start_new_session=True`` → setsid，使 bridge 自成进程组，
+    父进程 Ctrl-C 不会传递过来。
+    Windows: ``CREATE_NEW_PROCESS_GROUP`` 让我们后续可以发 CTRL_BREAK_EVENT；
+    ``CREATE_NO_WINDOW`` 避免在 GUI/服务环境弹出黑色控制台窗口。
+    """
+    if IS_WINDOWS:
+        CREATE_NEW_PROCESS_GROUP = 0x00000200
+        CREATE_NO_WINDOW = 0x08000000
+        return {'creationflags': CREATE_NEW_PROCESS_GROUP | CREATE_NO_WINDOW}
+    return {'start_new_session': True}
+
+
+def _win_pid_alive(pid: int) -> bool:
+    """Windows: 用 OpenProcess + GetExitCodeProcess 判断进程是否存活。"""
+    import ctypes
+    from ctypes import wintypes
+
+    PROCESS_QUERY_LIMITED_INFORMATION = 0x1000
+    STILL_ACTIVE = 259
+    kernel32 = ctypes.windll.kernel32
+    kernel32.OpenProcess.restype = wintypes.HANDLE
+    kernel32.OpenProcess.argtypes = [wintypes.DWORD, wintypes.BOOL, wintypes.DWORD]
+    h = kernel32.OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, False, pid)
+    if not h:
+        return False
+    try:
+        code = wintypes.DWORD()
+        if not kernel32.GetExitCodeProcess(h, ctypes.byref(code)):
+            return False
+        return code.value == STILL_ACTIVE
+    finally:
+        kernel32.CloseHandle(h)
+
+
+def _win_terminate(pid: int) -> None:
+    """Windows: taskkill /F /T 强杀进程及其子进程树。"""
+    try:
+        subprocess.run(
+            ['taskkill', '/F', '/T', '/PID', str(pid)],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            check=False,
+            timeout=5,
+        )
+    except Exception:
+        pass
+
 
 _READY_RE = re.compile(r'^BRIDGE_READY host=(?P<host>\S+) port=(?P<port>\d+)\s*$')
 
@@ -82,14 +137,15 @@ def start_bridge(user_data_dir: str | os.PathLike,
         '--listen', str(listen_port),
         '-v',
     ]
-    # start_new_session 让 bridge 成为独立进程组，防止父进程 SIGINT 误杀
+    # 让 bridge 成为独立进程组，防止父进程 SIGINT/Ctrl-C 误杀。
+    # POSIX 走 start_new_session；Windows 走 CREATE_NEW_PROCESS_GROUP。
     proc = subprocess.Popen(
         cmd,
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         text=True,
-        start_new_session=True,
         bufsize=1,  # 行缓冲
+        **_detach_spawn_kwargs(),
     )
 
     # 立即提示用户：bridge 正在连接；若 Chrome 弹出授权框请点击。
@@ -173,6 +229,8 @@ def start_bridge(user_data_dir: str | os.PathLike,
 def is_bridge_alive(pid: int) -> bool:
     if pid <= 0:
         return False
+    if IS_WINDOWS:
+        return _win_pid_alive(pid)
     try:
         os.kill(pid, 0)
         return True
@@ -185,18 +243,37 @@ def is_bridge_alive(pid: int) -> bool:
 
 
 def stop_bridge(pid: int, timeout: float = 2.0) -> bool:
-    """停止 bridge 子进程。返回是否成功终止。"""
+    """停止 bridge 子进程。返回是否成功终止。
+
+    POSIX: SIGTERM 整个进程组 → 等待 → SIGKILL。
+    Windows: CTRL_BREAK_EVENT（依赖 spawn 时的 CREATE_NEW_PROCESS_GROUP）
+             → 等待 → taskkill /F /T 终止进程树。
+    """
     if not is_bridge_alive(pid):
         return True
-    # 先 SIGTERM 整个进程组（start_new_session 让 bridge 自成组）
-    try:
-        os.killpg(pid, signal.SIGTERM)
-    except (ProcessLookupError, PermissionError):
+
+    if IS_WINDOWS:
+        # 1) 优雅: 给整个进程组发 CTRL_BREAK_EVENT
         try:
-            os.kill(pid, signal.SIGTERM)
+            os.kill(pid, signal.CTRL_BREAK_EVENT)
         except Exception:
             pass
-    except Exception:
+
+        deadline = time.monotonic() + timeout
+        while time.monotonic() < deadline:
+            if not is_bridge_alive(pid):
+                return True
+            time.sleep(0.05)
+
+        # 2) 强杀: taskkill /F /T 终止进程树
+        _win_terminate(pid)
+        time.sleep(0.1)
+        return not is_bridge_alive(pid)
+
+    # POSIX: 先 SIGTERM 整个进程组（start_new_session 让 bridge 自成组）
+    try:
+        os.killpg(pid, signal.SIGTERM)
+    except (ProcessLookupError, PermissionError, OSError):
         try:
             os.kill(pid, signal.SIGTERM)
         except Exception:

{dp_cli-0.6.0 → dp_cli-0.6.2}/dp_cli/commands/_utils.py

@@ -21,7 +21,7 @@ def normalize_url(url: str) -> str:
 
 
 def session_option(f):
-    return click.option('-s', '--session', default='default',
+    return click.option('-S', '--session', default='default',
                         help='会话名称，默认 default', show_default=True)(f)
 
 

{dp_cli-0.6.0 → dp_cli-0.6.2}/dp_cli/commands/keyboard.py

@@ -9,6 +9,20 @@ from dp_cli.commands._utils import (
     session_option, _get_page, resolve_locator, wait_network_idle,
 )
 
+# ponytail: 提取重复的 findScrollable JS 函数
+_FIND_SCROLLABLE_JS = """
+function findScrollable(el) {
+  while (el && el !== document.body && el !== document.documentElement) {
+    const st = getComputedStyle(el);
+    const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
+    const canX = /(auto|scroll|overlay)/.test(st.overflowX) && el.scrollWidth > el.clientWidth + 1;
+    if (canY || canX) return el;
+    el = el.parentElement;
+  }
+  return document.scrollingElement || document.documentElement;
+}
+"""
+
 
 def register(cli):
 
@@ -142,32 +156,22 @@ def register(cli):
 
             if mouse_x is not None and mouse_y is not None:
                 result = page.run_js(
-                    """
-                    function findScrollable(el) {
-                      while (el && el !== document.body && el !== document.documentElement) {
-                        const st = getComputedStyle(el);
-                        const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
-                        const canX = /(auto|scroll|overlay)/.test(st.overflowX) && el.scrollWidth > el.clientWidth + 1;
-                        if (canY || canX) return el;
-                        el = el.parentElement;
-                      }
-                      return document.scrollingElement || document.documentElement;
-                    }
+                    f"""{_FIND_SCROLLABLE_JS}
                     const start = document.elementFromPoint(arguments[2], arguments[3]);
                     const target = findScrollable(start);
-                    const before = {scrollTop: target.scrollTop, scrollLeft: target.scrollLeft};
-                    if (arguments[4]) {
+                    const before = {{scrollTop: target.scrollTop, scrollLeft: target.scrollLeft}};
+                    if (arguments[4]) {{
                       target.scrollTop = 0;
-                    } else if (arguments[5]) {
+                    }} else if (arguments[5]) {{
                       target.scrollTop = target.scrollHeight;
-                    } else {
+                    }} else {{
                       target.scrollTop += arguments[1];
                       target.scrollLeft += arguments[0];
-                    }
-                    target.dispatchEvent(new Event('scroll', {bubbles: true}));
-                    return {
+                    }}
+                    target.dispatchEvent(new Event('scroll', {{bubbles: true}}));
+                    return {{
                       before,
-                      after: {scrollTop: target.scrollTop, scrollLeft: target.scrollLeft},
+                      after: {{scrollTop: target.scrollTop, scrollLeft: target.scrollLeft}},
                       scrollHeight: target.scrollHeight,
                       clientHeight: target.clientHeight,
                       scrollWidth: target.scrollWidth,
@@ -176,8 +180,8 @@ def register(cli):
                       id: target.id || '',
                       className: target.className || '',
                       mode: 'mouse'
-                    };
-                    """,
+                    }};
+                    }}""",
                     x, y, mouse_x, mouse_y, top, bottom,
                 )
                 ok({'x': x, 'y': y, 'mouse': {'x': mouse_x, 'y': mouse_y},
@@ -292,19 +296,9 @@ def register(cli):
                     return int(target.run_js('return this.scrollHeight'))
                 if use_mouse_container:
                     return int(page.run_js(
-                        """
-                        function findScrollable(el) {
-                          while (el && el !== document.body && el !== document.documentElement) {
-                            const st = getComputedStyle(el);
-                            const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
-                            if (canY) return el;
-                            el = el.parentElement;
-                          }
-                          return document.scrollingElement || document.documentElement;
-                        }
+                        f"""{_FIND_SCROLLABLE_JS}
                         const target = findScrollable(document.elementFromPoint(arguments[0], arguments[1]));
-                        return target.scrollHeight;
-                        """,
+                        return target.scrollHeight;""",
                         mouse_x, mouse_y,
                     ))
                 return int(page.run_js('return document.documentElement.scrollHeight'))
@@ -329,22 +323,13 @@ def register(cli):
                     )
                 elif use_mouse_container:
                     position = page.run_js(
-                        """
-                        function findScrollable(el) {
-                          while (el && el !== document.body && el !== document.documentElement) {
-                            const st = getComputedStyle(el);
-                            const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
-                            if (canY) return el;
-                            el = el.parentElement;
-                          }
-                          return document.scrollingElement || document.documentElement;
-                        }
+                        f"""{_FIND_SCROLLABLE_JS}
                         const target = findScrollable(document.elementFromPoint(arguments[0], arguments[1]));
                         const before = target.scrollTop;
                         const delta = arguments[2] > 0 ? arguments[2] : Math.max(300, Math.floor(target.clientHeight * arguments[3]));
                         target.scrollTop += delta;
-                        target.dispatchEvent(new Event('scroll', {bubbles: true}));
-                        return {
+                        target.dispatchEvent(new Event('scroll', {{bubbles: true}}));
+                        return {{
                           before,
                           after: target.scrollTop,
                           delta,
@@ -354,8 +339,7 @@ def register(cli):
                           id: target.id || '',
                           className: target.className || '',
                           mode: 'mouse'
-                        };
-                        """,
+                        }};""",
                         mouse_x, mouse_y, step, 3 if fast else 0.9,
                     )
                 else:

{dp_cli-0.6.0 → dp_cli-0.6.2}/dp_cli/commands/snapshot_cmd.py

@@ -18,28 +18,33 @@ def register(cli):
 
     @cli.command()
     @session_option
-    @click.option('--mode',
-                  type=click.Choice(['full', 'brief', 'text']),
+    @click.option('--mode', '-m',
+                  type=click.Choice(['full', 'interactive', 'brief', 'text']),
                   default='full', show_default=True, help='快照模式')
-    @click.option('--selector', default=None, help='限定快照范围的 CSS 选择器')
-    @click.option('--format', 'fmt', type=click.Choice(['json', 'text']),
+    @click.option('--interactive', '-i', is_flag=True, default=False,
+                  help='快捷方式：等价于 --mode interactive')
+    @click.option('--selector', '-s', default=None, help='限定快照范围的 CSS 选择器')
+    @click.option('--format', '-f', 'fmt', type=click.Choice(['json', 'text']),
                   default='text', show_default=True, help='输出格式')
-    @click.option('--filename', default=None, help='保存到文件路径')
+    @click.option('--filename', '-o', default=None, help='保存到文件路径')
     @click.option('--no-clickables', is_flag=True, default=False,
                   help='禁用 Vimium 风格可交互元素补充探测（默认开启）')
     @click.option('--include-low', is_flag=True, default=False,
                   help='包含 low 置信度元素（cursor:pointer / class 规则匹配，可能假阳性）')
     @click.option('--viewport-only', is_flag=True, default=False,
                   help='补充探测只看视口内元素（省 token、更快）')
-    def snapshot(session, mode, selector, fmt, filename,
-                 no_clickables, include_low, viewport_only):
+    @click.option('--locator-priority', '-p', default=None,
+                  help='自定义 locator 属性优先级（逗号分隔），如 "data-testid,data-test-id,id"')
+    def snapshot(session, mode, interactive, selector, fmt, filename,
+                 no_clickables, include_low, viewport_only, locator_priority):
         """获取页面快照（a11y tree + Vimium 风格可交互元素补充）。
 
         \b
         模式说明（默认 full）:
-          full   【默认】完整页面快照，包含所有内容和交互元素
-          brief  精简模式，保留结构+交互，截断长文本（省 token）
-          text   纯文本模式，按阅读顺序输出可见文本
+          full       【默认】完整页面快照，包含所有内容和交互元素
+          interactive【推荐】只显示交互元素，适合脚本执行
+          brief      interactive 的别名（向后兼容）
+          text       纯文本模式，按阅读顺序输出可见文本
 
         \b
         可交互元素补充探测（默认开启）:
@@ -50,12 +55,24 @@ def register(cli):
         \b
         示例:
           dp snapshot                          # 完整快照（默认含 clickable 补充）
-          dp snapshot --mode brief             # 精简模式（省 token，适合循环调用）
+          dp snapshot -i                       # 只显示交互元素（最简洁，推荐）
+          dp snapshot -m interactive           # 只显示交互元素（明确）
+          dp snapshot -m brief                 # 精简模式（interactive 别名）
           dp snapshot --viewport-only          # 只扫视口内，更快
           dp snapshot --include-low            # 启用 low 置信度（可能假阳性）
           dp snapshot --no-clickables          # 纯 a11y tree，旧版本行为
-          dp snapshot --selector ".main"       # 只获取指定区域
+          dp snapshot -s ".main"               # 只获取指定区域
+          dp snapshot -p "data-testid,data-test-id,id"  # 自定义属性优先级
         """
+        # -i 选项覆盖 mode
+        if interactive:
+            mode = 'interactive'
+
+        # 解析 locator_priority
+        attr_priority = None
+        if locator_priority:
+            attr_priority = [p.strip() for p in locator_priority.split(',') if p.strip()]
+
         page = _get_page(session)
 
         try:
@@ -64,6 +81,7 @@ def register(cli):
                 with_clickables=not no_clickables,
                 include_low=include_low,
                 viewport_only=viewport_only,
+                attr_priority=attr_priority,
             )
         except Exception as e:
             error('获取页面快照失败', code='SNAPSHOT_FAILED', detail=str(e))
@@ -71,13 +89,15 @@ def register(cli):
 
         # 收集 ref 映射（所有模式都收集，便于后续 ref:N 引用）
         refs = {}
+        # brief 是 interactive 的别名，统一处理
+        mode_effective = 'interactive' if mode == 'brief' else mode
         if fmt == 'json':
             render_a11y_text(data, refs=refs)  # 触发编号分配
             output = json.dumps({'status': 'ok', 'data': data},
                                 ensure_ascii=False, indent=2)
-        elif mode == 'text':
+        elif mode_effective == 'text':
             output = render_a11y_plain_text(data, refs=refs)
-        elif mode == 'brief':
+        elif mode_effective == 'interactive':
             output = render_a11y_text(data, brief=True, refs=refs)
         else:
             output = render_a11y_text(data, refs=refs)
@@ -102,9 +122,9 @@ def register(cli):
                        '使用 "all" 等价于 high,medium,low')
     @click.option('--max', 'max_elements', default=1000, show_default=True,
                   help='最多返回多少个元素')
-    @click.option('--format', 'fmt', type=click.Choice(['text', 'json']),
+    @click.option('--format', '-f', 'fmt', type=click.Choice(['text', 'json']),
                   default='text', show_default=True, help='输出格式')
-    @click.option('--filename', default=None, help='保存到文件路径')
+    @click.option('--filename', '-o', default=None, help='保存到文件路径')
     @click.option('--verbose', '-v', is_flag=True, default=False,
                   help='显示 detection reason 和像素尺寸（调试用）')
     def scan(session, viewport_only, confidence, max_elements, fmt, filename, verbose):
@@ -244,9 +264,9 @@ def register(cli):
     @click.argument('container')
     @click.argument('fields_json')
     @click.option('--limit', type=int, default=None, help='最多提取多少条记录', show_default=True)
-    @click.option('--output', 'output_fmt', type=click.Choice(['json', 'csv']),
+    @click.option('--output', '-o', 'output_fmt', type=click.Choice(['json', 'csv']),
                   default='json', show_default=True, help='输出格式')
-    @click.option('--filename', default=None, help='保存结果到文件')
+    @click.option('--filename', '-f', default=None, help='保存结果到文件')
     def cmd_extract(session, container, fields_json, limit, output_fmt, filename):
         """批量提取结构化数据（列表页核心工具）。
 
@@ -305,7 +325,7 @@ def register(cli):
     @click.option('--fields', default='text,loc', show_default=True,
                   help='提取字段，逗号分隔')
     @click.option('--limit', default=None, help='最多返回多少条', show_default=True)
-    @click.option('--filename', default=None, help='保存结果到 JSON 文件')
+    @click.option('--filename', '-o', default=None, help='保存结果到 JSON 文件')
     def cmd_query(session, selector, fields, limit, filename):
         """按选择器查询元素，提取内容和定位器。支持动态渲染内容。
 
@@ -457,7 +477,7 @@ def register(cli):
             first_cls = cls.strip().split()[0] if cls.strip() else ''
             if first_cls:
                 label += f'.{first_cls}'
-        loc = suggest_locator(tag, attrs, text[:50])
+        loc = suggest_locator(tag, attrs, text[:50], attr_priority=None)
         summary = {'tag': label, 'loc': loc}
         if text:
             summary['text'] = text[:max_text] + ('…' if len(text) > max_text else '')

{dp_cli-0.6.0 → dp_cli-0.6.2}/dp_cli/output.py

@@ -6,6 +6,7 @@ dp-cli 输出格式化模块
 import json
 import sys
 from typing import Any, Optional
+from dp_cli.snapshot.utils import suggest_locator
 
 
 def ok(data: Any = None, msg: str = None) -> None:
@@ -15,7 +16,7 @@ def ok(data: Any = None, msg: str = None) -> None:
         result['message'] = msg
     if data is not None:
         result['data'] = data
-    _print(result)
+    print(json.dumps(result, ensure_ascii=False, indent=2))
 
 
 def error(msg: str, code: str = 'ERROR', detail: str = None) -> None:
@@ -23,12 +24,8 @@ def error(msg: str, code: str = 'ERROR', detail: str = None) -> None:
     result = {'status': 'error', 'code': code, 'message': msg}
     if detail:
         result['detail'] = detail
-    _print(result)
-    sys.exit(1)
-
-
-def _print(result: dict) -> None:
     print(json.dumps(result, ensure_ascii=False, indent=2))
+    sys.exit(1)
 
 
 def format_element(ele, include_rect: bool = False) -> dict:
@@ -42,7 +39,7 @@ def format_element(ele, include_rect: bool = False) -> dict:
         'tag': ele.tag,
         'text': (ele.raw_text or '').strip()[:200],
         'attrs': attrs,
-        'loc': _suggest_locator(ele, attrs),
+        'loc': suggest_locator(ele.tag, attrs, (ele.raw_text or '').strip()[:50]),
     }
 
     if include_rect:
@@ -58,36 +55,6 @@ def format_element(ele, include_rect: bool = False) -> dict:
     return info
 
 
-def _suggest_locator(ele, attrs: dict) -> str:
-    """为元素生成最优 DrissionPage 定位字符串"""
-    # 优先用 id
-    if attrs.get('id'):
-        return f'#{attrs["id"]}'
-
-    # data-testid / data-qa / aria-label 等语义属性
-    for semantic in ('data-testid', 'data-qa', 'aria-label', 'name', 'placeholder'):
-        if attrs.get(semantic):
-            return f'@{semantic}={attrs[semantic]}'
-
-    # 有唯一 class
-    cls = attrs.get('class', '')
-    if cls:
-        classes = cls.strip().split()
-        if classes:
-            return f'.{classes[0]}'
-
-    # 按文本
-    try:
-        txt = (ele.raw_text or '').strip()
-        if txt and len(txt) <= 30:
-            return f'text:{txt}'
-    except Exception:
-        pass
-
-    # 最后按 tag
-    return f't:{ele.tag}'
-
-
 def format_page_info(page) -> dict:
     """格式化页面基本信息"""
     return {