From bb85b9eafd7f7a6df7080b998b03123b959051ca Mon Sep 17 00:00:00 2001 From: tandem-demo Date: Thu, 5 Nov 2026 22:53:45 +0800 Subject: [PATCH 1/2] refactor: rename tandem to jevduo (package, CLI, session class, paths) - src/tandem -> src/jevduo, src/tandem_eval -> src/jevduo_eval (git mv, history preserved) - distribution name jevduo; CLI entry points jevduo / jevduo-eval - TandemSession -> JevDuoSession - rjob job name prefix tandem- -> jevduo- - pyproject: package-data key and ruff per-file-ignores follow the new package path - infra/config.example.json: repo_root / deploy_root / results_root; worker.sh entry module - CI: tandem check -> jevduo check - tests: imports, monkeypatch string paths, path / job-name assertions, demo boundary guard regex Not in this commit (follow-up PRs): TANDEM_* env vars, harness.name, schema id/ref/title, version bump, docs wording. Shared-volume paths (tandem_api_pool, tandem_jev_images, tandem_osworld21_*) and real-machine fixtures in tests/eval/rjob_fakes.py are intentionally unchanged. --- .github/workflows/ci.yml | 2 +- demo/README.md | 2 +- demo/reader/__init__.py | 2 +- demo/sync_official.py | 2 +- infra/config.example.json | 6 +-- infra/worker.sh | 8 ++-- pyproject.toml | 18 ++++----- scripts/run_experiment.sh | 4 +- scripts/run_osw2_20x5.sh | 2 +- src/jevduo/__init__.py | 3 ++ src/{tandem => jevduo}/__main__.py | 6 +-- src/{tandem => jevduo}/components.py | 0 src/{tandem => jevduo}/config.py | 2 +- src/{tandem => jevduo}/gui/__init__.py | 0 src/{tandem => jevduo}/gui/candidates.py | 0 src/{tandem => jevduo}/gui/compile.py | 2 +- src/{tandem => jevduo}/gui/field_binding.py | 0 src/{tandem => jevduo}/gui/focus.py | 0 src/{tandem => jevduo}/gui/goal_candidates.py | 0 src/{tandem => jevduo}/gui/grounding.py | 0 src/{tandem => jevduo}/gui/interaction.py | 0 src/{tandem => jevduo}/gui/proposals.py | 0 src/{tandem => jevduo}/gui/semantics.py | 0 src/{tandem => jevduo}/gui/targets.py | 0 src/{tandem => jevduo}/memory/__init__.py | 0 src/{tandem => jevduo}/memory/context.py | 0 src/{tandem => jevduo}/memory/state.py | 0 src/{tandem => jevduo}/models/__init__.py | 0 src/{tandem => jevduo}/models/api_errors.py | 0 src/{tandem => jevduo}/models/jev.py | 0 src/{tandem => jevduo}/models/kev.py | 0 .../models/planner_choice.py | 0 src/{tandem => jevduo}/models/ranking.py | 0 src/{tandem => jevduo}/models/slow.py | 2 +- src/{tandem => jevduo}/planning/__init__.py | 0 .../planning/goal_planner.py | 0 src/{tandem => jevduo}/planning/planner.py | 0 .../planning/stage_planner.py | 0 src/{tandem => jevduo}/protocol/__init__.py | 0 src/{tandem => jevduo}/protocol/models.py | 0 src/{tandem => jevduo}/protocol/samples.py | 2 +- .../protocol/samples/action_cli.json | 0 .../samples/action_cli_no_observation.json | 0 .../protocol/samples/action_fail.json | 0 .../protocol/samples/action_finish.json | 0 .../protocol/samples/action_finish_empty.json | 0 .../protocol/samples/action_gui_click.json | 0 .../protocol/samples/action_gui_scroll.json | 0 .../protocol/samples/action_gui_type.json | 0 .../protocol/samples/action_wait.json | 0 .../protocol/samples/observation_no_a11y.json | 0 .../samples/observation_osw1_step0.json | 0 .../samples/observation_osw2_cdp.json | 0 .../samples/observation_osw2_jev.json | 0 .../protocol/samples/receipt_cli.json | 0 .../protocol/samples/receipt_cli_error.json | 0 .../protocol/samples/receipt_gui.json | 0 .../protocol/samples/receipt_wait.json | 0 .../protocol/schema/action.schema.json | 0 .../protocol/schema/observation.schema.json | 0 .../protocol/schema/receipt.schema.json | 0 src/{tandem => jevduo}/protocol/validate.py | 0 src/{tandem => jevduo}/runtime/__init__.py | 0 src/{tandem => jevduo}/runtime/episode.py | 0 src/{tandem => jevduo}/runtime/goal_stage.py | 0 src/{tandem => jevduo}/runtime/session.py | 6 +-- src/{tandem => jevduo}/runtime/stages.py | 0 src/{tandem => jevduo}/runtime/stopping.py | 2 +- .../verification/__init__.py | 0 .../verification/goal_verifier.py | 0 .../verification/stage_rules.py | 0 .../verification/verifier.py | 0 src/{tandem_eval => jevduo_eval}/__init__.py | 2 +- src/{tandem_eval => jevduo_eval}/__main__.py | 4 +- src/{tandem_eval => jevduo_eval}/browser.py | 0 .../config_schema.py | 0 src/{tandem_eval => jevduo_eval}/entry.py | 32 ++++++++-------- src/{tandem_eval => jevduo_eval}/env.py | 2 +- src/{tandem_eval => jevduo_eval}/manifest.py | 0 src/{tandem_eval => jevduo_eval}/osworld.py | 2 +- src/{tandem_eval => jevduo_eval}/recorder.py | 6 +-- src/{tandem_eval => jevduo_eval}/rjob.py | 2 +- src/{tandem_eval => jevduo_eval}/rjob_spec.py | 2 +- .../rjob_status.py | 2 +- src/{tandem_eval => jevduo_eval}/runner.py | 14 +++---- src/{tandem_eval => jevduo_eval}/scoring.py | 0 src/tandem/__init__.py | 3 -- tests/demo/helpers.py | 4 +- tests/demo/test_reader.py | 4 +- tests/demo/test_site.py | 2 +- tests/eval/test_browser.py | 2 +- tests/eval/test_browser_controls.py | 2 +- tests/eval/test_config.py | 18 ++++----- tests/eval/test_manifest.py | 2 +- tests/eval/test_mock_chain.py | 28 +++++++------- tests/eval/test_osworld21_services.py | 8 ++-- tests/eval/test_osworld_env.py | 12 +++--- tests/eval/test_recorder_contract.py | 10 ++--- tests/eval/test_rjob_cleanup.py | 2 +- tests/eval/test_rjob_client.py | 14 +++---- tests/harness/conftest.py | 16 ++++---- tests/harness/test_candidates.py | 2 +- tests/harness/test_execution_control.py | 14 +++---- tests/harness/test_focus.py | 4 +- tests/harness/test_goal_blocker.py | 10 ++--- tests/harness/test_goal_delivery_loop.py | 14 +++---- tests/harness/test_goal_execution.py | 16 ++++---- tests/harness/test_goal_integration.py | 24 ++++++------ tests/harness/test_goal_interaction.py | 24 ++++++------ tests/harness/test_goal_loop_closure.py | 36 +++++++++--------- tests/harness/test_goal_mechanisms.py | 28 +++++++------- tests/harness/test_goal_memory.py | 28 +++++++------- tests/harness/test_goal_progress.py | 16 ++++---- tests/harness/test_goal_stage.py | 38 +++++++++---------- tests/harness/test_observation_closure.py | 14 +++---- tests/harness/test_planner_choice.py | 16 ++++---- tests/harness/test_planner_verifier.py | 4 +- tests/harness/test_selector_compile.py | 24 ++++++------ tests/harness/test_selector_kev.py | 16 ++++---- tests/harness/test_semantics.py | 10 ++--- tests/harness/test_session.py | 34 ++++++++--------- tests/harness/test_slow_api_errors.py | 10 ++--- tests/harness/test_slow_transport.py | 20 +++++----- tests/harness/test_stage_planner.py | 2 +- tests/harness/test_stages.py | 20 +++++----- tests/harness/test_target_binding.py | 6 +-- tests/harness/test_targets.py | 4 +- tests/protocol/test_golden_samples.py | 4 +- tests/protocol/test_roundtrip.py | 2 +- tests/protocol/test_validate_rejects.py | 2 +- tests/test_batch_summary.py | 2 +- tests/test_package.py | 6 +-- tools/batch_summary.py | 2 +- tools/compare_runs.py | 2 +- tools/rank_probe.py | 2 +- 135 files changed, 361 insertions(+), 361 deletions(-) create mode 100644 src/jevduo/__init__.py rename src/{tandem => jevduo}/__main__.py (89%) rename src/{tandem => jevduo}/components.py (100%) rename src/{tandem => jevduo}/config.py (98%) rename src/{tandem => jevduo}/gui/__init__.py (100%) rename src/{tandem => jevduo}/gui/candidates.py (100%) rename src/{tandem => jevduo}/gui/compile.py (98%) rename src/{tandem => jevduo}/gui/field_binding.py (100%) rename src/{tandem => jevduo}/gui/focus.py (100%) rename src/{tandem => jevduo}/gui/goal_candidates.py (100%) rename src/{tandem => jevduo}/gui/grounding.py (100%) rename src/{tandem => jevduo}/gui/interaction.py (100%) rename src/{tandem => jevduo}/gui/proposals.py (100%) rename src/{tandem => jevduo}/gui/semantics.py (100%) rename src/{tandem => jevduo}/gui/targets.py (100%) rename src/{tandem => jevduo}/memory/__init__.py (100%) rename src/{tandem => jevduo}/memory/context.py (100%) rename src/{tandem => jevduo}/memory/state.py (100%) rename src/{tandem => jevduo}/models/__init__.py (100%) rename src/{tandem => jevduo}/models/api_errors.py (100%) rename src/{tandem => jevduo}/models/jev.py (100%) rename src/{tandem => jevduo}/models/kev.py (100%) rename src/{tandem => jevduo}/models/planner_choice.py (100%) rename src/{tandem => jevduo}/models/ranking.py (100%) rename src/{tandem => jevduo}/models/slow.py (99%) rename src/{tandem => jevduo}/planning/__init__.py (100%) rename src/{tandem => jevduo}/planning/goal_planner.py (100%) rename src/{tandem => jevduo}/planning/planner.py (100%) rename src/{tandem => jevduo}/planning/stage_planner.py (100%) rename src/{tandem => jevduo}/protocol/__init__.py (100%) rename src/{tandem => jevduo}/protocol/models.py (100%) rename src/{tandem => jevduo}/protocol/samples.py (91%) rename src/{tandem => jevduo}/protocol/samples/action_cli.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_cli_no_observation.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_fail.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_finish.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_finish_empty.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_gui_click.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_gui_scroll.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_gui_type.json (100%) rename src/{tandem => jevduo}/protocol/samples/action_wait.json (100%) rename src/{tandem => jevduo}/protocol/samples/observation_no_a11y.json (100%) rename src/{tandem => jevduo}/protocol/samples/observation_osw1_step0.json (100%) rename src/{tandem => jevduo}/protocol/samples/observation_osw2_cdp.json (100%) rename src/{tandem => jevduo}/protocol/samples/observation_osw2_jev.json (100%) rename src/{tandem => jevduo}/protocol/samples/receipt_cli.json (100%) rename src/{tandem => jevduo}/protocol/samples/receipt_cli_error.json (100%) rename src/{tandem => jevduo}/protocol/samples/receipt_gui.json (100%) rename src/{tandem => jevduo}/protocol/samples/receipt_wait.json (100%) rename src/{tandem => jevduo}/protocol/schema/action.schema.json (100%) rename src/{tandem => jevduo}/protocol/schema/observation.schema.json (100%) rename src/{tandem => jevduo}/protocol/schema/receipt.schema.json (100%) rename src/{tandem => jevduo}/protocol/validate.py (100%) rename src/{tandem => jevduo}/runtime/__init__.py (100%) rename src/{tandem => jevduo}/runtime/episode.py (100%) rename src/{tandem => jevduo}/runtime/goal_stage.py (100%) rename src/{tandem => jevduo}/runtime/session.py (98%) rename src/{tandem => jevduo}/runtime/stages.py (100%) rename src/{tandem => jevduo}/runtime/stopping.py (88%) rename src/{tandem => jevduo}/verification/__init__.py (100%) rename src/{tandem => jevduo}/verification/goal_verifier.py (100%) rename src/{tandem => jevduo}/verification/stage_rules.py (100%) rename src/{tandem => jevduo}/verification/verifier.py (100%) rename src/{tandem_eval => jevduo_eval}/__init__.py (86%) rename src/{tandem_eval => jevduo_eval}/__main__.py (97%) rename src/{tandem_eval => jevduo_eval}/browser.py (100%) rename src/{tandem_eval => jevduo_eval}/config_schema.py (100%) rename src/{tandem_eval => jevduo_eval}/entry.py (93%) rename src/{tandem_eval => jevduo_eval}/env.py (99%) rename src/{tandem_eval => jevduo_eval}/manifest.py (100%) rename src/{tandem_eval => jevduo_eval}/osworld.py (99%) rename src/{tandem_eval => jevduo_eval}/recorder.py (98%) rename src/{tandem_eval => jevduo_eval}/rjob.py (99%) rename src/{tandem_eval => jevduo_eval}/rjob_spec.py (99%) rename src/{tandem_eval => jevduo_eval}/rjob_status.py (94%) rename src/{tandem_eval => jevduo_eval}/runner.py (95%) rename src/{tandem_eval => jevduo_eval}/scoring.py (100%) delete mode 100644 src/tandem/__init__.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0501ef0..f3b388c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Lint run: ruff check src tests demo - name: Protocol self-check - run: tandem check + run: jevduo check - name: Test run: | set -o pipefail diff --git a/demo/README.md b/demo/README.md index dc4db35..50906d2 100644 --- a/demo/README.md +++ b/demo/README.md @@ -6,7 +6,7 @@ ## 边界(硬约束) -demo 层与 harness **完全解耦**:不 import `tandem` / `tandem_eval`、不调模型、不碰 VM。 +demo 层与 harness **完全解耦**:不 import `jevduo` / `jevduo_eval`、不调模型、不碰 VM。 唯一输入是 `docs/RESULT_DIR_CONTRACT.md` 描述的结果目录契约 + `demo/data/` 里的 官方数据快照。`tests/demo/test_site.py` 有一条断言专门守这条边界。 diff --git a/demo/reader/__init__.py b/demo/reader/__init__.py index 9b3f529..880a82d 100644 --- a/demo/reader/__init__.py +++ b/demo/reader/__init__.py @@ -1,6 +1,6 @@ """demo 读取层:结果目录 → 站点数据契约。 -**边界**(见 `demo/README.md`):不 import `tandem` / `tandem_eval`、不调模型、不碰 VM。 +**边界**(见 `demo/README.md`):不 import `jevduo` / `jevduo_eval`、不调模型、不碰 VM。 唯一输入是 `docs/RESULT_DIR_CONTRACT.md` 描述的结果目录契约。 **为什么拆成包**:老 `demo/adapter.py` 一个模块同时干了"读目录 / 算指标 / 拼 HTML", diff --git a/demo/sync_official.py b/demo/sync_official.py index 9f739d8..5352e16 100644 --- a/demo/sync_official.py +++ b/demo/sync_official.py @@ -4,7 +4,7 @@ 站点是**离线可开**的,所以官方数据要 vendored 进 `demo/data/`;本脚本负责 "重新拉一遍 + 校验 + 写回",保证快照不是手工维护的。 -只用标准库(无新增依赖),不 import `tandem` / `tandem_eval`(demo 层纪律)。 +只用标准库(无新增依赖),不 import `jevduo` / `jevduo_eval`(demo 层纪律)。 用法: python3 demo/sync_official.py # 刷新全部 diff --git a/infra/config.example.json b/infra/config.example.json index 87e2b88..cc365fc 100644 --- a/infra/config.example.json +++ b/infra/config.example.json @@ -71,8 +71,8 @@ } }, "eval": { - "repo_root": "/mnt/shared-storage-user/adpc-share/chenxinquan/fastslow/tandem", - "deploy_root": "/mnt/shared-storage-user/adpc-share/chenxinquan/fastslow/tandem-deploy", + "repo_root": "/mnt/shared-storage-user/adpc-share/chenxinquan/fastslow/jevduo", + "deploy_root": "/mnt/shared-storage-user/adpc-share/chenxinquan/fastslow/jevduo-deploy", "mounts": [ { "source": "gpfs://gpfs2/adpc-share", @@ -129,7 +129,7 @@ } }, "log": { - "results_root": "/mnt/shared-storage-user/adpc-share/chenxinquan/fastslow/tandem/rjob_logs", + "results_root": "/mnt/shared-storage-user/adpc-share/chenxinquan/fastslow/jevduo/rjob_logs", "record": { "a11y_full": false } diff --git a/infra/worker.sh b/infra/worker.sh index 6121e9b..d5d6e88 100755 --- a/infra/worker.sh +++ b/infra/worker.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# rjob worker 内入口:读取 job spec,进入 tandem_eval entry。 +# rjob worker 内入口:读取 job spec,进入 jevduo_eval entry。 # - mock 基准:直接用系统 python3 跑(无需共享资源/docker)。 # - osworld1/2/21:加载共享资源 env.sh(冻结 venv/评测工具/JEV),启动 dockerd 并拉取 # inner 镜像(VM 容器),然后用 OSWORLD_PYTHON 跑 entry(Pillow 等依赖已在冻结 venv 内)。 @@ -34,7 +34,7 @@ print(spec.get("benchmark", "mock"), spec["output_root"])' "$SPEC") mkdir -p "$OUTPUT_ROOT/worker" if [ "$BENCHMARK" = "mock" ]; then - python3 -m tandem_eval entry --spec "$SPEC" 2>&1 | tee "$OUTPUT_ROOT/worker/entry.log" + python3 -m jevduo_eval entry --spec "$SPEC" 2>&1 | tee "$OUTPUT_ROOT/worker/entry.log" exit "${PIPESTATUS[0]}" fi @@ -77,7 +77,7 @@ else fi export no_proxy="$NO_PROXY" -DOCKER_ROOT="$(mktemp -d /tmp/tandem-docker.XXXXXX)" +DOCKER_ROOT="$(mktemp -d /tmp/jevduo-docker.XXXXXX)" dockerd --host=unix:///var/run/docker.sock \ --data-root="$DOCKER_ROOT/data" --exec-root="$DOCKER_ROOT/exec" \ --http-proxy="$PROXY" --https-proxy="$PROXY" --no-proxy="$NO_PROXY" \ @@ -104,5 +104,5 @@ fi tail -20 "$OUTPUT_ROOT/worker/deps-check.log" | tee -a "$OUTPUT_ROOT/worker/entry.log" >&2 echo "共享 venv 依赖检查失败" | tee -a "$OUTPUT_ROOT/worker/entry.log" >&2; exit 3; } -"$OSWORLD_PYTHON" -m tandem_eval entry --spec "$SPEC" 2>&1 | tee "$OUTPUT_ROOT/worker/entry.log" +"$OSWORLD_PYTHON" -m jevduo_eval entry --spec "$SPEC" 2>&1 | tee "$OUTPUT_ROOT/worker/entry.log" exit "${PIPESTATUS[0]}" diff --git a/pyproject.toml b/pyproject.toml index 9024978..2609f70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,9 +3,9 @@ requires = ["setuptools>=68"] build-backend = "setuptools.build_meta" [project] -name = "tandem" +name = "jevduo" version = "0.1.0" -description = "Tandem:快慢双模 CUA harness(主体)+ tandem_eval 集群测评薄适配层" +description = "JevDuo:快慢双模 CUA harness(主体)+ jevduo_eval 集群测评薄适配层" requires-python = ">=3.10" # 截图处理使用仓库白名单内的 Pillow。 dependencies = ["Pillow"] @@ -14,14 +14,14 @@ dependencies = ["Pillow"] dev = ["pytest>=7", "ruff>=0.4"] [project.scripts] -tandem = "tandem.__main__:main" -tandem-eval = "tandem_eval.__main__:main" +jevduo = "jevduo.__main__:main" +jevduo-eval = "jevduo_eval.__main__:main" [tool.setuptools.packages.find] where = ["src"] [tool.setuptools.package-data] -tandem = ["protocol/schema/*.json", "protocol/samples/*.json"] +jevduo = ["protocol/schema/*.json", "protocol/samples/*.json"] [tool.ruff] line-length = 110 @@ -32,10 +32,10 @@ select = ["E", "F", "I", "UP", "B"] [tool.ruff.lint.per-file-ignores] # 以下模块包含从旧仓库逐字移植的 LLM prompt 字符串(行为冻结,不重排换行)。 -"src/tandem/planning/planner.py" = ["E501"] -"src/tandem/verification/verifier.py" = ["E501"] -"src/tandem/gui/candidates.py" = ["E501"] -"src/tandem/gui/proposals.py" = ["E501"] +"src/jevduo/planning/planner.py" = ["E501"] +"src/jevduo/verification/verifier.py" = ["E501"] +"src/jevduo/gui/candidates.py" = ["E501"] +"src/jevduo/gui/proposals.py" = ["E501"] # demo/render.py、demo/pages.py 含整段 HTML 模板(行宽由模板结构决定,不硬拆)。 "demo/render.py" = ["E501"] "demo/pages.py" = ["E501"] diff --git a/scripts/run_experiment.sh b/scripts/run_experiment.sh index 54518dd..7c11493 100755 --- a/scripts/run_experiment.sh +++ b/scripts/run_experiment.sh @@ -124,7 +124,7 @@ fi env PYTHONPATH=src python3 - <<'PY' from pathlib import Path -from tandem_eval.rjob import load_config, sync_repo +from jevduo_eval.rjob import load_config, sync_repo config = load_config("infra/config.json") sync_repo(Path("."), Path(config["eval"]["deploy_root"])) @@ -138,7 +138,7 @@ run_task() { local fast_args=() if [[ -n "$FAST_MODEL" ]]; then fast_args=(--fast-model "$FAST_MODEL"); fi - env PYTHONPATH=src python3 -m tandem_eval rjob run \ + env PYTHONPATH=src python3 -m jevduo_eval rjob run \ --run-id "$run_id" \ --benchmark osworld21 \ --tasks "$task" \ diff --git a/scripts/run_osw2_20x5.sh b/scripts/run_osw2_20x5.sh index f79d239..bd0dea0 100755 --- a/scripts/run_osw2_20x5.sh +++ b/scripts/run_osw2_20x5.sh @@ -49,7 +49,7 @@ for i in $(seq 1 "$SHARDS"); do EXTRA+=(--no-sync) fi echo "[$(date '+%F %T')] 提交分片 $i/$SHARDS (run-id ${PREFIX}-s${i})" - tandem-eval rjob run \ + jevduo-eval rjob run \ --run-id "${PREFIX}-s${i}" \ --benchmark "$BENCHMARK" \ --limit "$LIMIT" --shard "$i/$SHARDS" \ diff --git a/src/jevduo/__init__.py b/src/jevduo/__init__.py new file mode 100644 index 0000000..4b62dbf --- /dev/null +++ b/src/jevduo/__init__.py @@ -0,0 +1,3 @@ +"""JevDuo:快慢双模 CUA harness。仓库主体;jevduo_eval 仅为集群测评薄适配层。""" + +__version__ = "0.1.0" diff --git a/src/tandem/__main__.py b/src/jevduo/__main__.py similarity index 89% rename from src/tandem/__main__.py rename to src/jevduo/__main__.py index c338bae..f49b5b1 100644 --- a/src/tandem/__main__.py +++ b/src/jevduo/__main__.py @@ -1,4 +1,4 @@ -"""tandem CLI。M0 提供 check(协议样例自检)与 version;smoke/run 在后续里程碑加入。""" +"""jevduo CLI。M0 提供 check(协议样例自检)与 version;smoke/run 在后续里程碑加入。""" from __future__ import annotations @@ -41,8 +41,8 @@ def cmd_check() -> int: def main(argv: list[str] | None = None) -> int: - parser = argparse.ArgumentParser(prog="tandem", description="Tandem harness CLI") - parser.add_argument("--version", action="version", version=f"tandem {__version__}") + parser = argparse.ArgumentParser(prog="jevduo", description="JevDuo harness CLI") + parser.add_argument("--version", action="version", version=f"jevduo {__version__}") sub = parser.add_subparsers(dest="command", required=True) sub.add_parser("check", help="校验协议 golden 样例") args = parser.parse_args(argv) diff --git a/src/tandem/components.py b/src/jevduo/components.py similarity index 100% rename from src/tandem/components.py rename to src/jevduo/components.py diff --git a/src/tandem/config.py b/src/jevduo/config.py similarity index 98% rename from src/tandem/config.py rename to src/jevduo/config.py index 9a5e36c..749a225 100644 --- a/src/tandem/config.py +++ b/src/jevduo/config.py @@ -1,4 +1,4 @@ -"""harness 侧会话配置。环境生命周期/预算强制/落盘配置属于 tandem_eval(M2),不在此处。 +"""harness 侧会话配置。环境生命周期/预算强制/落盘配置属于 jevduo_eval(M2),不在此处。 字段按**角色**命名,不按厂商命名:`slow_*` 是大脑(慢模型)的旋钮, `fast_*` 是小脑(快模型排序后端)的旋钮。换厂商只换配置里的 API 条目, diff --git a/src/tandem/gui/__init__.py b/src/jevduo/gui/__init__.py similarity index 100% rename from src/tandem/gui/__init__.py rename to src/jevduo/gui/__init__.py diff --git a/src/tandem/gui/candidates.py b/src/jevduo/gui/candidates.py similarity index 100% rename from src/tandem/gui/candidates.py rename to src/jevduo/gui/candidates.py diff --git a/src/tandem/gui/compile.py b/src/jevduo/gui/compile.py similarity index 98% rename from src/tandem/gui/compile.py rename to src/jevduo/gui/compile.py index 42fc37e..c33fb25 100644 --- a/src/tandem/gui/compile.py +++ b/src/jevduo/gui/compile.py @@ -1,7 +1,7 @@ """compile:胜出候选 + 目标 → 协议动作(声明式)。 旧仓库 action_code 产出 pyautogui 代码字符串;协议化后 harness 输出声明式 GuiAction, -pyautogui 代码生成移到 tandem_eval 的执行层(M2)。坐标计算逻辑保持与旧实现一致 +pyautogui 代码生成移到 jevduo_eval 的执行层(M2)。坐标计算逻辑保持与旧实现一致 (中心点、slider 分数位置、SCROLL_UP/DOWN ±5 clicks)。""" from __future__ import annotations diff --git a/src/tandem/gui/field_binding.py b/src/jevduo/gui/field_binding.py similarity index 100% rename from src/tandem/gui/field_binding.py rename to src/jevduo/gui/field_binding.py diff --git a/src/tandem/gui/focus.py b/src/jevduo/gui/focus.py similarity index 100% rename from src/tandem/gui/focus.py rename to src/jevduo/gui/focus.py diff --git a/src/tandem/gui/goal_candidates.py b/src/jevduo/gui/goal_candidates.py similarity index 100% rename from src/tandem/gui/goal_candidates.py rename to src/jevduo/gui/goal_candidates.py diff --git a/src/tandem/gui/grounding.py b/src/jevduo/gui/grounding.py similarity index 100% rename from src/tandem/gui/grounding.py rename to src/jevduo/gui/grounding.py diff --git a/src/tandem/gui/interaction.py b/src/jevduo/gui/interaction.py similarity index 100% rename from src/tandem/gui/interaction.py rename to src/jevduo/gui/interaction.py diff --git a/src/tandem/gui/proposals.py b/src/jevduo/gui/proposals.py similarity index 100% rename from src/tandem/gui/proposals.py rename to src/jevduo/gui/proposals.py diff --git a/src/tandem/gui/semantics.py b/src/jevduo/gui/semantics.py similarity index 100% rename from src/tandem/gui/semantics.py rename to src/jevduo/gui/semantics.py diff --git a/src/tandem/gui/targets.py b/src/jevduo/gui/targets.py similarity index 100% rename from src/tandem/gui/targets.py rename to src/jevduo/gui/targets.py diff --git a/src/tandem/memory/__init__.py b/src/jevduo/memory/__init__.py similarity index 100% rename from src/tandem/memory/__init__.py rename to src/jevduo/memory/__init__.py diff --git a/src/tandem/memory/context.py b/src/jevduo/memory/context.py similarity index 100% rename from src/tandem/memory/context.py rename to src/jevduo/memory/context.py diff --git a/src/tandem/memory/state.py b/src/jevduo/memory/state.py similarity index 100% rename from src/tandem/memory/state.py rename to src/jevduo/memory/state.py diff --git a/src/tandem/models/__init__.py b/src/jevduo/models/__init__.py similarity index 100% rename from src/tandem/models/__init__.py rename to src/jevduo/models/__init__.py diff --git a/src/tandem/models/api_errors.py b/src/jevduo/models/api_errors.py similarity index 100% rename from src/tandem/models/api_errors.py rename to src/jevduo/models/api_errors.py diff --git a/src/tandem/models/jev.py b/src/jevduo/models/jev.py similarity index 100% rename from src/tandem/models/jev.py rename to src/jevduo/models/jev.py diff --git a/src/tandem/models/kev.py b/src/jevduo/models/kev.py similarity index 100% rename from src/tandem/models/kev.py rename to src/jevduo/models/kev.py diff --git a/src/tandem/models/planner_choice.py b/src/jevduo/models/planner_choice.py similarity index 100% rename from src/tandem/models/planner_choice.py rename to src/jevduo/models/planner_choice.py diff --git a/src/tandem/models/ranking.py b/src/jevduo/models/ranking.py similarity index 100% rename from src/tandem/models/ranking.py rename to src/jevduo/models/ranking.py diff --git a/src/tandem/models/slow.py b/src/jevduo/models/slow.py similarity index 99% rename from src/tandem/models/slow.py rename to src/jevduo/models/slow.py index 159f60f..f9e7116 100644 --- a/src/tandem/models/slow.py +++ b/src/jevduo/models/slow.py @@ -155,7 +155,7 @@ def __init__(self, credential_file, config, audit_path: Path, llm_sink=None): self.config = config self.audit_path = audit_path # llm_sink(role=..., request=..., response=..., **meta):全量请求/响应落盘钩子, - # 由 tandem_eval.recorder 提供(llm_calls.jsonl);None 时仅审计。 + # 由 jevduo_eval.recorder 提供(llm_calls.jsonl);None 时仅审计。 self.llm_sink = llm_sink self.deadline = None diff --git a/src/tandem/planning/__init__.py b/src/jevduo/planning/__init__.py similarity index 100% rename from src/tandem/planning/__init__.py rename to src/jevduo/planning/__init__.py diff --git a/src/tandem/planning/goal_planner.py b/src/jevduo/planning/goal_planner.py similarity index 100% rename from src/tandem/planning/goal_planner.py rename to src/jevduo/planning/goal_planner.py diff --git a/src/tandem/planning/planner.py b/src/jevduo/planning/planner.py similarity index 100% rename from src/tandem/planning/planner.py rename to src/jevduo/planning/planner.py diff --git a/src/tandem/planning/stage_planner.py b/src/jevduo/planning/stage_planner.py similarity index 100% rename from src/tandem/planning/stage_planner.py rename to src/jevduo/planning/stage_planner.py diff --git a/src/tandem/protocol/__init__.py b/src/jevduo/protocol/__init__.py similarity index 100% rename from src/tandem/protocol/__init__.py rename to src/jevduo/protocol/__init__.py diff --git a/src/tandem/protocol/models.py b/src/jevduo/protocol/models.py similarity index 100% rename from src/tandem/protocol/models.py rename to src/jevduo/protocol/models.py diff --git a/src/tandem/protocol/samples.py b/src/jevduo/protocol/samples.py similarity index 91% rename from src/tandem/protocol/samples.py rename to src/jevduo/protocol/samples.py index 983373c..599cbb7 100644 --- a/src/tandem/protocol/samples.py +++ b/src/jevduo/protocol/samples.py @@ -1,5 +1,5 @@ """golden 样例加载:samples/ 下每个 *.json 按 _.json 命名, -category ∈ {action, observation, receipt}。tandem check 与 tests/protocol 共用。""" +category ∈ {action, observation, receipt}。jevduo check 与 tests/protocol 共用。""" from __future__ import annotations diff --git a/src/tandem/protocol/samples/action_cli.json b/src/jevduo/protocol/samples/action_cli.json similarity index 100% rename from src/tandem/protocol/samples/action_cli.json rename to src/jevduo/protocol/samples/action_cli.json diff --git a/src/tandem/protocol/samples/action_cli_no_observation.json b/src/jevduo/protocol/samples/action_cli_no_observation.json similarity index 100% rename from src/tandem/protocol/samples/action_cli_no_observation.json rename to src/jevduo/protocol/samples/action_cli_no_observation.json diff --git a/src/tandem/protocol/samples/action_fail.json b/src/jevduo/protocol/samples/action_fail.json similarity index 100% rename from src/tandem/protocol/samples/action_fail.json rename to src/jevduo/protocol/samples/action_fail.json diff --git a/src/tandem/protocol/samples/action_finish.json b/src/jevduo/protocol/samples/action_finish.json similarity index 100% rename from src/tandem/protocol/samples/action_finish.json rename to src/jevduo/protocol/samples/action_finish.json diff --git a/src/tandem/protocol/samples/action_finish_empty.json b/src/jevduo/protocol/samples/action_finish_empty.json similarity index 100% rename from src/tandem/protocol/samples/action_finish_empty.json rename to src/jevduo/protocol/samples/action_finish_empty.json diff --git a/src/tandem/protocol/samples/action_gui_click.json b/src/jevduo/protocol/samples/action_gui_click.json similarity index 100% rename from src/tandem/protocol/samples/action_gui_click.json rename to src/jevduo/protocol/samples/action_gui_click.json diff --git a/src/tandem/protocol/samples/action_gui_scroll.json b/src/jevduo/protocol/samples/action_gui_scroll.json similarity index 100% rename from src/tandem/protocol/samples/action_gui_scroll.json rename to src/jevduo/protocol/samples/action_gui_scroll.json diff --git a/src/tandem/protocol/samples/action_gui_type.json b/src/jevduo/protocol/samples/action_gui_type.json similarity index 100% rename from src/tandem/protocol/samples/action_gui_type.json rename to src/jevduo/protocol/samples/action_gui_type.json diff --git a/src/tandem/protocol/samples/action_wait.json b/src/jevduo/protocol/samples/action_wait.json similarity index 100% rename from src/tandem/protocol/samples/action_wait.json rename to src/jevduo/protocol/samples/action_wait.json diff --git a/src/tandem/protocol/samples/observation_no_a11y.json b/src/jevduo/protocol/samples/observation_no_a11y.json similarity index 100% rename from src/tandem/protocol/samples/observation_no_a11y.json rename to src/jevduo/protocol/samples/observation_no_a11y.json diff --git a/src/tandem/protocol/samples/observation_osw1_step0.json b/src/jevduo/protocol/samples/observation_osw1_step0.json similarity index 100% rename from src/tandem/protocol/samples/observation_osw1_step0.json rename to src/jevduo/protocol/samples/observation_osw1_step0.json diff --git a/src/tandem/protocol/samples/observation_osw2_cdp.json b/src/jevduo/protocol/samples/observation_osw2_cdp.json similarity index 100% rename from src/tandem/protocol/samples/observation_osw2_cdp.json rename to src/jevduo/protocol/samples/observation_osw2_cdp.json diff --git a/src/tandem/protocol/samples/observation_osw2_jev.json b/src/jevduo/protocol/samples/observation_osw2_jev.json similarity index 100% rename from src/tandem/protocol/samples/observation_osw2_jev.json rename to src/jevduo/protocol/samples/observation_osw2_jev.json diff --git a/src/tandem/protocol/samples/receipt_cli.json b/src/jevduo/protocol/samples/receipt_cli.json similarity index 100% rename from src/tandem/protocol/samples/receipt_cli.json rename to src/jevduo/protocol/samples/receipt_cli.json diff --git a/src/tandem/protocol/samples/receipt_cli_error.json b/src/jevduo/protocol/samples/receipt_cli_error.json similarity index 100% rename from src/tandem/protocol/samples/receipt_cli_error.json rename to src/jevduo/protocol/samples/receipt_cli_error.json diff --git a/src/tandem/protocol/samples/receipt_gui.json b/src/jevduo/protocol/samples/receipt_gui.json similarity index 100% rename from src/tandem/protocol/samples/receipt_gui.json rename to src/jevduo/protocol/samples/receipt_gui.json diff --git a/src/tandem/protocol/samples/receipt_wait.json b/src/jevduo/protocol/samples/receipt_wait.json similarity index 100% rename from src/tandem/protocol/samples/receipt_wait.json rename to src/jevduo/protocol/samples/receipt_wait.json diff --git a/src/tandem/protocol/schema/action.schema.json b/src/jevduo/protocol/schema/action.schema.json similarity index 100% rename from src/tandem/protocol/schema/action.schema.json rename to src/jevduo/protocol/schema/action.schema.json diff --git a/src/tandem/protocol/schema/observation.schema.json b/src/jevduo/protocol/schema/observation.schema.json similarity index 100% rename from src/tandem/protocol/schema/observation.schema.json rename to src/jevduo/protocol/schema/observation.schema.json diff --git a/src/tandem/protocol/schema/receipt.schema.json b/src/jevduo/protocol/schema/receipt.schema.json similarity index 100% rename from src/tandem/protocol/schema/receipt.schema.json rename to src/jevduo/protocol/schema/receipt.schema.json diff --git a/src/tandem/protocol/validate.py b/src/jevduo/protocol/validate.py similarity index 100% rename from src/tandem/protocol/validate.py rename to src/jevduo/protocol/validate.py diff --git a/src/tandem/runtime/__init__.py b/src/jevduo/runtime/__init__.py similarity index 100% rename from src/tandem/runtime/__init__.py rename to src/jevduo/runtime/__init__.py diff --git a/src/tandem/runtime/episode.py b/src/jevduo/runtime/episode.py similarity index 100% rename from src/tandem/runtime/episode.py rename to src/jevduo/runtime/episode.py diff --git a/src/tandem/runtime/goal_stage.py b/src/jevduo/runtime/goal_stage.py similarity index 100% rename from src/tandem/runtime/goal_stage.py rename to src/jevduo/runtime/goal_stage.py diff --git a/src/tandem/runtime/session.py b/src/jevduo/runtime/session.py similarity index 98% rename from src/tandem/runtime/session.py rename to src/jevduo/runtime/session.py index 63c796e..11898cc 100644 --- a/src/tandem/runtime/session.py +++ b/src/jevduo/runtime/session.py @@ -1,7 +1,7 @@ -"""TandemSession:planner_led 决策状态机(obs → action)。 +"""JevDuoSession:planner_led 决策状态机(obs → action)。 旧仓库 runtime.run_episode 的决策循环按消息层协议重表达:环境生命周期/预算强制/落盘/ -评分归 tandem_eval;回执验证与终态裁决在同包 episode.py。行为对齐旧实现, +评分归 jevduo_eval;回执验证与终态裁决在同包 episode.py。行为对齐旧实现, 差异见 DEVIATIONS.md。 """ @@ -23,7 +23,7 @@ from .stopping import NO_ACTION_LIMIT, budget_exhausted -class TandemSession: +class JevDuoSession: def __init__(self, components: Components, *, config: SessionConfig | None = None): self.components = components self.config = config or SessionConfig() diff --git a/src/tandem/runtime/stages.py b/src/jevduo/runtime/stages.py similarity index 100% rename from src/tandem/runtime/stages.py rename to src/jevduo/runtime/stages.py diff --git a/src/tandem/runtime/stopping.py b/src/jevduo/runtime/stopping.py similarity index 88% rename from src/tandem/runtime/stopping.py rename to src/jevduo/runtime/stopping.py index d0632fb..7284dfa 100644 --- a/src/tandem/runtime/stopping.py +++ b/src/jevduo/runtime/stopping.py @@ -1,4 +1,4 @@ -"""停止条件。墙钟/步数预算的强制执行在 tandem_eval.runner(M2); +"""停止条件。墙钟/步数预算的强制执行在 jevduo_eval.runner(M2); 本模块提供 harness 侧的判定与 no_action 上限常量(与旧仓库行为一致)。""" from __future__ import annotations diff --git a/src/tandem/verification/__init__.py b/src/jevduo/verification/__init__.py similarity index 100% rename from src/tandem/verification/__init__.py rename to src/jevduo/verification/__init__.py diff --git a/src/tandem/verification/goal_verifier.py b/src/jevduo/verification/goal_verifier.py similarity index 100% rename from src/tandem/verification/goal_verifier.py rename to src/jevduo/verification/goal_verifier.py diff --git a/src/tandem/verification/stage_rules.py b/src/jevduo/verification/stage_rules.py similarity index 100% rename from src/tandem/verification/stage_rules.py rename to src/jevduo/verification/stage_rules.py diff --git a/src/tandem/verification/verifier.py b/src/jevduo/verification/verifier.py similarity index 100% rename from src/tandem/verification/verifier.py rename to src/jevduo/verification/verifier.py diff --git a/src/tandem_eval/__init__.py b/src/jevduo_eval/__init__.py similarity index 86% rename from src/tandem_eval/__init__.py rename to src/jevduo_eval/__init__.py index 5a32f11..72b087c 100644 --- a/src/tandem_eval/__init__.py +++ b/src/jevduo_eval/__init__.py @@ -1,4 +1,4 @@ -"""tandem_eval:集群测评薄适配层。 +"""jevduo_eval:集群测评薄适配层。 worker 侧 6 文件:entry/env/runner/recorder/scoring/manifest(计划 §五); rjob.py 是开发机侧生命周期客户端(第 7 个模块,偏离"6 文件封顶"已记入 DEVIATIONS.md)。 diff --git a/src/tandem_eval/__main__.py b/src/jevduo_eval/__main__.py similarity index 97% rename from src/tandem_eval/__main__.py rename to src/jevduo_eval/__main__.py index 0947fc6..0a04d0d 100644 --- a/src/tandem_eval/__main__.py +++ b/src/jevduo_eval/__main__.py @@ -1,4 +1,4 @@ -"""tandem-eval CLI:entry(worker 侧)+ rjob(开发机侧生命周期)。""" +"""jevduo-eval CLI:entry(worker 侧)+ rjob(开发机侧生命周期)。""" from __future__ import annotations @@ -13,7 +13,7 @@ def _rjob_args(parser: argparse.ArgumentParser) -> None: def main(argv: list[str] | None = None) -> int: - parser = argparse.ArgumentParser(prog="tandem-eval", description="Tandem 集群测评入口") + parser = argparse.ArgumentParser(prog="jevduo-eval", description="JevDuo 集群测评入口") sub = parser.add_subparsers(dest="command", required=True) entry = sub.add_parser("entry", help="按 job spec 启动一次测评(worker 内执行)") diff --git a/src/tandem_eval/browser.py b/src/jevduo_eval/browser.py similarity index 100% rename from src/tandem_eval/browser.py rename to src/jevduo_eval/browser.py diff --git a/src/tandem_eval/config_schema.py b/src/jevduo_eval/config_schema.py similarity index 100% rename from src/tandem_eval/config_schema.py rename to src/jevduo_eval/config_schema.py diff --git a/src/tandem_eval/entry.py b/src/jevduo_eval/entry.py similarity index 93% rename from src/tandem_eval/entry.py rename to src/jevduo_eval/entry.py index e593304..3d8bd9e 100644 --- a/src/tandem_eval/entry.py +++ b/src/jevduo_eval/entry.py @@ -12,10 +12,10 @@ import subprocess from pathlib import Path -from tandem.components import Components -from tandem.config import SessionConfig -from tandem.models.ranking import Ranking -from tandem.runtime.session import TandemSession +from jevduo.components import Components +from jevduo.config import SessionConfig +from jevduo.models.ranking import Ranking +from jevduo.runtime.session import JevDuoSession from .env import MockEnv from .manifest import resolve_manifest @@ -154,12 +154,12 @@ def rank(self, **kwargs): def mock_components(*, stage_mode=False, goal_mode=False) -> Components: - from tandem.gui.candidates import ActionCandidateBuilder - from tandem.gui.compile import gui_action - from tandem.gui.proposals import focused_candidates - from tandem.gui.semantics import enrich_targets - from tandem.gui.targets import A11yTargetBuilder - from tandem.memory.state import TaskMemory + from jevduo.gui.candidates import ActionCandidateBuilder + from jevduo.gui.compile import gui_action + from jevduo.gui.proposals import focused_candidates + from jevduo.gui.semantics import enrich_targets + from jevduo.gui.targets import A11yTargetBuilder + from jevduo.memory.state import TaskMemory def goal_verifier(*args, **kwargs): return {"stage_outcome": "met", "unit_met": True, "delivery_state": "verified", @@ -182,15 +182,15 @@ def requirements(instruction): ) -def build_session(spec: dict, *, llm_tap: LlmTap | None = None) -> TandemSession: +def build_session(spec: dict, *, llm_tap: LlmTap | None = None) -> JevDuoSession: config = SessionConfig(**spec.get("harness_config", {})) benchmark = spec.get("benchmark") if benchmark == "mock": - return TandemSession(mock_components(stage_mode=config.execution_mode == "stage", + return JevDuoSession(mock_components(stage_mode=config.execution_mode == "stage", goal_mode=config.execution_mode == "goal"), config=config) if benchmark in {"osworld1", "osworld2", "osworld21"}: - from tandem.components import build_default - from tandem.models.slow import SlowModelClient + from jevduo.components import build_default + from jevduo.models.slow import SlowModelClient secrets = spec["secrets"] credentials = dict(secrets["slow_model"]) @@ -209,7 +209,7 @@ def build_session(spec: dict, *, llm_tap: LlmTap | None = None) -> TandemSession image_stage=image_stage, endpoint_provider=lambda: resolve_fast_model_endpoint(secrets.get("fast_model") or {}), ) - return TandemSession(components, config=config) + return JevDuoSession(components, config=config) raise NotImplementedError(f"未知 benchmark: {benchmark}") @@ -273,7 +273,7 @@ def run_from_spec(spec: dict) -> list[dict]: def entry_main(argv: list[str]) -> int: import argparse - parser = argparse.ArgumentParser(prog="tandem-eval entry") + parser = argparse.ArgumentParser(prog="jevduo-eval entry") parser.add_argument("--spec", required=True, help="job spec JSON 路径") args = parser.parse_args(argv) spec = json.loads(Path(args.spec).read_text(encoding="utf-8")) diff --git a/src/tandem_eval/env.py b/src/jevduo_eval/env.py similarity index 99% rename from src/tandem_eval/env.py rename to src/jevduo_eval/env.py index 77b2bd3..20c69a2 100644 --- a/src/tandem_eval/env.py +++ b/src/jevduo_eval/env.py @@ -14,7 +14,7 @@ from PIL import Image -from tandem.protocol.models import ( +from jevduo.protocol.models import ( AccessibilityTree, Action, Budget, diff --git a/src/tandem_eval/manifest.py b/src/jevduo_eval/manifest.py similarity index 100% rename from src/tandem_eval/manifest.py rename to src/jevduo_eval/manifest.py diff --git a/src/tandem_eval/osworld.py b/src/jevduo_eval/osworld.py similarity index 99% rename from src/tandem_eval/osworld.py rename to src/jevduo_eval/osworld.py index 6a88be5..0b1fd57 100644 --- a/src/tandem_eval/osworld.py +++ b/src/jevduo_eval/osworld.py @@ -21,7 +21,7 @@ from pathlib import Path from typing import Any -from tandem.protocol.models import ( +from jevduo.protocol.models import ( AccessibilityTree, Action, BrowserSnapshot, diff --git a/src/tandem_eval/recorder.py b/src/jevduo_eval/recorder.py similarity index 98% rename from src/tandem_eval/recorder.py rename to src/jevduo_eval/recorder.py index 2df4145..b252a55 100644 --- a/src/tandem_eval/recorder.py +++ b/src/jevduo_eval/recorder.py @@ -16,9 +16,9 @@ from pathlib import Path from typing import Any -from tandem import __version__ -from tandem.protocol import PROTOCOL_VERSION -from tandem.protocol.models import Action, Observation, Receipt +from jevduo import __version__ +from jevduo.protocol import PROTOCOL_VERSION +from jevduo.protocol.models import Action, Observation, Receipt _SECRET_PATTERNS = re.compile(r"(Bearer\s+)[^\s\"']+") diff --git a/src/tandem_eval/rjob.py b/src/jevduo_eval/rjob.py similarity index 99% rename from src/tandem_eval/rjob.py rename to src/jevduo_eval/rjob.py index eb4cc47..30c5b8d 100644 --- a/src/tandem_eval/rjob.py +++ b/src/jevduo_eval/rjob.py @@ -157,7 +157,7 @@ def run_job(*, config: dict, repo_root: Path, run_id: str, sync: bool = True) -> dict: """一站式:sync → spec → submit → watch → fetch → cleanup。 - 唯一落盘位置 = log.results_root/(= tandem/rjob_logs/): + 唯一落盘位置 = log.results_root/(= jevduo/rjob_logs/): worker 直接写 run 目录(adpc 挂载),平台日志由 fetch 补写进同一目录。 **收尾默认删 rjob**(delete=True):submit 之后的任何结局——成功、失败、 diff --git a/src/tandem_eval/rjob_spec.py b/src/jevduo_eval/rjob_spec.py similarity index 99% rename from src/tandem_eval/rjob_spec.py rename to src/jevduo_eval/rjob_spec.py index c9fff1d..f5a4cb0 100644 --- a/src/tandem_eval/rjob_spec.py +++ b/src/jevduo_eval/rjob_spec.py @@ -24,7 +24,7 @@ def job_name(run_id: str) -> str: - return f"tandem-{run_id}" + return f"jevduo-{run_id}" def _git_describe(repo_root: Path) -> str: diff --git a/src/tandem_eval/rjob_status.py b/src/jevduo_eval/rjob_status.py similarity index 94% rename from src/tandem_eval/rjob_status.py rename to src/jevduo_eval/rjob_status.py index d29e6ec..57d77fd 100644 --- a/src/tandem_eval/rjob_status.py +++ b/src/jevduo_eval/rjob_status.py @@ -21,7 +21,7 @@ ] # rjob get 的任务计数字典({'active': 0, 'failed': 0, ...})含状态词字样,须先剔除再关键词匹配 _COUNT_DICT_RE = re.compile(r"['\"]\w+['\"]\s*:\s*\d+") -# 首选:状态行本体,如 "rjob tandem-x: Succeeded" / "replica tandem-x-abc: SUCCEED" +# 首选:状态行本体,如 "rjob jevduo-x: Succeeded" / "replica jevduo-x-abc: SUCCEED" _STATUS_LINE_RE = re.compile(r"(?i)\b(?:rjob|replica)\s+\S+:\s*([a-z_]+)") diff --git a/src/tandem_eval/runner.py b/src/jevduo_eval/runner.py similarity index 95% rename from src/tandem_eval/runner.py rename to src/jevduo_eval/runner.py index 872fefe..a42c4b0 100644 --- a/src/tandem_eval/runner.py +++ b/src/jevduo_eval/runner.py @@ -1,4 +1,4 @@ -"""runner:任务主循环。驱动 TandemSession 与环境交换协议消息,落盘与评分。""" +"""runner:任务主循环。驱动 JevDuoSession 与环境交换协议消息,落盘与评分。""" from __future__ import annotations @@ -7,10 +7,10 @@ from dataclasses import replace from pathlib import Path -from tandem.models.slow import TaskBudgetExceeded -from tandem.protocol.models import Observation -from tandem.runtime.goal_stage import ObservationRequired -from tandem.runtime.session import TandemSession +from jevduo.models.slow import TaskBudgetExceeded +from jevduo.protocol.models import Observation +from jevduo.runtime.goal_stage import ObservationRequired +from jevduo.runtime.session import JevDuoSession from .env import budget_of from .manifest import TaskRef, write_resolved @@ -20,7 +20,7 @@ TERMINAL_KINDS = {"finish", "fail"} -def run_episode(env, session: TandemSession, recorder: EpisodeRecorder, task: dict, +def run_episode(env, session: JevDuoSession, recorder: EpisodeRecorder, task: dict, *, max_steps: int, max_wall_seconds: float, extra_exports: list[str] | None = None, started_monotonic: float | None = None) -> dict: """单题循环:obs → session.act → env.execute → 回执灌回,终态导出交付物并评分。""" @@ -112,7 +112,7 @@ def drain_events() -> None: ) -def run(spec: dict, *, env, session: TandemSession, tasks: list[TaskRef], +def run(spec: dict, *, env, session: JevDuoSession, tasks: list[TaskRef], run_root: Path, llm_tap=None) -> list[dict]: """逐题驱动;单题异常记 failed_unscored 后继续(failed_unscored 纪律)。""" run_root.mkdir(parents=True, exist_ok=True) diff --git a/src/tandem_eval/scoring.py b/src/jevduo_eval/scoring.py similarity index 100% rename from src/tandem_eval/scoring.py rename to src/jevduo_eval/scoring.py diff --git a/src/tandem/__init__.py b/src/tandem/__init__.py deleted file mode 100644 index f120a5f..0000000 --- a/src/tandem/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -"""Tandem:快慢双模 CUA harness。仓库主体;tandem_eval 仅为集群测评薄适配层。""" - -__version__ = "0.1.0" diff --git a/tests/demo/helpers.py b/tests/demo/helpers.py index b260c07..a29e2a0 100644 --- a/tests/demo/helpers.py +++ b/tests/demo/helpers.py @@ -1,8 +1,8 @@ """demo 单测的合成结果目录构造器。 造的是符合 `docs/RESULT_DIR_CONTRACT.md` v0.2 的 run 目录,不依赖 -`rjob_logs/` 里的真实 run(CI 上没有),也不 import `tandem` / -`tandem_eval`——demo 与 harness 完全解耦,这条边界本身就是被测项之一。 +`rjob_logs/` 里的真实 run(CI 上没有),也不 import `jevduo` / +`jevduo_eval`——demo 与 harness 完全解耦,这条边界本身就是被测项之一。 """ from __future__ import annotations diff --git a/tests/demo/test_reader.py b/tests/demo/test_reader.py index 97d9934..e5b5683 100644 --- a/tests/demo/test_reader.py +++ b/tests/demo/test_reader.py @@ -1,7 +1,7 @@ """demo 读取层单测:合成结果目录 → view model。 -不依赖 `rjob_logs/` 里的真实 run(CI 上没有),也不 import `tandem` / -`tandem_eval`——demo 与 harness 完全解耦,这条边界本身就是被测项之一。 +不依赖 `rjob_logs/` 里的真实 run(CI 上没有),也不 import `jevduo` / +`jevduo_eval`——demo 与 harness 完全解耦,这条边界本身就是被测项之一。 **最要紧的一条**:`test_llm_reader_never_reads_whole_file` 用一个"只许逐行读"的 假文件把 `llm_calls.jsonl`(单题 64MB、整批 39GB)罩住——读取层一旦整文件读, diff --git a/tests/demo/test_site.py b/tests/demo/test_site.py index 744a6a2..a7b3513 100644 --- a/tests/demo/test_site.py +++ b/tests/demo/test_site.py @@ -105,7 +105,7 @@ def test_demo_layer_does_not_import_harness(): offenders = [] for path in (REPO_ROOT / "demo").rglob("*.py"): text = path.read_text(encoding="utf-8", errors="replace") - if re.search(r"^\s*(from|import)\s+tandem(_eval)?\b", text, re.MULTILINE): + if re.search(r"^\s*(from|import)\s+jevduo(_eval)?\b", text, re.MULTILINE): offenders.append(str(path.relative_to(REPO_ROOT))) assert offenders == [] diff --git a/tests/eval/test_browser.py b/tests/eval/test_browser.py index d35f7c6..203bc80 100644 --- a/tests/eval/test_browser.py +++ b/tests/eval/test_browser.py @@ -2,7 +2,7 @@ import json -from tandem_eval.browser import VM_SCRIPT, capture_browser_snapshot +from jevduo_eval.browser import VM_SCRIPT, capture_browser_snapshot class Controller: diff --git a/tests/eval/test_browser_controls.py b/tests/eval/test_browser_controls.py index 5fd38f6..c6278c8 100644 --- a/tests/eval/test_browser_controls.py +++ b/tests/eval/test_browser_controls.py @@ -14,7 +14,7 @@ import pytest -from tandem_eval.browser import VM_SCRIPT +from jevduo_eval.browser import VM_SCRIPT def _wait_for_cdp_page(opener, process, active_port, page_url, evaluate): diff --git a/tests/eval/test_config.py b/tests/eval/test_config.py index 7b5f0fd..9cff1a2 100644 --- a/tests/eval/test_config.py +++ b/tests/eval/test_config.py @@ -13,8 +13,8 @@ import pytest -from tandem_eval.config_schema import ConfigError, api_names, select_api -from tandem_eval.rjob import load_config +from jevduo_eval.config_schema import ConfigError, api_names, select_api +from jevduo_eval.rjob import load_config CONFIG_PATH = Path(__file__).resolve().parents[2] / "infra" / "config.example.json" @@ -91,8 +91,8 @@ def test_paths_are_absolute_and_credentials_inlined(): assert config["eval"]["inner_image"].startswith("registry.") assert config["eval"]["rjob"]["image"].startswith("registry.") assert "auths" in config["eval"]["registry"] - assert config["log"]["results_root"].endswith("tandem/rjob_logs") - assert config["eval"]["repo_root"].endswith("/tandem") + assert config["log"]["results_root"].endswith("jevduo/rjob_logs") + assert config["eval"]["repo_root"].endswith("/jevduo") def test_mounts_cover_both_volumes_without_duplicate_sources(): @@ -199,7 +199,7 @@ def test_osworld21_inner_image_must_be_release_pinned(tmp_path): def test_cli_model_flags_reach_spec_overrides(monkeypatch): """启动命令按名字切大脑/小脑:--slow-model / --fast-model 进 spec 的 models 段。""" - from tandem_eval.__main__ import main + from jevduo_eval.__main__ import main captured: dict = {} @@ -207,7 +207,7 @@ def fake_run_job(**kwargs): captured.update(kwargs) return {"status": "succeeded"} - monkeypatch.setattr("tandem_eval.rjob.run_job", fake_run_job) + monkeypatch.setattr("jevduo_eval.rjob.run_job", fake_run_job) code = main(["rjob", "run", "--run-id", "r1", "--benchmark", "mock", "--config", str(CONFIG_PATH), "--slow-model", "kimi-k3", "--fast-model", "kev"]) @@ -222,7 +222,7 @@ def test_real_config_is_gitignored_with_example_committed(): def test_endpoint_discovery_prefers_explicit_then_file(tmp_path): - from tandem_eval.entry import read_endpoint_file, resolve_fast_model_endpoint + from jevduo_eval.entry import read_endpoint_file, resolve_fast_model_endpoint f = tmp_path / "endpoint.json" f.write_text(json.dumps({"base_url": "http://10.9.9.9:8891/"}), encoding="utf-8") @@ -240,7 +240,7 @@ def test_endpoint_discovery_prefers_explicit_then_file(tmp_path): def test_endpoint_file_symlink_view_fallback(tmp_path, monkeypatch): """给定路径不可读时,自动尝试另一挂载视角的等价路径(前缀翻译)。""" - from tandem_eval import entry as entry_mod + from jevduo_eval import entry as entry_mod user_dir = tmp_path / "user-view" canonical_dir = tmp_path / "canonical-view" @@ -256,7 +256,7 @@ def test_endpoint_file_symlink_view_fallback(tmp_path, monkeypatch): def test_endpoint_file_respects_readiness_flag(tmp_path): """发现文件标记未就绪时快速失败,不调用半启动的服务。""" - from tandem_eval.entry import read_endpoint_file + from jevduo_eval.entry import read_endpoint_file f = tmp_path / "svc.json" f.write_text(json.dumps({"status": "starting", "ready": False, diff --git a/tests/eval/test_manifest.py b/tests/eval/test_manifest.py index a093a7a..1c9d94f 100644 --- a/tests/eval/test_manifest.py +++ b/tests/eval/test_manifest.py @@ -7,7 +7,7 @@ import pytest -from tandem_eval.manifest import OSWORLD21_TASK_IDS, TaskRef, load_index, resolve_manifest, write_resolved +from jevduo_eval.manifest import OSWORLD21_TASK_IDS, TaskRef, load_index, resolve_manifest, write_resolved # OSW2.1 的 prepared/runtime 是指向 canonical 路径的软链层:worker 内可见(canonical 视角), # 开发机只有 user 视角的同一份 runtime。两处都没有时跳过该检查(例如 CI)。 diff --git a/tests/eval/test_mock_chain.py b/tests/eval/test_mock_chain.py index a0a4933..eeb6306 100644 --- a/tests/eval/test_mock_chain.py +++ b/tests/eval/test_mock_chain.py @@ -9,10 +9,10 @@ import pytest -from tandem_eval.entry import entry_main, run_from_spec -from tandem_eval.env import MockEnv -from tandem_eval.manifest import TaskRef -from tandem_eval.runner import run +from jevduo_eval.entry import entry_main, run_from_spec +from jevduo_eval.env import MockEnv +from jevduo_eval.manifest import TaskRef +from jevduo_eval.runner import run from ..harness.conftest import ( FixedSelector, @@ -86,12 +86,12 @@ def fetch_task(self, task_id: str, domain: str = "") -> dict: spec = _spec(tmp_path) env = FlakyEnv(base_dir=tmp_path / "run" / "mock_env") - from tandem.config import SessionConfig - from tandem.runtime.session import TandemSession + from jevduo.config import SessionConfig + from jevduo.runtime.session import JevDuoSession planner = ScriptedPlanner([{"done": True, "task_status": "completed", "current_goal": "g", "expected_observation": ""}]) - session = TandemSession(make_components(planner, ScriptedVerifier( + session = JevDuoSession(make_components(planner, ScriptedVerifier( [valid_verifier_response(task_status="completed")]), FixedSelector()), config=SessionConfig()) episodes = run(spec, env=env, session=session, @@ -103,9 +103,9 @@ def fetch_task(self, task_id: str, domain: str = "") -> dict: def test_agent_budget_exhausted_inside_model_still_reaches_official_scoring(tmp_path): - from tandem.config import SessionConfig - from tandem.models.slow import TaskBudgetExceeded - from tandem.runtime.session import TandemSession + from jevduo.config import SessionConfig + from jevduo.models.slow import TaskBudgetExceeded + from jevduo.runtime.session import JevDuoSession def planner(*args, **kwargs): raise TaskBudgetExceeded("Agent task budget exhausted") @@ -113,7 +113,7 @@ def planner(*args, **kwargs): components = make_components(planner, lambda *a, **kw: None, FixedSelector()) root = tmp_path / "run" episodes = run(_spec(tmp_path), env=MockEnv(base_dir=root / "mock_env"), - session=TandemSession(components, config=SessionConfig()), + session=JevDuoSession(components, config=SessionConfig()), tasks=[TaskRef("one", "mock")], run_root=root) assert episodes[0]["stop_reason"] == "wall_time_limit" assert episodes[0]["status"] == "scored" @@ -121,8 +121,8 @@ def planner(*args, **kwargs): def test_requirement_timeout_has_a_deadline_and_flushes_summary_before_next_task(tmp_path): - from tandem.config import SessionConfig - from tandem.runtime.session import TandemSession + from jevduo.config import SessionConfig + from jevduo.runtime.session import JevDuoSession deadlines = [] root = tmp_path / "run" @@ -141,7 +141,7 @@ def requirements(instruction): components.requirements = requirements components.set_deadline = deadlines.append episodes = run(_spec(tmp_path, requirements=None), env=Env(base_dir=root / "mock_env"), - session=TandemSession(components, config=SessionConfig()), + session=JevDuoSession(components, config=SessionConfig()), tasks=[TaskRef("first"), TaskRef("second")], run_root=root) assert [item["status"] for item in episodes] == ["failed_unscored", "failed_unscored"] assert deadlines[1] is None and deadlines[3] is None diff --git a/tests/eval/test_osworld21_services.py b/tests/eval/test_osworld21_services.py index 3c343dd..637877c 100644 --- a/tests/eval/test_osworld21_services.py +++ b/tests/eval/test_osworld21_services.py @@ -8,9 +8,9 @@ import pytest -from tandem_eval.config_schema import validate -from tandem_eval.entry import _mask_secrets, run_from_spec -from tandem_eval.rjob_spec import build_job_spec +from jevduo_eval.config_schema import validate +from jevduo_eval.entry import _mask_secrets, run_from_spec +from jevduo_eval.rjob_spec import build_job_spec from .rjob_fakes import CONFIG, with_paths @@ -97,7 +97,7 @@ def test_configured_evaluation_api_requires_its_own_model_and_endpoint(role): def test_credentials_are_injected_before_environment_loading(tmp_path, monkeypatch): - from tandem_eval import entry + from jevduo_eval import entry class EnvironmentReached(Exception): pass diff --git a/tests/eval/test_osworld_env.py b/tests/eval/test_osworld_env.py index bfd15b1..93a8173 100644 --- a/tests/eval/test_osworld_env.py +++ b/tests/eval/test_osworld_env.py @@ -10,7 +10,7 @@ import pytest -from tandem.protocol.models import ( +from jevduo.protocol.models import ( Budget, CliAction, FailAction, @@ -18,7 +18,7 @@ GuiAction, WaitAction, ) -from tandem_eval.osworld import ( +from jevduo_eval.osworld import ( OsWorldEnv, action_code, gui_code, @@ -73,7 +73,7 @@ def test_png_size_parses_ihdr(): def test_read_only_refresh_keeps_cdp_receipt_and_prior_evidence(tmp_path, env, monkeypatch): snapshot = {"elements": [{"index": 1, "role": "entry", "name": "Receipt Date"}]} - monkeypatch.setattr("tandem_eval.osworld.capture_browser_snapshot", + monkeypatch.setattr("jevduo_eval.osworld.capture_browser_snapshot", lambda controller: (snapshot, {"status": "ok"})) task = _task_file(tmp_path) first = env.reset(task) @@ -104,7 +104,7 @@ def test_empty_screenshot_retries_only_observation(tmp_path, env, monkeypatch): valid = env.env._get_obs() observe = Mock(side_effect=[{"screenshot": None}, {"screenshot": b""}, valid]) monkeypatch.setattr(env.env, "_get_obs", observe) - monkeypatch.setattr("tandem_eval.osworld.time.sleep", lambda seconds: None) + monkeypatch.setattr("jevduo_eval.osworld.time.sleep", lambda seconds: None) budget = Budget(steps_remaining=5, wall_seconds_remaining=30) refreshed = env.observe(task, budget=budget, previous=previous) assert observe.call_count == 3 and env.env.steps == [] @@ -119,7 +119,7 @@ def test_repeated_empty_screenshot_is_explicit_observation_failure(tmp_path, env previous = env.reset(task) observe = Mock(return_value={"screenshot": None}) monkeypatch.setattr(env.env, "_get_obs", observe) - monkeypatch.setattr("tandem_eval.osworld.time.sleep", lambda seconds: None) + monkeypatch.setattr("jevduo_eval.osworld.time.sleep", lambda seconds: None) with pytest.raises(RuntimeError, match="no screenshot after three read-only"): env.observe(task, budget=previous.budget, previous=previous) assert observe.call_count == 3 and env.env.steps == [] @@ -241,7 +241,7 @@ def test_reset_execute_score_lifecycle(tmp_path, env): def test_browser_snapshot_is_a_hashed_observation_file(tmp_path, env, monkeypatch): monkeypatch.setattr( - "tandem_eval.osworld.capture_browser_snapshot", + "jevduo_eval.osworld.capture_browser_snapshot", lambda controller: ({"elements": [{"name": "Save"}], "url": "https://example.test"}, {"available": True}), ) diff --git a/tests/eval/test_recorder_contract.py b/tests/eval/test_recorder_contract.py index 3efe443..1818249 100644 --- a/tests/eval/test_recorder_contract.py +++ b/tests/eval/test_recorder_contract.py @@ -5,8 +5,8 @@ import json from dataclasses import replace -from tandem.protocol.models import BrowserSnapshot, WaitAction -from tandem_eval.recorder import ( +from jevduo.protocol.models import BrowserSnapshot, WaitAction +from jevduo_eval.recorder import ( EpisodeRecorder, write_code_version, write_heartbeat, @@ -101,7 +101,7 @@ def test_heartbeat_and_code_version(tmp_path): def test_run_spec_masks_credentials_but_keeps_model_identity(): """secrets 段整体脱敏;模型身份留在 secrets 之外——结果目录要能回答"这次谁在跑"。""" - from tandem_eval.entry import _mask_secrets + from jevduo_eval.entry import _mask_secrets spec = { "secrets": { @@ -121,7 +121,7 @@ def test_run_spec_masks_credentials_but_keeps_model_identity(): def test_episode_records_error_message_and_traceback(tmp_path): """异常题必须记下消息与栈尾:只记 exception_type 的话,事后无法判断炸在哪一步。""" - from tandem_eval.recorder import EpisodeRecorder + from jevduo_eval.recorder import EpisodeRecorder recorder = EpisodeRecorder(tmp_path / "ep", {"id": "016"}) try: @@ -139,7 +139,7 @@ def test_episode_records_error_message_and_traceback(tmp_path): def test_episode_error_redacts_secrets(tmp_path): - from tandem_eval.recorder import EpisodeRecorder + from jevduo_eval.recorder import EpisodeRecorder recorder = EpisodeRecorder(tmp_path / "ep", {"id": "x"}) episode = recorder.finalize( diff --git a/tests/eval/test_rjob_cleanup.py b/tests/eval/test_rjob_cleanup.py index 256aa13..772905c 100644 --- a/tests/eval/test_rjob_cleanup.py +++ b/tests/eval/test_rjob_cleanup.py @@ -9,7 +9,7 @@ from __future__ import annotations -from tandem_eval.rjob import RjobClient, cleanup, run_job +from jevduo_eval.rjob import RjobClient, cleanup, run_job from .rjob_fakes import CONFIG, REAL_SUCCEEDED, FakeRunner, with_paths diff --git a/tests/eval/test_rjob_client.py b/tests/eval/test_rjob_client.py index 734284f..86c7122 100644 --- a/tests/eval/test_rjob_client.py +++ b/tests/eval/test_rjob_client.py @@ -9,7 +9,7 @@ import pytest -from tandem_eval.rjob import ( +from jevduo_eval.rjob import ( RjobClient, RjobError, build_job_spec, @@ -46,7 +46,7 @@ def test_parse_status_real_captured_outputs(): def test_submit_args_include_mount_and_worker_entrypoint(): args = build_submit_args(config=CONFIG, run_id="r1") joined = " ".join(args) - assert "--name=tandem-r1" in joined + assert "--name=jevduo-r1" in joined assert "--charged-group=evobox_proxy" in joined assert "--private-machine=group" in joined assert "--mount=gpfs://gpfs2/share:/mnt/share" in joined @@ -90,7 +90,7 @@ def test_build_job_spec_selects_models_by_name(tmp_path): def test_build_job_spec_rejects_unknown_model_name(tmp_path): - from tandem_eval.config_schema import ConfigError + from jevduo_eval.config_schema import ConfigError config = with_paths(CONFIG, deploy_root=str(tmp_path / "deploy")) with pytest.raises(ConfigError, match="可选"): @@ -231,7 +231,7 @@ def test_fetch_artifacts_writes_platform_logs_into_run_root(tmp_path): assert (run_root / "platform.status.txt").read_text() == "status" assert (run_root / "platform.tail.log").read_text() == "logs" assert (run_root / "worker" / "dockerd.log").is_file() # run 数据原样保留 - assert job_name("r1") == "tandem-r1" + assert job_name("r1") == "jevduo-r1" def test_fetch_artifacts_tolerates_cli_crash(tmp_path): @@ -256,7 +256,7 @@ def test_run_job_fetch_failure_never_skips_cleanup(tmp_path, monkeypatch): def exploding_fetch(*args, **kwargs): raise OSError("disk full") - monkeypatch.setattr("tandem_eval.rjob.fetch_artifacts", exploding_fetch) + monkeypatch.setattr("jevduo_eval.rjob.fetch_artifacts", exploding_fetch) result = run_job(config=config, repo_root=tmp_path, run_id="r3", spec_overrides={}, client=RjobClient(runner), @@ -268,7 +268,7 @@ def exploding_fetch(*args, **kwargs): def test_env_section_seeds_setup_cache_for_osw1(): - from tandem_eval.rjob_spec import _env_section + from jevduo_eval.rjob_spec import _env_section section = _env_section("osworld1", CONFIG) assert section["root"] == "/shared/osw1" @@ -278,6 +278,6 @@ def test_env_section_seeds_setup_cache_for_osw1(): def test_rsync_never_deletes_job_specs(): """job_specs 在部署副本里而非源仓库,必须排除出 rsync --delete(并发 run 互踩根因)。""" - from tandem_eval.rjob import RSYNC_EXCLUDES + from jevduo_eval.rjob import RSYNC_EXCLUDES assert "job_specs/" in RSYNC_EXCLUDES diff --git a/tests/harness/conftest.py b/tests/harness/conftest.py index e91bc14..4a2ca57 100644 --- a/tests/harness/conftest.py +++ b/tests/harness/conftest.py @@ -9,14 +9,14 @@ import pytest from PIL import Image -from tandem.components import Components -from tandem.gui.candidates import ActionCandidateBuilder -from tandem.gui.compile import gui_action -from tandem.gui.proposals import focused_candidates -from tandem.gui.semantics import enrich_targets -from tandem.gui.targets import A11yTargetBuilder -from tandem.models.ranking import Ranking -from tandem.protocol.models import ( +from jevduo.components import Components +from jevduo.gui.candidates import ActionCandidateBuilder +from jevduo.gui.compile import gui_action +from jevduo.gui.proposals import focused_candidates +from jevduo.gui.semantics import enrich_targets +from jevduo.gui.targets import A11yTargetBuilder +from jevduo.models.ranking import Ranking +from jevduo.protocol.models import ( AccessibilityTree, Budget, Observation, diff --git a/tests/harness/test_candidates.py b/tests/harness/test_candidates.py index 46ca63a..b4335bc 100644 --- a/tests/harness/test_candidates.py +++ b/tests/harness/test_candidates.py @@ -2,7 +2,7 @@ from __future__ import annotations -from tandem.gui.candidates import ActionCandidateBuilder +from jevduo.gui.candidates import ActionCandidateBuilder from .conftest import A11Y_XML, build_targets diff --git a/tests/harness/test_execution_control.py b/tests/harness/test_execution_control.py index b75af0b..5b2232a 100644 --- a/tests/harness/test_execution_control.py +++ b/tests/harness/test_execution_control.py @@ -2,13 +2,13 @@ from dataclasses import replace -from tandem.gui.candidates import ActionCandidate -from tandem.gui.compile import gui_action -from tandem.gui.goal_candidates import goal_candidates -from tandem.gui.interaction import GuiInteractionController -from tandem.memory.context import execution_context, planning_context -from tandem.memory.state import TaskMemory -from tandem.planning.goal_planner import goal_error +from jevduo.gui.candidates import ActionCandidate +from jevduo.gui.compile import gui_action +from jevduo.gui.goal_candidates import goal_candidates +from jevduo.gui.interaction import GuiInteractionController +from jevduo.memory.context import execution_context, planning_context +from jevduo.memory.state import TaskMemory +from jevduo.planning.goal_planner import goal_error from .conftest import build_space from .test_goal_execution import _space diff --git a/tests/harness/test_focus.py b/tests/harness/test_focus.py index b312dfe..c4ba91a 100644 --- a/tests/harness/test_focus.py +++ b/tests/harness/test_focus.py @@ -2,8 +2,8 @@ from __future__ import annotations -from tandem.gui.candidates import ActionCandidate, ActionCandidateBuilder -from tandem.gui.focus import action_key, input_and_menu_context, prune_stalled, toggle_transition +from jevduo.gui.candidates import ActionCandidate, ActionCandidateBuilder +from jevduo.gui.focus import action_key, input_and_menu_context, prune_stalled, toggle_transition from .conftest import A11Y_XML, build_targets diff --git a/tests/harness/test_goal_blocker.py b/tests/harness/test_goal_blocker.py index ede21d0..c58560b 100644 --- a/tests/harness/test_goal_blocker.py +++ b/tests/harness/test_goal_blocker.py @@ -2,11 +2,11 @@ from dataclasses import replace -from tandem.gui.candidates import ActionCandidate -from tandem.gui.goal_candidates import _input_target, goal_candidates -from tandem.gui.interaction import GuiInteractionController -from tandem.memory.context import execution_context, planning_context -from tandem.memory.state import TaskMemory +from jevduo.gui.candidates import ActionCandidate +from jevduo.gui.goal_candidates import _input_target, goal_candidates +from jevduo.gui.interaction import GuiInteractionController +from jevduo.memory.context import execution_context, planning_context +from jevduo.memory.state import TaskMemory from .conftest import build_space from .test_goal_execution import _space diff --git a/tests/harness/test_goal_delivery_loop.py b/tests/harness/test_goal_delivery_loop.py index 0a23800..cab0e47 100644 --- a/tests/harness/test_goal_delivery_loop.py +++ b/tests/harness/test_goal_delivery_loop.py @@ -6,18 +6,18 @@ import pytest -from tandem.gui.goal_candidates import ( +from jevduo.gui.goal_candidates import ( foreground_tree, goal_candidates, modal_frontier, portal_needs_grounding, ) -from tandem.gui.interaction import GuiInteractionController, target_effect -from tandem.gui.semantics import enrich_targets -from tandem.memory.context import execution_context, planning_context, verification_context -from tandem.memory.state import TaskMemory -from tandem.runtime.goal_stage import ObservationRequired -from tandem.verification.verifier import verify_observation +from jevduo.gui.interaction import GuiInteractionController, target_effect +from jevduo.gui.semantics import enrich_targets +from jevduo.memory.context import execution_context, planning_context, verification_context +from jevduo.memory.state import TaskMemory +from jevduo.runtime.goal_stage import ObservationRequired +from jevduo.verification.verifier import verify_observation from .conftest import build_space, build_targets, cli_receipt, make_observation from .test_goal_memory import session diff --git a/tests/harness/test_goal_execution.py b/tests/harness/test_goal_execution.py index c64db49..91711fc 100644 --- a/tests/harness/test_goal_execution.py +++ b/tests/harness/test_goal_execution.py @@ -5,20 +5,20 @@ import pytest -from tandem.gui.compile import gui_action -from tandem.gui.goal_candidates import foreground_tree, goal_candidates -from tandem.gui.targets import A11yTargetBuilder -from tandem.memory.context import planning_context -from tandem.models.ranking import Ranking -from tandem.planning.goal_planner import goal_error, plan_goal -from tandem.runtime.goal_stage import ( +from jevduo.gui.compile import gui_action +from jevduo.gui.goal_candidates import foreground_tree, goal_candidates +from jevduo.gui.targets import A11yTargetBuilder +from jevduo.memory.context import planning_context +from jevduo.models.ranking import Ranking +from jevduo.planning.goal_planner import goal_error, plan_goal +from jevduo.runtime.goal_stage import ( ObservationRequired, _action_key, _cycle_actions, _loop_state, _target_effect, ) -from tandem.verification.goal_verifier import result_error +from jevduo.verification.goal_verifier import result_error from .conftest import A11Y_XML, build_space, build_targets, gui_receipt, make_observation from .test_goal_memory import fact, session diff --git a/tests/harness/test_goal_integration.py b/tests/harness/test_goal_integration.py index 38e6991..93eefdb 100644 --- a/tests/harness/test_goal_integration.py +++ b/tests/harness/test_goal_integration.py @@ -11,15 +11,15 @@ import pytest from PIL import Image -from tandem.config import SessionConfig -from tandem.gui.candidates import ActionCandidate -from tandem.memory.state import TaskMemory -from tandem.models.jev import JevOmniPolicy -from tandem.models.ranking import Ranking -from tandem.models.slow import SlowModelClient -from tandem.protocol.models import BrowserSnapshot -from tandem.runtime.goal_stage import ObservationRequired -from tandem.verification.goal_verifier import verify_goal +from jevduo.config import SessionConfig +from jevduo.gui.candidates import ActionCandidate +from jevduo.memory.state import TaskMemory +from jevduo.models.jev import JevOmniPolicy +from jevduo.models.ranking import Ranking +from jevduo.models.slow import SlowModelClient +from jevduo.protocol.models import BrowserSnapshot +from jevduo.runtime.goal_stage import ObservationRequired +from jevduo.verification.goal_verifier import verify_goal from .conftest import build_space, build_targets, gui_receipt, make_observation from .test_goal_memory import session @@ -68,7 +68,7 @@ def rank(**kwargs): def test_joint_goal_choices_retain_main_endpoint_recovery(monkeypatch): - monkeypatch.setattr("tandem.models.jev.time.sleep", lambda seconds: None) + monkeypatch.setattr("jevduo.models.jev.time.sleep", lambda seconds: None) targets = build_targets() space = build_space(targets) space.target_heads = {"click": space.target_heads["click"][:1]} @@ -195,7 +195,7 @@ def test_exhausted_grounding_keeps_existing_legal_actions_available(tmp_path, mo client = Mock() s.components.stage_verifier = lambda *a, **kw: verify_goal(client, *a, **kw) now = [100.0] - monkeypatch.setattr("tandem.runtime.goal_stage.time.monotonic", lambda: now[0]) + monkeypatch.setattr("jevduo.runtime.goal_stage.time.monotonic", lambda: now[0]) def ground(*args): if budget == "elapsed": @@ -292,7 +292,7 @@ def test_waiting_outside_grounder_does_not_consume_visual_recovery_time(tmp_path s = session() s.begin("Open the application", requirements()) now = [100.0] - monkeypatch.setattr("tandem.runtime.goal_stage.time.monotonic", lambda: now[0]) + monkeypatch.setattr("jevduo.runtime.goal_stage.time.monotonic", lambda: now[0]) s.components.grounder = Mock(return_value=[_visual()]) before = _shell_observation(tmp_path / "before") with pytest.raises(ObservationRequired): diff --git a/tests/harness/test_goal_interaction.py b/tests/harness/test_goal_interaction.py index a86e294..7d17f87 100644 --- a/tests/harness/test_goal_interaction.py +++ b/tests/harness/test_goal_interaction.py @@ -8,18 +8,18 @@ import pytest from PIL import Image, ImageDraw -from tandem.components import build_default -from tandem.config import SessionConfig -from tandem.gui.candidates import ActionCandidate -from tandem.gui.compile import gui_action -from tandem.gui.goal_candidates import _input_target, application_mismatch, goal_candidates, input_frontier -from tandem.gui.interaction import GuiInteractionController, visual_changed -from tandem.memory.context import planning_context -from tandem.memory.state import TaskMemory -from tandem.models.ranking import Ranking -from tandem.planning.goal_planner import goal_error -from tandem.runtime.goal_stage import ObservationRequired, _action_key -from tandem.verification.goal_verifier import result_error, verify_goal +from jevduo.components import build_default +from jevduo.config import SessionConfig +from jevduo.gui.candidates import ActionCandidate +from jevduo.gui.compile import gui_action +from jevduo.gui.goal_candidates import _input_target, application_mismatch, goal_candidates, input_frontier +from jevduo.gui.interaction import GuiInteractionController, visual_changed +from jevduo.memory.context import planning_context +from jevduo.memory.state import TaskMemory +from jevduo.models.ranking import Ranking +from jevduo.planning.goal_planner import goal_error +from jevduo.runtime.goal_stage import ObservationRequired, _action_key +from jevduo.verification.goal_verifier import result_error, verify_goal from .conftest import build_space, gui_receipt, make_observation from .test_goal_execution import _space diff --git a/tests/harness/test_goal_loop_closure.py b/tests/harness/test_goal_loop_closure.py index ed8c388..662b15f 100644 --- a/tests/harness/test_goal_loop_closure.py +++ b/tests/harness/test_goal_loop_closure.py @@ -6,10 +6,10 @@ import pytest -from tandem.gui.goal_candidates import _input_target, goal_candidates -from tandem.gui.interaction import GuiInteractionController -from tandem.gui.semantics import enrich_targets -from tandem.memory.state import TaskMemory +from jevduo.gui.goal_candidates import _input_target, goal_candidates +from jevduo.gui.interaction import GuiInteractionController +from jevduo.gui.semantics import enrich_targets +from jevduo.memory.state import TaskMemory from .conftest import build_space from .test_goal_execution import _space @@ -103,7 +103,7 @@ def test_returning_to_seen_controls_is_not_endless_new_content(): def test_visual_dialog_name_variants_share_failure_and_grounding_budget(): - from tandem.gui.candidates import ActionCandidate + from jevduo.gui.candidates import ActionCandidate controller, memory, _ = _controller() tree = '' @@ -188,7 +188,7 @@ def test_unresolved_scope_recovery_omits_future_edit_values_and_exit_conditions( def test_verify_navigation_cannot_reclaim_a_historical_save(tmp_path): from PIL import Image - from tandem.verification.goal_verifier import verify_goal + from jevduo.verification.goal_verifier import verify_goal _, memory, _ = _controller() path = tmp_path / "screen.png" @@ -214,8 +214,8 @@ def request(messages, validate, **kw): def test_invalid_verify_output_is_uncertain_not_task_success_or_api_failure(tmp_path): from PIL import Image - from tandem.models.slow import ModelResponseError - from tandem.verification.goal_verifier import verify_goal + from jevduo.models.slow import ModelResponseError + from jevduo.verification.goal_verifier import verify_goal _, memory, _ = _controller() path = tmp_path / "screen.png" @@ -233,11 +233,11 @@ def test_invalid_verify_output_is_uncertain_not_task_success_or_api_failure(tmp_ def test_missing_current_target_triggers_grounding_despite_other_controls(tmp_path): import pytest - from tandem.config import SessionConfig - from tandem.gui.candidates import ActionCandidate - from tandem.models.ranking import Ranking - from tandem.runtime.goal_stage import ObservationRequired - from tandem.runtime.session import TandemSession + from jevduo.config import SessionConfig + from jevduo.gui.candidates import ActionCandidate + from jevduo.models.ranking import Ranking + from jevduo.runtime.goal_stage import ObservationRequired + from jevduo.runtime.session import JevDuoSession from .conftest import make_components, make_observation @@ -248,7 +248,7 @@ def test_missing_current_target_triggers_grounding_despite_other_controls(tmp_pa metadata={"visual_point": [20, 40]})]) components.selector.rank = Mock(return_value=Ranking( components.grounder.return_value[0], [], [], 0, 0, 1, True)) - session = TandemSession(components, config=SessionConfig(execution_mode="goal")) + session = JevDuoSession(components, config=SessionConfig(execution_mode="goal")) session.begin("Choose a visible option", requirements()) session.goal.memory.start({**plan(), "inputs": [{"label": "Requested option", "text": "Option B", "target_hint": "Requested option", "kind": "choice", "input_mode": "replace"}]}, 0) @@ -260,16 +260,16 @@ def test_missing_current_target_triggers_grounding_despite_other_controls(tmp_pa def test_invalid_planner_output_is_an_agent_stop_not_an_external_api_failure(tmp_path): - from tandem.config import SessionConfig - from tandem.models.slow import ModelResponseError - from tandem.runtime.session import TandemSession + from jevduo.config import SessionConfig + from jevduo.models.slow import ModelResponseError + from jevduo.runtime.session import JevDuoSession from .conftest import make_components, make_observation planner = Mock(side_effect=ModelResponseError("Unrepairable structured output")) components = make_components(planner, Mock(), Mock()) components.memory_factory = TaskMemory - session = TandemSession(components, config=SessionConfig(execution_mode="goal")) + session = JevDuoSession(components, config=SessionConfig(execution_mode="goal")) session.begin("Edit", requirements()) action = session.act(make_observation(tmp_path, 0)) assert action.kind == "fail" and action.reason == "planner_output_invalid" diff --git a/tests/harness/test_goal_mechanisms.py b/tests/harness/test_goal_mechanisms.py index de72b1f..456be5f 100644 --- a/tests/harness/test_goal_mechanisms.py +++ b/tests/harness/test_goal_mechanisms.py @@ -8,17 +8,17 @@ import pytest from PIL import Image -from tandem.gui.candidates import ActionCandidate -from tandem.gui.compile import gui_action -from tandem.gui.goal_candidates import application_mismatch, document_frontier, input_frontier, modal_frontier -from tandem.gui.grounding import ground_visual -from tandem.gui.semantics import enrich_targets -from tandem.memory.context import planning_context -from tandem.memory.state import TaskMemory -from tandem.models.ranking import Ranking -from tandem.planning.goal_planner import goal_error, goal_requirements, plan_goal -from tandem.runtime.goal_stage import _action_key, _target_effect, _visual_changed -from tandem.verification.goal_verifier import result_error, verify_goal +from jevduo.gui.candidates import ActionCandidate +from jevduo.gui.compile import gui_action +from jevduo.gui.goal_candidates import application_mismatch, document_frontier, input_frontier, modal_frontier +from jevduo.gui.grounding import ground_visual +from jevduo.gui.semantics import enrich_targets +from jevduo.memory.context import planning_context +from jevduo.memory.state import TaskMemory +from jevduo.models.ranking import Ranking +from jevduo.planning.goal_planner import goal_error, goal_requirements, plan_goal +from jevduo.runtime.goal_stage import _action_key, _target_effect, _visual_changed +from jevduo.verification.goal_verifier import result_error, verify_goal from .conftest import build_space, make_observation from .test_goal_execution import _space @@ -53,7 +53,7 @@ def test_native_date_uses_observed_segments_and_checks_iso_value(order, suffix): name="Departure date" if t.id == original.id else t.name) for t in targets] target = next(t for t in enrich_targets(targets, FORM, (1920, 1080), snapshot) if t.name == "Departure date") - from tandem.gui.goal_candidates import goal_candidates + from jevduo.gui.goal_candidates import goal_candidates inputs = [{"label": "Travel date", "target_hint": "Departure date", "text": "2026-03-25", "input_mode": "replace"}] @@ -272,7 +272,7 @@ def test_anonymous_shell_strip_is_not_renamed_to_activities(): ''' - from tandem.gui.targets import A11yTargetBuilder + from jevduo.gui.targets import A11yTargetBuilder raw = A11yTargetBuilder().build(tree, "t", 128, infer_button_labels=True) targets = enrich_targets(raw, tree, (1920, 1080)) @@ -326,7 +326,7 @@ def test_planner_method_or_unproven_policy_error_is_recoverable(tmp_path, constr def test_duplicate_buttons_keep_row_context_and_identity_after_layout_shift(): - from tandem.gui.candidates import ActionCandidateBuilder + from jevduo.gui.candidates import ActionCandidateBuilder snapshot = {"elements": [{"index": index, "role": "push_button", "name": "Select", "nearby_text": row, "x": 100, "y": 100 * index, "width": 80, "height": 30, diff --git a/tests/harness/test_goal_memory.py b/tests/harness/test_goal_memory.py index 195837d..c457307 100644 --- a/tests/harness/test_goal_memory.py +++ b/tests/harness/test_goal_memory.py @@ -5,17 +5,17 @@ import pytest from PIL import Image -from tandem.config import SessionConfig -from tandem.gui.candidates import ActionCandidate, ActionCandidateBuilder -from tandem.gui.goal_candidates import foreground_tree, goal_candidates, scroll_point -from tandem.gui.targets import A11yTargetBuilder -from tandem.memory.context import planning_context -from tandem.memory.state import TaskMemory -from tandem.models.ranking import Ranking -from tandem.protocol.models import GuiAction -from tandem.runtime.goal_stage import ObservationRequired -from tandem.runtime.session import TandemSession -from tandem_eval.osworld import gui_code +from jevduo.config import SessionConfig +from jevduo.gui.candidates import ActionCandidate, ActionCandidateBuilder +from jevduo.gui.goal_candidates import foreground_tree, goal_candidates, scroll_point +from jevduo.gui.targets import A11yTargetBuilder +from jevduo.memory.context import planning_context +from jevduo.memory.state import TaskMemory +from jevduo.models.ranking import Ranking +from jevduo.protocol.models import GuiAction +from jevduo.runtime.goal_stage import ObservationRequired +from jevduo.runtime.session import JevDuoSession +from jevduo_eval.osworld import gui_code from .conftest import FixedSelector, gui_receipt, make_components, make_observation from .test_goal_stage import plan, requirements, result @@ -170,7 +170,7 @@ def session(): components = make_components(lambda *a, **kw: plan(), lambda *a, **kw: None, FixedSelector()) components.memory_factory = TaskMemory components.stage_verifier = lambda *a, **kw: result(unit_met=False, delivery_state="none") - return TandemSession(components, config=SessionConfig(execution_mode="goal")) + return JevDuoSession(components, config=SessionConfig(execution_mode="goal")) def test_no_effect_forces_grounding_and_masks_the_failed_candidate(tmp_path): @@ -191,7 +191,7 @@ def test_no_effect_forces_grounding_and_masks_the_failed_candidate(tmp_path): s.components.grounder.assert_called_once() def rank(**kwargs): - from tandem.runtime.goal_stage import _action_key + from jevduo.runtime.goal_stage import _action_key candidates = kwargs["action_space"].candidates() assert grounded in candidates @@ -256,7 +256,7 @@ def test_preparation_targets_one_unit_not_all_materials(): def test_snapshot_ids_and_ancestry_are_not_a_new_ui_state(): from dataclasses import replace - from tandem.runtime.goal_stage import _state_key + from jevduo.runtime.goal_stage import _state_key target = A11yTargetBuilder().build('''''', "one")[0] diff --git a/tests/harness/test_goal_progress.py b/tests/harness/test_goal_progress.py index 7dd5cb4..2d1ab7e 100644 --- a/tests/harness/test_goal_progress.py +++ b/tests/harness/test_goal_progress.py @@ -6,14 +6,14 @@ import pytest from PIL import Image -from tandem.gui.compile import gui_action -from tandem.gui.goal_candidates import goal_candidates, input_frontier -from tandem.gui.grounding import ground_visual -from tandem.memory.context import planning_context -from tandem.memory.state import TaskMemory -from tandem.models.ranking import Ranking -from tandem.runtime.goal_stage import ObservationRequired, _document_mismatch, _navigation_key, _target_effect -from tandem.verification.goal_verifier import verify_goal +from jevduo.gui.compile import gui_action +from jevduo.gui.goal_candidates import goal_candidates, input_frontier +from jevduo.gui.grounding import ground_visual +from jevduo.memory.context import planning_context +from jevduo.memory.state import TaskMemory +from jevduo.models.ranking import Ranking +from jevduo.runtime.goal_stage import ObservationRequired, _document_mismatch, _navigation_key, _target_effect +from jevduo.verification.goal_verifier import verify_goal from .conftest import gui_receipt, make_observation from .test_goal_execution import _space diff --git a/tests/harness/test_goal_stage.py b/tests/harness/test_goal_stage.py index 17422ca..fc1a5b9 100644 --- a/tests/harness/test_goal_stage.py +++ b/tests/harness/test_goal_stage.py @@ -4,15 +4,15 @@ import pytest -from tandem.config import SessionConfig -from tandem.gui.goal_candidates import foreground_tree, goal_candidates -from tandem.memory.context import planning_context -from tandem.memory.state import TaskMemory -from tandem.models.ranking import Ranking -from tandem.protocol.models import FinishAction -from tandem.runtime.goal_stage import ObservationRequired -from tandem.runtime.session import TandemSession -from tandem.verification.goal_verifier import valid_result, verify_goal +from jevduo.config import SessionConfig +from jevduo.gui.goal_candidates import foreground_tree, goal_candidates +from jevduo.memory.context import planning_context +from jevduo.memory.state import TaskMemory +from jevduo.models.ranking import Ranking +from jevduo.protocol.models import FinishAction +from jevduo.runtime.goal_stage import ObservationRequired +from jevduo.runtime.session import JevDuoSession +from jevduo.verification.goal_verifier import valid_result, verify_goal from .conftest import ( A11Y_XML, @@ -81,7 +81,7 @@ def rank(**kwargs): components.stage_verifier = stage_verifier components.memory_factory = TaskMemory components.selector.rank = rank - session = TandemSession(components, config=SessionConfig(execution_mode="goal")) + session = JevDuoSession(components, config=SessionConfig(execution_mode="goal")) session.begin("Edit and save", requirements()) obs = make_observation(tmp_path, 0) with pytest.raises(ObservationRequired, match="planner_returned"): @@ -101,7 +101,7 @@ def rank(**kwargs): def test_missing_receipt_never_replays(tmp_path, components): components.planner = lambda *a, **kw: plan() components.memory_factory = TaskMemory - session = TandemSession(components, config=SessionConfig(execution_mode="goal")) + session = JevDuoSession(components, config=SessionConfig(execution_mode="goal")) session.begin("Edit", requirements()) obs = make_observation(tmp_path, 0) with pytest.raises(ObservationRequired): @@ -161,7 +161,7 @@ def test_result_rejects_non_string_evidence_ids(): def test_requirement_schema_retry_explains_missing_requirement_field(): - from tandem.planning.goal_planner import goal_requirements + from jevduo.planning.goal_planner import goal_requirements class Client: def json_request(self, messages, validate, **kwargs): @@ -209,7 +209,7 @@ def json_request(self, messages, validate, **kwargs): def test_schema_retry_does_not_increase_reasoning_effort(tmp_path, monkeypatch): import json - from tandem.models.slow import SlowModelClient + from jevduo.models.slow import SlowModelClient payloads = [] responses = iter([{"unexpected": True}, {"done": True}]) @@ -232,7 +232,7 @@ def open_request(request, **kwargs): return Response() monkeypatch.setattr("urllib.request.urlopen", open_request) - monkeypatch.setattr("tandem.models.slow.time.sleep", lambda seconds: None) + monkeypatch.setattr("jevduo.models.slow.time.sleep", lambda seconds: None) client = SlowModelClient({"base_url": "http://synthetic"}, SessionConfig(), tmp_path / "audit.jsonl") client.json_request([], lambda value: "done" in value, role="plan_stage") assert [p.get("reasoning_effort") for p in payloads] == [None, None] @@ -261,7 +261,7 @@ def test_diagnostic_success_does_not_become_delivery(): def test_delivery_unit_can_prepare_but_cannot_commit_delivery_in_preparation(): - from tandem.planning.goal_planner import valid_goal + from jevduo.planning.goal_planner import valid_goal memory = TaskMemory("Edit", requirements()) preparation = {**plan(), "purpose": "prepare"} @@ -321,8 +321,8 @@ def test_preparation_reuses_registered_confirmed_facts(): def test_component_factory_selects_goal_mode(): - from tandem.components import build_default - from tandem.planning.goal_planner import plan_goal + from jevduo.components import build_default + from jevduo.planning.goal_planner import plan_goal built = build_default(client=object(), endpoint="http://unused", config=SessionConfig(execution_mode="goal")) @@ -332,8 +332,8 @@ def test_component_factory_selects_goal_mode(): def test_initial_empty_memory_is_per_session(components): components.memory_factory = TaskMemory - a = TandemSession(components, config=SessionConfig(execution_mode="goal")) - b = TandemSession(replace(components), config=SessionConfig(execution_mode="goal")) + a = JevDuoSession(components, config=SessionConfig(execution_mode="goal")) + b = JevDuoSession(replace(components), config=SessionConfig(execution_mode="goal")) assert a.goal.memory is not b.goal.memory diff --git a/tests/harness/test_observation_closure.py b/tests/harness/test_observation_closure.py index e8ec3af..9937b33 100644 --- a/tests/harness/test_observation_closure.py +++ b/tests/harness/test_observation_closure.py @@ -5,13 +5,13 @@ import pytest -from tandem.gui.candidates import ActionCandidateBuilder -from tandem.gui.compile import gui_action -from tandem.gui.field_binding import _input_target, matches_field -from tandem.gui.goal_candidates import foreground_tree, goal_candidates, modal_frontier -from tandem.gui.interaction import target_effect -from tandem.gui.semantics import enrich_targets -from tandem.gui.targets import A11yTargetBuilder +from jevduo.gui.candidates import ActionCandidateBuilder +from jevduo.gui.compile import gui_action +from jevduo.gui.field_binding import _input_target, matches_field +from jevduo.gui.goal_candidates import foreground_tree, goal_candidates, modal_frontier +from jevduo.gui.interaction import target_effect +from jevduo.gui.semantics import enrich_targets +from jevduo.gui.targets import A11yTargetBuilder from .test_semantics import _named, _targets diff --git a/tests/harness/test_planner_choice.py b/tests/harness/test_planner_choice.py index aaceb48..e761541 100644 --- a/tests/harness/test_planner_choice.py +++ b/tests/harness/test_planner_choice.py @@ -5,12 +5,12 @@ from PIL import Image -from tandem.components import build_default -from tandem.config import SessionConfig -from tandem.models.planner_choice import PlannerChoicePolicy -from tandem.models.ranking import ranking_dict -from tandem.models.slow import SlowModelClient -from tandem_eval.entry import build_session +from jevduo.components import build_default +from jevduo.config import SessionConfig +from jevduo.models.planner_choice import PlannerChoicePolicy +from jevduo.models.ranking import ranking_dict +from jevduo.models.slow import SlowModelClient +from jevduo_eval.entry import build_session from .conftest import build_space, build_targets from .test_slow_transport import _Response @@ -45,10 +45,10 @@ def choose(messages, validate, **kw): def test_planner_backend_does_not_construct_or_discover_jev(tmp_path): config = SessionConfig(execution_mode="goal", fast_backend="planner") - with patch("tandem.components.JevOmniPolicy") as jev: + with patch("jevduo.components.JevOmniPolicy") as jev: components = build_default(client=Mock(), endpoint="", config=config) assert isinstance(components.selector, PlannerChoicePolicy) - with patch("tandem_eval.entry.resolve_fast_model_endpoint") as discover: + with patch("jevduo_eval.entry.resolve_fast_model_endpoint") as discover: session = build_session({"benchmark": "osworld21", "output_root": str(tmp_path), "harness_config": {"execution_mode": "goal", "fast_backend": "planner"}, "secrets": {"slow_model": {"base_url": "http://synthetic"}}}) diff --git a/tests/harness/test_planner_verifier.py b/tests/harness/test_planner_verifier.py index fc238d4..f26cabd 100644 --- a/tests/harness/test_planner_verifier.py +++ b/tests/harness/test_planner_verifier.py @@ -7,8 +7,8 @@ import pytest -from tandem.planning.planner import plan_step -from tandem.verification.verifier import task_requirements, verify_observation +from jevduo.planning.planner import plan_step +from jevduo.verification.verifier import task_requirements, verify_observation from .conftest import A11Y_XML, build_targets diff --git a/tests/harness/test_selector_compile.py b/tests/harness/test_selector_compile.py index f1fce96..86b9f2b 100644 --- a/tests/harness/test_selector_compile.py +++ b/tests/harness/test_selector_compile.py @@ -8,10 +8,10 @@ import pytest -from tandem.gui.compile import gui_action -from tandem.models.jev import JevOmniPolicy -from tandem.models.ranking import ranking_dict -from tandem.protocol.models import GuiAction, WaitAction +from jevduo.gui.compile import gui_action +from jevduo.models.jev import JevOmniPolicy +from jevduo.models.ranking import ranking_dict +from jevduo.protocol.models import GuiAction, WaitAction from .conftest import build_space, build_targets @@ -73,7 +73,7 @@ def _single_candidate_space(): def test_rank_recovers_after_url_timeout(tmp_path, monkeypatch): - monkeypatch.setattr("tandem.models.jev.time.sleep", lambda seconds: None) + monkeypatch.setattr("jevduo.models.jev.time.sleep", lambda seconds: None) targets, space = _single_candidate_space() opener = ScriptedOpener([ urllib.error.URLError("timed out"), @@ -89,7 +89,7 @@ def test_rank_recovers_after_url_timeout(tmp_path, monkeypatch): def test_rank_refreshes_endpoint_during_recovery(tmp_path, monkeypatch): - monkeypatch.setattr("tandem.models.jev.time.sleep", lambda seconds: None) + monkeypatch.setattr("jevduo.models.jev.time.sleep", lambda seconds: None) targets, space = _single_candidate_space() opener = ScriptedOpener([ urllib.error.URLError("old endpoint unavailable"), @@ -111,7 +111,7 @@ def test_rank_refreshes_endpoint_during_recovery(tmp_path, monkeypatch): def test_rank_retries_transient_http_error(tmp_path, monkeypatch): - monkeypatch.setattr("tandem.models.jev.time.sleep", lambda seconds: None) + monkeypatch.setattr("jevduo.models.jev.time.sleep", lambda seconds: None) targets, space = _single_candidate_space() opener = ScriptedOpener([ urllib.error.HTTPError("http://jev-fake/", 503, "unavailable", {}, None), @@ -198,7 +198,7 @@ def _target_by_name(name): def test_compile_click_uses_target_center(): - from tandem.gui.candidates import ActionCandidate + from jevduo.gui.candidates import ActionCandidate target = _target_by_name("确定") winner = ActionCandidate( @@ -212,7 +212,7 @@ def test_compile_click_uses_target_center(): def test_compile_slider_maps_to_fractional_click(): - from tandem.gui.candidates import ActionCandidate + from jevduo.gui.candidates import ActionCandidate target = _target_by_name("缩放") winner = ActionCandidate( @@ -225,7 +225,7 @@ def test_compile_slider_maps_to_fractional_click(): def test_compile_keypress_sequence_and_named_key(): - from tandem.gui.candidates import ActionCandidate + from jevduo.gui.candidates import ActionCandidate seq = ActionCandidate( id="KEY_SEQUENCE:ctrl+l", operation="keypress", @@ -239,7 +239,7 @@ def test_compile_keypress_sequence_and_named_key(): def test_compile_scroll_and_type_and_wait(): - from tandem.gui.candidates import ActionCandidate + from jevduo.gui.candidates import ActionCandidate up = ActionCandidate( id="SCROLL_UP", operation="scroll", description="上滚", @@ -269,7 +269,7 @@ def test_compile_scroll_and_type_and_wait(): def test_compile_unsupported_returns_none(): - from tandem.gui.candidates import ActionCandidate + from jevduo.gui.candidates import ActionCandidate fallback = ActionCandidate( id="VISUAL_FALLBACK", operation="visual_fallback", description="视觉回退", metadata={} diff --git a/tests/harness/test_selector_kev.py b/tests/harness/test_selector_kev.py index 556ee02..0a5407e 100644 --- a/tests/harness/test_selector_kev.py +++ b/tests/harness/test_selector_kev.py @@ -6,13 +6,13 @@ import pytest -from tandem.components import build_default -from tandem.config import SessionConfig -from tandem.models.jev import JevOmniPolicy -from tandem.models.kev import KevPolicy -from tandem.models.ranking import ranking_dict -from tandem.planning.planner import plan_step -from tandem.planning.stage_planner import plan_stage +from jevduo.components import build_default +from jevduo.config import SessionConfig +from jevduo.models.jev import JevOmniPolicy +from jevduo.models.kev import KevPolicy +from jevduo.models.ranking import ranking_dict +from jevduo.planning.planner import plan_step +from jevduo.planning.stage_planner import plan_stage from ..harness.conftest import build_space, build_targets @@ -97,7 +97,7 @@ def test_rank_single_candidate_skips_action_request(tmp_path): def test_missing_probability_counts_as_zero(tmp_path): - from tandem.gui.candidates import ActionCandidate + from jevduo.gui.candidates import ActionCandidate policy, _ = _policy(tmp_path, [_answer({"type_text": 1.0})]) targets = build_targets() diff --git a/tests/harness/test_semantics.py b/tests/harness/test_semantics.py index e625ef3..4b859af 100644 --- a/tests/harness/test_semantics.py +++ b/tests/harness/test_semantics.py @@ -2,11 +2,11 @@ import json -from tandem.gui.candidates import ActionCandidateBuilder -from tandem.gui.proposals import focused_candidates -from tandem.gui.semantics import enrich_targets -from tandem.gui.targets import A11yTargetBuilder -from tandem.models.ranking import build_choice_requests +from jevduo.gui.candidates import ActionCandidateBuilder +from jevduo.gui.proposals import focused_candidates +from jevduo.gui.semantics import enrich_targets +from jevduo.gui.targets import A11yTargetBuilder +from jevduo.models.ranking import build_choice_requests CHROME_XML = """ float | None: 口径说明:判空转看的是"动作有没有编译出来"(gui 事件里 `action` 为 null), 而不是"winner 是不是回退项"。真机路径下 grounder 是关的 - (`tandem_eval/entry.py` 显式传 `grounder=None`),因此 `visual_fallback` + (`jevduo_eval/entry.py` 显式传 `grounder=None`),因此 `visual_fallback` 与 `return_to_planner` **同样编译不出动作**——两者都是真空转。 (2026-10-25 修正:旧口径只数 `return_to_planner`,把 44% 的真实空转 报成了 22%,低估了一倍。) diff --git a/tools/compare_runs.py b/tools/compare_runs.py index 8226efe..462ea64 100644 --- a/tools/compare_runs.py +++ b/tools/compare_runs.py @@ -25,7 +25,7 @@ _spec.loader.exec_module(batch_summary) #: 不产生 UI 动作的赢家。真机路径下 grounder 是关闭的 -#: (`tandem_eval/entry.py` 显式传 `grounder=None`),因此 `visual_fallback` +#: (`jevduo_eval/entry.py` 显式传 `grounder=None`),因此 `visual_fallback` #: 与 `return_to_planner` **都**编译不出动作,两者都是真空转。 #: (2026-10-25 修正:旧口径只数 `return_to_planner`,把真实空转率低估了一半。) NOOP_OPERATIONS = ("return_to_planner", "visual_fallback") diff --git a/tools/rank_probe.py b/tools/rank_probe.py index be850df..49848e0 100644 --- a/tools/rank_probe.py +++ b/tools/rank_probe.py @@ -21,7 +21,7 @@ REPO = Path(__file__).resolve().parents[1] sys.path.insert(0, str(REPO / "src")) -from tandem.candidates import OPERATION_DESCRIPTIONS # noqa: E402 +from jevduo.candidates import OPERATION_DESCRIPTIONS # noqa: E402 SA = Path("/mnt/shared-storage-user/evobox-share-gpfs2/xuyuanxun/shared_resources/sa_cua") # 排序服务宿主机能读的截图视角(harness 的 image_stage.read) From 905c33b99873930d2b4c8293d346d83879464a2d Mon Sep 17 00:00:00 2001 From: tandem-demo Date: Thu, 5 Nov 2026 23:29:59 +0800 Subject: [PATCH 2/2] docs: sync executable commands and imports with the jevduo rename; add upgrade note - README / AGENTS.md / docs: tandem check, tandem-eval, TandemSession, src/tandem*/ paths and the tandem- job name now match the renamed entry points, so the documented steps run as written - README: add a short upgrade section (uninstall old package, reinstall, config path sync) - verified by running the README commands and the library-usage imports for real Not in this commit (PR2 wording batch): brand wording in titles and intro sentences, DEVIATIONS.md history, TANDEM_* env vars. --- AGENTS.md | 32 ++++++++++++++--------------- README.md | 40 +++++++++++++++++++++++++------------ docs/CLUSTER_RUNTIME.md | 24 +++++++++++----------- docs/RESULT_DIR_CONTRACT.md | 2 +- docs/STAGE_EXECUTION.md | 2 +- 5 files changed, 57 insertions(+), 43 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index a79127a..73a91d0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -6,7 +6,7 @@ ## 仓库定位 -主体是 **Tandem harness**(快慢双模 CUA,`src/tandem/`);`src/tandem_eval/` 仅为适配集群 rjob 的测评薄适配层(worker 侧 6 文件 + 开发机侧 rjob.py / rjob_spec.py / rjob_status.py / config_schema.py)。 +主体是 **Tandem harness**(快慢双模 CUA,`src/jevduo/`);`src/jevduo_eval/` 仅为适配集群 rjob 的测评薄适配层(worker 侧 6 文件 + 开发机侧 rjob.py / rjob_spec.py / rjob_status.py / config_schema.py)。 ## 五条硬纪律(CI/评审强制) @@ -16,7 +16,7 @@ 4. **一个 PR = 一个组件改动 + 单测 + smoke 结果链接**(真机 smoke 已可用:`--benchmark mock` 走 mock 链路;真实基准走 OSW1/OSW2)。 5. **ruff + pytest + 契约测试三件套从第一天齐上**:本地提交前 `ruff check src tests && pytest` 必须绿。 -## 协议纪律(`src/tandem/protocol/`) +## 协议纪律(`src/jevduo/protocol/`) - `schema/*.json` 是唯一真源;`validate.py` 是运行时强制者;`samples/*.json` 是 golden 样例。三者由 `tests/protocol/` 锚定,改动必须同步。 - 任何字段增删/语义变化 = bump `protocol_version` 次版本号,并同步全部 golden 样例与 schema。 @@ -40,13 +40,13 @@ ## 开发闭环 ``` -改代码 → ruff check src tests → pytest →(若触碰协议)tandem check → PR(附单测 + smoke 链接) +改代码 → ruff check src tests → pytest →(若触碰协议)jevduo check → PR(附单测 + smoke 链接) ``` -- `tandem check`:协议样例自检(CI 也跑)。 -- `tandem-eval rjob run …`:一站式提交(sync→spec→submit→watch→fetch→cleanup)。 +- `jevduo check`:协议样例自检(CI 也跑)。 +- `jevduo-eval rjob run …`:一站式提交(sync→spec→submit→watch→fetch→cleanup)。 **收尾默认删 rjob**——成功/失败/超时/异常都删,不在集群上留残留;`--keep` 保留现场。 -- `tandem-eval entry --spec …`:worker 侧入口(infra/worker.sh 调用)。 +- `jevduo-eval entry --spec …`:worker 侧入口(infra/worker.sh 调用)。 ## 共享资源纪律(worker 侧) @@ -86,14 +86,14 @@ ## 目录地图 ``` -src/tandem/ harness 主体(组件、协议、CLI) -src/tandem/runtime/ 会话状态机、回执处理、阶段推进与停止条件 -src/tandem/planning/ 单步规划与阶段规划 -src/tandem/gui/ A11y 目标、动作候选、聚焦剪枝与声明式动作编译 -src/tandem/models/ 慢模型客户端、JEV/Kev 选择器与共用排序结构 -src/tandem/verification/ 需求抽取、模型验证与阶段规则验证 -src/tandem/protocol/ 消息层协议:schema/ 真源、validate/ 校验、samples/ golden -src/tandem_eval/ worker 侧 6 文件(entry/env/runner/recorder/scoring/manifest) +src/jevduo/ harness 主体(组件、协议、CLI) +src/jevduo/runtime/ 会话状态机、回执处理、阶段推进与停止条件 +src/jevduo/planning/ 单步规划与阶段规划 +src/jevduo/gui/ A11y 目标、动作候选、聚焦剪枝与声明式动作编译 +src/jevduo/models/ 慢模型客户端、JEV/Kev 选择器与共用排序结构 +src/jevduo/verification/ 需求抽取、模型验证与阶段规则验证 +src/jevduo/protocol/ 消息层协议:schema/ 真源、validate/ 校验、samples/ golden +src/jevduo_eval/ worker 侧 6 文件(entry/env/runner/recorder/scoring/manifest) + 开发机侧 rjob.py / rjob_spec.py / rjob_status.py 生命周期客户端 + config_schema.py(config.json 的校验与 API 选取) tests/ protocol/ harness/ eval/ demo/ 四组 @@ -108,9 +108,9 @@ docs/ RESULT_DIR_CONTRACT.md(eval↔demo 唯一接口) CLUSTER_RUNTIME.md(内部集群运行手册:rjob/共享资源/已知坑) ``` -`src/tandem/` 根目录只保留包信息、CLI、`config.py` 和 `components.py`。 +`src/jevduo/` 根目录只保留包信息、CLI、`config.py` 和 `components.py`。 组件继续经 `Components` / `build_default` 装配;不要在 runtime 中硬编码新的模型后端。 -真实执行、环境生命周期、评分与结果落盘仍归 `tandem_eval`。 +真实执行、环境生命周期、评分与结果落盘仍归 `jevduo_eval`。 ## 结果目录纪律 diff --git a/README.md b/README.md index 112ed19..ebea2f4 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ ## 一次决策的链路 -`TandemSession.act(observation)` 是唯一的决策入口,状态机语义(`runtime/session.py`): +`JevDuoSession.act(observation)` 是唯一的决策入口,状态机语义(`runtime/session.py`): 1. **读观察**:`Observation` 含截图、a11y 树和可选 CDP DOM 快照引用、预算、上一轮回执。 2. **建目标**:a11y 树解析成 `UITarget`,`gui/semantics.py` 恢复邻近标签、 @@ -94,7 +94,7 @@ 结果带 `operation_margin`(两级置信度差)与 `latency_ms`。 8. **编译动作**:`gui/compile.py` 把 winner + 目标编译成**声明式** `GuiAction` (kind / action_type / parameters / target_id),不做代码生成。 -9. **执行与验证**(tandem_eval 层):环境执行后回传 `Receipt`;下一轮进入 +9. **执行与验证**(jevduo_eval 层):环境执行后回传 `Receipt`;下一轮进入 `runtime.episode.verify_pending`——用新观察独立核验上一步,更新 verified_focus、failed_toggles、 以及**逐条需求的核验状态**(`requirement_checks`)。 10. **停止条件**:步数/墙钟预算耗尽 → `FailAction`;连续 3 次无可执行动作 → `FailAction(no_action_limit)`。 @@ -130,7 +130,7 @@ ## 消息层协议 -harness 与环境之间只走 JSON 消息(`src/tandem/protocol/`): +harness 与环境之间只走 JSON 消息(`src/jevduo/protocol/`): - **Observation**(环境 → harness):任务指令、步号、预算、截图引用、a11y 树引用、上一轮回执; - **Action**(harness → 环境):`GuiAction` / `CliAction` / `WaitAction` / `FinishAction` / `FailAction`; @@ -146,15 +146,15 @@ harness 与环境之间只走 JSON 消息(`src/tandem/protocol/`): 自检: ```bash -tandem check # 协议样例自检(CI 同样跑) +jevduo check # 协议样例自检(CI 同样跑) ``` ## 仓库结构 | 路径 | 定位 | |---|---| -| `src/tandem/` | **仓库主体**:快慢双模 harness(决策状态机、规划/验证、候选与排序、协议层、组件装配) | -| `src/tandem_eval/` | 测评薄适配层:worker 侧 6 文件(entry/env/runner/recorder/scoring/manifest)+ 开发机侧 `rjob.py` 生命周期客户端 | +| `src/jevduo/` | **仓库主体**:快慢双模 harness(决策状态机、规划/验证、候选与排序、协议层、组件装配) | +| `src/jevduo_eval/` | 测评薄适配层:worker 侧 6 文件(entry/env/runner/recorder/scoring/manifest)+ 开发机侧 `rjob.py` 生命周期客户端 | | `infra/` | 内部集群适配:唯一配置文件、worker 入口脚本(详见 [集群运行手册](docs/CLUSTER_RUNTIME.md)) | | `demo/` | 轨迹回放与对比站点:只读结果目录,不 import harness、不调模型、不碰 VM | | `tests/` | `protocol/` `harness/` `eval/` `demo/` 四组 | @@ -171,22 +171,22 @@ tandem check # 协议样例自检(CI 同样跑) pip install -e '.[dev]' # 三件套:lint + 单测 + 协议自检 -ruff check src tests && pytest && tandem check +ruff check src tests && pytest && jevduo check ``` 把 harness 当库用: ```python -from tandem.components import build_default -from tandem.config import SessionConfig -from tandem.runtime.session import TandemSession +from jevduo.components import build_default +from jevduo.config import SessionConfig +from jevduo.runtime.session import JevDuoSession components = build_default( client=slow_client, # models.slow.SlowModelClient(慢模型客户端) endpoint="http://<排序服务>/rank", config=SessionConfig(fast_backend="jev"), ) -session = TandemSession(components) +session = JevDuoSession(components) session.begin("把 FYP 答辩安排逐条加进日历", None) # None → 慢模型抽取需求 action = session.act(observation) # Observation → Action ``` @@ -194,7 +194,7 @@ action = session.act(observation) # Observation → Action 在真实环境上跑一题(提交到内部集群): ```bash -tandem-eval rjob run --run-id --benchmark osworld2 --tasks \ +jevduo-eval rjob run --run-id --benchmark osworld2 --tasks \ --repo . --config infra/config.json --poll 60 --timeout 3600 ``` @@ -207,9 +207,23 @@ tandem-eval rjob run --run-id --benchmark osworld2 --tasks \ 完整参数表与运行细节见 [docs/CLUSTER_RUNTIME.md](docs/CLUSTER_RUNTIME.md)。 +### 从旧名称 tandem 升级 + +项目已更名为 JevDuo:包名 `tandem` → `jevduo`,`tandem_eval` → `jevduo_eval`,命令 `tandem` / `tandem-eval` → `jevduo` / `jevduo-eval`,类 `TandemSession` → `JevDuoSession`。旧入口已移除,不保留别名。已有安装按下面三步升级: + +```bash +pip uninstall -y tandem # 卸载旧包(uv 环境:uv pip uninstall tandem) +pip install -e '.[dev]' # 以新名称重装 +jevduo check # 确认入口可用 +``` + +- 自己的脚本里 `import tandem` / `from tandem_eval ...` 需改为 `jevduo` / `jevduo_eval`。 +- 环境变量 `TANDEM_*` 本次未改名,仍按原名使用。 +- rjob 任务名前缀由 `tandem-` 变为 `jevduo-`;开发机 `infra/config.json` 里的 `eval.repo_root` / `eval.deploy_root` 需按新目录同步,旧的部署副本确认无在跑任务后再清理。 + ## 会话配置 -`SessionConfig`(`src/tandem/config.py`,frozen dataclass,构造即校验): +`SessionConfig`(`src/jevduo/config.py`,frozen dataclass,构造即校验): | 字段 | 默认 | 说明 | |---|---|---| diff --git a/docs/CLUSTER_RUNTIME.md b/docs/CLUSTER_RUNTIME.md index 2ce90ed..38ff5b7 100644 --- a/docs/CLUSTER_RUNTIME.md +++ b/docs/CLUSTER_RUNTIME.md @@ -12,8 +12,8 @@ worker 入口、共享资源与已知坑。 | 组件 | 位置 | 职责 | |---|---|---| -| `src/tandem/` | 仓库主体 | harness 本体,与集群无关(见 README) | -| `src/tandem_eval/` | 薄适配层 | worker 侧 6 文件(entry/env/runner/recorder/scoring/manifest)+ 开发机侧 `rjob.py` / `rjob_spec.py` / `rjob_status.py` / `config_schema.py` | +| `src/jevduo/` | 仓库主体 | harness 本体,与集群无关(见 README) | +| `src/jevduo_eval/` | 薄适配层 | worker 侧 6 文件(entry/env/runner/recorder/scoring/manifest)+ 开发机侧 `rjob.py` / `rjob_spec.py` / `rjob_status.py` / `config_schema.py` | | `infra/config.json` | 唯一配置 | 全绝对路径、含密钥 → **已 gitignore**,模板 `infra/config.example.json` 提交 | | `infra/worker.sh` | worker 入口 | rjob worker 内被调用,按 benchmark 分 mock / 真机两条路 | | `scripts/` | 批量脚本 | `run_osw2_20x5.sh` 等批量运行 | @@ -83,12 +83,12 @@ Harness 内部已按 `runtime` / `planning` / `gui` / `models` / `verification` | `log.results_root` | 唯一落盘位置,run 目录 = `//` | | `log.record.a11y_full` | 是否落每步完整 a11y XML(默认只落摘要) | -缺项/非法值由 `tandem_eval.config_schema` 统一校验(一次列出全部问题); +缺项/非法值由 `jevduo_eval.config_schema` 统一校验(一次列出全部问题); 必填路径清单见 `config_schema.REQUIRED_PATHS`。 ## 3. 一次 run 的生命周期 -`tandem-eval rjob run` 一站式完成 **sync → spec → submit → watch → fetch → cleanup** +`jevduo-eval rjob run` 一站式完成 **sync → spec → submit → watch → fetch → cleanup** (`rjob.run_job`): ``` @@ -153,14 +153,14 @@ cleanup stop(释放资源)+ delete(永久删除 rjob 记录)——默 单独盯一个已提交的 job: ```bash -tandem-eval rjob watch tandem- --run-id --config infra/config.json +jevduo-eval rjob watch jevduo- --run-id --config infra/config.json ``` ## 4. worker 侧入口 `infra/worker.sh ` 由 rjob worker 调用: -- **mock 基准**:直接用系统 `python3` 跑 `tandem_eval entry`,不碰共享资源与 docker; +- **mock 基准**:直接用系统 `python3` 跑 `jevduo_eval entry`,不碰共享资源与 docker; - **真实基准**: 1. source 共享 `env.sh`(`OSWORLD_PYTHON` / `EVAL_TOOLS` / `LD_LIBRARY_PATH` 等); 2. 把 config 里的 registry 凭据写入 `~/.docker/config.json`(`chmod 600`); @@ -168,10 +168,10 @@ tandem-eval rjob watch tandem- --run-id --config infra/config.j 固定为 `httpproxy-headless.kubebrain.svc.pjlab.local:3128`,并设置 `NO_PROXY`; 4. 起 `dockerd`(独立 data-root/exec-root,指向该代理),拉 `inner_image`, 打 tag 为 `happysixd/osworld-docker:latest`; - 5. 用 `$OSWORLD_PYTHON` 跑 `tandem_eval entry`(Pillow / easyocr 已在冻结 venv 内), + 5. 用 `$OSWORLD_PYTHON` 跑 `jevduo_eval entry`(Pillow / easyocr 已在冻结 venv 内), 跑前先做一次依赖自检。 -worker 侧 `tandem_eval entry --spec ` 是实际执行体:起 VM → 跑任务 → 录事件 → 评分 → +worker 侧 `jevduo_eval entry --spec ` 是实际执行体:起 VM → 跑任务 → 录事件 → 评分 → 写 run 目录。环境生命周期、预算强制、落盘都在这一层,harness 只管决策。 ## 5. 共享资源(只读) @@ -229,7 +229,7 @@ OSW2.1 走**独立环境**(独立 runtime / VM / 资产 / venv / env.sh), `desktop_env/providers/docker/provider.py`。 - **依赖自检**:OSW2.1 的独立 venv 按官方 `uv.lock` 安装,**没有 easyocr**, worker 只检查 Pillow;旧环境仍检查 `easyocr + PIL`。 -- **题目清单**:`tandem_eval/manifest.py` 的 `OSWORLD21_TASK_IDS` 覆盖官方001–108题。 +- **题目清单**:`jevduo_eval/manifest.py` 的 `OSWORLD21_TASK_IDS` 覆盖官方001–108题。 清单不等于环境验收报告;API、VM或评分异常仍记为 `failed_unscored`。 - **共享环境**:通用VM为 `vm/unified-20261022-complete.qcow2`,经 `prepared/runtime` 接入环境准备适配。依赖缓存、网站DNS/证书和控制器传输适配在共享环境侧维护, @@ -288,7 +288,7 @@ worker 侧各段日志: ## 10. 开发闭环 ``` -改代码 → ruff check src tests demo → pytest →(若触碰协议)tandem check → 提交 +改代码 → ruff check src tests demo → pytest →(若触碰协议)jevduo check → 提交 ``` 真机 smoke: @@ -298,7 +298,7 @@ worker 侧各段日志: ## 11. 浏览器 CDP 语义快照 -- `tandem_eval.browser` 在 VM 内通过 loopback 依次探测 `1337` / `9222`,只调用 +- `jevduo_eval.browser` 在 VM 内通过 loopback 依次探测 `1337` / `9222`,只调用 `GET /json/list` 与 `Runtime.evaluate`,不重启 Chrome、不激活 tab、不执行页面 mutation。 多 tab 时选择 `document.visibilityState=visible` 的页面。 - 任务必须已由环境以远程调试参数启动 Chrome;Task 008 的 setup 已显式启用 `1337`。 @@ -320,7 +320,7 @@ worker 侧各段日志: ## 13. 命名实验 -统一使用仓库内 `scripts/run_experiment.sh`,不要直接散落调用 `tandem-eval rjob run`。 +统一使用仓库内 `scripts/run_experiment.sh`,不要直接散落调用 `jevduo-eval rjob run`。 每次实验必须指定唯一名称(小写字母、数字、连字符),所有结果归档到 `rjob_logs//`: diff --git a/docs/RESULT_DIR_CONTRACT.md b/docs/RESULT_DIR_CONTRACT.md index 65839b2..be694c1 100644 --- a/docs/RESULT_DIR_CONTRACT.md +++ b/docs/RESULT_DIR_CONTRACT.md @@ -1,7 +1,7 @@ # 结果目录契约(Result Directory Contract) > eval ↔ demo/分析 的唯一接口。demo/分析工具只读本契约描述的目录;任何一侧改动必须先改本文档。 -> 契约版本:`v0.3`。tandem_eval.recorder 是唯一写入者。 +> 契约版本:`v0.3`。jevduo_eval.recorder 是唯一写入者。 ## run 目录(`rjob_logs//`,唯一落盘位置) diff --git a/docs/STAGE_EXECUTION.md b/docs/STAGE_EXECUTION.md index 3087ce9..0cb6773 100644 --- a/docs/STAGE_EXECUTION.md +++ b/docs/STAGE_EXECUTION.md @@ -2,7 +2,7 @@ 通过 `--execution-mode stage` 启用:慢模型规划阶段,JEV/Kev 连续选择 GUI 动作,CLI 执行计划中的命令;优先使用规则验证,证据不足时调用模型 Verify,失败或状态偏离时按需重规划,最终完成仍需独立验证。默认保留原有 `step` 模式。 -开发入口(相对 `src/tandem/`): +开发入口(相对 `src/jevduo/`): - `planning/stage_planner.py`:阶段计划生成与响应校验。 - `runtime/stages.py`:里程碑进度、当前目标重新绑定及重规划。