@camstack/system 1.1.0 → 1.1.2

package/dist/{model-download-service-RxAOiYvX.mjs → model-download-service-C-IHWnXx.mjs}

@@ -318,6 +318,24 @@ function siblingFilesFor(formatEntry) {
 function siblingUrl(mainUrl, sibling) {
 	return mainUrl.replace(/[^/]+$/, sibling);
 }
+/**
+* The relative filenames a model format occupies under `modelsDir` — the main
+* file (URL basename, or `${id}.${format}` fallback), its declared siblings
+* (e.g. the OpenVINO `.bin` next to the `.xml`), and any `extraFiles`. For a
+* directory bundle the single entry is the bundle dir itself (tar/extract
+* recurse into it).
+*
+* Used by model distribution (P2): the hub tars exactly these names from its
+* `modelsDir` and the agent untars them into its own `modelsDir`, so both ends
+* agree on the on-disk layout without re-deriving it.
+*/
+function collectModelFiles(entry, format) {
+	const formatEntry = entry.formats[format];
+	if (!formatEntry) return [];
+	const names = [formatEntry.url.split("/").pop() ?? `${entry.id}.${format}`, ...siblingFilesFor(formatEntry)];
+	for (const extra of entry.extraFiles ?? []) names.push(extra.filename);
+	return names;
+}
 /** Build fetch headers, including HF auth token for huggingface.co URLs */
 function buildHeaders(url) {
 	const headers = { "User-Agent": "CamStack/1.0" };
@@ -566,15 +584,21 @@ var ModelDownloadService = class {
 		if (!formatEntry) throw new Error(`ModelDownloadService: model "${modelId}" has no ${selectedFormat} format`);
 		await this.ensureExtraFiles(modelId);
 		const modelPath = this.modelFilePath(entry, selectedFormat);
-		if (fs.existsSync(modelPath)) if (formatEntry.isDirectory) if (!fs.existsSync(path$1.join(modelPath, "Manifest.json"))) fs.rmSync(modelPath, {
-			recursive: true,
-			force: true
-		});
-		else return modelPath;
-		else return modelPath;
+		const siblings = siblingFilesFor(formatEntry);
+		if (fs.existsSync(modelPath)) {
+			if (formatEntry.isDirectory) if (!fs.existsSync(path$1.join(modelPath, "Manifest.json"))) fs.rmSync(modelPath, {
+				recursive: true,
+				force: true
+			});
+			else return modelPath;
+			else if (siblings.every((f) => isNonEmptyFile(path$1.join(this.modelsDir, f)))) return modelPath;
+		}
 		fs.mkdirSync(this.modelsDir, { recursive: true });
 		if (formatEntry.isDirectory) await this.downloadDirectory(formatEntry.url, modelPath, formatEntry.files, modelId);
-		else await downloadFile(formatEntry.url, modelPath, this.onProgress ? (downloaded, total) => this.onProgress(modelId, downloaded, total) : void 0);
+		else {
+			await downloadFile(formatEntry.url, modelPath, this.onProgress ? (downloaded, total) => this.onProgress(modelId, downloaded, total) : void 0);
+			for (const sibling of siblings) await downloadFile(siblingUrl(formatEntry.url, sibling), path$1.join(this.modelsDir, sibling));
+		}
 		return modelPath;
 	}
 	/**
@@ -608,7 +632,8 @@ var ModelDownloadService = class {
 		const modelPath = this.modelFilePath(entry, selectedFormat);
 		if (!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(this.modelsDir, f)));
 	}
 	/** Get the catalog entry for a model by ID. */
 	getEntry(modelId) {
@@ -695,4 +720,4 @@ var ModelDownloadService = class {
 	}
 };
 //#endregion
-export { ensureModel as a, isModelDownloaded as c, createAuthenticatedFileServer as d, parseRangeHeader as f, downloadModel as i, createFileDataPlaneHandler as l, resolveFilePath as m, deleteModelFromDisk as n, fetchJson as o, parseTokenizedUrl as p, downloadFile as r, getModelFilePath as s, ModelDownloadService as t, contentTypeFor as u };
+export { downloadModel as a, getModelFilePath as c, contentTypeFor as d, createAuthenticatedFileServer as f, resolveFilePath as h, downloadFile as i, isModelDownloaded as l, parseTokenizedUrl as m, collectModelFiles as n, ensureModel as o, parseRangeHeader as p, deleteModelFromDisk as r, fetchJson as s, ModelDownloadService as t, createFileDataPlaneHandler as u };

package/dist/{model-download-service-1eEOkNeS.js → model-download-service-D-Umz4-L.js}

@@ -319,6 +319,24 @@ function siblingFilesFor(formatEntry) {
 function siblingUrl(mainUrl, sibling) {
 	return mainUrl.replace(/[^/]+$/, sibling);
 }
+/**
+* The relative filenames a model format occupies under `modelsDir` — the main
+* file (URL basename, or `${id}.${format}` fallback), its declared siblings
+* (e.g. the OpenVINO `.bin` next to the `.xml`), and any `extraFiles`. For a
+* directory bundle the single entry is the bundle dir itself (tar/extract
+* recurse into it).
+*
+* Used by model distribution (P2): the hub tars exactly these names from its
+* `modelsDir` and the agent untars them into its own `modelsDir`, so both ends
+* agree on the on-disk layout without re-deriving it.
+*/
+function collectModelFiles(entry, format) {
+	const formatEntry = entry.formats[format];
+	if (!formatEntry) return [];
+	const names = [formatEntry.url.split("/").pop() ?? `${entry.id}.${format}`, ...siblingFilesFor(formatEntry)];
+	for (const extra of entry.extraFiles ?? []) names.push(extra.filename);
+	return names;
+}
 /** Build fetch headers, including HF auth token for huggingface.co URLs */
 function buildHeaders(url) {
 	const headers = { "User-Agent": "CamStack/1.0" };
@@ -567,15 +585,21 @@ var ModelDownloadService = class {
 		if (!formatEntry) throw new Error(`ModelDownloadService: model "${modelId}" has no ${selectedFormat} format`);
 		await this.ensureExtraFiles(modelId);
 		const modelPath = this.modelFilePath(entry, selectedFormat);
-		if (node_fs.existsSync(modelPath)) if (formatEntry.isDirectory) if (!node_fs.existsSync(node_path.join(modelPath, "Manifest.json"))) node_fs.rmSync(modelPath, {
-			recursive: true,
-			force: true
-		});
-		else return modelPath;
-		else return modelPath;
+		const siblings = siblingFilesFor(formatEntry);
+		if (node_fs.existsSync(modelPath)) {
+			if (formatEntry.isDirectory) if (!node_fs.existsSync(node_path.join(modelPath, "Manifest.json"))) node_fs.rmSync(modelPath, {
+				recursive: true,
+				force: true
+			});
+			else return modelPath;
+			else if (siblings.every((f) => isNonEmptyFile(node_path.join(this.modelsDir, f)))) return modelPath;
+		}
 		node_fs.mkdirSync(this.modelsDir, { recursive: true });
 		if (formatEntry.isDirectory) await this.downloadDirectory(formatEntry.url, modelPath, formatEntry.files, modelId);
-		else await downloadFile(formatEntry.url, modelPath, this.onProgress ? (downloaded, total) => this.onProgress(modelId, downloaded, total) : void 0);
+		else {
+			await downloadFile(formatEntry.url, modelPath, this.onProgress ? (downloaded, total) => this.onProgress(modelId, downloaded, total) : void 0);
+			for (const sibling of siblings) await downloadFile(siblingUrl(formatEntry.url, sibling), node_path.join(this.modelsDir, sibling));
+		}
 		return modelPath;
 	}
 	/**
@@ -609,7 +633,8 @@ var ModelDownloadService = class {
 		const modelPath = this.modelFilePath(entry, selectedFormat);
 		if (!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(this.modelsDir, f)));
 	}
 	/** Get the catalog entry for a model by ID. */
 	getEntry(modelId) {
@@ -702,6 +727,12 @@ Object.defineProperty(exports, "ModelDownloadService", {
 		return ModelDownloadService;
 	}
 });
+Object.defineProperty(exports, "collectModelFiles", {
+	enumerable: true,
+	get: function() {
+		return collectModelFiles;
+	}
+});
 Object.defineProperty(exports, "contentTypeFor", {
 	enumerable: true,
 	get: function() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/system",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Core addon for CamStack — builtins, pipeline, process management, auth, logging, events",
   "keywords": [
     "camstack",