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): show pool and claim TTLs (#7314)

r33drichards2fcabb05a341
diff --git a/libs/fleet/e2e/fixtures/mock-api.ts b/libs/fleet/e2e/fixtures/mock-api.ts
index a2179bc09f..9981227c64 100644
--- a/libs/fleet/e2e/fixtures/mock-api.ts
+++ b/libs/fleet/e2e/fixtures/mock-api.ts
@@ -643,6 +643,7 @@ export async function mockPoolsApi(page: Page): Promise<void> {
spec: {
replicas: 2,
sandboxTemplateRef: { name: "demo-pool-template" },
+ ttlSecondsAfterCreated: 3600,
},
status: { replicas: 2, readyReplicas: 2 },
};
@@ -888,6 +889,7 @@ export interface MockClaim {
phase?: "Bound" | "Pending" | "Failed";
sandboxName?: string;
sandboxService?: string;
+ ttlSecondsAfterCreated?: number;
}
export interface MockClaimsApiOptions {
@@ -910,6 +912,7 @@ export async function mockClaimsApi(
phase: "Bound",
sandboxName: "vm-xyz789",
sandboxService: "vm-xyz789-svc",
+ ttlSecondsAfterCreated: 1800,
},
];
const heldLists: Array<ReturnType<typeof deferred>> = [];
@@ -925,6 +928,7 @@ export async function mockClaimsApi(
spec: {
sandboxTemplateRef: { name: "demo-pool-template" },
warmpool: "demo-pool",
+ ttlSecondsAfterCreated: claim.ttlSecondsAfterCreated,
},
status: {
phase: claim.phase ?? "Bound",
diff --git a/libs/fleet/e2e/pools.spec.ts b/libs/fleet/e2e/pools.spec.ts
index b33a0b0e63..ce91a4879e 100644
--- a/libs/fleet/e2e/pools.spec.ts
+++ b/libs/fleet/e2e/pools.spec.ts
@@ -36,8 +36,10 @@ test.describe("Pools page header", () => {
const refreshPools = page.getByRole("button", { name: "Refresh pools" })
const newPool = page.getByRole("button", { name: "New pool" })
const status = page.getByRole("columnheader", { name: "Status" })
+ const ttl = page.getByRole("columnheader", { name: "TTL" })
await expect(mesh).toHaveCount(0)
+ if (viewport.width >= 768) await expect(ttl).toBeVisible()
await expect(page).toHaveTitle("Pools · Cua")
await expect(page.locator(".cua-pagehead canvas")).toHaveCount(0)
const navigationPanel = page.locator('[class*="awsui_navigation-container_"]').first()
@@ -640,6 +642,7 @@ test.describe("Pool detail instances", () => {
await expect(claimedRow).toContainText("Ready")
await expect(claimedRow).toContainText("claim-abc123")
await expect(claimedRow).toContainText("Bound")
+ await expect(claimedRow).toContainText("30m")
await expect(claimedRow.getByRole("button", { name: "Release" })).toBeVisible()
const availableRow = page.getByRole("row").filter({ hasText: "vm-ready456" })
diff --git a/libs/fleet/src/fleet/claims.ts b/libs/fleet/src/fleet/claims.ts
index 2ee81500d1..e89a5a85b3 100644
--- a/libs/fleet/src/fleet/claims.ts
+++ b/libs/fleet/src/fleet/claims.ts
@@ -22,6 +22,7 @@ function claimModel(claim: SdkClaim): Claim {
phase: claim.status?.phase ?? "Pending",
sandboxName: claim.status?.sandbox?.name,
sandboxService: claim.status?.sandbox?.service,
+ ttlSecondsAfterCreated: claim.spec.ttlSecondsAfterCreated,
createdAt: claim.metadata.creationTimestamp ?? "",
}
}
diff --git a/libs/fleet/src/fleet/models.ts b/libs/fleet/src/fleet/models.ts
index c478ce94b9..410d9ad811 100644
--- a/libs/fleet/src/fleet/models.ts
+++ b/libs/fleet/src/fleet/models.ts
@@ -32,6 +32,7 @@ export interface PoolSummary {
namespace: string
replicas: number
availableCount: number
+ ttlSecondsAfterCreated?: number
status: PoolDisplayStatus
}
@@ -49,6 +50,7 @@ export interface Claim {
phase: string
sandboxName?: string
sandboxService?: string
+ ttlSecondsAfterCreated?: number
createdAt: string
}
diff --git a/libs/fleet/src/fleet/pools.ts b/libs/fleet/src/fleet/pools.ts
index d4f844d154..457c01652c 100644
--- a/libs/fleet/src/fleet/pools.ts
+++ b/libs/fleet/src/fleet/pools.ts
@@ -60,6 +60,7 @@ function poolSummary(pool: Pool): PoolSummary {
namespace: pool.metadata.namespace,
replicas: pool.spec.replicas,
availableCount: pool.status?.readyReplicas ?? 0,
+ ttlSecondsAfterCreated: pool.spec.ttlSecondsAfterCreated,
status: poolDisplayStatus(pool),
}
}
diff --git a/libs/fleet/src/fleet/ttl.ts b/libs/fleet/src/fleet/ttl.ts
new file mode 100644
index 0000000000..2c59d036de
--- /dev/null
+++ b/libs/fleet/src/fleet/ttl.ts
@@ -0,0 +1,23 @@
+export function formatTtl(seconds: number | undefined): string {
+ if (seconds === undefined) return "None"
+ if (seconds === 0) return "0s"
+
+ const units = [
+ { label: "d", seconds: 86_400 },
+ { label: "h", seconds: 3_600 },
+ { label: "m", seconds: 60 },
+ { label: "s", seconds: 1 },
+ ]
+ const parts: string[] = []
+ let remaining = seconds
+
+ for (const unit of units) {
+ const value = Math.floor(remaining / unit.seconds)
+ if (value > 0) {
+ parts.push(`${value}${unit.label}`)
+ remaining %= unit.seconds
+ }
+ }
+
+ return parts.join(" ")
+}
diff --git a/libs/fleet/src/pages/PoolDetail.tsx b/libs/fleet/src/pages/PoolDetail.tsx
index fb36f9907a..88f265f4d7 100644
--- a/libs/fleet/src/pages/PoolDetail.tsx
+++ b/libs/fleet/src/pages/PoolDetail.tsx
@@ -23,6 +23,7 @@ import { tombstonePool } from "../fleet/status"
import { CuaButton } from "../components/CuaButton"
import { PageEmpty, PageError } from "../components/PageState"
import { PageShell } from "../components/PageShell"
+import { formatTtl } from "../fleet/ttl"
export function PoolDetail() {
const { namespace = "", name = "" } = useParams()
@@ -621,6 +622,14 @@ function InstancesTable({ pool }: { pool: PoolData }) {
)
},
},
+ {
+ id: "ttl",
+ header: "TTL",
+ cell: (instance: InstanceRow) =>
+ instance.claim
+ ? formatTtl(instance.claim.ttlSecondsAfterCreated)
+ : "-",
+ },
{
id: "age",
header: "Age",
diff --git a/libs/fleet/src/pages/PoolsList.tsx b/libs/fleet/src/pages/PoolsList.tsx
index da0e3ee6f3..0fa2195fb5 100644
--- a/libs/fleet/src/pages/PoolsList.tsx
+++ b/libs/fleet/src/pages/PoolsList.tsx
@@ -18,11 +18,13 @@ import { CuaButton } from "../components/CuaButton"
import { PageEmpty } from "../components/PageState"
import { PageShell } from "../components/PageShell"
import type { PoolSummary } from "../fleet/models"
+import { formatTtl } from "../fleet/ttl"
interface PoolRow {
name: string
namespace: string
replicas: number
+ ttlSecondsAfterCreated?: number
status: PoolSummary["status"]
statusText: string
}
@@ -258,6 +260,7 @@ export function PoolsList() {
columnDisplay={[
{ id: "name", visible: true },
{ id: "replicas", visible: !compactTable },
+ { id: "ttl", visible: !compactTable },
{ id: "status", visible: true },
]}
columnDefinitions={[
@@ -290,6 +293,13 @@ export function PoolsList() {
sortingField: "replicas",
minWidth: 96,
},
+ {
+ id: "ttl",
+ header: "TTL",
+ cell: p => formatTtl(p.ttlSecondsAfterCreated),
+ sortingField: "ttlSecondsAfterCreated",
+ minWidth: 96,
+ },
{
id: "status",
header: "Status",
diff --git a/libs/fleet/tests/ttl.test.ts b/libs/fleet/tests/ttl.test.ts
new file mode 100644
index 0000000000..e9a07ec9b1
--- /dev/null
+++ b/libs/fleet/tests/ttl.test.ts
@@ -0,0 +1,10 @@
+import assert from "node:assert/strict"
+import test from "node:test"
+import { formatTtl } from "../src/fleet/ttl"
+
+test("formats TTL values for fleet tables", () => {
+ assert.equal(formatTtl(undefined), "None")
+ assert.equal(formatTtl(0), "0s")
+ assert.equal(formatTtl(90), "1m 30s")
+ assert.equal(formatTtl(90_061), "1d 1h 1m 1s")
+})