diff --git a/bot_bottle/backend/docker/backend.py b/bot_bottle/backend/docker/backend.py index 36db005..580593a 100644 --- a/bot_bottle/backend/docker/backend.py +++ b/bot_bottle/backend/docker/backend.py @@ -29,7 +29,7 @@ from .. import ActiveAgent, BottleBackend, BottleSpec from . import cleanup as _cleanup from . import enumerate as _enumerate from . import launch as _launch -from . import prepare as _prepare +from . import resolve_plan as _resolve_plan from .bottle import DockerBottle from .bottle_cleanup_plan import DockerBottleCleanupPlan from .bottle_plan import DockerBottlePlan @@ -49,7 +49,7 @@ class DockerBottleBackend(BottleBackend["DockerBottlePlan", "DockerBottleCleanup return shutil.which("docker") is not None def _resolve_plan(self, spec: BottleSpec, *, stage_dir: Path) -> DockerBottlePlan: - return _prepare.resolve_plan(spec, stage_dir=stage_dir) + return _resolve_plan.resolve_plan(spec, stage_dir=stage_dir) @contextmanager def launch(self, plan: DockerBottlePlan) -> Generator[DockerBottle, None, None]: diff --git a/bot_bottle/backend/docker/prepare.py b/bot_bottle/backend/docker/resolve_plan.py similarity index 100% rename from bot_bottle/backend/docker/prepare.py rename to bot_bottle/backend/docker/resolve_plan.py diff --git a/bot_bottle/backend/smolmachines/backend.py b/bot_bottle/backend/smolmachines/backend.py index 6387da1..a57cc9f 100644 --- a/bot_bottle/backend/smolmachines/backend.py +++ b/bot_bottle/backend/smolmachines/backend.py @@ -17,7 +17,7 @@ from .. import ActiveAgent, Bottle, BottleBackend, BottleSpec from . import cleanup as _cleanup from . import enumerate as _enumerate from . import launch as _launch -from . import prepare as _prepare +from . import resolve_plan as _resolve_plan from . import smolvm as _smolvm from .bottle import SmolmachinesBottle from .bottle_cleanup_plan import SmolmachinesBottleCleanupPlan @@ -44,7 +44,7 @@ class SmolmachinesBottleBackend( def _resolve_plan( self, spec: BottleSpec, *, stage_dir: Path ) -> SmolmachinesBottlePlan: - return _prepare.resolve_plan(spec, stage_dir=stage_dir) + return _resolve_plan.resolve_plan(spec, stage_dir=stage_dir) @contextmanager def launch( diff --git a/bot_bottle/backend/smolmachines/prepare.py b/bot_bottle/backend/smolmachines/resolve_plan.py similarity index 100% rename from bot_bottle/backend/smolmachines/prepare.py rename to bot_bottle/backend/smolmachines/resolve_plan.py diff --git a/tests/unit/test_smolmachines_prepare.py b/tests/unit/test_smolmachines_prepare.py index f300d37..82ee261 100644 --- a/tests/unit/test_smolmachines_prepare.py +++ b/tests/unit/test_smolmachines_prepare.py @@ -50,16 +50,16 @@ class TestSmolmachinesResolveEnv(unittest.TestCase): try: with ( - patch("bot_bottle.backend.smolmachines.prepare.resolve_env", + patch("bot_bottle.backend.smolmachines.resolve_plan.resolve_env", return_value=resolved) as mock_resolve, - patch("bot_bottle.backend.smolmachines.prepare.smolmachines_preflight"), - patch("bot_bottle.backend.smolmachines.prepare.smolmachines_bundle_subnet", + patch("bot_bottle.backend.smolmachines.resolve_plan.smolmachines_preflight"), + patch("bot_bottle.backend.smolmachines.resolve_plan.smolmachines_bundle_subnet", return_value=("10.99.0.0/24", "10.99.0.1", "10.99.0.2")), - patch("bot_bottle.backend.smolmachines.prepare.GitGate") as mock_gg, - patch("bot_bottle.backend.smolmachines.prepare.Egress") as mock_eg, - patch("bot_bottle.backend.smolmachines.prepare.Supervise"), + patch("bot_bottle.backend.smolmachines.resolve_plan.GitGate") as mock_gg, + patch("bot_bottle.backend.smolmachines.resolve_plan.Egress") as mock_eg, + patch("bot_bottle.backend.smolmachines.resolve_plan.Supervise"), patch( - "bot_bottle.backend.smolmachines.prepare.agent_provision_plan" + "bot_bottle.backend.smolmachines.resolve_plan.agent_provision_plan" ) as mock_app, ): mock_gg.return_value.prepare.return_value = MagicMock() @@ -75,7 +75,7 @@ class TestSmolmachinesResolveEnv(unittest.TestCase): ) mock_app.side_effect = lambda **kw: _make_provision(**kw) # type: ignore - from bot_bottle.backend.smolmachines.prepare import resolve_plan + from bot_bottle.backend.smolmachines.resolve_plan import resolve_plan plan = resolve_plan(spec, stage_dir=stage) mock_resolve.assert_called_once_with(manifest, "myagent")