Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/agent_env/env/envs/computer/utils/composer.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def _composed_vm_bundle(env: ComputerEnv, base: ComputerArtifact, driver: Comput
protocol = _stage_protocol(context)
layer = _stage_driver(context, driver, base, {})
apps = [(app, _stage_app(context, app, base, {})) for app in env.composed_apps()]
parts = [_part(layer, _services(f"driver-{gate.folder_name(driver.id, 'driver')}", layer.install),
parts = [_part(layer, _services(f"driver-{gate.driver_folder(driver)}", layer.install),
{"MCP_PORT": driver.port}, protocol, False)]
parts += [_part(staged, dict(zip(gate.programs(app, platform_of(base.os)), [
f"venv/bin/python -m agentenv_protocol.computer.serve_app {shlex.quote(staged.served)}",
Expand Down Expand Up @@ -378,7 +378,7 @@ def _composed_windows_disk(env: ComputerEnv, base: ComputerArtifact, driver: Com
context = build / "context"
context.mkdir(parents=True)
protocol = _stage_protocol(context)
layer, name = _stage_driver(context, driver, base, {}), gate.folder_name(driver.id, "driver")
layer, name = _stage_driver(context, driver, base, {}), gate.driver_folder(driver)
driver_prefix = windows_disk.DRIVERS / name
parts = [_windows_part(layer, driver_prefix, {
program: windows_disk.argv(command, driver_prefix)
Expand Down Expand Up @@ -525,7 +525,7 @@ def _composed_omarchy_disk(env: ComputerEnv, base: ComputerArtifact, driver: Com
context = build / "context"
context.mkdir(parents=True)
protocol = _stage_protocol(context)
layer, name = _stage_driver(context, driver, base, {}), gate.folder_name(driver.id, "driver")
layer, name = _stage_driver(context, driver, base, {}), gate.driver_folder(driver)
prefix = omarchy_disk.DRIVERS / name
parts = [_omarchy_part(layer, prefix, {
program: omarchy_disk.argv(command, prefix)
Expand Down Expand Up @@ -916,9 +916,9 @@ class _Layer:
def _stage_driver(context: Path, driver: ComputerDriverEnv, base: ComputerArtifact,
from_store: dict[str, tuple[str, str]]) -> _Layer:
"""Write the driver's install files under ``context/driver/`` and its supervisord programs beside them, served on
its port, its folder under ``DRIVERS`` named for its id's last part, its programs and their file under ``driver-``
its port, its folder under ``DRIVERS`` named for the name its class declares (``gate.driver_folder``), its programs and their file under ``driver-``
as an app's are under ``app-``, so neither ever takes the other's."""
install, name = for_os(driver.install, base.os), gate.folder_name(driver.id, "driver")
install, name = for_os(driver.install, base.os), gate.driver_folder(driver)
layer = _Layer("driver", f"{DRIVERS}/{name}", install, f"agentenv-driver-{name}.conf", driver.id)
_stage(context, layer, f"driver {driver.id}", driver.files, _services(f"driver-{name}", install),
{"MCP_PORT": driver.port}, from_store)
Expand Down
7 changes: 7 additions & 0 deletions src/agent_env/env/envs/computer/utils/gate.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@ def app_folder(app: ComputerAppEnv) -> str:
return folder_name(app.environment_name, "app")


def driver_folder(driver: ComputerDriverEnv) -> str:
"""The name of the folder ``driver`` is installed in, under its computer's drivers folder, and of its programs: the
name its class declares (``@computer_driver(name=...)``), not its id, so the same driver stored under another id (a
bundle registered with a prefix) composes the same image, of the same key."""
return folder_name(driver.declaration.name, "driver")


def _apps(base: ComputerArtifact, driver: ComputerDriverEnv, apps: list[ComputerAppEnv],
environment_name: str) -> list[str]:
"""Every way ``apps`` don't fit together on ``base`` and ``driver`` in a computer env named ``environment_name``:
Expand Down
12 changes: 12 additions & 0 deletions tst/unit/env/envs/test_computer_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,18 @@ def test_an_env_that_differs_only_in_what_doesnt_change_the_image_reuses_the_one
assert docker_calls == [("join", index, auth)]


def test_the_same_driver_stored_under_another_id_composes_the_same_image(base, driver, docker):
first = _put(base, driver)
stored_again = ComputerDriverEnv.put(id="@local/~/kit/registered-desk", module=driver.module, files=driver.files,
declaration=driver.declaration, install=driver.install, port=driver.port)
second = _put(base, stored_again, id="@local/~/kit/other", environment_name="other")

built, reused = (Env.get(env.id).metadata["composed"]["container"] for env in (first, second))
assert len(docker.builds) == 2 and all(reused[arch]["reused"] for arch in reused)
assert {arch: r["key"] for arch, r in reused.items()} == {arch: r["key"] for arch, r in built.items()}
assert all("COPY driver/ /opt/agentenv/drivers/desk/" in build["dockerfile"] for build in docker.builds)


@pytest.mark.parametrize("change", ["requirements", "build-setting", "service", "display-read-at-build"])
def test_what_changes_the_image_changes_its_key_and_builds_it_again(base, driver, docker, tmp_path, monkeypatch,
change):
Expand Down
Loading