@camstack/addon-pipeline 1.0.8 → 1.1.0

package/dist/{model-download-service-C7AjBsX9-rXY-VFDk.js → model-download-service-RxAOiYvX-C8rTRJy_.js}

@@ -25,7 +25,7 @@ node_fs = __toESM(node_fs, 1);
 let node_path = require("node:path");
 node_path = __toESM(node_path, 1);
 require("node:crypto");
-//#region ../system/dist/model-download-service-C7AjBsX9.mjs
+//#region ../system/dist/model-download-service-RxAOiYvX.mjs
 /**
 * Map a rel path to one candidate absolute path PER root, keeping only roots the
 * path stays within (traversal guard). The handler serves the first candidate
@@ -173,6 +173,24 @@ function createFileDataPlaneHandler(opts) {
 		(0, node_fs.createReadStream)(absPath).pipe(res);
 	};
 }
+function isNonEmptyFile(filePath) {
+	return node_fs.existsSync(filePath) && node_fs.statSync(filePath).size > 0;
+}
+/**
+* Sibling files of a single-file (non-directory) format — extra files the
+* format needs, fetched from the same remote directory as `url` and stored
+* flat alongside the main file in `modelsDir`. Catalog-declared via
+* `formatEntry.files`, e.g. OpenVINO IR lists its `.bin` weights next to the
+* `.xml`. The downloader stays format-agnostic; the convention lives in the
+* catalog data (like `MLPACKAGE_FILES` for the directory case).
+*/
+function siblingFilesFor(formatEntry) {
+	return formatEntry.isDirectory ? [] : formatEntry.files ?? [];
+}
+/** Resolve a sibling's remote URL relative to the main file's directory. */
+function siblingUrl(mainUrl, sibling) {
+	return mainUrl.replace(/[^/]+$/, sibling);
+}
 /** Build fetch headers, including HF auth token for huggingface.co URLs */
 function buildHeaders(url) {
 	const headers = { "User-Agent": "CamStack/1.0" };
@@ -282,14 +300,18 @@ async function ensureModel(modelsDir, entry, format, onProgress) {
 	if (entry.extraFiles) for (const extra of entry.extraFiles) await downloadFile(extra.url, node_path.join(modelsDir, extra.filename));
 	const filename = formatEntry.url.split("/").pop() ?? `${entry.id}.${format}`;
 	const modelPath = node_path.join(modelsDir, filename);
+	const siblings = siblingFilesFor(formatEntry);
 	if (node_fs.existsSync(modelPath)) if (formatEntry.isDirectory && !node_fs.existsSync(node_path.join(modelPath, "Manifest.json"))) node_fs.rmSync(modelPath, {
 		recursive: true,
 		force: true
 	});
-	else return modelPath;
+	else if (siblings.some((f) => !isNonEmptyFile(node_path.join(modelsDir, f)))) {} else return modelPath;
 	node_fs.mkdirSync(modelsDir, { recursive: true });
 	if (formatEntry.isDirectory) await downloadDirectory(formatEntry.url, modelPath, formatEntry.files, onProgress);
-	else await downloadFile(formatEntry.url, modelPath, (downloaded, total) => onProgress?.(downloaded, total === 0 ? void 0 : total));
+	else {
+		await downloadFile(formatEntry.url, modelPath, (downloaded, total) => onProgress?.(downloaded, total === 0 ? void 0 : total));
+		for (const sibling of siblings) await downloadFile(siblingUrl(formatEntry.url, sibling), node_path.join(modelsDir, sibling));
+	}
 	return modelPath;
 }
 /** Compute the on-disk path for a given model + format, even when not yet downloaded. */
@@ -306,17 +328,25 @@ function isModelDownloaded(modelsDir, entry, format) {
 	const modelPath = getModelFilePath(modelsDir, entry, format);
 	if (!modelPath || !node_fs.existsSync(modelPath)) return false;
 	if (formatEntry.isDirectory) return node_fs.existsSync(node_path.join(modelPath, "Manifest.json"));
-	return node_fs.statSync(modelPath).size > 0;
+	if (node_fs.statSync(modelPath).size <= 0) return false;
+	return siblingFilesFor(formatEntry).every((f) => isNonEmptyFile(node_path.join(modelsDir, f)));
 }
 /** Remove the on-disk model file/directory. Returns true if something was deleted. */
 function deleteModelFromDisk(modelsDir, entry, format) {
 	const modelPath = getModelFilePath(modelsDir, entry, format);
 	if (!modelPath || !node_fs.existsSync(modelPath)) return false;
-	if (entry.formats[format]?.isDirectory) node_fs.rmSync(modelPath, {
+	const formatEntry = entry.formats[format];
+	if (formatEntry?.isDirectory) node_fs.rmSync(modelPath, {
 		recursive: true,
 		force: true
 	});
-	else node_fs.unlinkSync(modelPath);
+	else {
+		node_fs.unlinkSync(modelPath);
+		if (formatEntry) for (const sibling of siblingFilesFor(formatEntry)) {
+			const sibPath = node_path.join(modelsDir, sibling);
+			if (node_fs.existsSync(sibPath)) node_fs.unlinkSync(sibPath);
+		}
+	}
 	return true;
 }
 //#endregion

package/dist/{model-download-service-C7AjBsX9-B0ekM6dF.mjs → model-download-service-RxAOiYvX-CMAvhgO7.mjs}

@@ -3,7 +3,7 @@ import { createReadStream, promises } from "node:fs";
 import * as path$1 from "node:path";
 import path from "node:path";
 import "node:crypto";
-//#region ../system/dist/model-download-service-C7AjBsX9.mjs
+//#region ../system/dist/model-download-service-RxAOiYvX.mjs
 /**
 * Map a rel path to one candidate absolute path PER root, keeping only roots the
 * path stays within (traversal guard). The handler serves the first candidate
@@ -151,6 +151,24 @@ function createFileDataPlaneHandler(opts) {
 		createReadStream(absPath).pipe(res);
 	};
 }
+function isNonEmptyFile(filePath) {
+	return fs.existsSync(filePath) && fs.statSync(filePath).size > 0;
+}
+/**
+* Sibling files of a single-file (non-directory) format — extra files the
+* format needs, fetched from the same remote directory as `url` and stored
+* flat alongside the main file in `modelsDir`. Catalog-declared via
+* `formatEntry.files`, e.g. OpenVINO IR lists its `.bin` weights next to the
+* `.xml`. The downloader stays format-agnostic; the convention lives in the
+* catalog data (like `MLPACKAGE_FILES` for the directory case).
+*/
+function siblingFilesFor(formatEntry) {
+	return formatEntry.isDirectory ? [] : formatEntry.files ?? [];
+}
+/** Resolve a sibling's remote URL relative to the main file's directory. */
+function siblingUrl(mainUrl, sibling) {
+	return mainUrl.replace(/[^/]+$/, sibling);
+}
 /** Build fetch headers, including HF auth token for huggingface.co URLs */
 function buildHeaders(url) {
 	const headers = { "User-Agent": "CamStack/1.0" };
@@ -260,14 +278,18 @@ async function ensureModel(modelsDir, entry, format, onProgress) {
 	if (entry.extraFiles) for (const extra of entry.extraFiles) await downloadFile(extra.url, path$1.join(modelsDir, extra.filename));
 	const filename = formatEntry.url.split("/").pop() ?? `${entry.id}.${format}`;
 	const modelPath = path$1.join(modelsDir, filename);
+	const siblings = siblingFilesFor(formatEntry);
 	if (fs.existsSync(modelPath)) if (formatEntry.isDirectory && !fs.existsSync(path$1.join(modelPath, "Manifest.json"))) fs.rmSync(modelPath, {
 		recursive: true,
 		force: true
 	});
-	else return modelPath;
+	else if (siblings.some((f) => !isNonEmptyFile(path$1.join(modelsDir, f)))) {} else return modelPath;
 	fs.mkdirSync(modelsDir, { recursive: true });
 	if (formatEntry.isDirectory) await downloadDirectory(formatEntry.url, modelPath, formatEntry.files, onProgress);
-	else await downloadFile(formatEntry.url, modelPath, (downloaded, total) => onProgress?.(downloaded, total === 0 ? void 0 : total));
+	else {
+		await downloadFile(formatEntry.url, modelPath, (downloaded, total) => onProgress?.(downloaded, total === 0 ? void 0 : total));
+		for (const sibling of siblings) await downloadFile(siblingUrl(formatEntry.url, sibling), path$1.join(modelsDir, sibling));
+	}
 	return modelPath;
 }
 /** Compute the on-disk path for a given model + format, even when not yet downloaded. */
@@ -284,17 +306,25 @@ function isModelDownloaded(modelsDir, entry, format) {
 	const modelPath = getModelFilePath(modelsDir, entry, format);
 	if (!modelPath || !fs.existsSync(modelPath)) return false;
 	if (formatEntry.isDirectory) return fs.existsSync(path$1.join(modelPath, "Manifest.json"));
-	return fs.statSync(modelPath).size > 0;
+	if (fs.statSync(modelPath).size <= 0) return false;
+	return siblingFilesFor(formatEntry).every((f) => isNonEmptyFile(path$1.join(modelsDir, f)));
 }
 /** Remove the on-disk model file/directory. Returns true if something was deleted. */
 function deleteModelFromDisk(modelsDir, entry, format) {
 	const modelPath = getModelFilePath(modelsDir, entry, format);
 	if (!modelPath || !fs.existsSync(modelPath)) return false;
-	if (entry.formats[format]?.isDirectory) fs.rmSync(modelPath, {
+	const formatEntry = entry.formats[format];
+	if (formatEntry?.isDirectory) fs.rmSync(modelPath, {
 		recursive: true,
 		force: true
 	});
-	else fs.unlinkSync(modelPath);
+	else {
+		fs.unlinkSync(modelPath);
+		if (formatEntry) for (const sibling of siblingFilesFor(formatEntry)) {
+			const sibPath = path$1.join(modelsDir, sibling);
+			if (fs.existsSync(sibPath)) fs.unlinkSync(sibPath);
+		}
+	}
 	return true;
 }
 //#endregion

package/dist/recorder/index.js

@@ -1,8 +1,8 @@
-const require_model_download_service_C7AjBsX9 = require("../model-download-service-C7AjBsX9-rXY-VFDk.js");
+const require_model_download_service_RxAOiYvX = require("../model-download-service-RxAOiYvX-C8rTRJy_.js");
 const require_dist = require("../dist-BLcTVvol.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
-node_path = require_model_download_service_C7AjBsX9.__toESM(node_path);
+node_path = require_model_download_service_RxAOiYvX.__toESM(node_path);
 let node_child_process = require("node:child_process");
 //#region src/recorder/segment-path.ts
 function segmentRelPath(deviceId, profile, startMs, durMs, bytes) {
@@ -1934,7 +1934,7 @@ var RecorderV2Addon = class extends require_dist.BaseAddon {
 			store: this.segmentStore
 		});
 		try {
-			const handler = require_model_download_service_C7AjBsX9.createFileDataPlaneHandler({ getRoots: () => this.playbackRoots() });
+			const handler = require_model_download_service_RxAOiYvX.createFileDataPlaneHandler({ getRoots: () => this.playbackRoots() });
 			const served = await this.ctx.dataPlane?.serve({
 				prefix: PLAYBACK_PREFIX,
 				access: "authenticated",

package/dist/recorder/index.mjs

@@ -1,5 +1,5 @@
 import { $ as selectAssignedProfileSlots, B as BaseAddon, F as storageEvictableCapability, J as hydrateSchema, K as createDurableState, N as recordingCapability, O as migrateConfigToBands, W as EventCategory, d as RecordingConfigSchema, lt as record, ut as string, z as errMsg } from "../dist-BA6DR_jV.mjs";
-import { t as createFileDataPlaneHandler } from "../model-download-service-C7AjBsX9-B0ekM6dF.mjs";
+import { t as createFileDataPlaneHandler } from "../model-download-service-RxAOiYvX-CMAvhgO7.mjs";
 import { promises } from "node:fs";
 import path from "node:path";
 import { spawn } from "node:child_process";

package/dist/stream-broker/{_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-BFy9iszl.mjs → _virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-DrohyZ5L.mjs}

@@ -3,7 +3,7 @@ import "./dist-CYZr2fwk.mjs";
 var e = {
 	"@camstack/sdk": {
 		name: "@camstack/sdk",
-		version: "1.0.7",
+		version: "1.1.0",
 		scope: ["default"],
 		loaded: !1,
 		from: "addon_stream_broker_widgets",
@@ -18,7 +18,7 @@ var e = {
 	},
 	"@camstack/types": {
 		name: "@camstack/types",
-		version: "1.0.7",
+		version: "1.1.0",
 		scope: ["default"],
 		loaded: !1,
 		from: "addon_stream_broker_widgets",
@@ -33,7 +33,7 @@ var e = {
 	},
 	"@camstack/ui-library": {
 		name: "@camstack/ui-library",
-		version: "1.0.7",
+		version: "1.1.0",
 		scope: ["default"],
 		loaded: !1,
 		from: "addon_stream_broker_widgets",

package/dist/stream-broker/{hostInit-zRy9SzlX.mjs → hostInit-zLZbYJcg.mjs}

@@ -36,7 +36,7 @@ async function r() {
 				}
 			},
 			"@camstack/types": {
-				version: "1.0.7",
+				version: "1.1.0",
 				scope: "default",
 				shareConfig: {
 					singleton: !0,
@@ -45,7 +45,7 @@ async function r() {
 				}
 			},
 			"@camstack/sdk": {
-				version: "1.0.7",
+				version: "1.1.0",
 				scope: "default",
 				shareConfig: {
 					singleton: !0,
@@ -81,7 +81,7 @@ async function r() {
 				}
 			},
 			"@camstack/ui-library": {
-				version: "1.0.7",
+				version: "1.1.0",
 				scope: "default",
 				shareConfig: {
 					singleton: !0,

package/dist/stream-broker/index.js

@@ -2,20 +2,20 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_model_download_service_C7AjBsX9 = require("../model-download-service-C7AjBsX9-rXY-VFDk.js");
+const require_model_download_service_RxAOiYvX = require("../model-download-service-RxAOiYvX-C8rTRJy_.js");
 const require_dist = require("../dist-BLcTVvol.js");
 const require_codec_runtime = require("../codec-runtime-BOk-13PN.js");
 let node_fs = require("node:fs");
-node_fs = require_model_download_service_C7AjBsX9.__toESM(node_fs);
+node_fs = require_model_download_service_RxAOiYvX.__toESM(node_fs);
 let node_path = require("node:path");
-node_path = require_model_download_service_C7AjBsX9.__toESM(node_path);
+node_path = require_model_download_service_RxAOiYvX.__toESM(node_path);
 let node_os = require("node:os");
-node_os = require_model_download_service_C7AjBsX9.__toESM(node_os);
+node_os = require_model_download_service_RxAOiYvX.__toESM(node_os);
 let node_crypto = require("node:crypto");
-node_crypto = require_model_download_service_C7AjBsX9.__toESM(node_crypto);
+node_crypto = require_model_download_service_RxAOiYvX.__toESM(node_crypto);
 let node_child_process = require("node:child_process");
 let node_net = require("node:net");
-node_net = require_model_download_service_C7AjBsX9.__toESM(node_net);
+node_net = require_model_download_service_RxAOiYvX.__toESM(node_net);
 let net = require("net");
 let events = require("events");
 let node_fs_promises = require("node:fs/promises");
@@ -26,7 +26,7 @@ let node_events = require("node:events");
 /** Build a `(req, res)` handler serving the embed bundle at `root` with SPA fallback.
 *  Web MIME types (`.html`/`.js`/`.css`/…) come from the core handler's defaults. */
 function createEmbedSpaHandler(root) {
-	const fileHandler = require_model_download_service_C7AjBsX9.createFileDataPlaneHandler({ getRoots: () => [root] });
+	const fileHandler = require_model_download_service_RxAOiYvX.createFileDataPlaneHandler({ getRoots: () => [root] });
 	return (req, res) => {
 		const [pathPart = "/", query] = (req.url ?? "/").split("?");
 		const lastSegment = pathPart.split("/").pop() ?? "";

package/dist/stream-broker/index.mjs

@@ -1,6 +1,6 @@
 import { t as __require } from "../chunk-BdkLduGY.mjs";
 import { B as BaseAddon, D as maskUrlCredentials, G as asJsonObject, H as DeviceFeature, I as streamBrokerCapability, Q as parseProfileBrokerId, R as webrtcSessionCapability, U as DeviceType, V as CAM_PROFILE_ORDER, W as EventCategory, X as makeSourceBrokerId, Y as makeProfileBrokerId, c as EncodeProfileSchema, ct as object, dt as union, f as RingBuffer, it as discriminatedUnion, lt as record, m as addonWidgetsSourceCapability, ot as literal, q as createEvent, rt as boolean, st as number, tt as _enum, ut as string, v as cameraStreamsCapability, z as errMsg } from "../dist-BA6DR_jV.mjs";
-import { t as createFileDataPlaneHandler } from "../model-download-service-C7AjBsX9-B0ekM6dF.mjs";
+import { t as createFileDataPlaneHandler } from "../model-download-service-RxAOiYvX-CMAvhgO7.mjs";
 import { t as DecodeRuntime } from "../codec-runtime-BsqlEjPi.mjs";
 import * as fs from "node:fs";
 import * as path$1 from "node:path";

package/dist/stream-broker/remoteEntry.js

@@ -30,7 +30,7 @@ async function d(e) {
 	}
 }
 async function f() {
-	return l ||= d(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-BFy9iszl.mjs")).catch((e) => {
+	return l ||= d(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-DrohyZ5L.mjs")).catch((e) => {
 		throw l = void 0, e;
 	}), l;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-pipeline",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "CamStack Pipeline bundle — runner, detection, motion, decoders, audio + stream broker. Multi-entry npm package shipping 7 addons under a single bundle.",
   "keywords": [
     "camstack",

package/python/inference_pool.py

@@ -9,8 +9,10 @@ Architecture mirrors Scrypted's ML plugins (coreml / openvino / onnx):
   - Runtime executors:
       CoreML   → ThreadPoolExecutor(1) — ANE is single-context; one
                  Python thread is enough, and avoids GIL thrashing.
-      OpenVINO → ThreadPoolExecutor(1) driving the compiled model (the
-                 OV runtime manages internal infer-request parallelism).
+      OpenVINO → ThreadPoolExecutor(OPTIMAL_NUMBER_OF_INFER_REQUESTS),
+                 each thread driving its own InferRequest, with the model
+                 compiled under the THROUGHPUT hint so the streams run
+                 concurrently (a single shared request serialises cameras).
       ONNX     → ThreadPoolExecutor(N) — N independent InferenceSessions
                  where N = concurrency setting; each session pinned to
                  its own worker thread.
@@ -160,6 +162,13 @@ class ModelSlot:
 
 _runtime: str = ""
 _runtime_lib: Any = None
+# Max OPTIMAL_NUMBER_OF_INFER_REQUESTS across loaded OpenVINO models — used
+# to size the predict pool so the THROUGHPUT streams are actually fed.
+_ov_optimal_reqs: int = 0
+# Default OpenVINO predict-pool size when models load lazily (so we can't yet
+# query the device's optimal request count). ≈ measured optimal on Intel
+# CPU/iGPU/NPU (4-5). Threads idle-block on infer, so over-provisioning is cheap.
+OV_DEFAULT_CONCURRENCY: int = 4
 
 
 def _init_runtime(runtime: str) -> None:
@@ -226,14 +235,48 @@ def _load_model(slot: ModelSlot, config: dict) -> None:
     elif _runtime == "openvino":
         core = _runtime_lib
         ov_device = config.get("device", "AUTO").upper()
-        compiled = core.compile_model(path, device_name=ov_device)
+        if ov_device == "AUTO":
+            # Scrypted-style device priority, built from the devices OpenVINO
+            # actually enumerates (more accurate than a hardware probe): NPU >
+            # GPU > CPU. The AUTO plugin handles runtime selection + failover.
+            # On a CPU-only image this is just AUTO:CPU; once the Intel GPU/NPU
+            # runtime is present it becomes AUTO:NPU,GPU,CPU automatically.
+            order = [d for d in ("NPU", "GPU", "CPU") if d in core.available_devices]
+            if order:
+                ov_device = "AUTO:" + ",".join(order)
+        # THROUGHPUT hint lets OpenVINO spin up multiple internal execution
+        # streams. Combined with one InferRequest per predict-pool thread
+        # (below), concurrent frames from N cameras run in parallel — the
+        # old `compiled(inp)` path drove a single shared default request, so
+        # every camera serialised through one stream regardless of how many
+        # predict workers existed. Measured ~1.5–2.4x throughput on CPU/GPU/NPU.
+        ov_config = {"PERFORMANCE_HINT": "THROUGHPUT"}
+        compiled = core.compile_model(path, device_name=ov_device, config=ov_config)
         output_layers = [compiled.output(i) for i in range(len(compiled.outputs))]
         output_names = [o.get_any_name() for o in compiled.outputs]
 
-        def predict(inp_dict: dict) -> dict:
+        # Record the device's optimal infer-request count so the dispatcher
+        # can size the predict pool to actually feed the streams.
+        global _ov_optimal_reqs
+        try:
+            opt = int(compiled.get_property("OPTIMAL_NUMBER_OF_INFER_REQUESTS"))
+            if opt > _ov_optimal_reqs:
+                _ov_optimal_reqs = opt
+        except Exception:
+            pass
+
+        # One InferRequest per predict thread (thread-local) — InferRequests
+        # are NOT safe to share across threads, and a per-thread request is
+        # what lets the THROUGHPUT streams run concurrently.
+        _ov_tls = threading.local()
+
+        def predict(inp_dict: dict, _c=compiled, _layers=output_layers, _names=output_names, _tls=_ov_tls) -> dict:
+            req = getattr(_tls, "req", None)
+            if req is None:
+                req = _tls.req = _c.create_infer_request()
             inp = list(inp_dict.values())[0]
-            result = compiled(inp)
-            return {name: result[layer] for name, layer in zip(output_names, output_layers)}
+            result = req.infer(inp)
+            return {name: result[layer] for name, layer in zip(_names, _layers)}
 
         slot.model = compiled
         slot.predict_fn = predict
@@ -772,6 +815,22 @@ async def _run() -> None:
             sys.stderr.flush()
         models.append(slot)
 
+    # OpenVINO: size the predict pool so the THROUGHPUT execution streams are
+    # actually fed by concurrent infer-requests. The addon passes
+    # concurrency=1 (it predates per-thread infer requests) and models load
+    # lazily AFTER this point, so we can't read OPTIMAL_NUMBER_OF_INFER_REQUESTS
+    # here — default to OV_DEFAULT_CONCURRENCY (≈ the measured optimal of 4-5
+    # on Intel CPU/iGPU/NPU). If startup-loaded models report a higher optimal,
+    # use that. One InferRequest is created per predict thread on first use.
+    if runtime == "openvino":
+        target = max(_ov_optimal_reqs, OV_DEFAULT_CONCURRENCY)
+        if target > concurrency:
+            sys.stderr.write(
+                f"OpenVINO THROUGHPUT: predict concurrency {concurrency} -> {target}\n"
+            )
+            sys.stderr.flush()
+            concurrency = target
+
     dispatcher = RuntimeDispatcher(runtime, concurrency)
     startup_ms = round((time.perf_counter() - t_start) * 1000)
     loaded_count = sum(1 for s in models if s.loaded)