ok-script 2.0.0b2__tar.gz → 2.0.0b3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 2.0.0b2
+Version: 2.0.0b3
 Summary: Automation with Computer Vision for Python
 Author-email: ok-oldking <firedcto@gmail.com>
 Project-URL: Homepage, https://github.com/ok-oldking/ok-script
@@ -23,13 +23,34 @@ Requires-Dist: psutil>=6.0.0
 Requires-Dist: pydirectinput==1.0.4
 Requires-Dist: pycaw==20240210
 Requires-Dist: mouse==0.7.1
+Requires-Dist: pynput>=1.8.1
+Provides-Extra: default
+Requires-Dist: numpy>=1.26.4; extra == "default"
+Requires-Dist: Pillow>=10.0; extra == "default"
+Requires-Dist: ok-d3dshot>=0.1.5; extra == "default"
+Requires-Dist: OpenCC==1.2.0; extra == "default"
 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-Essentials>=6.7.0; extra == "qt"
+Requires-Dist: PySideSix-Frameless-Window>=0.3.12; extra == "qt"
+Requires-Dist: darkdetect>=0.8.0; extra == "qt"
 Requires-Dist: PySide6-Fluent-Widgets>=1.8.3; extra == "qt"
-Requires-Dist: pynput>=1.8.1; extra == "qt"
+Provides-Extra: adb
+Requires-Dist: adbutils>=2.2.1; extra == "adb"
+Provides-Extra: ocr
+Requires-Dist: onnxocr-ppocrv5; extra == "ocr"
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0; extra == "dev"
+Requires-Dist: mypy>=1.10; extra == "dev"
+Requires-Dist: build>=1.2; extra == "dev"
+Requires-Dist: twine>=5.0; extra == "dev"
+Requires-Dist: setuptools>=77; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: get-pypi-latest-version; extra == "dev"
+Requires-Dist: mkdocs-material==9.7.7; extra == "dev"
 Dynamic: license-file
 
 # ok-script
@@ -67,17 +88,27 @@ ok-script 支持 Python 3.11 及以上版本，推荐使用 Python 3.12。
 python -m pip install ok-script
 ```
 
-按使用场景安装界面依赖：
+只安装应用所需的依赖配置。`default` 为无界面模式，Web、Qt、ADB 和 OCR
+能力分别按需安装：
 
 ```powershell
+python -m pip install "ok-script[default]"
 python -m pip install "ok-script[qt]"
 python -m pip install "ok-script[web]"
+python -m pip install "ok-script[adb]"
+python -m pip install "ok-script[ocr]"
 ```
 
-开发本仓库时，使用 `pyproject.toml` 中的 `default` 依赖组安装完整开发环境：
+ok-script 不会自动选择 OpenCV。用户必须根据自己的应用选择版本，并且只安装
+一个变体：`opencv-python`、`opencv-contrib-python`、`opencv-python-headless`
+或 `opencv-contrib-python-headless`。
+
+以无界面模式开发本仓库时，同时安装 `pyproject.toml` 中的 `default` 和 `dev`
+依赖组；再根据需要添加 `--group web`、`--group qt`、`--group adb` 或
+`--group ocr`：
 
 ```powershell
-python -m pip install --editable . --group default
+python -m pip install --editable . --group default --group dev
 ```
 
 如果要创建完整的自动化项目，建议从 [`ok-script-app`](https://github.com/ok-oldking/ok-script-app) 模板开始，而不是直接在本仓库中编写业务脚本。

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

@@ -33,17 +33,27 @@ ok-script 支持 Python 3.11 及以上版本，推荐使用 Python 3.12。
 python -m pip install ok-script
 ```
 
-按使用场景安装界面依赖：
+只安装应用所需的依赖配置。`default` 为无界面模式，Web、Qt、ADB 和 OCR
+能力分别按需安装：
 
 ```powershell
+python -m pip install "ok-script[default]"
 python -m pip install "ok-script[qt]"
 python -m pip install "ok-script[web]"
+python -m pip install "ok-script[adb]"
+python -m pip install "ok-script[ocr]"
 ```
 
-开发本仓库时，使用 `pyproject.toml` 中的 `default` 依赖组安装完整开发环境：
+ok-script 不会自动选择 OpenCV。用户必须根据自己的应用选择版本，并且只安装
+一个变体：`opencv-python`、`opencv-contrib-python`、`opencv-python-headless`
+或 `opencv-contrib-python-headless`。
+
+以无界面模式开发本仓库时，同时安装 `pyproject.toml` 中的 `default` 和 `dev`
+依赖组；再根据需要添加 `--group web`、`--group qt`、`--group adb` 或
+`--group ocr`：
 
 ```powershell
-python -m pip install --editable . --group default
+python -m pip install --editable . --group default --group dev
 ```
 
 如果要创建完整的自动化项目，建议从 [`ok-script-app`](https://github.com/ok-oldking/ok-script-app) 模板开始，而不是直接在本仓库中编写业务脚本。

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 2.0.0b2
+Version: 2.0.0b3
 Summary: Automation with Computer Vision for Python
 Author-email: ok-oldking <firedcto@gmail.com>
 Project-URL: Homepage, https://github.com/ok-oldking/ok-script
@@ -23,13 +23,34 @@ Requires-Dist: psutil>=6.0.0
 Requires-Dist: pydirectinput==1.0.4
 Requires-Dist: pycaw==20240210
 Requires-Dist: mouse==0.7.1
+Requires-Dist: pynput>=1.8.1
+Provides-Extra: default
+Requires-Dist: numpy>=1.26.4; extra == "default"
+Requires-Dist: Pillow>=10.0; extra == "default"
+Requires-Dist: ok-d3dshot>=0.1.5; extra == "default"
+Requires-Dist: OpenCC==1.2.0; extra == "default"
 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-Essentials>=6.7.0; extra == "qt"
+Requires-Dist: PySideSix-Frameless-Window>=0.3.12; extra == "qt"
+Requires-Dist: darkdetect>=0.8.0; extra == "qt"
 Requires-Dist: PySide6-Fluent-Widgets>=1.8.3; extra == "qt"
-Requires-Dist: pynput>=1.8.1; extra == "qt"
+Provides-Extra: adb
+Requires-Dist: adbutils>=2.2.1; extra == "adb"
+Provides-Extra: ocr
+Requires-Dist: onnxocr-ppocrv5; extra == "ocr"
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0; extra == "dev"
+Requires-Dist: mypy>=1.10; extra == "dev"
+Requires-Dist: build>=1.2; extra == "dev"
+Requires-Dist: twine>=5.0; extra == "dev"
+Requires-Dist: setuptools>=77; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: get-pypi-latest-version; extra == "dev"
+Requires-Dist: mkdocs-material==9.7.7; extra == "dev"
 Dynamic: license-file
 
 # ok-script
@@ -67,17 +88,27 @@ ok-script 支持 Python 3.11 及以上版本，推荐使用 Python 3.12。
 python -m pip install ok-script
 ```
 
-按使用场景安装界面依赖：
+只安装应用所需的依赖配置。`default` 为无界面模式，Web、Qt、ADB 和 OCR
+能力分别按需安装：
 
 ```powershell
+python -m pip install "ok-script[default]"
 python -m pip install "ok-script[qt]"
 python -m pip install "ok-script[web]"
+python -m pip install "ok-script[adb]"
+python -m pip install "ok-script[ocr]"
 ```
 
-开发本仓库时，使用 `pyproject.toml` 中的 `default` 依赖组安装完整开发环境：
+ok-script 不会自动选择 OpenCV。用户必须根据自己的应用选择版本，并且只安装
+一个变体：`opencv-python`、`opencv-contrib-python`、`opencv-python-headless`
+或 `opencv-contrib-python-headless`。
+
+以无界面模式开发本仓库时，同时安装 `pyproject.toml` 中的 `default` 和 `dev`
+依赖组；再根据需要添加 `--group web`、`--group qt`、`--group adb` 或
+`--group ocr`：
 
 ```powershell
-python -m pip install --editable . --group default
+python -m pip install --editable . --group default --group dev
 ```
 
 如果要创建完整的自动化项目，建议从 [`ok-script-app`](https://github.com/ok-oldking/ok-script-app) 模板开始，而不是直接在本仓库中编写业务脚本。

ok_script-2.0.0b3/ok_script.egg-info/requires.txt

@@ -0,0 +1,42 @@
+pywin32>=306
+pyappify>=1.0.6
+typing-extensions>=4.11.0
+requests>=2.32.3
+psutil>=6.0.0
+pydirectinput==1.0.4
+pycaw==20240210
+mouse==0.7.1
+pynput>=1.8.1
+
+[adb]
+adbutils>=2.2.1
+
+[default]
+numpy>=1.26.4
+Pillow>=10.0
+ok-d3dshot>=0.1.5
+OpenCC==1.2.0
+
+[dev]
+pytest>=8.0
+mypy>=1.10
+build>=1.2
+twine>=5.0
+setuptools>=77
+wheel
+get-pypi-latest-version
+mkdocs-material==9.7.7
+
+[ocr]
+onnxocr-ppocrv5
+
+[qt]
+PySide6-Essentials>=6.7.0
+PySideSix-Frameless-Window>=0.3.12
+darkdetect>=0.8.0
+PySide6-Fluent-Widgets>=1.8.3
+
+[web]
+fastapi>=0.115.0
+uvicorn[standard]>=0.30.0
+pywebview>=5.4

{ok_script-2.0.0b2 → ok_script-2.0.0b3}/pyproject.toml

@@ -34,17 +34,42 @@ dependencies = [
     "pydirectinput==1.0.4",
     "pycaw==20240210",
     "mouse==0.7.1",
+    "pynput>=1.8.1",
 ]
 
 [project.optional-dependencies]
+default = [
+    "numpy>=1.26.4",
+    "Pillow>=10.0",
+    "ok-d3dshot>=0.1.5",
+    "OpenCC==1.2.0",
+]
 web = [
     "fastapi>=0.115.0",
     "uvicorn[standard]>=0.30.0",
     "pywebview>=5.4",
 ]
 qt = [
+    "PySide6-Essentials>=6.7.0",
+    "PySideSix-Frameless-Window>=0.3.12",
+    "darkdetect>=0.8.0",
     "PySide6-Fluent-Widgets>=1.8.3",
-    "pynput>=1.8.1",
+]
+adb = [
+    "adbutils>=2.2.1",
+]
+ocr = [
+    "onnxocr-ppocrv5",
+]
+dev = [
+    "pytest>=8.0",
+    "mypy>=1.10",
+    "build>=1.2",
+    "twine>=5.0",
+    "setuptools>=77",
+    "wheel",
+    "get-pypi-latest-version",
+    "mkdocs-material==9.7.7",
 ]
 
 [project.urls]
@@ -55,6 +80,12 @@ Repository = "https://github.com/ok-oldking/ok-script"
 ok = "ok.cli:main"
 
 [dependency-groups]
+default = [
+    "numpy>=1.26.4",
+    "Pillow>=10.0",
+    "ok-d3dshot>=0.1.5",
+    "OpenCC==1.2.0",
+]
 web = [
     "fastapi>=0.115.0",
     "uvicorn[standard]>=0.30.0",
@@ -65,17 +96,14 @@ qt = [
     "PySideSix-Frameless-Window>=0.3.12",
     "darkdetect>=0.8.0",
     "PySide6-Fluent-Widgets>=1.8.3",
-    "pynput>=1.8.1",
 ]
-default = [
-    { include-group = "web" },
-    { include-group = "qt" },
-    "numpy>=1.26.4",
-    "opencv-python>=4.9.0.80",
-    "Pillow>=10.0",
+adb = [
     "adbutils>=2.2.1",
-    "ok-d3dshot>=0.1.5",
-    "OpenCC==1.2.0",
+]
+ocr = [
+    "onnxocr-ppocrv5",
+]
+dev = [
     "pytest>=8.0",
     "mypy>=1.10",
     "build>=1.2",

ok_script-2.0.0b3/tests/test_package_metadata.py

@@ -0,0 +1,35 @@
+import tomllib
+from pathlib import Path
+
+
+ROOT = Path(__file__).parents[1]
+
+
+def test_pyproject_profiles_are_consistent_and_headless_by_default():
+    metadata = tomllib.loads((ROOT / "pyproject.toml").read_text(encoding="utf-8"))
+    project = metadata["project"]
+    extras = project["optional-dependencies"]
+    groups = metadata["dependency-groups"]
+
+    assert set(extras) == {"default", "web", "qt", "adb", "ocr", "dev"}
+    assert extras == groups
+    assert extras["adb"] == ["adbutils>=2.2.1"]
+    assert extras["ocr"] == ["onnxocr-ppocrv5"]
+    assert not any(
+        requirement.startswith(("fastapi", "PySide6"))
+        for requirement in extras["default"]
+    )
+    assert any(requirement.startswith("pytest") for requirement in extras["dev"])
+    assert not any(requirement.startswith("pytest") for requirement in project["dependencies"])
+    assert "pynput>=1.8.1" in project["dependencies"]
+
+    managed_requirements = [
+        *project["dependencies"],
+        *(requirement for profile in extras.values() for requirement in profile),
+    ]
+    assert not any("opencv" in requirement.lower() for requirement in managed_requirements)
+
+
+def test_legacy_requirements_files_are_replaced_by_pyproject_groups():
+    assert not (ROOT / "requirements.txt").exists()
+    assert not (ROOT / "requirements-docs.txt").exists()

ok_script-2.0.0b2/ok_script.egg-info/requires.txt

@@ -1,17 +0,0 @@
-pywin32>=306
-pyappify>=1.0.6
-typing-extensions>=4.11.0
-requests>=2.32.3
-psutil>=6.0.0
-pydirectinput==1.0.4
-pycaw==20240210
-mouse==0.7.1
-
-[qt]
-PySide6-Fluent-Widgets>=1.8.3
-pynput>=1.8.1
-
-[web]
-fastapi>=0.115.0
-uvicorn[standard]>=0.30.0
-pywebview>=5.4

ok_script-2.0.0b2/tests/test_package_metadata.py

@@ -1,27 +0,0 @@
-import tomllib
-from pathlib import Path
-
-
-ROOT = Path(__file__).parents[1]
-
-
-def test_pyproject_keeps_runtime_and_development_dependencies_separate():
-    metadata = tomllib.loads((ROOT / "pyproject.toml").read_text(encoding="utf-8"))
-    project = metadata["project"]
-    extras = project["optional-dependencies"]
-    groups = metadata["dependency-groups"]
-
-    assert set(extras) == {"web", "qt"}
-    assert {item["include-group"] for item in groups["default"] if isinstance(item, dict)} == {
-        "web", "qt",
-    }
-    assert any(
-        isinstance(requirement, str) and requirement.startswith("pytest")
-        for requirement in groups["default"]
-    )
-    assert not any(requirement.startswith("pytest") for requirement in project["dependencies"])
-
-
-def test_legacy_requirements_files_are_replaced_by_pyproject_groups():
-    assert not (ROOT / "requirements.txt").exists()
-    assert not (ROOT / "requirements-docs.txt").exists()