ok-script 1.0.190__tar.gz → 2.0.0b2__tar.gz

{ok_script-1.0.190/ok_script.egg-info → ok_script-2.0.0b2}/PKG-INFO

@@ -1,43 +1,46 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.190
+Version: 2.0.0b2
 Summary: Automation with Computer Vision for Python
-Home-page: https://github.com/ok-oldking/ok-script
-Author: ok-oldking
-Author-email: firedcto@gmail.com
+Author-email: ok-oldking <firedcto@gmail.com>
+Project-URL: Homepage, https://github.com/ok-oldking/ok-script
+Project-URL: Repository, https://github.com/ok-oldking/ok-script
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: pywin32>=306
 Requires-Dist: pyappify>=1.0.6
-Requires-Dist: PySide6-Fluent-Widgets>=1.8.3
 Requires-Dist: typing-extensions>=4.11.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: psutil>=6.0.0
 Requires-Dist: pydirectinput==1.0.4
 Requires-Dist: pycaw==20240210
 Requires-Dist: mouse==0.7.1
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
+Provides-Extra: web
+Requires-Dist: fastapi>=0.115.0; extra == "web"
+Requires-Dist: uvicorn[standard]>=0.30.0; extra == "web"
+Requires-Dist: pywebview>=5.4; extra == "web"
+Provides-Extra: qt
+Requires-Dist: PySide6-Fluent-Widgets>=1.8.3; extra == "qt"
+Requires-Dist: pynput>=1.8.1; extra == "qt"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # ok-script
 
+## 无界面、桌面与 Web 模式
+
+自动化核心现已与 Qt 解耦。使用 `ok-script` 可无界面运行，使用
+`ok-script[qt]` 启用原有桌面界面，或使用 `ok-script[web]` 启用 FastAPI
+浏览器界面；对应命令为 `ok run_task`、`ok gui` 和 `ok web`。详见
+[运行时架构](docs/architecture.md)。
+
 [简体中文](README.md) | [English](README_en.md)
 
 [![Discord](https://img.shields.io/discord/296598043787132928?color=5865f2&label=%20Discord)](https://discord.gg/vVyCatEBgA)
@@ -64,6 +67,19 @@ ok-script 支持 Python 3.11 及以上版本，推荐使用 Python 3.12。
 python -m pip install ok-script
 ```
 
+按使用场景安装界面依赖：
+
+```powershell
+python -m pip install "ok-script[qt]"
+python -m pip install "ok-script[web]"
+```
+
+开发本仓库时，使用 `pyproject.toml` 中的 `default` 依赖组安装完整开发环境：
+
+```powershell
+python -m pip install --editable . --group default
+```
+
 如果要创建完整的自动化项目，建议从 [`ok-script-app`](https://github.com/ok-oldking/ok-script-app) 模板开始，而不是直接在本仓库中编写业务脚本。
 
 ## 文档

{ok_script-1.0.190 → ok_script-2.0.0b2}/README.md

@@ -1,5 +1,12 @@
 # ok-script
 
+## 无界面、桌面与 Web 模式
+
+自动化核心现已与 Qt 解耦。使用 `ok-script` 可无界面运行，使用
+`ok-script[qt]` 启用原有桌面界面，或使用 `ok-script[web]` 启用 FastAPI
+浏览器界面；对应命令为 `ok run_task`、`ok gui` 和 `ok web`。详见
+[运行时架构](docs/architecture.md)。
+
 [简体中文](README.md) | [English](README_en.md)
 
 [![Discord](https://img.shields.io/discord/296598043787132928?color=5865f2&label=%20Discord)](https://discord.gg/vVyCatEBgA)
@@ -26,6 +33,19 @@ ok-script 支持 Python 3.11 及以上版本，推荐使用 Python 3.12。
 python -m pip install ok-script
 ```
 
+按使用场景安装界面依赖：
+
+```powershell
+python -m pip install "ok-script[qt]"
+python -m pip install "ok-script[web]"
+```
+
+开发本仓库时，使用 `pyproject.toml` 中的 `default` 依赖组安装完整开发环境：
+
+```powershell
+python -m pip install --editable . --group default
+```
+
 如果要创建完整的自动化项目，建议从 [`ok-script-app`](https://github.com/ok-oldking/ok-script-app) 模板开始，而不是直接在本仓库中编写业务脚本。
 
 ## 文档

ok_script-2.0.0b2/diagnostics/qq_trace.py

@@ -0,0 +1,101 @@
+"""Trace QQ notification navigation without sending a message.
+
+Usage: .venv\\Scripts\\python.exe diagnostics\\qq_trace.py [nickname]
+"""
+from __future__ import annotations
+
+import logging
+import sys
+import time
+from pathlib import Path
+
+import cv2
+import numpy as np
+from types import SimpleNamespace
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+from ok.notification.windows_messenger import MessengerAutomation
+
+
+OUT = Path(__file__).resolve().parents[1] / "logs" / "qq_trace"
+OUT.mkdir(parents=True, exist_ok=True)
+logging.basicConfig(
+    filename=OUT / "trace.log",
+    level=logging.INFO,
+    format="%(asctime)s.%(msecs)03d %(levelname)s %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
+log = logging.getLogger("qq_trace")
+
+
+def snap(automation: MessengerAutomation, hwnd: int, label: str) -> None:
+    try:
+        frame = automation._capture(hwnd)
+        path = OUT / f"{time.time_ns()}_{label}.png"
+        cv2.imwrite(str(path), frame)
+        log.info("screenshot label=%s path=%s shape=%s", label, path, frame.shape)
+    except Exception:
+        log.exception("screenshot_failed label=%s", label)
+
+
+def main() -> int:
+    nickname = (sys.argv[1] if len(sys.argv) > 1 else "文件传输助手").strip()
+    log.info("START nickname=%r", nickname)
+    automation = MessengerAutomation(
+        ("QQ.exe",), SimpleNamespace(), window_titles=("QQ",),
+        dismiss_search_after_contact=True, post_activate=False,
+    )
+    hwnd = automation._find_hwnd()
+    log.info("find_hwnd hwnd=%s foreground=%s", hwnd, __import__("win32gui").GetForegroundWindow())
+    if not hwnd:
+        log.error("QQ window not found")
+        return 2
+    snap(automation, hwnd, "01_initial")
+    if not automation._wait_until_background(hwnd):
+        log.warning("wait_until_background returned false")
+        return 3
+    log.info("background_ready foreground=%s", __import__("win32gui").GetForegroundWindow())
+    snap(automation, hwnd, "02_background_ready")
+    search_region, contact_region, send_region = automation._layout_regions(hwnd)
+    log.info("layout search=%s contact=%s send=%s", search_region, contact_region, send_region)
+    search = automation._wait_text(hwnd, {"Search", "搜索"}, region=search_region, timeout=1.5)
+    log.info("search_ocr point=%s", search)
+    if search is None:
+        search = automation._search_field_point(hwnd)
+        log.info("search_fallback point=%s", search)
+    snap(automation, hwnd, "03_before_search_click")
+    target = automation._click(hwnd, search)
+    log.info("click search target=%s point=%s", target, search)
+    snap(automation, hwnd, "04_after_search_click")
+    time.sleep(1)
+    automation._clear_text(target)
+    log.info("clear search")
+    time.sleep(1)
+    automation._type_text(target, nickname)
+    log.info("type nickname=%r", nickname)
+    time.sleep(1)
+    snap(automation, hwnd, "05_after_typing")
+    contact_hwnd, contact = automation._wait_contact(hwnd, nickname, contact_region, timeout=8)
+    log.info("contact_result hwnd=%s point=%s", contact_hwnd, contact)
+    if contact is None:
+        log.error("contact not found")
+        automation._send_key(hwnd, 0x1B)
+        snap(automation, hwnd, "06_contact_not_found_escape")
+        return 4
+    automation._click(contact_hwnd, contact, focus=contact_hwnd == hwnd)
+    log.info("click contact target=%s point=%s", contact_hwnd, contact)
+    snap(automation, hwnd, "06_after_contact_click")
+    time.sleep(1)
+    automation._send_key(hwnd, 0x1B)
+    log.info("send escape to dismiss search overlay")
+    time.sleep(1)
+    snap(automation, hwnd, "07_after_escape")
+    send_box = automation._wait_text(hwnd, {"Send", "发送"}, region=send_region, timeout=3)
+    log.info("send_box=%s (dry-run; no message sent)", send_box)
+    snap(automation, hwnd, "08_final_dry_run")
+    log.info("END")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())