Ship trust-first CLI and runtime defaults
This commit is contained in:
parent
fb718af154
commit
5d63e4c16e
26 changed files with 894 additions and 134 deletions
|
|
@ -4,6 +4,7 @@ from __future__ import annotations
|
|||
|
||||
import argparse
|
||||
import json
|
||||
import sys
|
||||
from typing import Any
|
||||
|
||||
from pyro_mcp import __version__
|
||||
|
|
@ -12,12 +13,135 @@ from pyro_mcp.demo import run_demo
|
|||
from pyro_mcp.ollama_demo import DEFAULT_OLLAMA_BASE_URL, DEFAULT_OLLAMA_MODEL, run_ollama_tool_demo
|
||||
from pyro_mcp.runtime import DEFAULT_PLATFORM, doctor_report
|
||||
from pyro_mcp.vm_environments import DEFAULT_CATALOG_VERSION
|
||||
from pyro_mcp.vm_manager import (
|
||||
DEFAULT_MEM_MIB,
|
||||
DEFAULT_VCPU_COUNT,
|
||||
)
|
||||
|
||||
|
||||
def _print_json(payload: dict[str, Any]) -> None:
|
||||
print(json.dumps(payload, indent=2, sort_keys=True))
|
||||
|
||||
|
||||
def _write_stream(text: str, *, stream: Any) -> None:
|
||||
if text == "":
|
||||
return
|
||||
stream.write(text)
|
||||
stream.flush()
|
||||
|
||||
|
||||
def _print_run_human(payload: dict[str, Any]) -> None:
|
||||
stdout = str(payload.get("stdout", ""))
|
||||
stderr = str(payload.get("stderr", ""))
|
||||
_write_stream(stdout, stream=sys.stdout)
|
||||
_write_stream(stderr, stream=sys.stderr)
|
||||
print(
|
||||
"[run] "
|
||||
f"environment={str(payload.get('environment', 'unknown'))} "
|
||||
f"execution_mode={str(payload.get('execution_mode', 'unknown'))} "
|
||||
f"exit_code={int(payload.get('exit_code', 1))} "
|
||||
f"duration_ms={int(payload.get('duration_ms', 0))}",
|
||||
file=sys.stderr,
|
||||
flush=True,
|
||||
)
|
||||
|
||||
|
||||
def _print_env_list_human(payload: dict[str, Any]) -> None:
|
||||
print(f"Catalog version: {payload.get('catalog_version', 'unknown')}")
|
||||
environments = payload.get("environments")
|
||||
if not isinstance(environments, list) or not environments:
|
||||
print("No environments found.")
|
||||
return
|
||||
for entry in environments:
|
||||
if not isinstance(entry, dict):
|
||||
continue
|
||||
status = "installed" if bool(entry.get("installed")) else "not installed"
|
||||
print(
|
||||
f"{str(entry.get('name', 'unknown'))} [{status}] "
|
||||
f"{str(entry.get('description', '')).strip()}".rstrip()
|
||||
)
|
||||
|
||||
|
||||
def _print_env_detail_human(payload: dict[str, Any], *, action: str) -> None:
|
||||
print(f"{action}: {str(payload.get('name', 'unknown'))}")
|
||||
print(f"Version: {str(payload.get('version', 'unknown'))}")
|
||||
print(
|
||||
f"Distribution: {str(payload.get('distribution', 'unknown'))} "
|
||||
f"{str(payload.get('distribution_version', 'unknown'))}"
|
||||
)
|
||||
print(f"Installed: {'yes' if bool(payload.get('installed')) else 'no'}")
|
||||
print(f"Cache dir: {str(payload.get('cache_dir', 'unknown'))}")
|
||||
packages = payload.get("default_packages")
|
||||
if isinstance(packages, list) and packages:
|
||||
print("Default packages: " + ", ".join(str(item) for item in packages))
|
||||
description = str(payload.get("description", "")).strip()
|
||||
if description != "":
|
||||
print(f"Description: {description}")
|
||||
if payload.get("installed"):
|
||||
print(f"Install dir: {str(payload.get('install_dir', 'unknown'))}")
|
||||
install_manifest = payload.get("install_manifest")
|
||||
if install_manifest is not None:
|
||||
print(f"Install manifest: {str(install_manifest)}")
|
||||
kernel_image = payload.get("kernel_image")
|
||||
if kernel_image is not None:
|
||||
print(f"Kernel image: {str(kernel_image)}")
|
||||
rootfs_image = payload.get("rootfs_image")
|
||||
if rootfs_image is not None:
|
||||
print(f"Rootfs image: {str(rootfs_image)}")
|
||||
registry = payload.get("oci_registry")
|
||||
repository = payload.get("oci_repository")
|
||||
reference = payload.get("oci_reference")
|
||||
if isinstance(registry, str) and isinstance(repository, str) and isinstance(reference, str):
|
||||
print(f"OCI source: {registry}/{repository}:{reference}")
|
||||
|
||||
|
||||
def _print_prune_human(payload: dict[str, Any]) -> None:
|
||||
count = int(payload.get("count", 0))
|
||||
print(f"Deleted {count} cached environment entr{'y' if count == 1 else 'ies'}.")
|
||||
deleted = payload.get("deleted_environment_dirs")
|
||||
if isinstance(deleted, list):
|
||||
for entry in deleted:
|
||||
print(f"- {entry}")
|
||||
|
||||
|
||||
def _print_doctor_human(payload: dict[str, Any]) -> None:
|
||||
issues = payload.get("issues")
|
||||
runtime_ok = bool(payload.get("runtime_ok"))
|
||||
print(f"Platform: {str(payload.get('platform', 'unknown'))}")
|
||||
print(f"Runtime: {'PASS' if runtime_ok else 'FAIL'}")
|
||||
kvm = payload.get("kvm")
|
||||
if isinstance(kvm, dict):
|
||||
print(
|
||||
"KVM: "
|
||||
f"exists={'yes' if bool(kvm.get('exists')) else 'no'} "
|
||||
f"readable={'yes' if bool(kvm.get('readable')) else 'no'} "
|
||||
f"writable={'yes' if bool(kvm.get('writable')) else 'no'}"
|
||||
)
|
||||
runtime = payload.get("runtime")
|
||||
if isinstance(runtime, dict):
|
||||
print(f"Environment cache: {str(runtime.get('cache_dir', 'unknown'))}")
|
||||
capabilities = runtime.get("capabilities")
|
||||
if isinstance(capabilities, dict):
|
||||
print(
|
||||
"Capabilities: "
|
||||
f"vm_boot={'yes' if bool(capabilities.get('supports_vm_boot')) else 'no'} "
|
||||
f"guest_exec={'yes' if bool(capabilities.get('supports_guest_exec')) else 'no'} "
|
||||
"guest_network="
|
||||
f"{'yes' if bool(capabilities.get('supports_guest_network')) else 'no'}"
|
||||
)
|
||||
networking = payload.get("networking")
|
||||
if isinstance(networking, dict):
|
||||
print(
|
||||
"Networking: "
|
||||
f"tun={'yes' if bool(networking.get('tun_available')) else 'no'} "
|
||||
f"ip_forward={'yes' if bool(networking.get('ip_forward_enabled')) else 'no'}"
|
||||
)
|
||||
if isinstance(issues, list) and issues:
|
||||
print("Issues:")
|
||||
for issue in issues:
|
||||
print(f"- {issue}")
|
||||
|
||||
|
||||
def _build_parser() -> argparse.ArgumentParser:
|
||||
parser = argparse.ArgumentParser(
|
||||
description="pyro CLI for curated ephemeral Linux environments."
|
||||
|
|
@ -27,15 +151,19 @@ def _build_parser() -> argparse.ArgumentParser:
|
|||
|
||||
env_parser = subparsers.add_parser("env", help="Inspect and manage curated environments.")
|
||||
env_subparsers = env_parser.add_subparsers(dest="env_command", required=True)
|
||||
env_subparsers.add_parser("list", help="List official environments.")
|
||||
list_parser = env_subparsers.add_parser("list", help="List official environments.")
|
||||
list_parser.add_argument("--json", action="store_true")
|
||||
pull_parser = env_subparsers.add_parser(
|
||||
"pull",
|
||||
help="Install an environment into the local cache.",
|
||||
)
|
||||
pull_parser.add_argument("environment")
|
||||
pull_parser.add_argument("--json", action="store_true")
|
||||
inspect_parser = env_subparsers.add_parser("inspect", help="Inspect one environment.")
|
||||
inspect_parser.add_argument("environment")
|
||||
env_subparsers.add_parser("prune", help="Delete stale cached environments.")
|
||||
inspect_parser.add_argument("--json", action="store_true")
|
||||
prune_parser = env_subparsers.add_parser("prune", help="Delete stale cached environments.")
|
||||
prune_parser.add_argument("--json", action="store_true")
|
||||
|
||||
mcp_parser = subparsers.add_parser("mcp", help="Run the MCP server.")
|
||||
mcp_subparsers = mcp_parser.add_subparsers(dest="mcp_command", required=True)
|
||||
|
|
@ -43,15 +171,18 @@ def _build_parser() -> argparse.ArgumentParser:
|
|||
|
||||
run_parser = subparsers.add_parser("run", help="Run one command inside an ephemeral VM.")
|
||||
run_parser.add_argument("environment")
|
||||
run_parser.add_argument("--vcpu-count", type=int, required=True)
|
||||
run_parser.add_argument("--mem-mib", type=int, required=True)
|
||||
run_parser.add_argument("--vcpu-count", type=int, default=DEFAULT_VCPU_COUNT)
|
||||
run_parser.add_argument("--mem-mib", type=int, default=DEFAULT_MEM_MIB)
|
||||
run_parser.add_argument("--timeout-seconds", type=int, default=30)
|
||||
run_parser.add_argument("--ttl-seconds", type=int, default=600)
|
||||
run_parser.add_argument("--network", action="store_true")
|
||||
run_parser.add_argument("--allow-host-compat", action="store_true")
|
||||
run_parser.add_argument("--json", action="store_true")
|
||||
run_parser.add_argument("command_args", nargs="*")
|
||||
|
||||
doctor_parser = subparsers.add_parser("doctor", help="Inspect runtime and host diagnostics.")
|
||||
doctor_parser.add_argument("--platform", default=DEFAULT_PLATFORM)
|
||||
doctor_parser.add_argument("--json", action="store_true")
|
||||
|
||||
demo_parser = subparsers.add_parser("demo", help="Run built-in demos.")
|
||||
demo_subparsers = demo_parser.add_subparsers(dest="demo_command")
|
||||
|
|
@ -77,40 +208,72 @@ def main() -> None:
|
|||
pyro = Pyro()
|
||||
if args.command == "env":
|
||||
if args.env_command == "list":
|
||||
_print_json(
|
||||
{
|
||||
"catalog_version": DEFAULT_CATALOG_VERSION,
|
||||
"environments": pyro.list_environments(),
|
||||
}
|
||||
)
|
||||
list_payload: dict[str, Any] = {
|
||||
"catalog_version": DEFAULT_CATALOG_VERSION,
|
||||
"environments": pyro.list_environments(),
|
||||
}
|
||||
if bool(args.json):
|
||||
_print_json(list_payload)
|
||||
else:
|
||||
_print_env_list_human(list_payload)
|
||||
return
|
||||
if args.env_command == "pull":
|
||||
_print_json(dict(pyro.pull_environment(args.environment)))
|
||||
pull_payload = pyro.pull_environment(args.environment)
|
||||
if bool(args.json):
|
||||
_print_json(pull_payload)
|
||||
else:
|
||||
_print_env_detail_human(pull_payload, action="Pulled")
|
||||
return
|
||||
if args.env_command == "inspect":
|
||||
_print_json(dict(pyro.inspect_environment(args.environment)))
|
||||
inspect_payload = pyro.inspect_environment(args.environment)
|
||||
if bool(args.json):
|
||||
_print_json(inspect_payload)
|
||||
else:
|
||||
_print_env_detail_human(inspect_payload, action="Environment")
|
||||
return
|
||||
if args.env_command == "prune":
|
||||
_print_json(dict(pyro.prune_environments()))
|
||||
prune_payload = pyro.prune_environments()
|
||||
if bool(args.json):
|
||||
_print_json(prune_payload)
|
||||
else:
|
||||
_print_prune_human(prune_payload)
|
||||
return
|
||||
if args.command == "mcp":
|
||||
pyro.create_server().run(transport="stdio")
|
||||
return
|
||||
if args.command == "run":
|
||||
command = _require_command(args.command_args)
|
||||
result = pyro.run_in_vm(
|
||||
environment=args.environment,
|
||||
command=command,
|
||||
vcpu_count=args.vcpu_count,
|
||||
mem_mib=args.mem_mib,
|
||||
timeout_seconds=args.timeout_seconds,
|
||||
ttl_seconds=args.ttl_seconds,
|
||||
network=args.network,
|
||||
)
|
||||
_print_json(result)
|
||||
try:
|
||||
result = pyro.run_in_vm(
|
||||
environment=args.environment,
|
||||
command=command,
|
||||
vcpu_count=args.vcpu_count,
|
||||
mem_mib=args.mem_mib,
|
||||
timeout_seconds=args.timeout_seconds,
|
||||
ttl_seconds=args.ttl_seconds,
|
||||
network=args.network,
|
||||
allow_host_compat=args.allow_host_compat,
|
||||
)
|
||||
except Exception as exc: # noqa: BLE001
|
||||
if bool(args.json):
|
||||
_print_json({"ok": False, "error": str(exc)})
|
||||
else:
|
||||
print(f"[error] {exc}", file=sys.stderr, flush=True)
|
||||
raise SystemExit(1) from exc
|
||||
if bool(args.json):
|
||||
_print_json(result)
|
||||
else:
|
||||
_print_run_human(result)
|
||||
exit_code = int(result.get("exit_code", 1))
|
||||
if exit_code != 0:
|
||||
raise SystemExit(exit_code)
|
||||
return
|
||||
if args.command == "doctor":
|
||||
_print_json(doctor_report(platform=args.platform))
|
||||
payload = doctor_report(platform=args.platform)
|
||||
if bool(args.json):
|
||||
_print_json(payload)
|
||||
else:
|
||||
_print_doctor_human(payload)
|
||||
return
|
||||
if args.command == "demo" and args.demo_command == "ollama":
|
||||
try:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue