@buaa_smat/hometrans 0.1.14 → 0.1.16

package/skills/hmos-incremental-ui-align/scripts/app_feature_verify.py

@@ -1,22 +1,32 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+# /// script
+# requires-python = ">=3.12"
+# dependencies = [
+#     "openpyxl",
+#     "phone-agent",
+# ]
+# [[tool.uv.index]]
+# url = "https://pypi.tuna.tsinghua.edu.cn/simple"
+# ///
 """
 应用页面导航工具 —— 使用 PhoneAgent 按指定路径操作设备，导航到目标页面。
 
 支持 Android (ADB) 和 HarmonyOS (HDC) 两种设备类型。
 
-依赖: pip install openpyxl phone-agent
+依赖: openpyxl、phone-agent —— 已在文件顶部 PEP 723 元数据声明，`uv run` 自动安装（无需手动 pip install）
 运行前需确保: 设备已连接 (HDC/ADB)、模型 API 可用
 
 用法:
   # 自由 prompt 导航
-  python app_feature_verify.py --device adb --app Gallery --package com.example.gallery --prompt "打开相册，进入设置页面"
+  uv run app_feature_verify.py --device adb --app Gallery --package com.example.gallery --prompt "打开相册，进入设置页面"
 
   # 按功能路径导航
-  python app_feature_verify.py --app 简单图库 --package com.simplemobiletools.gallery.pro --task "L1相册详情L2更多L3筛选媒体文件"
+  uv run app_feature_verify.py --app 简单图库 --package com.simplemobiletools.gallery.pro --task "L1相册详情L2更多L3筛选媒体文件"
 """
 
 import argparse
+import json
 import re
 import sys
 import os
@@ -267,25 +277,62 @@ def _apply_phone_agent_patches():
         _swipe._patched = True
         _hdc.swipe = _swipe
 
-    # Patch 2: parse_action — regex fallback when do() contains unescaped quotes
+    # Patch 2: _parse_response — strip <think>/<answer> tags before splitting by do()/finish()
+    import phone_agent.model.client as _client
+    if not getattr(_client.ModelClient._parse_response, '_patched', False):
+        _orig_parse_response = _client.ModelClient._parse_response
+
+        def _patched_parse_response(self, content: str):
+            # Strip <think>...</think> and <answer>...</answer> wrappers first
+            cleaned = re.sub(r'<think>.*?</think>\s*', '', content, flags=re.DOTALL)
+            m = re.search(r'<answer>\s*(.*?)\s*</answer>', cleaned, re.DOTALL)
+            if m:
+                cleaned = m.group(1)
+            # Also strip trailing </answer> if only opening was consumed by rule 2
+            cleaned = cleaned.replace('</answer>', '').strip()
+            if cleaned:
+                return _orig_parse_response(self, cleaned)
+            return _orig_parse_response(self, content)
+
+        _patched_parse_response._patched = True
+        _client.ModelClient._parse_response = _patched_parse_response
+
+    # Patch 3: parse_action — strip thinking tags + regex fallback for malformed do()
     import phone_agent.actions.handler as _handler
     if not getattr(_handler.parse_action, '_patched', False):
         _orig_parse = _handler.parse_action
+        _THINK_RE = re.compile(r'<think>.*?</think>\s*', re.DOTALL)
+        _ANSWER_RE = re.compile(r'<answer>\s*(.*?)\s*</answer>', re.DOTALL)
+
+        def _strip_llm_tags(text: str) -> str:
+            text = _THINK_RE.sub('', text)
+            m = _ANSWER_RE.search(text)
+            if m:
+                text = m.group(1)
+            return text.strip()
+
         def _parse_action(response):
+            cleaned = _strip_llm_tags(response)
             try:
-                return _orig_parse(response)
-            except ValueError as e:
-                if 'Failed to parse do() action' in str(e):
-                    m = re.search(
-                        r'do\s*\(\s*action\s*=\s*"([^"]*)"\s*,\s*message\s*="(.*)"\s*\)\s*$',
-                        response.strip(), re.DOTALL,
-                    )
-                    if m:
-                        msg = m.group(2)
-                        msg = msg.replace("\\n", "\x0a").replace("\\t", "\x09").replace("\\r", "\x0d")
-                        msg = msg.replace('\\"', '"')
-                        return {"_metadata": "do", "action": m.group(1), "message": msg}
-                raise
+                return _orig_parse(cleaned)
+            except ValueError:
+                pass
+            # regex fallback for do() with unescaped quotes
+            for text in (cleaned, response.strip()):
+                m = re.search(
+                    r'do\s*\(\s*action\s*=\s*"([^"]*)"\s*,\s*message\s*="(.*)"\s*\)\s*$',
+                    text, re.DOTALL,
+                )
+                if m:
+                    msg = m.group(2)
+                    msg = msg.replace("\\n", "\x0a").replace("\\t", "\x09").replace("\\r", "\x0d")
+                    msg = msg.replace('\\"', '"')
+                    return {"_metadata": "do", "action": m.group(1), "message": msg}
+            # fallback: extract bare do() from anywhere in the text
+            m = re.search(r'do\s*\(\s*action\s*=\s*"([^"]*)".*?\)', cleaned)
+            if m:
+                return _orig_parse(m.group(0))
+            return _orig_parse(response)
         _parse_action._patched = True
         _handler.parse_action = _parse_action
 
@@ -374,6 +421,63 @@ def navigate(
             agent.reset()
 
 
+# ---------------------------------------------------------------------------
+# 模型配置加载：UI 对齐与自测共用同一个多模态模型。
+#   优先级：CLI --api-key > HOMETRANS_MODEL_* 环境变量 > ~/.hometrans/config.json
+#   的 autotest.unified_model（由 `ht init` 写入，两端共用）> 老版本 GLM_API_KEY（兼容）。
+# ---------------------------------------------------------------------------
+
+def _load_model_config(cli_api_key: str = ""):
+    """加载统一多模态模型配置（UI 对齐 + 自测共用）。
+
+    `ht init` 把模型四要素（api_key / name / base_url / provider）写入
+    `autotest.unified_model`，并导出为 HOMETRANS_MODEL_* 环境变量。这里优先读
+    环境变量，缺字段时回落到 config.json，单个字段可被 CLI/环境变量覆盖；
+    都没有时再兼容老版本的 GLM_API_KEY（走智谱 GLM 端点）。
+    """
+    from phone_agent.model import ModelConfig
+
+    # 1) 环境变量（ht init 导出）+ CLI 覆盖
+    api_key = (cli_api_key or os.environ.get("HOMETRANS_MODEL_API_KEY", "")).strip()
+    base_url = os.environ.get("HOMETRANS_MODEL_BASE_URL", "").strip()
+    model_name = os.environ.get("HOMETRANS_MODEL_NAME", "").strip()
+    temperature = 0.1
+
+    # 2) 回落 ~/.hometrans/config.json 的 autotest.unified_model（补齐缺失字段）
+    config_path = Path.home() / ".hometrans" / "config.json"
+    if config_path.exists():
+        try:
+            cfg = json.loads(config_path.read_text(encoding="utf-8"))
+            um = cfg.get("autotest", {}).get("unified_model", {})
+            api_key = api_key or str(um.get("api_key", "")).strip()
+            base_url = base_url or str(um.get("base_url", "")).strip()
+            model_name = model_name or str(um.get("name", "")).strip()
+            if um.get("temperature") is not None:
+                temperature = um.get("temperature")
+        except (json.JSONDecodeError, KeyError):
+            pass
+
+    if api_key:
+        return ModelConfig(
+            base_url=base_url or "http://localhost:8000/v1",
+            api_key=api_key,
+            model_name=model_name,
+            temperature=temperature,
+        )
+
+    # 3) 向后兼容老版本：仅设置了 GLM_API_KEY 时，回落到智谱 GLM 端点。
+    glm_key = os.environ.get("GLM_API_KEY", "").strip()
+    if glm_key:
+        return ModelConfig(
+            base_url="https://open.bigmodel.cn/api/paas/v4",
+            api_key=glm_key,
+            model_name="autoglm-phone",
+            temperature=0.1,
+        )
+
+    return ModelConfig(temperature=temperature)
+
+
 # ---------------------------------------------------------------------------
 # CLI 入口
 # ---------------------------------------------------------------------------
@@ -395,7 +499,7 @@ def main():
     parser.add_argument("--limit", type=int, default=None, help="仅导航前 N 条")
     parser.add_argument("--offset", type=int, default=1, help="从第几条开始（1-based）")
     parser.add_argument("--sheet", type=int, default=0, help="Excel 工作表索引")
-    parser.add_argument("--api-key", type=str, default="", help="智谱 API Key")
+    parser.add_argument("--api-key", type=str, default="", help="API Key（可选，不传则读取 HOMETRANS_MODEL_* 环境变量 / ~/.hometrans/config.json）")
     parser.add_argument("--max-steps", type=int, default=30, help="Agent 最大步数")
     parser.add_argument("--app-hints", type=str, default=None, help="应用上下文提示")
     parser.add_argument("-q", "--quiet", action="store_true", help="减少输出")
@@ -404,19 +508,14 @@ def main():
     if not args.prompt and not args.task and not args.feature:
         parser.error("必须指定 --feature、--task 或 --prompt 之一")
 
-    api_key = args.api_key or os.environ.get("GLM_API_KEY", "")
-    if not api_key and not args.quiet:
-        print("提示: 未设置 API Key，请通过 --api-key 或环境变量 GLM_API_KEY 配置")
-        print("继续运行可能因鉴权失败而报错\n")
-
     from phone_agent.model import ModelConfig
 
-    model_config = ModelConfig(
-        base_url="https://open.bigmodel.cn/api/paas/v4",
-        api_key=api_key,
-        model_name="autoglm-phone",
-        temperature=0.1,
-    )
+    model_config = _load_model_config(args.api_key)
+    if not model_config.api_key or model_config.api_key == "EMPTY":
+        if not args.quiet:
+            print("提示: 未找到可用的模型配置。请运行 `ht init` 配置统一模型（UI 对齐 + 自测共用），")
+            print("它会写入 ~/.hometrans/config.json 的 autotest.unified_model 并导出 HOMETRANS_MODEL_* 环境变量；")
+            print("或通过 --api-key 传入 API Key。\n")
 
     device_label = "ADB (Android)" if args.device == "adb" else "HDC (HarmonyOS)"
     print(f"设备: {device_label}, 应用: {args.app} ({args.package})")

package/skills/hmos-incremental-ui-align/scripts/navigation-capure.md

@@ -1,37 +1,37 @@
-Create a timestamped output directory under `capture_output_dir`:
-```
-task_dir = capture_output_dir / "task_{timestamp}"
-android_capture_dir = task_dir / "android_page_{i}_{name}"
-hmos_capture_dir = task_dir / "hmos_page_{i}_{name}"
-```
-Each paired hmos-android page-pair should have the same `i`
-
-## Navigation prompt rules
-
-Each page's `android_nav_path` / `hmos_nav_path` is used as the `--prompt` for `app_feature_verify.py`.
-The `--prompt` mode auto-prepends "打开{app_name}，" so do not include "打开{app_name}" in the prompt.
-
-## Navigate to Android page and Capture (If navigated Success)
-```bash
-PYTHONIOENCODING=utf-8 python ./app_feature_verify.py \
-  --device adb \
-  --app "{android.app_name}" \
-  --package "{android.package}" \
-  --prompt "{pages[i].android_nav_path}" \
-  --api-key "{glm_api_key}" \
-  --max-steps 15
-```
-
-**Capture Android page** (if navigation succeeded)
-```bash
-PYTHONIOENCODING=utf-8 python ./page_capture.py --device adb -o "{android_capture_dir}"
-```
-
-## Navigate & Capture HarmonyOS Pages
-
-Same as Andorid but with `--device hdc` and HarmonyOS config values. Directory pattern:
-```
-hmos_capture_dir = task_dir / "hmos_page_{i}_{name}"
-```
-For pages missed in harmony OS app, navigation will certainly fail — `hmos_capture_dir` will be empty, which is expected. Skip navigation for these pages and leave the directory empty.
-
+Create a timestamped output directory under `capture_output_dir`:
+```
+task_dir = capture_output_dir / "task_{timestamp}"
+android_capture_dir = task_dir / "android_page_{i}_{name}"
+hmos_capture_dir = task_dir / "hmos_page_{i}_{name}"
+```
+Each paired hmos-android page-pair should have the same `i`
+
+## Navigation prompt rules
+
+Each page's `android_nav_path` / `hmos_nav_path` is used as the `--prompt` for `app_feature_verify.py`.
+The `--prompt` mode auto-prepends "打开{app_name}，" so do not include "打开{app_name}" in the prompt.
+
+## Navigate to Android page and Capture (If navigated Success)
+```bash
+PYTHONIOENCODING=utf-8 uv run ./app_feature_verify.py \
+  --device adb \
+  --app "{android.app_name}" \
+  --package "{android.package}" \
+  --prompt "{pages[i].android_nav_path}" \
+  \
+  --max-steps 15
+```
+
+**Capture Android page** (if navigation succeeded)
+```bash
+PYTHONIOENCODING=utf-8 uv run ./page_capture.py --device adb -o "{android_capture_dir}"
+```
+
+## Navigate & Capture HarmonyOS Pages
+
+Same as Andorid but with `--device hdc` and HarmonyOS config values. Directory pattern:
+```
+hmos_capture_dir = task_dir / "hmos_page_{i}_{name}"
+```
+For pages missed in harmony OS app, navigation will certainly fail — `hmos_capture_dir` will be empty, which is expected. Skip navigation for these pages and leave the directory empty.
+

package/skills/hmos-incremental-ui-align/scripts/page_capture.py

@@ -1,5 +1,10 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+# /// script
+# requires-python = ">=3.10"
+# [[tool.uv.index]]
+# url = "https://pypi.tuna.tsinghua.edu.cn/simple"
+# ///
 """
 统一页面采集工具 —— 单次采集当前设备页面的 View Tree (XML)、截图，支持滚动采集。
 
@@ -7,10 +12,10 @@
 
 用法:
   # HarmonyOS
-  python page_capture.py --device hdc -o ./output
+  uv run page_capture.py --device hdc -o ./output
 
   # Android
-  python page_capture.py --device adb -o ./output --serial emulator-5554
+  uv run page_capture.py --device adb -o ./output --serial emulator-5554
 """
 
 import argparse