From a7b68e571a4e6d74a7c695ed30ede17f32ec745b Mon Sep 17 00:00:00 2001 From: Haizhong Zheng Date: Fri, 20 Nov 2026 11:07:59 -0500 Subject: [PATCH 1/2] Remove the forwards of moved modules hermit.agents, hermit.evolver, hermit.llm, hermit.backends and hermit.trajectory forwarded for 0.2 only; hermit.agent.base.direct, hermit.agent.base.container and hermit.agent.environment were added this release and never shipped. Nothing in the repository imports them. hermit/_moved.py goes with them. The docs, the CHANGELOG and the Docker comments name the new paths; a test checks the old ones are gone. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 12 +++++++++--- docker/claude/Dockerfile | 4 ++-- docker/codex/Dockerfile.standalone | 2 +- docker/offline.sh | 2 +- docs/framework/agent-layers.md | 10 +++++----- hermit/_moved.py | 25 ------------------------- hermit/agent/base/container.py | 4 ---- hermit/agent/base/direct.py | 4 ---- hermit/agent/environment/__init__.py | 5 ----- hermit/agents/__init__.py | 7 ------- hermit/backends.py | 8 -------- hermit/evolver/__init__.py | 5 ----- hermit/llm.py | 4 ---- hermit/trajectory.py | 4 ---- tests/core/test_task.py | 18 ++++++------------ tests/selection.py | 4 ++-- 16 files changed, 26 insertions(+), 92 deletions(-) delete mode 100644 hermit/_moved.py delete mode 100644 hermit/agent/base/container.py delete mode 100644 hermit/agent/base/direct.py delete mode 100644 hermit/agent/environment/__init__.py delete mode 100644 hermit/agents/__init__.py delete mode 100644 hermit/backends.py delete mode 100644 hermit/evolver/__init__.py delete mode 100644 hermit/llm.py delete mode 100644 hermit/trajectory.py diff --git a/CHANGELOG.md b/CHANGELOG.md index ca8039e4..9b444c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ Changes are grouped by software version. Entries under Unreleased describe work ### Breaking +- The forwards of moved modules are gone: `hermit.agents`, `hermit.evolver`, `hermit.llm`, `hermit.backends` and + `hermit.trajectory` (0.2's) and `hermit.agent.base.direct`, `hermit.agent.base.container` and + `hermit.agent.environment` (this release's). Import `hermit.agent.acting`, `hermit.agent.evolver`, + `hermit.agent.model.llm`, `hermit.agent.model.backends`, `hermit.agent.base.trajectory`, `hermit.agent.model.direct`, + `hermit.environment.docker` and `hermit.environment`. + - Harbor gives a task set its data, its environments and its verifier; every agent is Hermit's ([Benchmarks](docs/framework/task.md#benchmarks)). `agent.name: harbor` is gone, with `hermit/harbor/runner.py`, `hermit/harbor/harborside/` (the HermitXXX classes, the scripted agent, the stream driver) and the runner's parts @@ -69,7 +75,7 @@ Changes are grouped by software version. Entries under Unreleased describe work `tasks/`. - Tasks and environments are packages of their own beside the agents: `hermit/environment/` (moved from - `hermit/agent/environment/`, which forwards for one release) and `hermit/task/` (from `hermit/task.py`: `Task` with + `hermit/agent/environment/`) and `hermit/task/` (from `hermit/task.py`: `Task` with a public half the agent is handed and a private half only the judge reads, `Benchmark`, the verifier). `RunOutput` and `load_callable` live in `hermit/common.py`; every name importable from `hermit.task` before still is. Tasks and agents never import each other (`tests/core/test_layers.py`). @@ -79,8 +85,8 @@ Changes are grouped by software version. Entries under Unreleased describe work roles=)` replaces `run(prompt, workspace=, limits=)` (a path is a `Local` environment), and a CLI Base Agent refuses `isolation`, `sandbox` or `container` given as settings (use `Sandboxed(path, sandbox=...)` or `Container(path, settings=...)`). A single model call is Layer 1: `Direct(settings, model)` in - `hermit.agent.model.direct` returns a `Reply`, and `make("direct")` is refused. `hermit.agent.base.direct` and - `hermit.agent.base.container` (now `hermit.environment.docker`) forward for one release. A run whose acting + `hermit.agent.model.direct` returns a `Reply`, and `make("direct")` is refused. `hermit.agent.base.container` is + now `hermit.environment.docker`. A run whose acting agent does not take what its method needs of an adapter (`supports` against `evolver.yaml` `needs`) is refused before it starts. diff --git a/docker/claude/Dockerfile b/docker/claude/Dockerfile index aa8ebdf2..2655d804 100644 --- a/docker/claude/Dockerfile +++ b/docker/claude/Dockerfile @@ -1,4 +1,4 @@ -# The Claude Code agent's container (hermit/agent/base/container.py): Ubuntu 24.04, python3 (for the session's +# The Claude Code agent's container (hermit/environment/docker.py): Ubuntu 24.04, python3 (for the session's # scripts), ripgrep, bubblewrap and socat (Claude Code's own sandbox, which runs the session's commands, needs both), and # the machine's own Claude Code, its native build (one file), copied here first: # @@ -6,7 +6,7 @@ # docker build --build-context codex=docker/codex -t officeqa-claude:2.1.318 docker/claude # # A run names the tag it built (environment.image, or a CLI model endpoint's container.image); a session given none -# takes HERMIT_CLAUDE_IMAGE, else hermit-claude:2.1.318 (container.py's default). +# takes HERMIT_CLAUDE_IMAGE, else hermit-claude:2.1.318 (docker.py's default). # # The egress proxy's script is the Codex images' (docker/codex/egress_proxy.py, the `codex` build context), so an # egress container can run this image too. The CLI does not update itself here (DISABLE_AUTOUPDATER): the image is diff --git a/docker/codex/Dockerfile.standalone b/docker/codex/Dockerfile.standalone index d1c1f5aa..d3c85aba 100644 --- a/docker/codex/Dockerfile.standalone +++ b/docker/codex/Dockerfile.standalone @@ -1,4 +1,4 @@ -# The Codex agent's container (hermit/agent/base/container.py) with the standalone Codex a machine installs for +# The Codex agent's container (hermit/environment/docker.py) with the standalone Codex a machine installs for # itself instead of the npm package (the Codex a ChatGPT login runs: the OfficeQA GPT-5.6-Luna configs): # `codex` keeps it under ~/.codex/packages/standalone/releases/-/ (bin/codex, codex-path/rg, # codex-resources/bwrap). Copy that directory into ./codex-standalone first: diff --git a/docker/offline.sh b/docker/offline.sh index 211bea4d..bf765b6b 100755 --- a/docker/offline.sh +++ b/docker/offline.sh @@ -38,7 +38,7 @@ EGRESS=hermit-egress PROXY_URL=http://$EGRESS:3128 USER_IDS=$(id -u):$(id -g) STAMP=$(date +%Y%m%d-%H%M%S)-$$ -# Docker's default capabilities less three the runs do not need (hermit/agent/base/container.py's list); label=disable keeps an +# Docker's default capabilities less three the runs do not need (hermit/environment/docker.py's list); label=disable keeps an # SELinux host from refusing the mounts. SANDBOX adds what hermit's bubblewrap sandboxes need: SYS_ADMIN with seccomp # and AppArmor off to make namespaces, and Docker's masks over /proc lifted (systempaths), without which a fresh # /proc cannot be mounted in a namespace ("Can't mount proc on /newroot/proc"); the user is unprivileged, so what the diff --git a/docs/framework/agent-layers.md b/docs/framework/agent-layers.md index 364713aa..b89c56af 100644 --- a/docs/framework/agent-layers.md +++ b/docs/framework/agent-layers.md @@ -319,9 +319,9 @@ The layers moved `hermit/backends.py`, `hermit/llm.py`, `hermit/trajectory.py`, `hermit/evolver/` into `hermit/agent/`, the learning methods from `hermit/algorithms/evolvers/` to `hermit/agent/evolver/methods/`, and the adapter templates from `hermit/algorithms/templates/` to `hermit/adapter/templates/`. The old import paths (`hermit.backends`, `hermit.llm`, `hermit.trajectory`, -`hermit.agents`, `hermit.evolver`) forward to the new ones for one release and warn when used; `hermit.algorithms` -is gone, and so are `hermit.tools_mcp` and the tool gate `hermit.agent.evolver.gate` (an agent Evolver's tools are -served over MCP and JSON by the call's tool server). +`hermit.agents`, `hermit.evolver`) forwarded to the new ones in 0.2 only; `hermit.algorithms` is gone, and so are +`hermit.tools_mcp` and the tool gate `hermit.agent.evolver.gate` (an agent Evolver's tools are served over MCP and +JSON by the call's tool server). Configurations that name an agent, an Evolver or a template (`agent.name: codex`, `evolver.name: gepa`, `template: prompt-only@1.0`) are unchanged. @@ -331,8 +331,8 @@ Configurations that name an agent, an Evolver or a template (`agent.name: codex` |---|---| | `agent.run(prompt, workspace=path, limits=Limits(...))` | `agent.run(prompt, environment=Local(path, Limits(...)))` (a path alone is a `Local`) | | `isolation`, `sandbox`, `container` in a Base Agent's settings | the environment: `Sandboxed(path, sandbox=box)`, `Container(path, settings={...})`; given as settings, refused | -| `make("direct", settings, model)`, `hermit.agent.base.direct` | `Direct(settings, model)`, `hermit.agent.model.direct` (Layer 1); `make("direct")` is refused; the old module path forwards for one release | -| `hermit.agent.base.container` | `hermit.environment.docker` (the old path forwards for one release) | +| `make("direct", settings, model)`, `hermit.agent.base.direct` | `Direct(settings, model)`, `hermit.agent.model.direct` (Layer 1); `make("direct")` is refused | +| `hermit.agent.base.container` | `hermit.environment.docker` | | `agent.name: harbor` (Hermit's agents injected into `harbor run`) | Codex, Claude Code, `answer`, `react` or a custom agent that takes the `environment` argument, in the task's Harbor environment (`environment.harbor`; Pi, OpenCode, dsh, mini-swe-agent and Hermes refuse it), verified by Harbor's verifier (`judge: {path: hermit.task.verify, name: environment}`) | | `Mount`, `Limits` from `hermit.agent.base.interface` | `hermit.environment` (still importable from the interface) | | a benchmark's own copy of the tool loop | a `ReactAgent` subclass with `@tool` methods and hooks | diff --git a/hermit/_moved.py b/hermit/_moved.py deleted file mode 100644 index 6e1f13cf..00000000 --- a/hermit/_moved.py +++ /dev/null @@ -1,25 +0,0 @@ -"""Forwarding for import paths that moved in the agent layers (docs/framework/agent-layers.md), kept for one release.""" -from __future__ import annotations - -import importlib -import sys -import warnings - - -def forward(old: str, new: str, submodules: dict[str, str] | None = None): - """Make the module `old` forward to the module `new`, and `old.` to each `submodules` target, with a - DeprecationWarning that names the new path. A package's `__getattr__` is what this returns.""" - warnings.warn(f"{old} moved to {new}; the old path works for one release", DeprecationWarning, stacklevel=3) - module = importlib.import_module(new) - targets = dict(submodules or {}) - for name, target in targets.items(): - sys.modules[f"{old}.{name}"] = importlib.import_module(target) - if not targets: - sys.modules[old] = module - return None - - def __getattr__(name: str): - if name in targets: - return sys.modules[f"{old}.{name}"] - return getattr(module, name) - return __getattr__ diff --git a/hermit/agent/base/container.py b/hermit/agent/base/container.py deleted file mode 100644 index 3acda95a..00000000 --- a/hermit/agent/base/container.py +++ /dev/null @@ -1,4 +0,0 @@ -"""Moved to hermit.environment.docker.""" -from hermit._moved import forward - -forward(__name__, "hermit.environment.docker") diff --git a/hermit/agent/base/direct.py b/hermit/agent/base/direct.py deleted file mode 100644 index b037a0a4..00000000 --- a/hermit/agent/base/direct.py +++ /dev/null @@ -1,4 +0,0 @@ -"""Moved to hermit.agent.model.direct (Layer 1: a single model call).""" -from hermit._moved import forward - -forward(__name__, "hermit.agent.model.direct") diff --git a/hermit/agent/environment/__init__.py b/hermit/agent/environment/__init__.py deleted file mode 100644 index ab2a3278..00000000 --- a/hermit/agent/environment/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Moved to hermit.environment (the environments every layer shares: the task's, the agent's, the judge's).""" -from hermit._moved import forward - -__getattr__ = forward(__name__, "hermit.environment", {"base": "hermit.environment.base", - "docker": "hermit.environment.docker"}) diff --git a/hermit/agents/__init__.py b/hermit/agents/__init__.py deleted file mode 100644 index 24003c93..00000000 --- a/hermit/agents/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -"""Moved to hermit.agent.acting (the Acting Agents) and hermit.agent.base (Layer 2).""" -from hermit._moved import forward - -__getattr__ = forward(__name__, "hermit.agent.acting", { - "base": "hermit.agent.acting.agent", "cli": "hermit.agent.acting.workspace", "react": "hermit.agent.acting.react", - "tools": "hermit.agent.acting.tools", - "container": "hermit.environment.docker", "login": "hermit.agent.base.login"}) diff --git a/hermit/backends.py b/hermit/backends.py deleted file mode 100644 index 0746197f..00000000 --- a/hermit/backends.py +++ /dev/null @@ -1,8 +0,0 @@ -"""Moved to hermit.agent.model.backends.""" -from hermit._moved import forward - -if __name__ == "__main__": # `python -m hermit.backends ...`, as older launchers run it - import runpy - runpy.run_module("hermit.agent.model.backends", run_name="__main__", alter_sys=True) -else: - forward(__name__, "hermit.agent.model.backends") diff --git a/hermit/evolver/__init__.py b/hermit/evolver/__init__.py deleted file mode 100644 index 310d26fb..00000000 --- a/hermit/evolver/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Moved to hermit.agent.evolver.""" -from hermit._moved import forward - -__getattr__ = forward(__name__, "hermit.agent.evolver", {name: f"hermit.agent.evolver.{name}" - for name in ("base", "agent", "loader", "dependencies")}) diff --git a/hermit/llm.py b/hermit/llm.py deleted file mode 100644 index 84df2fed..00000000 --- a/hermit/llm.py +++ /dev/null @@ -1,4 +0,0 @@ -"""Moved to hermit.agent.model.llm.""" -from hermit._moved import forward - -forward(__name__, "hermit.agent.model.llm") diff --git a/hermit/trajectory.py b/hermit/trajectory.py deleted file mode 100644 index 2fed1f69..00000000 --- a/hermit/trajectory.py +++ /dev/null @@ -1,4 +0,0 @@ -"""Moved to hermit.agent.base.trajectory.""" -from hermit._moved import forward - -forward(__name__, "hermit.agent.base.trajectory") diff --git a/tests/core/test_task.py b/tests/core/test_task.py index 0e62cd33..ebf6aae5 100644 --- a/tests/core/test_task.py +++ b/tests/core/test_task.py @@ -1,7 +1,6 @@ """Tasks (hermit.task): the public half an agent is handed, the private half only the judge reads, the task set and its splits, and the run that brings a task and an agent together (hermit.trainer.rollout).""" import json -import warnings import pytest @@ -68,18 +67,13 @@ def score(row, output): assert wrapped(as_task({"id": "c", "q": 2}), RunOutput(output=4)).score == 1.0 -def test_the_environments_moved_to_the_top_level_and_the_old_path_forwards(): +@pytest.mark.parametrize("old", ["hermit.agent.environment", "hermit.agent.base.direct", + "hermit.agent.base.container", "hermit.agents", "hermit.evolver", "hermit.llm", + "hermit.backends", "hermit.trajectory"]) +def test_the_moved_modules_old_paths_are_gone(old): import importlib - import hermit.agent.environment as forwarded - from hermit.environment import Local - with warnings.catch_warnings(record=True) as caught: - warnings.simplefilter("always") - importlib.reload(forwarded) # the warning comes with the import, once - from hermit.agent.environment import Local as old - from hermit.agent.environment.base import Sandboxed as old_sandboxed - from hermit.environment.base import Sandboxed - assert old is Local and old_sandboxed is Sandboxed - assert any("hermit.environment" in str(w.message) for w in caught) + with pytest.raises(ModuleNotFoundError): + importlib.import_module(old) def test_the_names_imported_from_hermit_task_before_the_package_still_import(): diff --git a/tests/selection.py b/tests/selection.py index 1cf62140..27adaccc 100644 --- a/tests/selection.py +++ b/tests/selection.py @@ -58,14 +58,14 @@ def fnmatch(path: str, pattern: str) -> bool: "harness2": {"continual_harness"}} # Continual Harness deploys with the harness2_codex template # what every method is built on: a change here runs every group (tests/core/test_selection.py checks that every # framework module these import, or a method's tests import, is here too) -SHARED = ["hermit/agent/__init__.py", "hermit/agent/base/*", "hermit/environment/*", "hermit/agent/environment/*", +SHARED = ["hermit/agent/__init__.py", "hermit/agent/base/*", "hermit/environment/*", "hermit/agent/acting/*", "hermit/harbor/*", "hermit/agent/evolver/*.py", "hermit/agent/evolver/methods/__init__.py", "hermit/agent/model/*", "hermit/trainer/*", "hermit/tree.py", "hermit/evaluate.py", "hermit/sandbox.py", "hermit/sandbox_relay.py", "hermit/isolate.py", "hermit/worker.py", "hermit/spec.py", - "hermit/redact.py", "hermit/_moved.py", # the moved modules' forwards in hermit/agent/base + "hermit/redact.py", "hermit/hosts/*", "hermit/runtime/*", "hermit/adapter/*.py", "hermit/config.py", "hermit/defaults.yaml", "hermit/tools.py", "hermit/task/*", "hermit/common.py", "hermit/__init__.py", "hermit/adapter/templates/prompt_only/*", # toy From a30e62f94204f4c2ec17bcdae22f83499650cbc7 Mon Sep 17 00:00:00 2001 From: Haizhong Zheng Date: Fri, 20 Nov 2026 11:31:41 -0500 Subject: [PATCH 2/2] Name every old path's new place, and test that the old module itself is missing The CHANGELOG lists each removed path with its new one, hermit.agents' submodules included, and no longer calls hermit.agent.base.direct and hermit.agent.base.container unreleased: they were 0.2's modules. The test checks the ModuleNotFoundError names the old module, so a forward left behind without its helper fails it. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 18 +++++++++++++----- tests/core/test_task.py | 3 ++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b444c35..0c142530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,19 @@ Changes are grouped by software version. Entries under Unreleased describe work ### Breaking -- The forwards of moved modules are gone: `hermit.agents`, `hermit.evolver`, `hermit.llm`, `hermit.backends` and - `hermit.trajectory` (0.2's) and `hermit.agent.base.direct`, `hermit.agent.base.container` and - `hermit.agent.environment` (this release's). Import `hermit.agent.acting`, `hermit.agent.evolver`, - `hermit.agent.model.llm`, `hermit.agent.model.backends`, `hermit.agent.base.trajectory`, `hermit.agent.model.direct`, - `hermit.environment.docker` and `hermit.environment`. +- The old import paths of moved modules are gone, with no forward: 0.1's, which 0.2 forwarded (`hermit.agents`, + `hermit.evolver`, `hermit.llm`, `hermit.backends`, `hermit.trajectory`), and 0.2's `hermit.agent.base.direct` and + `hermit.agent.base.container`, and `hermit.agent.environment` (never released). Import instead: + + | Old | New | + |---|---| + | `hermit.agents` (`.base`, `.cli`, `.react`, `.tools`, `.container`, `.login`) | `hermit.agent.acting` (`.agent`, `.workspace`, `.react`, `.tools`), `hermit.environment.docker`, `hermit.agent.base.login` | + | `hermit.evolver` (`.base`, `.agent`, `.loader`, `.dependencies`) | `hermit.agent.evolver` (the same submodules) | + | `hermit.llm`, `hermit.backends` | `hermit.agent.model.llm`, `hermit.agent.model.backends` | + | `hermit.trajectory` | `hermit.agent.base.trajectory` | + | `hermit.agent.base.direct` | `hermit.agent.model.direct` | + | `hermit.agent.base.container` | `hermit.environment.docker` | + | `hermit.agent.environment` (`.base`, `.docker`) | `hermit.environment` (`.base`, `.docker`) | - Harbor gives a task set its data, its environments and its verifier; every agent is Hermit's ([Benchmarks](docs/framework/task.md#benchmarks)). `agent.name: harbor` is gone, with `hermit/harbor/runner.py`, diff --git a/tests/core/test_task.py b/tests/core/test_task.py index ebf6aae5..5a2cfd7e 100644 --- a/tests/core/test_task.py +++ b/tests/core/test_task.py @@ -72,8 +72,9 @@ def score(row, output): "hermit.backends", "hermit.trajectory"]) def test_the_moved_modules_old_paths_are_gone(old): import importlib - with pytest.raises(ModuleNotFoundError): + with pytest.raises(ModuleNotFoundError) as missing: importlib.import_module(old) + assert missing.value.name == old # the old module itself, not a module a leftover forward imports def test_the_names_imported_from_hermit_task_before_the_package_still_import():