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
12 changes: 11 additions & 1 deletion src/agent_env/bundle/plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
from agent_env.env.envs.computer.driver_env import ComputerDriverEnv
from agent_env.env.envs.computer.utils import sites
from agent_env.env.envs.mcp_server import MCPServerEnv
from agent_env.env.envs import _multi_computers
from agent_env.env.envs.multi_env import MultiEnv
from agent_env.env.envs.website import WebsiteEnv
from agent_env.env.published_images import published_bundle_image
Expand Down Expand Up @@ -894,7 +895,8 @@ def _check_multi_names(self, closure: set[_Key], store_latest: dict[tuple[Entity
"""Each env of a multi runs as containers its environment_name names: an MCP server as one by that name, a
website as its backend's and frontend's. No two of a multi's envs may name one container, and a provider
other than the core's, which gives a multi one env card, can't tell an MCP server and a website of one name
apart. Nor may two of its websites claim one name."""
apart. Nor may two of its websites claim one name. A computer runs on a sandbox of its own, which the gateway
knows by its name alone, and serves its tools under it (``_multi_computers.name_problems``)."""
for key in sorted(closure, key=self.rank.__getitem__):
source = self.nodes[key]
if isinstance(source, BundleImage) or source.entry.kind is not BundleKind.ENV:
Expand All @@ -904,6 +906,7 @@ def _check_multi_names(self, closure: set[_Key], store_latest: dict[tuple[Entity
where = self._path(source.entry)
taken: dict[str, str] = {} # each container a child runs as, by the field naming the child
named: dict[str, set[str]] = {} # the environment_names of each list's envs
computers: list[str] = [] # the computers' environment_names, in order
claimed = [sites.Claim(domain, sites.SYNTHETIC, ref.where) for ref in source.references
if ref.where.startswith("website_envs[")
for domain in dict.fromkeys(self._domains(ref, store_latest))]
Expand All @@ -916,6 +919,9 @@ def _check_multi_names(self, closure: set[_Key], store_latest: dict[tuple[Entity
continue
group = ref.where.partition("[")[0]
named.setdefault(group, set()).add(name)
if group == "computer_envs":
computers.append(name)
continue
containers = [name] if group == "mcp_server_envs" else [
f"{name}-{AGENT_ENV_WEBSITE_BACKEND_SUFFIX}", f"{name}-{AGENT_ENV_WEBSITE_FRONTEND_SUFFIX}"]
clash = next((container for container in containers if container in taken), None)
Expand All @@ -924,6 +930,8 @@ def _check_multi_names(self, closure: set[_Key], store_latest: dict[tuple[Entity
f"{clash!r}, as {taken[clash]}'s does; each env of a multi needs its own")
else:
taken.update(dict.fromkeys(containers, ref.where))
self.problems += [f"{where}: computer_envs: {problem}" for problem in _multi_computers.name_problems(
computers, mcp_servers=named.get("mcp_server_envs", ()), websites=named.get("website_envs", ()))]
provider_type = source.config.get("env_provider_type", EnvironmentGatewayProvider.type)
try:
provider = _env_provider_class(provider_type)
Expand All @@ -935,6 +943,8 @@ def _check_multi_names(self, closure: set[_Key], store_latest: dict[tuple[Entity
website_names=named.get("website_envs", ()))
if reason is not None:
self.problems.append(f"{where}: env_provider_type {provider_type!r} {reason}; rename one")
if (reason := provider_refusal(provider, MultiEnv, computer_names=computers)) is not None:
self.problems.append(f"{where}: env_provider_type {provider_type!r} {reason}")

def _check_environment_names(self, closure: set[_Key],
store_latest: dict[tuple[EntityKind, str], int] | None) -> None:
Expand Down
62 changes: 33 additions & 29 deletions src/agent_env/cli/env/multi.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from agent_env.artifact import EnvironmentArtifact, EnvironmentUniverseArtifact
from agent_env.cli.utils import detect_base_metadata, env_provider_type_option
from agent_env.env import Env, MultiEnv
from agent_env.env.envs.computer import COMPUTER_ENV_TYPE


def parse_env_ref(ref: str) -> tuple[str, int | None]:
Expand All @@ -25,40 +26,25 @@ def multi():
@click.option("--id", "env_id", required=True, help="Env id")
@click.option("--mcp-server", "mcp_servers", multiple=True, help="MCPServerEnv id[:version]")
@click.option("--website", "websites", multiple=True, help="WebsiteEnv id[:version]")
@click.option("--computer", "computers", multiple=True,
help="ComputerEnv id[:version], deployed on a sandbox of its own; its tools are served under its "
"environment_name and '_'")
@click.option("--metadata", "metadata_pairs", multiple=True, help="Metadata key=value pair (repeatable)")
@click.option("--name", default=None, help="Name agents see this env's MCP server under, e.g. crm -> mcp__crm__<tool> (default: env + 4 random digits per deploy)")
@env_provider_type_option("What deploys the env: 'gateway' (a gateway in front of its servers and websites, whatever their own "
"env_provider_type), or the type of an installed agent_env.env_providers plugin, which deploys them all", "multi")
@click.option("--validate", "run_validation", is_flag=True, default=False, help="Validate the environment after registering it")
def put(env_id: str, mcp_servers: tuple[str, ...], websites: tuple[str, ...], metadata_pairs: tuple[str, ...], name: str | None, env_provider_type: str,
run_validation: bool):
"""Create a MultiEnv from MCPServerEnv and/or WebsiteEnv ids."""
def put(env_id: str, mcp_servers: tuple[str, ...], websites: tuple[str, ...], computers: tuple[str, ...],
metadata_pairs: tuple[str, ...], name: str | None, env_provider_type: str, run_validation: bool):
"""Create a MultiEnv from MCPServerEnv, WebsiteEnv and ComputerEnv ids."""

if not mcp_servers and not websites:
click.echo("Error: At least one of --mcp-server or --website must be provided.", err=True)
if not mcp_servers and not websites and not computers:
click.echo("Error: At least one of --mcp-server, --website or --computer must be provided.", err=True)
raise SystemExit(1)

mcp_server_envs = []
for ref in mcp_servers:
server_id, server_version = parse_env_ref(ref)
click.echo(f"Fetching MCPServerEnv: id={server_id} version={server_version or 'latest'}...")
env = Env.get(server_id, version=server_version)
if env.type != "mcp_server":
click.echo(f"Error: {server_id} is type '{env.type}', expected 'mcp_server'", err=True)
raise SystemExit(1)
mcp_server_envs.append(env)
click.echo(f" Found: id={env.id} version={env.version}")

website_envs = []
for ref in websites:
website_id, website_version = parse_env_ref(ref)
click.echo(f"Fetching WebsiteEnv: id={website_id} version={website_version or 'latest'}...")
env = Env.get(website_id, version=website_version)
if env.type != "website":
click.echo(f"Error: {website_id} is type '{env.type}', expected 'website'", err=True)
raise SystemExit(1)
website_envs.append(env)
click.echo(f" Found: id={env.id} version={env.version}")
mcp_server_envs = _fetch(mcp_servers, "mcp_server", "MCPServerEnv")
website_envs = _fetch(websites, "website", "WebsiteEnv")
computer_envs = _fetch(computers, COMPUTER_ENV_TYPE, "ComputerEnv")

user_metadata = {}
for pair in metadata_pairs:
Expand All @@ -69,21 +55,39 @@ def put(env_id: str, mcp_servers: tuple[str, ...], websites: tuple[str, ...], me
metadata = detect_base_metadata()
metadata.update(user_metadata)

refusal = MultiEnv(id=env_id, version=None, mcp_server_envs=mcp_server_envs, website_envs=website_envs, name=name,
env_provider_type=env_provider_type).deploy_refusal()
try:
refusal = MultiEnv(id=env_id, version=None, mcp_server_envs=mcp_server_envs, website_envs=website_envs, name=name,
env_provider_type=env_provider_type, computer_envs=computer_envs).save_refusal()
except ValueError as e:
refusal = str(e)
if refusal:
click.echo(f"Error: {refusal}", err=True)
raise SystemExit(1)
click.echo("Creating MultiEnv...")
multi_env = MultiEnv.put(id=env_id, mcp_server_envs=mcp_server_envs, website_envs=website_envs, metadata=metadata if metadata else None, name=name,
env_provider_type=env_provider_type)
env_provider_type=env_provider_type, computer_envs=computer_envs)
click.echo(f"Created MultiEnv: id={multi_env.id} version={multi_env.version} env_provider_type={multi_env.env_provider_type}")
if run_validation:
click.echo("\nValidating environment...")
instance_id = asyncio.run(multi_env.validate(on_progress=click.echo))
click.echo(f"Validation task: {instance_id}")


def _fetch(refs: tuple[str, ...], env_type: str, label: str) -> list[Env]:
"""The env each of ``refs`` (id[:version]) names, exiting unless each is an ``env_type`` env."""
envs = []
for ref in refs:
env_id, version = parse_env_ref(ref)
click.echo(f"Fetching {label}: id={env_id} version={version or 'latest'}...")
env = Env.get(env_id, version=version)
if env.type != env_type:
click.echo(f"Error: {env_id} is type '{env.type}', expected '{env_type}'", err=True)
raise SystemExit(1)
envs.append(env)
click.echo(f" Found: id={env.id} version={env.version}")
return envs


@multi.command(name="load-environment-universe-artifact")
@click.option("--env-instance-id", "env_instance_id", required=True, help="Deployed env instance ID")
@click.option("--environment-universe-artifact-id", "environment_universe_artifact_id",
Expand Down
7 changes: 6 additions & 1 deletion src/agent_env/env/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ class DeployedGatewayEnv(DeployedSandboxEnv):
# Ids of the EnvStateInstance record(s) this deploy's state was provisioned into
# (one today — one backend per deploy). The forward pointer deploy -> state store.
env_state_instance_ids: list[str] = field(default_factory=list)
# Each child env on a sandbox of its own, which the gateway fronts (a multi env's computers): its own deploy record,
# by its environment name.
child_envs: dict[str, dict] = field(default_factory=dict)

@classmethod
def _fields_from(cls, data: dict) -> dict:
Expand All @@ -248,6 +251,7 @@ def _fields_from(cls, data: dict) -> dict:
"website_frontend_urls": data.get("website_frontend_urls"),
"vnc_url": data.get("vnc_url"),
"env_state_instance_ids": data.get("env_state_instance_ids") or [],
"child_envs": data.get("child_envs") or {},
}


Expand Down Expand Up @@ -562,4 +566,5 @@ def _record_class(data: dict) -> type[DeployedEnv]:


# A record carrying any of these is a gateway's. Not gateway_mode: an older kernel writes its default into any record it round-trips.
_GATEWAY_ONLY_FIELDS = ("gateway_url", "db_web_url", "db_mcp_url", "website_frontend_urls", "vnc_url", "env_state_instance_ids")
_GATEWAY_ONLY_FIELDS = ("gateway_url", "db_web_url", "db_mcp_url", "website_frontend_urls", "vnc_url", "env_state_instance_ids",
"child_envs")
13 changes: 9 additions & 4 deletions src/agent_env/env/envs/_deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,24 +297,29 @@ def deploy_refusal(env: Env, provider: EnvironmentProvider | type[EnvironmentPro
provider_class = provider if isinstance(provider, type) else type(provider)
reason = provider_refusal(provider_class, type(env),
mcp_names=[child.environment_name for child in getattr(env, "mcp_server_envs", ())],
website_names=[child.environment_name for child in getattr(env, "website_envs", ())])
website_names=[child.environment_name for child in getattr(env, "website_envs", ())],
computer_names=[child.environment_name for child in getattr(env, "computer_envs", ())])
if reason is not None:
return f"env '{env.id}' has env_provider_type '{env.env_provider_type}', which {reason}"
return option_refusal(env, provider, options)


def provider_refusal(provider_class: type[EnvironmentProvider], env_class: type[Env], *, mcp_names: Iterable[str] = (),
website_names: Iterable[str] = ()) -> str | None:
website_names: Iterable[str] = (), computer_names: Iterable[str] = ()) -> str | None:
"""Why a provider of provider_class can't deploy an env of env_class, a multi's with children of these environment_names, worded
to follow the provider's type, or None: the server provider deploys one MCP server, and a plugin's provider gives a multi one
env card, which can't tell an MCP server and a website of one name apart. It needs no env, so a bundle checks it before writing one."""
to follow the provider's type, or None: the server provider deploys one MCP server, a plugin's provider gives a multi one
env card, which can't tell an MCP server and a website of one name apart, and only a provider whose deploy() takes
``children`` deploys a multi's computers. It needs no env, so a bundle checks it before writing one."""
from agent_env.env.envs.mcp_server import MCPServerEnv
from agent_env.env.envs.multi_env import MultiEnv
from agent_env.providers.env_providers.env_provider import _SandboxEnvironmentProvider
from agent_env.providers.env_providers.env_server_provider import EnvironmentServerProvider

if issubclass(provider_class, EnvironmentServerProvider) and not issubclass(env_class, MCPServerEnv):
return f"deploys one MCP server, not a {env_class.type} env"
computer_names = list(computer_names)
if computer_names and "children" not in inspect.signature(provider_class.deploy).parameters:
return f"deploys no computers, so not its {', '.join(map(repr, computer_names))}"
if issubclass(env_class, MultiEnv) and not issubclass(provider_class, _SandboxEnvironmentProvider):
if shared := set(mcp_names) & set(website_names):
return (f"gives a multi one env card, so it can't tell an MCP server and a website apart by name, and both are named "
Expand Down
Loading
Loading