Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

feat(cyclops): support optional pool TTL (#7316)

r33drichards4f605ff08900
diff --git a/libs/fleet/e2e/pools.spec.ts b/libs/fleet/e2e/pools.spec.ts
index 770589a162..b33a0b0e63 100644
--- a/libs/fleet/e2e/pools.spec.ts
+++ b/libs/fleet/e2e/pools.spec.ts
@@ -312,11 +312,77 @@ test.describe("Pool creation", () => {
await expect(page.getByPlaceholder("my-pool")).toBeVisible()
// Numeric inputs (vCPU, replicas)
await expect(page.getByRole("spinbutton").first()).toBeVisible()
+ await expect(
+ page.getByRole("spinbutton", { name: "Time to live (seconds)" }),
+ ).toHaveValue("")
// Services section has an "Add service" button
await expect(page.getByRole("button", { name: "Add service" })).toBeVisible()
})
+ test("submits an optional time to live in seconds", async ({ page }) => {
+ await mockAuth(page)
+ await mockNamespacesApi(page)
+ await mockPoolsApi(page)
+ let submittedTtl: number | undefined
+ await page.route(
+ "**/api/k8s/apis/osgym.cua.ai/v1alpha1/namespaces/*/osgymsandboxwarmpools",
+ async route => {
+ if (route.request().method() !== "POST") return route.fallback()
+ const body = route.request().postDataJSON() as {
+ spec: { replicas: number; ttlSecondsAfterCreated?: number }
+ }
+ submittedTtl = body.spec.ttlSecondsAfterCreated
+ await route.fulfill({
+ status: 201,
+ contentType: "application/json",
+ body: JSON.stringify({
+ ...body,
+ status: { replicas: body.spec.replicas },
+ }),
+ })
+ },
+ )
+
+ await page.goto("/pools/new")
+ await page.getByRole("textbox", { name: "Name" }).fill("ttl-pool")
+ await page
+ .getByRole("spinbutton", { name: "Time to live (seconds)" })
+ .fill("3600")
+ await page.getByRole("button", { name: "Create" }).click()
+
+ await expect.poll(() => submittedTtl).toBe(3600)
+ })
+
+ test("rejects a negative time to live", async ({ page }) => {
+ await mockAuth(page)
+ await mockNamespacesApi(page)
+ await mockPoolsApi(page)
+ let createRequests = 0
+ await page.route(
+ "**/api/k8s/apis/osgym.cua.ai/v1alpha1/namespaces/*/osgymsandboxwarmpools",
+ route => {
+ if (route.request().method() !== "POST") return route.fallback()
+ createRequests += 1
+ return route.fulfill({ status: 500, body: "unexpected create" })
+ },
+ )
+
+ await page.goto("/pools/new")
+ await page.getByRole("textbox", { name: "Name" }).fill("ttl-pool")
+ const ttl = page.getByRole("spinbutton", {
+ name: "Time to live (seconds)",
+ })
+ await ttl.fill("-1")
+ await page.getByRole("button", { name: "Create" }).click()
+
+ await expect(ttl).toBeFocused()
+ await expect(
+ page.getByText("Time to live must be a non-negative whole number."),
+ ).toBeVisible()
+ expect(createRequests).toBe(0)
+ })
+
test("invalid submission focuses the name and cancel protects unsaved work", async ({
page,
}) => {
@@ -454,6 +520,7 @@ test.describe("Pool duplication", () => {
metadata: { name: "demo-pool", namespace: "demo-pool" },
spec: {
replicas: 3,
+ ttlSecondsAfterCreated: 7200,
sandboxTemplateRef: { name: "demo-pool-template" },
},
status: { replicas: 3, readyReplicas: 3 },
@@ -531,6 +598,9 @@ test.describe("Pool duplication", () => {
await expect(page.getByRole("textbox", { name: "OCI image" })).toHaveValue(
"custom-image:v1",
)
+ await expect(
+ page.getByRole("spinbutton", { name: "Time to live (seconds)" }),
+ ).toHaveValue("7200")
})
})
diff --git a/libs/fleet/e2e/sdk-builders.spec.ts b/libs/fleet/e2e/sdk-builders.spec.ts
index 53e94d507e..d32b455b11 100644
--- a/libs/fleet/e2e/sdk-builders.spec.ts
+++ b/libs/fleet/e2e/sdk-builders.spec.ts
@@ -74,6 +74,7 @@ test.describe("SDK builders", () => {
ram: "8Gi",
ociImage: "registry.example/cyclops:v1",
replicas: 2,
+ ttlSecondsAfterCreated: 3600,
firmware: "efi" as const,
services: [
{ name: "ssh", targetPort: 22, protocol: "TCP" },
@@ -89,6 +90,7 @@ test.describe("SDK builders", () => {
replicas: pool.spec.replicas,
template: pool.spec.sandboxTemplateRef.name,
autoscaling: pool.spec.autoscaling,
+ ttlSecondsAfterCreated: pool.spec.ttlSecondsAfterCreated,
},
template: {
namespace: template.namespace,
@@ -110,6 +112,7 @@ test.describe("SDK builders", () => {
replicas: 2,
template: "demo-pool-template",
autoscaling: { minPoolSize: 1, initialPoolSize: 2, maxPoolSize: 5 },
+ ttlSecondsAfterCreated: 3600,
})
expect(result.template).toEqual({
namespace: "demo-pool",
diff --git a/libs/fleet/src/fleet/models.ts b/libs/fleet/src/fleet/models.ts
index d5b89a73eb..c478ce94b9 100644
--- a/libs/fleet/src/fleet/models.ts
+++ b/libs/fleet/src/fleet/models.ts
@@ -17,6 +17,7 @@ export interface PoolTemplateConfig {
ram: string
ociImage: string
replicas: number
+ ttlSecondsAfterCreated?: number
firmware?: "bios" | "efi"
services?: PoolService[]
probes?: {
diff --git a/libs/fleet/src/fleet/pools.ts b/libs/fleet/src/fleet/pools.ts
index b6b8d4158f..d4f844d154 100644
--- a/libs/fleet/src/fleet/pools.ts
+++ b/libs/fleet/src/fleet/pools.ts
@@ -74,6 +74,7 @@ function poolData(pool: Pool, template: Template): PoolData {
cpu: vm.cpuCores ?? 0,
ram: vm.memory ?? "",
ociImage: vm.containerDiskImage,
+ ttlSecondsAfterCreated: pool.spec.ttlSecondsAfterCreated,
firmware: vm.firmware === Firmware.Efi ? "efi" : undefined,
services: (vm.services ?? []).map(service => ({
name: service.name,
@@ -202,6 +203,11 @@ export function buildPoolRequest(
.sandboxTemplateRef(reference)
const autoscaling = buildAutoscaling(values.autoscaling)
if (autoscaling) specBuilder = specBuilder.autoscaling(autoscaling)
+ if (values.ttlSecondsAfterCreated !== undefined) {
+ specBuilder = specBuilder.ttlSecondsAfterCreated(
+ values.ttlSecondsAfterCreated,
+ )
+ }
return new CreatePoolRequestBuilder()
.namespace(namespace)
diff --git a/libs/fleet/src/pages/PoolNew.tsx b/libs/fleet/src/pages/PoolNew.tsx
index 4a0bb4929d..63ef8f2a10 100644
--- a/libs/fleet/src/pages/PoolNew.tsx
+++ b/libs/fleet/src/pages/PoolNew.tsx
@@ -94,6 +94,11 @@ export function PoolNew() {
const [ociImage, setOciImage] = useState(seed.ociImage ?? DEFAULTS.ociImage)
const [firmware, setFirmware] = useState<"bios" | "efi">(seed.firmware ?? "bios")
const [replicas, setReplicas] = useState(String(seed.replicas ?? DEFAULTS.replicas))
+ const [ttlSecondsAfterCreated, setTtlSecondsAfterCreated] = useState(
+ seed.ttlSecondsAfterCreated === undefined
+ ? ""
+ : String(seed.ttlSecondsAfterCreated),
+ )
const [readinessPort, setReadinessPort] = useState(
portFromProbe(seed.probes?.readinessProbe),
)
@@ -124,6 +129,7 @@ export function PoolNew() {
// enforcement point, so the gate fails open on a billing hiccup.
const [cardRequired, setCardRequired] = useState(false)
const nameRef = useRef<InputProps.Ref>(null)
+ const ttlRef = useRef<InputProps.Ref>(null)
useEffect(() => {
if (!billingEnabled || !paymentMethodGateEnabled) return
@@ -157,6 +163,15 @@ export function PoolNew() {
return undefined
}, [name, submitAttempted])
+ const ttlError = useMemo(() => {
+ if (!ttlSecondsAfterCreated.trim()) return undefined
+ const value = Number(ttlSecondsAfterCreated)
+ if (!Number.isInteger(value) || value < 0) {
+ return "Time to live must be a non-negative whole number."
+ }
+ return undefined
+ }, [ttlSecondsAfterCreated])
+
const addService = () => {
setDirty(true)
setServices(prev => [...prev, { id: genId(), name: "", targetPort: "", protocol: "TCP" }])
@@ -196,6 +211,9 @@ export function PoolNew() {
ociImage: ociImage.trim() || DEFAULTS.ociImage,
firmware: firmware !== "bios" ? firmware : undefined,
replicas: parseInt(replicas, 10) || DEFAULTS.replicas,
+ ttlSecondsAfterCreated: ttlSecondsAfterCreated.trim()
+ ? Number(ttlSecondsAfterCreated)
+ : undefined,
services: validServices.length ? validServices : undefined,
probes: Object.keys(probes).length ? probes : undefined,
autoscaling: autoscalingEnabled
@@ -210,8 +228,12 @@ export function PoolNew() {
const create = async () => {
setSubmitAttempted(true)
- if (!name || nameError) {
- nameRef.current?.focus()
+ if (!name || nameError || ttlError) {
+ if (!name || nameError) {
+ nameRef.current?.focus()
+ } else {
+ ttlRef.current?.focus()
+ }
return
}
setSubmitting(true)
@@ -342,6 +364,22 @@ export function PoolNew() {
/>
</FormField>
+ <FormField
+ label="Time to live (seconds)"
+ description="Optional. Automatically deletes the pool after this many seconds. Leave blank for no expiration."
+ errorText={ttlError}
+ >
+ <Input
+ ref={ttlRef}
+ type="number"
+ value={ttlSecondsAfterCreated}
+ onChange={({ detail }) =>
+ setTtlSecondsAfterCreated(detail.value)
+ }
+ placeholder="3600"
+ />
+ </FormField>
+
<FormField
label="Autoscaling"
description="Optional. KEDA scales the pool to its claim demand (the number of claims/VMs in use), and back down when idle (never below Min pool size). Off = the static Replicas above."