6aed1bc589
Adds `./cli.py commit [<slug>]` which runs `docker commit` on the active agent container and stores the resulting image tag in per-bottle state. The next `./cli.py resume <slug>` automatically boots from the committed snapshot instead of rebuilding from the Dockerfile, preserving all in-container state across restarts and migrations. - bottle_state: add write_committed_image / read_committed_image helpers - docker/util: add commit_container wrapper around `docker commit` - docker/launch: check for a committed image before the Dockerfile build step; fall back to normal build if the image is absent from the daemon - cli/commit: new command with interactive slug picker; errors clearly on non-Docker backends - 50 new unit tests covering all paths Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
193 lines
6.0 KiB
Python
193 lines
6.0 KiB
Python
"""Unit: cli.py commit command."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, call, patch
|
|
|
|
from bot_bottle.cli.commit import cmd_commit, _committed_image_tag, _agent_container_name
|
|
from bot_bottle import supervise
|
|
from bot_bottle import bottle_state
|
|
|
|
|
|
class _FakeHomeMixin:
|
|
def _setup_fake_home(self):
|
|
self._tmp = tempfile.TemporaryDirectory(prefix="cli-commit-test.")
|
|
original = supervise.bot_bottle_root
|
|
|
|
def fake_root() -> Path:
|
|
return Path(self._tmp.name) / ".bot-bottle"
|
|
|
|
supervise.bot_bottle_root = fake_root # type: ignore[assignment]
|
|
self._restore = lambda: setattr(supervise, "bot_bottle_root", original)
|
|
|
|
def _teardown_fake_home(self):
|
|
self._restore()
|
|
self._tmp.cleanup()
|
|
|
|
|
|
class TestCommitHelpers(unittest.TestCase):
|
|
def test_committed_image_tag(self):
|
|
self.assertEqual(
|
|
"bot-bottle-committed-dev-abc12:latest",
|
|
_committed_image_tag("dev-abc12"),
|
|
)
|
|
|
|
def test_agent_container_name(self):
|
|
self.assertEqual(
|
|
"bot-bottle-dev-abc12",
|
|
_agent_container_name("dev-abc12"),
|
|
)
|
|
|
|
|
|
class TestCmdCommitSlugArg(_FakeHomeMixin, unittest.TestCase):
|
|
"""cmd_commit with an explicit slug bypasses the TUI picker."""
|
|
|
|
def setUp(self):
|
|
self._setup_fake_home()
|
|
|
|
def tearDown(self):
|
|
self._teardown_fake_home()
|
|
|
|
def test_commits_docker_bottle(self):
|
|
slug = "dev-abc12"
|
|
# Write metadata saying this is a docker bottle.
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity=slug, agent_name="dev", cwd="", copy_cwd=False,
|
|
started_at="t", backend="docker",
|
|
))
|
|
|
|
with patch(
|
|
"bot_bottle.cli.commit.commit_container",
|
|
) as mock_commit, patch(
|
|
"bot_bottle.cli.commit.info",
|
|
):
|
|
rc = cmd_commit([slug])
|
|
|
|
self.assertEqual(0, rc)
|
|
mock_commit.assert_called_once_with(
|
|
f"bot-bottle-{slug}",
|
|
f"bot-bottle-committed-{slug}:latest",
|
|
)
|
|
|
|
def test_writes_committed_image_to_state(self):
|
|
slug = "dev-abc12"
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity=slug, agent_name="dev", cwd="", copy_cwd=False,
|
|
started_at="t", backend="docker",
|
|
))
|
|
|
|
with patch("bot_bottle.cli.commit.commit_container"), \
|
|
patch("bot_bottle.cli.commit.info"):
|
|
cmd_commit([slug])
|
|
|
|
self.assertEqual(
|
|
f"bot-bottle-committed-{slug}:latest",
|
|
bottle_state.read_committed_image(slug),
|
|
)
|
|
|
|
def test_marks_bottle_preserved(self):
|
|
slug = "dev-abc12"
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity=slug, agent_name="dev", cwd="", copy_cwd=False,
|
|
started_at="t", backend="docker",
|
|
))
|
|
|
|
with patch("bot_bottle.cli.commit.commit_container"), \
|
|
patch("bot_bottle.cli.commit.info"):
|
|
cmd_commit([slug])
|
|
|
|
self.assertTrue(bottle_state.is_preserved(slug))
|
|
|
|
def test_empty_backend_treated_as_docker(self):
|
|
"""Old state dirs without a backend field should be treated as docker."""
|
|
slug = "dev-abc12"
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity=slug, agent_name="dev", cwd="", copy_cwd=False,
|
|
started_at="t", backend="",
|
|
))
|
|
|
|
with patch("bot_bottle.cli.commit.commit_container") as mock_commit, \
|
|
patch("bot_bottle.cli.commit.info"):
|
|
rc = cmd_commit([slug])
|
|
|
|
self.assertEqual(0, rc)
|
|
mock_commit.assert_called_once()
|
|
|
|
|
|
class TestCmdCommitNonDockerBackend(_FakeHomeMixin, unittest.TestCase):
|
|
def setUp(self):
|
|
self._setup_fake_home()
|
|
|
|
def tearDown(self):
|
|
self._teardown_fake_home()
|
|
|
|
def test_dies_for_smolmachines_backend(self):
|
|
slug = "dev-abc12"
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity=slug, agent_name="dev", cwd="", copy_cwd=False,
|
|
started_at="t", backend="smolmachines",
|
|
))
|
|
|
|
with patch(
|
|
"bot_bottle.cli.commit.die", side_effect=SystemExit("die"),
|
|
) as mock_die:
|
|
with self.assertRaises(SystemExit):
|
|
cmd_commit([slug])
|
|
|
|
mock_die.assert_called_once()
|
|
self.assertIn("smolmachines", mock_die.call_args.args[0])
|
|
|
|
def test_dies_for_macos_container_backend(self):
|
|
slug = "dev-abc12"
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity=slug, agent_name="dev", cwd="", copy_cwd=False,
|
|
started_at="t", backend="macos-container",
|
|
))
|
|
|
|
with patch(
|
|
"bot_bottle.cli.commit.die", side_effect=SystemExit("die"),
|
|
) as mock_die:
|
|
with self.assertRaises(SystemExit):
|
|
cmd_commit([slug])
|
|
|
|
mock_die.assert_called_once()
|
|
self.assertIn("macos-container", mock_die.call_args.args[0])
|
|
|
|
|
|
class TestCmdCommitNoActiveBottles(_FakeHomeMixin, unittest.TestCase):
|
|
def setUp(self):
|
|
self._setup_fake_home()
|
|
|
|
def tearDown(self):
|
|
self._teardown_fake_home()
|
|
|
|
def test_dies_when_no_active_bottles_and_no_slug(self):
|
|
with patch(
|
|
"bot_bottle.cli.commit.enumerate_active_agents", return_value=[],
|
|
), patch(
|
|
"bot_bottle.cli.commit.die", side_effect=SystemExit("die"),
|
|
) as mock_die:
|
|
with self.assertRaises(SystemExit):
|
|
cmd_commit([])
|
|
|
|
mock_die.assert_called_once()
|
|
|
|
def test_returns_zero_when_picker_cancelled(self):
|
|
active = MagicMock()
|
|
active.slug = "dev-abc12"
|
|
with patch(
|
|
"bot_bottle.cli.commit.enumerate_active_agents", return_value=[active],
|
|
), patch(
|
|
"bot_bottle.cli.commit.tui.filter_select", return_value=None,
|
|
):
|
|
rc = cmd_commit([])
|
|
|
|
self.assertEqual(0, rc)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|