@camstack/addon-pipeline 1.2.338 → 1.2.340

package/dist/audio-analyzer/index.js

@@ -3,8 +3,9 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../chunk-emK7D4bc.js");
-const require_dist = require("../dist-WIL4yeyi.js");
-const require_process_memory = require("../process-memory-Bsj_b---.js");
+const require_dist = require("../dist-BWigCRRN.js");
+const require_model_catalogs = require("../model-catalogs-BFBf8sHb.js");
+const require_process_memory = require("../process-memory-C9U6dKxS.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_path = require("node:path");
@@ -178,19 +179,22 @@ async function createAudioPipeline(modelsDir, logger, options) {
 	if (!options?.pythonPath) throw new Error("YAMNet audio backend requires the embedded Python interpreter — pass options.pythonPath (ctx.deps.ensurePython()).");
 	return new YamnetPythonPipeline(modelsDir, logger, options.pythonPath, options.installPythonRequirements);
 }
+var YAMNET_MODEL_ID = "yamnet-onnx";
 /**
-* Canonical model URLs on the camstack HuggingFace mirror. Mirrors the
-* convention every detection model follows (single point of truth =
-* `HF_BASE_URL` from `@camstack/types`); the auto-download path uses
-* `downloadFile` from `@camstack/system`, the SAME helper detection-
-* pipeline uses to materialise its YOLO/face/plate models.
-*
-*   {domain}/{family}/{format}/{filename}
-* For YAMNet that's `audioClassification/yamnet/onnx/camstack-yamnet.onnx`,
-* with the labels JSON one level up (`audioClassification/yamnet/`).
+* Materialise the YAMNet ONNX model and its labels from the catalog entry,
+* through `ensureModel` — the one download path every hosted artefact takes,
+* so a copy the mirror replaced in place is fetched again (D743, D744).
 */
-var YAMNET_MODEL_URL = `${require_dist.HF_BASE_URL}/audioClassification/yamnet/onnx/camstack-yamnet.onnx`;
-var YAMNET_LABELS_URL = `${require_dist.HF_BASE_URL}/audioClassification/yamnet/camstack-yamnet-labels.json`;
+async function ensureYamnetFiles(modelsDir) {
+	const entry = require_model_catalogs.AUDIO_CLASSIFIER_MODELS.find((m) => m.id === YAMNET_MODEL_ID);
+	if (entry === void 0) throw new Error(`audio catalog has no ${YAMNET_MODEL_ID} entry`);
+	const labels = entry.extraFiles?.[0];
+	if (labels === void 0) throw new Error(`${YAMNET_MODEL_ID} declares no labels file`);
+	return {
+		modelPath: await (0, _camstack_system_addon_utils.ensureModel)(modelsDir, entry, "onnx"),
+		labelsPath: node_path.join(modelsDir, labels.filename)
+	};
+}
 /**
 * Locate the addon's bundled `python/` dir (holds `yamnet_audio.py` +
 * `requirements-audio.txt`). Mirrors detection-pipeline's resolver: the
@@ -230,23 +234,11 @@ var YamnetPythonPipeline = class {
 		this.channel = new AudioSubprocessChannel("YAMNet Python", logger);
 	}
 	async initialize() {
-		const modelPath = node_path.join(this.modelsDir, "camstack-yamnet.onnx");
-		const labelsPath = node_path.join(this.modelsDir, "camstack-yamnet-labels.json");
-		if (!node_fs.existsSync(modelPath)) {
-			this.log.info("YAMNet ONNX model not found locally — downloading from HuggingFace", { meta: {
-				url: YAMNET_MODEL_URL,
-				dest: modelPath
-			} });
-			await (0, _camstack_system_addon_utils.downloadFile)(YAMNET_MODEL_URL, modelPath);
-			this.log.info("YAMNet ONNX model downloaded", { meta: { sizeBytes: node_fs.statSync(modelPath).size } });
-		}
-		if (!node_fs.existsSync(labelsPath)) {
-			this.log.info("YAMNet labels not found locally — downloading from HuggingFace", { meta: {
-				url: YAMNET_LABELS_URL,
-				dest: labelsPath
-			} });
-			await (0, _camstack_system_addon_utils.downloadFile)(YAMNET_LABELS_URL, labelsPath);
-		}
+		const { modelPath, labelsPath } = await ensureYamnetFiles(this.modelsDir);
+		this.log.info("YAMNet model ready", { meta: {
+			modelPath,
+			sizeBytes: node_fs.statSync(modelPath).size
+		} });
 		const pythonDir = resolveAudioPythonDir();
 		if (this.installPythonRequirements) await this.installPythonRequirements(node_path.join(pythonDir, "requirements-audio.txt"));
 		const scriptPath = node_path.join(pythonDir, "yamnet_audio.py");

package/dist/audio-analyzer/index.mjs

@@ -1,9 +1,10 @@
 import { n as __require } from "../chunk-DnnnRqeS.mjs";
-import { An as audioChunkBytesPerSample, D as HF_BASE_URL, Dn as BaseAddon, Fn as hydrateSchema, Mt as mapAudioLabelToMacro, N as PoolMemoryWatchdog, Pn as expandAudioChunkToF32le, Tn as errMsg, X as audioAnalyzerCapability, Y as audioAnalysisCapability, h as DEFAULT_AUDIO_ANALYZER_CONFIG, nr as EventCategory, r as AUDIO_BACKEND_CHOICES, rn as resolvePoolMemoryPolicy, zn as nodePin } from "../dist-CdmlJu1J.mjs";
-import { n as pickNodePlatformArch, t as readProcessMemory } from "../process-memory-maZfOnev.mjs";
+import { Dn as errMsg, In as expandAudioChunkToF32le, Ln as hydrateSchema, Mn as audioChunkBytesPerSample, N as PoolMemoryWatchdog, Nt as mapAudioLabelToMacro, Vn as nodePin, X as audioAnalyzerCapability, Y as audioAnalysisCapability, an as resolvePoolMemoryPolicy, h as DEFAULT_AUDIO_ANALYZER_CONFIG, ir as EventCategory, kn as BaseAddon, r as AUDIO_BACKEND_CHOICES } from "../dist-CsA6fY6I.mjs";
+import { n as AUDIO_CLASSIFIER_MODELS } from "../model-catalogs-D7JXV0_i.mjs";
+import { n as pickNodePlatformArch, t as readProcessMemory } from "../process-memory-DOEeg2pL.mjs";
 import * as fs from "node:fs";
 import * as path$1 from "node:path";
-import { downloadFile } from "@camstack/system/addon-utils";
+import { ensureModel } from "@camstack/system/addon-utils";
 //#region src/audio-analyzer/audio-subprocess-channel.ts
 /** The backend process ended (or was disposed) while — or before — a request waited on it. */
 var AudioBackendExitedError = class extends Error {
@@ -172,19 +173,22 @@ async function createAudioPipeline(modelsDir, logger, options) {
 	if (!options?.pythonPath) throw new Error("YAMNet audio backend requires the embedded Python interpreter — pass options.pythonPath (ctx.deps.ensurePython()).");
 	return new YamnetPythonPipeline(modelsDir, logger, options.pythonPath, options.installPythonRequirements);
 }
+var YAMNET_MODEL_ID = "yamnet-onnx";
 /**
-* Canonical model URLs on the camstack HuggingFace mirror. Mirrors the
-* convention every detection model follows (single point of truth =
-* `HF_BASE_URL` from `@camstack/types`); the auto-download path uses
-* `downloadFile` from `@camstack/system`, the SAME helper detection-
-* pipeline uses to materialise its YOLO/face/plate models.
-*
-*   {domain}/{family}/{format}/{filename}
-* For YAMNet that's `audioClassification/yamnet/onnx/camstack-yamnet.onnx`,
-* with the labels JSON one level up (`audioClassification/yamnet/`).
+* Materialise the YAMNet ONNX model and its labels from the catalog entry,
+* through `ensureModel` — the one download path every hosted artefact takes,
+* so a copy the mirror replaced in place is fetched again (D743, D744).
 */
-var YAMNET_MODEL_URL = `${HF_BASE_URL}/audioClassification/yamnet/onnx/camstack-yamnet.onnx`;
-var YAMNET_LABELS_URL = `${HF_BASE_URL}/audioClassification/yamnet/camstack-yamnet-labels.json`;
+async function ensureYamnetFiles(modelsDir) {
+	const entry = AUDIO_CLASSIFIER_MODELS.find((m) => m.id === YAMNET_MODEL_ID);
+	if (entry === void 0) throw new Error(`audio catalog has no ${YAMNET_MODEL_ID} entry`);
+	const labels = entry.extraFiles?.[0];
+	if (labels === void 0) throw new Error(`${YAMNET_MODEL_ID} declares no labels file`);
+	return {
+		modelPath: await ensureModel(modelsDir, entry, "onnx"),
+		labelsPath: path$1.join(modelsDir, labels.filename)
+	};
+}
 /**
 * Locate the addon's bundled `python/` dir (holds `yamnet_audio.py` +
 * `requirements-audio.txt`). Mirrors detection-pipeline's resolver: the
@@ -224,23 +228,11 @@ var YamnetPythonPipeline = class {
 		this.channel = new AudioSubprocessChannel("YAMNet Python", logger);
 	}
 	async initialize() {
-		const modelPath = path$1.join(this.modelsDir, "camstack-yamnet.onnx");
-		const labelsPath = path$1.join(this.modelsDir, "camstack-yamnet-labels.json");
-		if (!fs.existsSync(modelPath)) {
-			this.log.info("YAMNet ONNX model not found locally — downloading from HuggingFace", { meta: {
-				url: YAMNET_MODEL_URL,
-				dest: modelPath
-			} });
-			await downloadFile(YAMNET_MODEL_URL, modelPath);
-			this.log.info("YAMNet ONNX model downloaded", { meta: { sizeBytes: fs.statSync(modelPath).size } });
-		}
-		if (!fs.existsSync(labelsPath)) {
-			this.log.info("YAMNet labels not found locally — downloading from HuggingFace", { meta: {
-				url: YAMNET_LABELS_URL,
-				dest: labelsPath
-			} });
-			await downloadFile(YAMNET_LABELS_URL, labelsPath);
-		}
+		const { modelPath, labelsPath } = await ensureYamnetFiles(this.modelsDir);
+		this.log.info("YAMNet model ready", { meta: {
+			modelPath,
+			sizeBytes: fs.statSync(modelPath).size
+		} });
 		const pythonDir = resolveAudioPythonDir();
 		if (this.installPythonRequirements) await this.installPythonRequirements(path$1.join(pythonDir, "requirements-audio.txt"));
 		const scriptPath = path$1.join(pythonDir, "yamnet_audio.py");