@camstack/types 1.2.398 → 1.2.400

package/dist/capabilities/pipeline-orchestrator.cap.d.ts

@@ -1401,8 +1401,6 @@ export declare const pipelineOrchestratorCapability: {
                         modelId: z.ZodString;
                     }, z.core.$strip>, z.ZodObject<{
                         kind: z.ZodLiteral<"cpu-device">;
-                    }, z.core.$strip>, z.ZodObject<{
-                        kind: z.ZodLiteral<"coral-untouched">;
                     }, z.core.$strip>, z.ZodObject<{
                         kind: z.ZodLiteral<"device-disabled">;
                     }, z.core.$strip>, z.ZodObject<{
@@ -1459,8 +1457,6 @@ export declare const pipelineOrchestratorCapability: {
                     modelId: z.ZodString;
                 }, z.core.$strip>, z.ZodObject<{
                     kind: z.ZodLiteral<"cpu-device">;
-                }, z.core.$strip>, z.ZodObject<{
-                    kind: z.ZodLiteral<"coral-untouched">;
                 }, z.core.$strip>, z.ZodObject<{
                     kind: z.ZodLiteral<"device-disabled">;
                 }, z.core.$strip>, z.ZodObject<{
@@ -1531,10 +1527,6 @@ export declare const pipelineOrchestratorCapability: {
             }, z.core.$strip>, z.ZodObject<{
                 kind: z.ZodLiteral<"detector-store-unreadable">;
                 error: z.ZodString;
-            }, z.core.$strip>, z.ZodObject<{
-                kind: z.ZodLiteral<"coral-enabled">;
-                nodeId: z.ZodString;
-                deviceKey: z.ZodString;
             }, z.core.$strip>, z.ZodObject<{
                 kind: z.ZodLiteral<"custom-pin-kept">;
                 nodeId: z.ZodString;
@@ -1660,8 +1652,6 @@ export declare const pipelineOrchestratorCapability: {
                             modelId: z.ZodString;
                         }, z.core.$strip>, z.ZodObject<{
                             kind: z.ZodLiteral<"cpu-device">;
-                        }, z.core.$strip>, z.ZodObject<{
-                            kind: z.ZodLiteral<"coral-untouched">;
                         }, z.core.$strip>, z.ZodObject<{
                             kind: z.ZodLiteral<"device-disabled">;
                         }, z.core.$strip>, z.ZodObject<{
@@ -1718,8 +1708,6 @@ export declare const pipelineOrchestratorCapability: {
                         modelId: z.ZodString;
                     }, z.core.$strip>, z.ZodObject<{
                         kind: z.ZodLiteral<"cpu-device">;
-                    }, z.core.$strip>, z.ZodObject<{
-                        kind: z.ZodLiteral<"coral-untouched">;
                     }, z.core.$strip>, z.ZodObject<{
                         kind: z.ZodLiteral<"device-disabled">;
                     }, z.core.$strip>, z.ZodObject<{
@@ -1790,10 +1778,6 @@ export declare const pipelineOrchestratorCapability: {
                 }, z.core.$strip>, z.ZodObject<{
                     kind: z.ZodLiteral<"detector-store-unreadable">;
                     error: z.ZodString;
-                }, z.core.$strip>, z.ZodObject<{
-                    kind: z.ZodLiteral<"coral-enabled">;
-                    nodeId: z.ZodString;
-                    deviceKey: z.ZodString;
                 }, z.core.$strip>, z.ZodObject<{
                     kind: z.ZodLiteral<"custom-pin-kept">;
                     nodeId: z.ZodString;

package/dist/index.js

@@ -51332,7 +51332,6 @@ var RecommendationReasonSchema = zod.z.discriminatedUnion("kind", [
 		modelId: zod.z.string()
 	}),
 	zod.z.object({ kind: zod.z.literal("cpu-device") }),
-	zod.z.object({ kind: zod.z.literal("coral-untouched") }),
 	zod.z.object({ kind: zod.z.literal("device-disabled") }),
 	zod.z.object({ kind: zod.z.literal("device-unavailable") }),
 	zod.z.object({ kind: zod.z.literal("node-offline") }),
@@ -51430,11 +51429,6 @@ var AutoTuneWarningSchema = zod.z.discriminatedUnion("kind", [
 		kind: zod.z.literal("detector-store-unreadable"),
 		error: zod.z.string()
 	}),
-	zod.z.object({
-		kind: zod.z.literal("coral-enabled"),
-		nodeId: zod.z.string(),
-		deviceKey: zod.z.string()
-	}),
 	zod.z.object({
 		kind: zod.z.literal("custom-pin-kept"),
 		nodeId: zod.z.string(),
@@ -100715,7 +100709,12 @@ var DETECTOR_PERF = {
 				fps: 19,
 				measured: true
 			}
-		}
+		},
+		coral: { "yolov9s-320-edgetpu": {
+			p50Ms: 32,
+			fps: 31,
+			measured: false
+		} }
 	},
 	"intel-n-series": {
 		"intel-igpu": {
@@ -100841,7 +100840,12 @@ var DETECTOR_PERF = {
 				fps: 3,
 				measured: true
 			}
-		}
+		},
+		coral: { "yolov9s-320-edgetpu": {
+			p50Ms: 32,
+			fps: 31,
+			measured: false
+		} }
 	},
 	"amd-phoenix": {
 		"x86-cpu": {
@@ -100908,96 +100912,120 @@ var DETECTOR_PERF = {
 		},
 		"amd-igpu": {
 			"yolov9t-320": {
-				p50Ms: 188,
-				fps: 5,
+				p50Ms: 40,
+				fps: 25,
 				measured: true
 			},
 			"yolov9t-640": {
-				p50Ms: 671,
-				fps: 1,
+				p50Ms: 89,
+				fps: 11,
 				measured: true
 			},
 			"yolov9s-320": {
-				p50Ms: 401,
-				fps: 2,
+				p50Ms: 65,
+				fps: 15,
 				measured: true
 			},
 			"yolov9s-640": {
-				p50Ms: 1434,
-				fps: 1,
+				p50Ms: 125,
+				fps: 8,
 				measured: true
 			},
 			"yolov9m-320": {
-				p50Ms: 1076,
-				fps: 1,
+				p50Ms: 85,
+				fps: 12,
+				measured: true
+			},
+			"yolov9m-640": {
+				p50Ms: 228,
+				fps: 4,
 				measured: true
 			}
-		}
-	},
-	"apple-m-pro": { "apple-ane": {
-		"yolov9t-320": {
-			p50Ms: 1.1,
-			fps: 952,
-			measured: true
-		},
-		"yolov9t-640": {
-			p50Ms: 3,
-			fps: 333,
-			measured: true
-		},
-		"yolov9s-320": {
-			p50Ms: 1.5,
-			fps: 667,
-			measured: true
 		},
-		"yolov9s-640": {
-			p50Ms: 5.1,
-			fps: 196,
-			measured: true
-		},
-		"yolov9m-320": {
-			p50Ms: 3.2,
-			fps: 312,
+		coral: { "yolov9s-320-edgetpu": {
+			p50Ms: 32,
+			fps: 31,
 			measured: true
+		} }
+	},
+	"apple-m-pro": {
+		"apple-ane": {
+			"yolov9t-320": {
+				p50Ms: 1.1,
+				fps: 952,
+				measured: true
+			},
+			"yolov9t-640": {
+				p50Ms: 3,
+				fps: 333,
+				measured: true
+			},
+			"yolov9s-320": {
+				p50Ms: 1.5,
+				fps: 667,
+				measured: true
+			},
+			"yolov9s-640": {
+				p50Ms: 5.1,
+				fps: 196,
+				measured: true
+			},
+			"yolov9m-320": {
+				p50Ms: 3.2,
+				fps: 312,
+				measured: true
+			},
+			"yolov9m-640": {
+				p50Ms: 10.2,
+				fps: 98,
+				measured: true
+			}
 		},
-		"yolov9m-640": {
-			p50Ms: 10.2,
-			fps: 98,
-			measured: true
-		}
-	} },
-	"apple-m-base": { "apple-ane": {
-		"yolov9t-320": {
-			p50Ms: 1.32,
-			fps: 758,
+		coral: { "yolov9s-320-edgetpu": {
+			p50Ms: 32,
+			fps: 31,
 			measured: false
+		} }
+	},
+	"apple-m-base": {
+		"apple-ane": {
+			"yolov9t-320": {
+				p50Ms: 1.32,
+				fps: 758,
+				measured: false
+			},
+			"yolov9t-640": {
+				p50Ms: 3.45,
+				fps: 290,
+				measured: true
+			},
+			"yolov9s-320": {
+				p50Ms: 1.8,
+				fps: 556,
+				measured: false
+			},
+			"yolov9s-640": {
+				p50Ms: 5.46,
+				fps: 183,
+				measured: true
+			},
+			"yolov9m-320": {
+				p50Ms: 3.79,
+				fps: 264,
+				measured: true
+			},
+			"yolov9m-640": {
+				p50Ms: 10.34,
+				fps: 97,
+				measured: true
+			}
 		},
-		"yolov9t-640": {
-			p50Ms: 3.45,
-			fps: 290,
-			measured: true
-		},
-		"yolov9s-320": {
-			p50Ms: 1.8,
-			fps: 556,
+		coral: { "yolov9s-320-edgetpu": {
+			p50Ms: 32,
+			fps: 31,
 			measured: false
-		},
-		"yolov9s-640": {
-			p50Ms: 5.46,
-			fps: 183,
-			measured: true
-		},
-		"yolov9m-320": {
-			p50Ms: 3.79,
-			fps: 264,
-			measured: true
-		},
-		"yolov9m-640": {
-			p50Ms: 10.34,
-			fps: 97,
-			measured: true
-		}
-	} }
+		} }
+	}
 };
 var DETECTOR_ACCURACY = {
 	"yolov9m-320": {
@@ -101053,6 +101081,11 @@ var DETECTOR_ACCURACY = {
 //#region src/pipeline/auto-tune/recommend.ts
 /** The family the cluster runs. */
 var AUTO_TUNE_FAMILY = "yolov9";
+/**
+* The model a Coral runs by default (D908) and the only one Auto tune sizes it
+* at (D912). Auto tune never enables a device; it sizes the enabled ones.
+*/
+var CORAL_DEFAULT_MODEL_ID = "yolov9s-320-edgetpu";
 /** Recall within this of the best counts as a tie — the faster one wins. */
 var RECALL_TIE = .02;
 /** Default share of an accelerator's throughput kept free. */
@@ -101212,12 +101245,9 @@ function recommendNode(input) {
 	const devices = node.devices.toSorted((a, b) => a.key.localeCompare(b.key));
 	const contexts = /* @__PURE__ */ new Map();
 	const early = /* @__PURE__ */ new Map();
+	const corals = [];
 	for (const device of devices) {
 		const accelerator = acceleratorKindOf(device.key, hardware);
-		if (accelerator === "coral") {
-			early.set(device.key, device.enabled ? [{ kind: "coral-untouched" }] : []);
-			continue;
-		}
 		if (!device.enabled) {
 			early.set(device.key, [{ kind: "device-disabled" }]);
 			continue;
@@ -101226,6 +101256,23 @@ function recommendNode(input) {
 			early.set(device.key, [{ kind: "device-unavailable" }]);
 			continue;
 		}
+		if (accelerator === "coral") {
+			const column = overlayMeasured(classTable.coral, measured[device.key]);
+			const builds = node.formatsByModel["yolov9s-320-edgetpu"] ?? [];
+			if (column?.["yolov9s-320-edgetpu"] === void 0 || !builds.includes(device.format)) {
+				early.set(device.key, [{
+					kind: "no-family-build",
+					format: device.format
+				}]);
+				continue;
+			}
+			corals.push({
+				device,
+				accelerator,
+				column
+			});
+			continue;
+		}
 		const column = accelerator === null ? void 0 : overlayMeasured(classTable[accelerator], measured[device.key]);
 		if (accelerator === null || column === void 0) {
 			early.set(device.key, [{
@@ -101276,6 +101323,12 @@ function recommendNode(input) {
 		kind: "no-family-build",
 		format: ctx.device.format
 	}]);
+	for (const ctx of corals) {
+		const choice = choiceOn(ctx, CORAL_DEFAULT_MODEL_ID, sizing);
+		if (choice === null) continue;
+		chosenByKey.set(ctx.device.key, choice);
+		reasonsByKey.set(ctx.device.key, deviceReasonsFor(choice, sizing));
+	}
 	for (const ctx of cpus) {
 		const pick = pickForGroup([ctx], node.formatsByModel, sizing);
 		const choice = pick === null ? null : choiceOn(ctx, pick.modelId, sizing);
@@ -101326,10 +101379,11 @@ function spareOf(c) {
 function electByShare(candidates) {
 	if (candidates.length === 0) return { kind: "none" };
 	const shareSum = candidates.reduce((s, c) => s + Math.max(c.share, 0), 0);
-	const running = candidates.reduce((s, c) => s + Math.max(c.running, 0), 0);
+	const loadOf = (c) => Math.max(c.running, 0) + Math.max(c.recent ?? 0, 0);
+	const running = candidates.reduce((s, c) => s + loadOf(c), 0);
 	const scored = candidates.map((candidate) => ({
 		candidate,
-		deficit: (shareSum > 0 ? Math.max(candidate.share, 0) / shareSum : 1 / candidates.length) * (running + 1) - candidate.running
+		deficit: (shareSum > 0 ? Math.max(candidate.share, 0) / shareSum : 1 / candidates.length) * (running + 1) - loadOf(candidate)
 	})).toSorted(byDeficit);
 	const turn = scored[0].candidate;
 	if (!turn.capped && !turn.saturated) return {
@@ -101441,6 +101495,39 @@ function resolveEffectiveShares(input) {
 *    every enabled device it would be sized on is sized from `hardware`
 *    instead, and the answer says so per node — never a silent mix.
 */
+/**
+* The measured capacity of `deviceKey` for the model it runs NOW, or
+* undefined. A cell measured for another model says nothing about this one
+* (a failed load of a heavier build is not this build's capacity), and a cell
+* that names no model cannot be matched. The ONE predicate behind both the
+* automatic shares and the automatic benchmark's "has results".
+*/
+function capacityForModel(node, deviceKey, modelId) {
+	if (node === void 0 || modelId === null) return void 0;
+	return node.devices.filter((d) => d.deviceKey === deviceKey && d.modelId === modelId).toSorted((a, b) => b.measuredAtMs - a.measuredAtMs)[0];
+}
+/**
+* Every measured (device × model) cell that no device runs now — what
+* {@link capacityForModel} skips, so the caller can say so once.
+*/
+function foreignCapacityCells(recommendations, measured) {
+	const out = [];
+	for (const rec of recommendations) {
+		const node = measured.get(rec.nodeId);
+		if (node === void 0) continue;
+		for (const cell of node.devices) {
+			const runs = rec.devices.find((d) => d.deviceKey === cell.deviceKey)?.chosen?.modelId ?? null;
+			if (cell.modelId === null || cell.modelId === runs) continue;
+			out.push({
+				nodeId: rec.nodeId,
+				deviceKey: cell.deviceKey,
+				measuredModelId: cell.modelId,
+				runsModelId: runs
+			});
+		}
+	}
+	return out;
+}
 /** A source that has no results — the benchmark store before it exists. */
 var NO_MEASURED_CAPACITY = { readMeasuredCapacity: async () => /* @__PURE__ */ new Map() };
 /** Integer shares summing to 100 (largest remainder); ties broken by key. */
@@ -101494,7 +101581,11 @@ function sizeNode(rec, input) {
 	if (input.source === "hardware") return fromHardware(null);
 	if (!rec.reachable) return fromHardware(null);
 	const results = input.measured.get(rec.nodeId);
-	const byKey = new Map((results?.devices ?? []).map((d) => [d.deviceKey, d]));
+	const byKey = /* @__PURE__ */ new Map();
+	for (const d of rec.devices) {
+		const row = capacityForModel(results, d.deviceKey, d.chosen?.modelId ?? null);
+		if (row !== void 0) byKey.set(d.deviceKey, row);
+	}
 	const usable = rec.devices.filter((d) => d.enabled && d.available);
 	const mustCover = rec.devices.filter((d) => d.enabled && d.available && d.chosen !== null);
 	const covered = usable.filter((d) => byKey.has(d.deviceKey));
@@ -101748,16 +101839,34 @@ function measuredDetectorCells(rows, nodeId, ctx) {
 	return out;
 }
 /**
-* Per node, each device at its newest fresh `pipeline` measurement — the
-* `NodeCapacitySource` answer the automatic shares read.
+* Parallel sessions a `device`-phase cell stands for.
+*
+* Both numbers are "streams at the camera rate the hardware carried inside
+* the frame interval" (`kMax` for the detector alone, `maxSessions` for the
+* detector plus its enrichment steps) and the benchmark page already shows
+* `kMax` as "streams", so the unit is the same and the conversion is the
+* identity. It is an UPPER bound for a session that also runs enrichment —
+* which is why a `pipeline` cell for the same model always wins over it.
+*/
+function sessionsOfDeviceCell(kMax) {
+	return Math.max(0, Math.floor(kMax));
+}
+/**
+* Per node, every (device × model) at its best fresh measurement: the newest
+* `pipeline` cell, else the newest `device` cell read as
+* {@link sessionsOfDeviceCell}. Several models of one device are kept apart —
+* the caller picks the one the device runs NOW (a cell for another model says
+* nothing about it).
 */
 function measuredCapacityFromResults(rows, nodeIds, ctx) {
 	const byNode = /* @__PURE__ */ new Map();
 	for (const row of freshResults(rows, ctx)) {
-		if (!nodeIds.includes(row.nodeId) || row.cell.phase !== "pipeline") continue;
+		if (!nodeIds.includes(row.nodeId)) continue;
+		const candidate = capacityOfRow(row);
 		const devices = byNode.get(row.nodeId) ?? /* @__PURE__ */ new Map();
-		const held = devices.get(row.cell.deviceKey);
-		if (held === void 0 || row.measuredAtMs > held.measuredAtMs) devices.set(row.cell.deviceKey, row);
+		const key = `${candidate.deviceKey}\u0000${candidate.modelId ?? ""}`;
+		const held = devices.get(key);
+		if (held === void 0 || betterCapacityCell(candidate, held)) devices.set(key, candidate);
 		byNode.set(row.nodeId, devices);
 	}
 	const out = /* @__PURE__ */ new Map();
@@ -101766,16 +101875,32 @@ function measuredCapacityFromResults(rows, nodeIds, ctx) {
 		if (devices === void 0) continue;
 		out.set(nodeId, {
 			nodeId,
-			devices: [...devices.values()].toSorted((a, b) => a.cell.deviceKey.localeCompare(b.cell.deviceKey)).map((r) => ({
-				deviceKey: r.cell.deviceKey,
-				maxSessions: r.cell.phase === "pipeline" ? r.cell.maxSessions : 0,
-				modelId: r.cell.modelId,
-				measuredAtMs: r.measuredAtMs
-			}))
+			devices: [...devices.values()].toSorted((a, b) => a.deviceKey.localeCompare(b.deviceKey) || (a.modelId ?? "").localeCompare(b.modelId ?? ""))
 		});
 	}
 	return out;
 }
+function capacityOfRow(row) {
+	const { cell } = row;
+	return cell.phase === "pipeline" ? {
+		deviceKey: cell.deviceKey,
+		maxSessions: cell.maxSessions,
+		modelId: cell.modelId,
+		measuredAtMs: row.measuredAtMs,
+		phase: "pipeline"
+	} : {
+		deviceKey: cell.deviceKey,
+		maxSessions: sessionsOfDeviceCell(cell.kMax),
+		modelId: cell.modelId,
+		measuredAtMs: row.measuredAtMs,
+		phase: "device"
+	};
+}
+/** A pipeline cell beats a device cell; within a phase the newer one wins. */
+function betterCapacityCell(a, b) {
+	if (a.phase !== b.phase) return a.phase === "pipeline";
+	return a.measuredAtMs > b.measuredAtMs;
+}
 //#endregion
 //#region src/pipeline/node-benchmark/step-tree.ts
 var BENCH_ROOT_STEP_ID = "object-detection";
@@ -104355,6 +104480,7 @@ exports.COMPOSITION_ITEM_ARRAY_PATH = require_composition.COMPOSITION_ITEM_ARRAY
 exports.COMPOSITION_ITEM_KEY_RE = require_composition.COMPOSITION_ITEM_KEY_RE;
 exports.CONNECTION_TEST_TIMEOUT_MS = CONNECTION_TEST_TIMEOUT_MS;
 exports.CONTAINER_CHILD_PRIORITY = CONTAINER_CHILD_PRIORITY;
+exports.CORAL_DEFAULT_MODEL_ID = CORAL_DEFAULT_MODEL_ID;
 exports.CORE_BLOCKS_ADDON_ID = CORE_BLOCKS_ADDON_ID;
 exports.CORE_BLOCK_ADDON_PREFIX = CORE_BLOCK_ADDON_PREFIX;
 exports.CREDENTIAL_TOKEN_AUDIENCE = CREDENTIAL_TOKEN_AUDIENCE;
@@ -106173,6 +106299,7 @@ exports.canonicalEgressPlan = canonicalEgressPlan;
 exports.canonicalIconKey = canonicalIconKey;
 exports.canonicalizeAppCallback = canonicalizeAppCallback;
 exports.capabilityScopesOf = capabilityScopesOf;
+exports.capacityForModel = capacityForModel;
 exports.capacitySessionsOf = capacitySessionsOf;
 exports.carbonMonoxideCapability = carbonMonoxideCapability;
 exports.cellsToRects = cellsToRects;
@@ -106401,6 +106528,7 @@ exports.findCompositionCycles = findCompositionCycles;
 exports.findTimezone = findTimezone;
 exports.floodCapability = floodCapability;
 exports.foldSnapshotByFunction = foldSnapshotByFunction;
+exports.foreignCapacityCells = foreignCapacityCells;
 exports.forgetKnownSecret = require_sleep.forgetKnownSecret;
 exports.formatDeviceRevoker = formatDeviceRevoker;
 exports.formatForRuntime = formatForRuntime;
@@ -106832,6 +106960,7 @@ exports.sensorTransitionNeverFires = sensorTransitionNeverFires;
 exports.sensorTransitionOffered = sensorTransitionOffered;
 exports.servedTemplateVars = servedTemplateVars;
 exports.serverManagementCapability = serverManagementCapability;
+exports.sessionsOfDeviceCell = sessionsOfDeviceCell;
 exports.setByPath = setByPath;
 exports.settingValuesEqual = settingValuesEqual;
 exports.settingsBelow = settingsBelow;