diff --git a/src/agent_env/task_step/task_steps/deploy_env.py b/src/agent_env/task_step/task_steps/deploy_env.py index 96a669f65..9f3163ce7 100644 --- a/src/agent_env/task_step/task_steps/deploy_env.py +++ b/src/agent_env/task_step/task_steps/deploy_env.py @@ -77,6 +77,18 @@ def run_state(self, user_overrides: Mapping[str, Any]) -> tuple[str | None, str return (user_overrides.get("env_state_type") or self.env_state_type, user_overrides.get("env_state_instance_id") or self.env_state_instance_id) + def run_env_version(self, context: TaskStepContext) -> Optional[int]: + """The env version a run with ``context`` deploys: this step's ``step_params`` ``env_version`` over its own, + None for the latest.""" + overrides = self.step_param_overrides(context) + if "env_version" not in overrides: + return self.env_version + version = overrides["env_version"] + if version is not None and (isinstance(version, bool) or not isinstance(version, int) or version < 1): + raise ValueError(f"deploy_env '{self.id}': step_overrides 'env_version' must be a positive integer or null, " + f"got {version!r}") + return version + def to_dict(self) -> dict: base = super().to_dict() base["env_id"] = self.env_id @@ -157,7 +169,7 @@ async def execute(self, context: TaskStepContext) -> TaskStepContext: if existing is not None: raise StepContextError(f"Env '{self.env_id}' is already deployed") - env = Env.get(self.env_id, self.env_version) + env = Env.get(self.env_id, self.run_env_version(context)) user_overrides = context.metadata.get("user_overrides", {}) resolved_sandbox_type = user_overrides.get("env_sandbox") or self.sandbox_type resolved_env_state_type, resolved_env_state_instance_id = self.run_state(user_overrides) diff --git a/tst/unit/task_step/deploy_env_test.py b/tst/unit/task_step/deploy_env_test.py index d0f47a62a..fd5cd467d 100644 --- a/tst/unit/task_step/deploy_env_test.py +++ b/tst/unit/task_step/deploy_env_test.py @@ -7,6 +7,7 @@ import pytest from agent_env.env.env import DeployedGatewayEnv, Env +from agent_env.store.base import NotFoundError from agent_env.task_step.context import TaskStepContext from agent_env.task_step.task_steps.deploy_env import DeployEnvTaskStep @@ -572,3 +573,65 @@ async def test_execute_refuses_child_envs_for_an_env_whose_deploy_takes_none(): with patch("agent_env.env.env.Env") as Env, pytest.raises(ValueError, match="have no child envs"): Env.get.return_value = env await step.execute(TaskStepContext()) + + +def _step_params_context(step_params): + return TaskStepContext(metadata={"user_overrides": {"step_params": step_params}}) + + +@pytest.mark.asyncio +async def test_execute_deploys_the_env_version_its_step_params_pin(): + step = DeployEnvTaskStep(id="t-1.deploy_env", version=None, env_id="art-1") + with patch("agent_env.env.env.Env") as Env: + Env.get.return_value = _fake_env(_deployed_env(None)) + await step.execute(_step_params_context({"t-1.deploy_env": {"env_version": 3}})) + Env.get.assert_called_once_with("art-1", 3) + + +@pytest.mark.asyncio +async def test_a_step_params_env_version_wins_over_the_stored_one_and_leaves_the_step_as_stored(): + step = DeployEnvTaskStep(id="t-1.deploy_env", version=None, env_id="art-1", env_version=5) + with patch("agent_env.env.env.Env") as Env: + Env.get.return_value = _fake_env(_deployed_env(None)) + await step.execute(_step_params_context({"t-1.deploy_env": {"env_version": 2}})) + Env.get.assert_called_once_with("art-1", 2) + assert step.env_version == 5 + assert step.to_dict()["env_version"] == 5 + + +@pytest.mark.asyncio +async def test_a_null_step_params_env_version_deploys_the_latest(): + step = DeployEnvTaskStep(id="t-1.deploy_env", version=None, env_id="art-1", env_version=2) + with patch("agent_env.env.env.Env") as Env: + Env.get.return_value = _fake_env(_deployed_env(None)) + await step.execute(_step_params_context({"t-1.deploy_env": {"env_version": None}})) + Env.get.assert_called_once_with("art-1", None) + + +@pytest.mark.asyncio +@pytest.mark.parametrize("step_params", [None, {}, {"other": {"env_version": 3}}, {"t-1.deploy_env": {"ttl_seconds": 60}}]) +async def test_execute_deploys_the_stored_env_version_without_a_step_params_one(step_params): + step = DeployEnvTaskStep(id="t-1.deploy_env", version=None, env_id="art-1", env_version=2) + context = TaskStepContext() if step_params is None else _step_params_context(step_params) + with patch("agent_env.env.env.Env") as Env: + Env.get.return_value = _fake_env(_deployed_env(None)) + await step.execute(context) + Env.get.assert_called_once_with("art-1", 2) + + +@pytest.mark.asyncio +@pytest.mark.parametrize("version", ["3", 0, -1, 2.0, True]) +async def test_execute_refuses_a_step_params_env_version_that_is_no_version_before_it_loads_the_env(version): + step = DeployEnvTaskStep(id="t-1.deploy_env", version=None, env_id="art-1", env_version=2) + with patch("agent_env.env.env.Env") as Env, pytest.raises(ValueError, match="step_overrides 'env_version'"): + await step.execute(_step_params_context({"t-1.deploy_env": {"env_version": version}})) + Env.get.assert_not_called() + + +@pytest.mark.asyncio +async def test_a_step_params_env_version_the_store_lacks_fails_the_deploy(): + step = DeployEnvTaskStep(id="t-1.deploy_env", version=None, env_id="art-1", env_version=2) + with patch("agent_env.env.env.Env") as Env, pytest.raises(NotFoundError): + Env.get.side_effect = NotFoundError("Env art-1 v99 not found") + await step.execute(_step_params_context({"t-1.deploy_env": {"env_version": 99}})) + Env.get.assert_called_once_with("art-1", 99)