@camstack/system 1.0.8 → 1.1.1

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

@@ -300,6 +300,42 @@ function createFileDataPlaneHandler(opts) {
 }
 //#endregion
 //#region src/download/model-downloader.ts
+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);
+}
+/**
+* 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" };
@@ -465,14 +501,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. */
@@ -489,17 +529,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
@@ -536,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;
 	}
 	/**
@@ -578,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) {
@@ -665,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-JtVQtbb6.js → model-download-service-D-Umz4-L.js}

@@ -301,6 +301,42 @@ function createFileDataPlaneHandler(opts) {
 }
 //#endregion
 //#region src/download/model-downloader.ts
+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);
+}
+/**
+* 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" };
@@ -466,14 +502,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. */
@@ -490,17 +530,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
@@ -537,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;
 	}
 	/**
@@ -579,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) {
@@ -672,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.0.8",
+  "version": "1.1.1",
   "description": "Core addon for CamStack — builtins, pipeline, process management, auth, logging, events",
   "keywords": [
     "camstack",