mirror of
https://github.com/NVIDIA/OpenShell.git
synced 2026-10-15 05:09:44 +08:00
* feat(workspace): implement workspace model (Phase 1 of RFC 0011) Implements workspace and membership model providing hard isolation boundaries for multi-player OpenShell deployments. Workspace CRUD with Kubernetes-style Terminating phase for graceful deletion. All resources scoped by workspace via ObjectMeta. Membership RPCs for workspace access control. Persistence migration shifts name uniqueness to (object_type, workspace, name). Provider profiles support platform and workspace scoping. Service routing uses workspace-prefixed DNS labels. Inference routes renamed and workspace-scoped with DeleteInferenceRoute RPC. Python SDK with WorkspaceClient, two-method list pattern (workspace-scoped and for_all_workspaces), and workspace parameter on all methods. CLI workspace flags, TUI workspace cycling. K8s driver filters unmanaged CRs and uses delete preconditions. Podman driver uses immutable container IDs. Label serialization fixed across all put_if call sites. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(cli): delegate sandbox upload command to existing upload function The standalone `sandbox upload` command reimplemented upload logic inline with two bugs: it used `Path::exists()` which follows symlinks (rejecting dangling symlinks), and it ran git-aware filtering on symlink sources. The `run::sandbox_upload()` function already handles both cases correctly via `sandbox_upload_plan()`. Replace the inline logic with a call to the existing function. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): shorten sandbox names and fix test compatibility Shorten the sandbox name in initial_sparse_policy_is_acknowledged_as_loaded from 'e2e-2159-sparse-enrich' (22 chars) to 'e2e-sparse-enrich' (17 chars) to comply with MAX_ROUTABLE_NAME_LEN (19 chars). Also capture stderr in create_keep_with_args so future sandbox creation failures include the actual CLI error instead of reporting empty output. Signed-off-by: Derek Carr <decarr@redhat.com> * test(workspace): add test coverage for workspace CRUD and persistence isolation Add unit tests for workspace create happy path, get round-trip, get not-found, get empty-name rejection, already-exists error, and resolve_workspace not-found. Add persistence test proving cross-workspace name uniqueness (same name in different workspaces produces separate records). Add workspace name max-length boundary tests. Fix e2e harness to include stderr in name-parse-failure error path. Align Python e2e test_workspace_crud with try/finally pattern. Document provider profile catalog workspace scoping gap in RFC 0011. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(examples): update examples for workspace model compatibility Shorten sandbox names in demo scripts to fit the 19-character MAX_ROUTABLE_NAME_LEN limit: policy-demo prefix to pd-, multi-agent notepad derives a short SANDBOX_TAG from the run ID, governance interceptor uses gs-PID-RANDOM. Update vscode-remote-sandbox.md SSH host aliases from openshell-{name} to openshell-{name}.{workspace} format. Signed-off-by: Derek Carr <decarr@redhat.com> * feat(sdk): add workspace-scoped client and workspace CRUD Add WorkspaceScopedClient modeled after kube::Api::namespaced — captures workspace once and injects it into every sandbox request. Add workspace CRUD methods (create, get, list, delete) and list_sandboxes_all_workspaces on OpenShellClient. Extend SandboxRef with workspace field and add WorkspaceRef type. Include mock tests for all new operations. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(lint): resolve clippy warnings in workspace test assertions Signed-off-by: Derek Carr <decarr@redhat.com> * fix(docs): convert indented code blocks to fenced in RFC 0011 Signed-off-by: Derek Carr <decarr@redhat.com> * fix(lint): resolve clippy warnings and apply cargo fmt across workspace Auto-format with cargo fmt and fix clippy warnings exposed by the reformat: unnecessary qualifications, map_unwrap_or, identical match arms, unused variable prefix, dead code annotations, and let-unit-value in e2e harness. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): address workspace scoping issues from review - Add workspace field to settings JSON output (CLI) - Skip Podman containers missing workspace label instead of defaulting to empty string, matching K8s driver behavior - Add resource_version to list_by_scope SELECT in both SQLite and Postgres backends, with regression test - Gate PolicyLocalContext proposal/lookup routes on workspace readiness, returning 503 when workspace is not yet discovered - Block sandbox and provider creation in TUI all-workspaces mode - Clear workspace vectors in TUI reset_sandbox_state Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): make provider profile catalog workspace-aware Thread workspace through snapshot_catalog so the EffectiveProviderProfileCatalog enforces workspace boundaries on both read and write paths. UserProviderProfileSource now loads platform-scoped profiles (workspace "") plus the target workspace's profiles, preventing cross-workspace duplicate profile ID collisions that previously caused global catalog failures. Update RFC 0011 to reflect catalog scoping is implemented in Phase 1 rather than deferred to future work. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(persistence): include workspace column in atomic policy revision INSERT put_policy_revision_atomic omitted the workspace column from the INSERT into the objects table in both SQLite and Postgres backends, causing atomically-written policy revisions to lose their workspace association. Add workspace field to AtomicPolicyRevisionWrite and thread it through both backend INSERT statements, matching the non-atomic put_policy_revision path which already included it. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(proxy): skip ancestor walk when socket owner is the entrypoint collect_ancestor_identities walked the entire process tree above the entrypoint when the connecting process was the entrypoint itself, SHA256-hashing every ancestor binary (IDE, shell, container runtime). On dev machines with large binaries in the ancestor chain this exceeded the 30-second test timeout. When start_pid == stop_pid there are no intermediate ancestors to verify, so return an empty list immediately. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): make provider profile catalog scope-aware Allow the same profile ID at platform and workspace scopes by introducing layered catalog entries where workspace profiles shadow platform profiles. Add source and scope fields to the ProviderProfile proto and CLI output. Migrate List/Get handlers to the catalog, fixing divergence with runtime profile resolution. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): align podman e2e labels with centralized driver constants The podman driver moved its container labels to the centralized openshell.ai/ prefix, but the e2e test harness and cleanup script still referenced the old openshell.sandbox-* keys, causing the local_driver_token_restart test to fail on container lookup. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): align python profile isolation test with scope-aware catalog Platform profiles are now visible in workspace listings as fallbacks per the layered catalog design. Update the assertion to match. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): honor profile_workspace in runtime profile resolution Runtime profile lookups now consult provider.profile_workspace via get_type_profile_for_scope. Providers created with --global-profile (profile_workspace="") resolve to the platform profile even when a workspace profile shadows the same ID. All 6 runtime call sites updated; type-only call sites remain scope-agnostic. Signed-off-by: Derek Carr <decarr@redhat.com> --------- Signed-off-by: Derek Carr <decarr@redhat.com>
239 lines
8.2 KiB
Python
239 lines
8.2 KiB
Python
# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
from typing import TYPE_CHECKING
|
|
|
|
from openshell._proto import openshell_pb2
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Callable
|
|
|
|
from openshell import Sandbox, SandboxClient, WorkspaceClient
|
|
|
|
|
|
def test_sandbox_api_crud_and_exec(
|
|
sandbox: Callable[..., Sandbox],
|
|
sandbox_client: SandboxClient,
|
|
) -> None:
|
|
class _FileOps:
|
|
def write(self, path: str, content: str) -> None:
|
|
from pathlib import Path
|
|
|
|
Path(path).write_text(content)
|
|
|
|
def read(self, path: str) -> str:
|
|
from pathlib import Path
|
|
|
|
return Path(path).read_text()
|
|
|
|
with sandbox(delete_on_exit=True) as sb:
|
|
assert sb.id
|
|
# Server auto-generates a petname (e.g. "feasible-retriever")
|
|
assert sb.sandbox.name
|
|
parts = sb.sandbox.name.split("-")
|
|
assert len(parts) == 2, (
|
|
f"expected petname with 2 parts, got {sb.sandbox.name!r}"
|
|
)
|
|
assert all(p.isalpha() and p.islower() for p in parts)
|
|
|
|
fetched = sandbox_client.get(sb.sandbox.name, workspace="default")
|
|
assert fetched.id == sb.id
|
|
|
|
ids = set(sandbox_client.list_ids(workspace="default", limit=100))
|
|
assert sb.id in ids
|
|
|
|
result = sb.exec(["python", "-c", "print('sandbox-ok')"])
|
|
assert result.exit_code == 0
|
|
assert "sandbox-ok" in result.stdout
|
|
|
|
file_ops = _FileOps()
|
|
create_file = sb.exec_python(
|
|
file_ops.write,
|
|
args=("/sandbox/exec-persistence.txt", "ok"),
|
|
)
|
|
assert create_file.exit_code == 0
|
|
|
|
verify_file = sb.exec_python(
|
|
file_ops.read, args=("/sandbox/exec-persistence.txt",)
|
|
)
|
|
assert verify_file.exit_code == 0
|
|
assert verify_file.stdout.strip() == "ok"
|
|
|
|
|
|
def test_sandbox_interactive_exec_honors_tty(
|
|
sandbox: Callable[..., Sandbox],
|
|
sandbox_client: SandboxClient,
|
|
) -> None:
|
|
stdin_sentinel = b"streamed-stdin-sentinel"
|
|
stdout_sentinel = b"stdout-sentinel"
|
|
stderr_sentinel = b"stderr-sentinel"
|
|
|
|
def exec_interactive(sandbox_id: str, *, tty: bool) -> tuple[bytes, bytes]:
|
|
request = openshell_pb2.ExecSandboxInput(
|
|
start=openshell_pb2.ExecSandboxRequest(
|
|
sandbox_id=sandbox_id,
|
|
command=[
|
|
"/bin/sh",
|
|
"-c",
|
|
"[ -t 0 ] && printf T || printf N; "
|
|
"[ -t 1 ] && printf T || printf N; "
|
|
"[ -t 2 ] && printf T || printf N; printf '\\n'; "
|
|
"IFS= read -r stdin_value; "
|
|
"printf 'stdin:%s\\n' \"$stdin_value\"; "
|
|
"printf 'stdout-sentinel\\n'; "
|
|
"printf 'stderr-sentinel\\n' >&2",
|
|
],
|
|
tty=tty,
|
|
timeout_seconds=20,
|
|
)
|
|
)
|
|
|
|
done = threading.Event()
|
|
|
|
def requests():
|
|
yield request
|
|
yield openshell_pb2.ExecSandboxInput(stdin=stdin_sentinel + b"\n")
|
|
done.wait(timeout=30)
|
|
|
|
stdout: list[bytes] = []
|
|
stderr: list[bytes] = []
|
|
exit_code: int | None = None
|
|
try:
|
|
events = sandbox_client._stub.ExecSandboxInteractive(requests(), timeout=30)
|
|
for event in events:
|
|
payload = event.WhichOneof("payload")
|
|
if payload == "stdout":
|
|
stdout.append(bytes(event.stdout.data))
|
|
elif payload == "stderr":
|
|
stderr.append(bytes(event.stderr.data))
|
|
elif payload == "exit":
|
|
exit_code = int(event.exit.exit_code)
|
|
finally:
|
|
done.set()
|
|
|
|
assert exit_code == 0
|
|
return b"".join(stdout), b"".join(stderr)
|
|
|
|
with sandbox(delete_on_exit=True) as sb:
|
|
stdout, stderr = exec_interactive(sb.id, tty=False)
|
|
assert b"NNN" in stdout
|
|
assert b"stdin:" + stdin_sentinel in stdout
|
|
assert stdout_sentinel in stdout
|
|
assert stdout_sentinel not in stderr
|
|
assert stderr_sentinel in stderr
|
|
assert stderr_sentinel not in stdout
|
|
|
|
stdout, stderr = exec_interactive(sb.id, tty=True)
|
|
assert b"TTT" in stdout + stderr
|
|
|
|
|
|
def test_list_scoped_and_for_all_workspaces(
|
|
sandbox_client: SandboxClient,
|
|
workspace_client: "WorkspaceClient",
|
|
) -> None:
|
|
import contextlib
|
|
import uuid
|
|
|
|
suffix = uuid.uuid4().hex[:8]
|
|
other_ws = f"list-ws-{suffix}"
|
|
created_default: list[str] = []
|
|
created_other: list[str] = []
|
|
|
|
try:
|
|
workspace_client.create(other_ws)
|
|
|
|
ref_default = sandbox_client.create(
|
|
workspace="default", name=f"ls-def-{suffix}"
|
|
)
|
|
created_default.append(ref_default.name)
|
|
|
|
ref_other = sandbox_client.create(
|
|
workspace=other_ws, name=f"ls-oth-{suffix}"
|
|
)
|
|
created_other.append(ref_other.name)
|
|
|
|
default_ids = set(sandbox_client.list_ids(workspace="default"))
|
|
assert ref_default.id in default_ids
|
|
assert ref_other.id not in default_ids
|
|
|
|
other_ids = set(sandbox_client.list_ids(workspace=other_ws))
|
|
assert ref_other.id in other_ids
|
|
assert ref_default.id not in other_ids
|
|
|
|
all_ids = set(sandbox_client.list_ids_for_all_workspaces())
|
|
assert ref_default.id in all_ids
|
|
assert ref_other.id in all_ids
|
|
finally:
|
|
for name in created_default:
|
|
with contextlib.suppress(Exception):
|
|
sandbox_client.delete(name, workspace="default")
|
|
sandbox_client.wait_deleted(name, workspace="default")
|
|
for name in created_other:
|
|
with contextlib.suppress(Exception):
|
|
sandbox_client.delete(name, workspace=other_ws)
|
|
sandbox_client.wait_deleted(name, workspace=other_ws)
|
|
with contextlib.suppress(Exception):
|
|
workspace_client.delete(other_ws)
|
|
|
|
|
|
def test_sandbox_labels_and_selectors(sandbox_client: SandboxClient) -> None:
|
|
import contextlib
|
|
import uuid
|
|
|
|
suffix = uuid.uuid4().hex[:8]
|
|
job_a = f"lbl-a-{suffix}"
|
|
job_b = f"lbl-b-{suffix}"
|
|
group_selector = f"aiq-test={suffix}"
|
|
primary_selector = f"aiq-test={suffix},role=primary"
|
|
|
|
created: list[str] = []
|
|
try:
|
|
ref_a = sandbox_client.create(
|
|
workspace="default",
|
|
name=job_a,
|
|
labels={"aiq-test": suffix, "role": "primary"},
|
|
)
|
|
created.append(ref_a.name)
|
|
ref_b = sandbox_client.create(
|
|
workspace="default",
|
|
name=job_b,
|
|
labels={"aiq-test": suffix, "role": "secondary"},
|
|
)
|
|
created.append(ref_b.name)
|
|
|
|
# Labels round-trip through create and get.
|
|
assert ref_a.labels["role"] == "primary"
|
|
assert dict(sandbox_client.get(job_a, workspace="default").labels)["role"] == "primary"
|
|
assert dict(sandbox_client.get(job_b, workspace="default").labels)["role"] == "secondary"
|
|
|
|
# A specific selector filters to exactly the primary sandbox.
|
|
assert {
|
|
s.name for s in sandbox_client.list(workspace="default", label_selector=primary_selector)
|
|
} == {job_a}
|
|
# The shared group label returns both.
|
|
assert {s.name for s in sandbox_client.list(workspace="default", label_selector=group_selector)} == {
|
|
job_a,
|
|
job_b,
|
|
}
|
|
|
|
# Deleting one removes only it from selector results.
|
|
assert sandbox_client.delete(job_a, workspace="default")
|
|
sandbox_client.wait_deleted(job_a, workspace="default")
|
|
created.remove(job_a)
|
|
assert {s.name for s in sandbox_client.list(workspace="default", label_selector=group_selector)} == {
|
|
job_b
|
|
}
|
|
|
|
# Final deletion leaves no matching sandboxes.
|
|
assert sandbox_client.delete(job_b, workspace="default")
|
|
sandbox_client.wait_deleted(job_b, workspace="default")
|
|
created.remove(job_b)
|
|
assert not sandbox_client.list(workspace="default", label_selector=group_selector)
|
|
finally:
|
|
for name in created:
|
|
with contextlib.suppress(Exception):
|
|
sandbox_client.delete(name, workspace="default")
|