@infersec/conduit 1.6.0 → 1.6.1

package/dist/cli.js

@@ -6,7 +6,7 @@ const __dirname = __pathDirname(__filename);
 
 import { parseArgs } from 'node:util';
 import 'node:crypto';
-import { a as asError, s as startInferenceAgent } from './start-XRPU7RSB.js';
+import { a as asError, s as startInferenceAgent } from './start-BS3RcUet.js';
 import 'argon2';
 import 'node:child_process';
 import 'node:stream';
@@ -45,8 +45,8 @@ import 'querystring';
 import 'url';
 import 'http';
 import 'crypto';
-import 'node:stream/promises';
 import 'node:fs';
+import 'node:stream/promises';
 import 'fs/promises';
 import 'stream/promises';
 import 'node:string_decoder';

package/dist/index.js

@@ -5,7 +5,7 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __pathDirname(__filename);
 
 import 'node:crypto';
-import { s as startInferenceAgent, a as asError } from './start-XRPU7RSB.js';
+import { s as startInferenceAgent, a as asError } from './start-BS3RcUet.js';
 import 'argon2';
 import 'node:child_process';
 import 'node:stream';
@@ -45,8 +45,8 @@ import 'querystring';
 import 'url';
 import 'http';
 import 'crypto';
-import 'node:stream/promises';
 import 'node:fs';
+import 'node:stream/promises';
 import 'fs/promises';
 import 'stream/promises';
 import 'node:string_decoder';

package/dist/{start-XRPU7RSB.js → start-BS3RcUet.js}

@@ -30,7 +30,7 @@ import require$$1$3 from 'node:worker_threads';
 import require$$1$5, { fileURLToPath } from 'node:url';
 import require$$1$6 from 'node:async_hooks';
 import require$$1$7 from 'node:console';
-import require$$0$b, { mkdir, readFile, writeFile, realpath, readlink, readdir, lstat } from 'node:fs/promises';
+import require$$0$b, { mkdir, readFile, writeFile, stat, unlink, rename, realpath, readlink, readdir, lstat } from 'node:fs/promises';
 import path$1, { dirname, join, win32, posix } from 'node:path';
 import require$$1$8 from 'node:dns';
 import require$$2$4 from 'node:sqlite';
@@ -44,9 +44,9 @@ import require$$8$1 from 'querystring';
 import require$$0$f from 'url';
 import require$$0$g from 'http';
 import require$$0$h from 'crypto';
-import { pipeline, finished } from 'node:stream/promises';
 import * as actualFS from 'node:fs';
 import { existsSync, createWriteStream, statSync, readFileSync, appendFileSync, writeFileSync, createReadStream } from 'node:fs';
+import { pipeline, finished } from 'node:stream/promises';
 import 'fs/promises';
 import 'stream/promises';
 import { StringDecoder } from 'node:string_decoder';
@@ -96473,11 +96473,13 @@ const ModelDownloadProgressSchema = object({
     completedFiles: array(string$1().min(1))
 });
 
-const DOWNLOAD_PROGRESS_TIMEOUT = 30000;
-const DOWNLOAD_RETRY_ATTEMPTS = 3;
+const DOWNLOAD_PROGRESS_TIMEOUT = 60000;
+const DOWNLOAD_RETRY_ATTEMPTS_FULL = 3;
+const DOWNLOAD_RETRY_ATTEMPTS_RANGE = 10;
 async function downloadModelViaHuggingFace({ format, huggingFaceToken, modelSlug: rawModelSlug, progressFilePath, targetDirectory }) {
     // Sanitise model ID
-    const [modelSlug, variant = null] = rawModelSlug.split(":");
+    const [modelSlugWithRevision, variant = null] = rawModelSlug.split(":");
+    const { modelSlug, revision } = parseModelRevision(modelSlugWithRevision);
     // Prepare directory
     await mkdir(targetDirectory, { recursive: true });
     let progress;
@@ -96512,65 +96514,273 @@ async function downloadModelViaHuggingFace({ format, huggingFaceToken, modelSlug
             console.log("Skipping due to already having completed file:", file.path, file.size);
             continue;
         }
-        let downloaded = false;
-        let lastError = null;
-        for (let attempt = 1; attempt <= DOWNLOAD_RETRY_ATTEMPTS; attempt++) {
+        const rangeInfo = await getRangeInfo({
+            accessToken,
+            filePath: file.path,
+            fileSize: file.size,
+            modelSlug,
+            revision
+        });
+        if (rangeInfo.supportsRanges) {
             try {
-                console.log("Downloading:", file.path, file.size, `(attempt ${attempt})`);
-                await mkdir(dirname(join(targetDirectory, file.path)), { recursive: true });
-                const response = await downloadFile({
+                await downloadFileWithRange({
                     accessToken,
-                    repo: modelSlug,
-                    path: file.path
-                    // path: join(targetDirectory, file.path)
-                });
-                if (!response) {
-                    throw new Error(`Requested file did not return a valid response: ${file.path}`);
-                }
-                const input = Readable.fromWeb(response.stream());
-                const meter = watchStreamProgress(25 * 1024 * 1024); // 25 MiB intervals
-                const output = createWriteStream(join(targetDirectory, file.path));
-                let progressTimeout = null;
-                let lastPercentage = "0.0";
-                let lastProgressBytes = 0;
-                meter.progress.on("progress", (totalBytes) => {
-                    lastProgressBytes = totalBytes;
-                    const percentComplete = ((totalBytes / file.size) * 100).toFixed(1);
-                    if (lastPercentage !== percentComplete) {
-                        console.log(` => ${percentComplete}% (${totalBytes} / ${file.size})`);
-                    }
-                    lastPercentage = percentComplete;
-                    clearTimeout(progressTimeout);
-                    progressTimeout = setTimeout(() => {
-                        input.destroy(new Error(`Timed out with no progress for ${DOWNLOAD_PROGRESS_TIMEOUT}ms while downloading ${file.path}. Last progress: ${lastPercentage}% (${lastProgressBytes} / ${file.size})`));
-                    }, DOWNLOAD_PROGRESS_TIMEOUT);
+                    filePath: file.path,
+                    fileSize: rangeInfo.totalSize ?? file.size,
+                    modelSlug,
+                    revision,
+                    targetDirectory
                 });
-                try {
-                    await pipeline(input, meter, output);
-                }
-                finally {
-                    clearTimeout(progressTimeout);
-                }
-                downloaded = true;
-                break;
             }
             catch (error) {
-                lastError = asError(error);
-                if (attempt < DOWNLOAD_RETRY_ATTEMPTS) {
-                    console.warn(`Retrying download (${attempt}/${DOWNLOAD_RETRY_ATTEMPTS}) for ${file.path} due to error: ${lastError.message}`);
-                    continue;
+                if (error instanceof RangeNotSupportedError) {
+                    console.warn(`Range download unavailable for ${file.path}: ${error.message}`);
+                    await downloadFileFull({
+                        accessToken,
+                        filePath: file.path,
+                        fileSize: file.size,
+                        modelSlug,
+                        targetDirectory
+                    });
+                }
+                else {
+                    throw error;
                 }
             }
         }
-        if (!downloaded) {
-            const errorMessage = `Failed downloading ${file.path} (${file.size} bytes) after ${DOWNLOAD_RETRY_ATTEMPTS} attempts. Last error: ${lastError?.message ?? "Unknown error"}`;
-            throw new Error(errorMessage);
+        else {
+            if (rangeInfo.reason) {
+                console.warn(`Range download unavailable for ${file.path}: ${rangeInfo.reason}`);
+            }
+            await downloadFileFull({
+                accessToken,
+                filePath: file.path,
+                fileSize: file.size,
+                modelSlug,
+                targetDirectory
+            });
         }
         // Update progress
         progress.completedFiles.push(file.path);
         await writeFile(progressFilePath, JSON.stringify(progress, undefined, 4));
     }
 }
+function encodePathSegments(path) {
+    return path
+        .split("/")
+        .map(segment => encodeURIComponent(segment))
+        .join("/");
+}
+function parseModelRevision(modelSlugWithRevision) {
+    const revisionIndex = modelSlugWithRevision.indexOf("@");
+    if (revisionIndex === -1) {
+        return { modelSlug: modelSlugWithRevision, revision: "main" };
+    }
+    return {
+        modelSlug: modelSlugWithRevision.slice(0, revisionIndex),
+        revision: modelSlugWithRevision.slice(revisionIndex + 1)
+    };
+}
+function getDownloadPaths({ filePath, targetDirectory }) {
+    const finalPath = join(targetDirectory, filePath);
+    return {
+        finalPath,
+        partialPath: `${finalPath}.partial`
+    };
+}
+function getResolveURL({ filePath, modelSlug, revision }) {
+    const encodedRepo = encodeURIComponent(modelSlug);
+    const encodedRevision = encodeURIComponent(revision);
+    const encodedPath = encodePathSegments(filePath);
+    return `https://huggingface.co/${encodedRepo}/resolve/${encodedRevision}/${encodedPath}`;
+}
+class RangeNotSupportedError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "RangeNotSupportedError";
+    }
+}
+function getAuthHeaders(accessToken) {
+    if (!accessToken) {
+        return {};
+    }
+    return {
+        Authorization: `Bearer ${accessToken}`
+    };
+}
+async function getRangeInfo({ accessToken, filePath, fileSize, modelSlug, revision }) {
+    const url = getResolveURL({ filePath, modelSlug, revision });
+    try {
+        const response = await undiciExports.fetch(url, {
+            method: "HEAD",
+            headers: getAuthHeaders(accessToken)
+        });
+        if (!response.ok) {
+            return {
+                reason: `HEAD request failed with status ${response.status}`,
+                supportsRanges: false,
+                totalSize: null
+            };
+        }
+        const acceptRanges = response.headers.get("accept-ranges")?.toLowerCase() ?? "";
+        const totalSize = Number(response.headers.get("content-length"));
+        if (acceptRanges.includes("bytes") === false) {
+            return {
+                reason: "Server does not advertise range support",
+                supportsRanges: false,
+                totalSize: Number.isFinite(totalSize) ? totalSize : fileSize
+            };
+        }
+        return {
+            reason: null,
+            supportsRanges: true,
+            totalSize: Number.isFinite(totalSize) ? totalSize : fileSize
+        };
+    }
+    catch (error) {
+        const parsed = asError(error);
+        return {
+            reason: `HEAD request failed: ${parsed.message}`,
+            supportsRanges: false,
+            totalSize: fileSize
+        };
+    }
+}
+async function downloadFileFull({ accessToken, filePath, fileSize, modelSlug, targetDirectory }) {
+    const { finalPath, partialPath } = getDownloadPaths({ filePath, targetDirectory });
+    let lastError = null;
+    for (let attempt = 1; attempt <= DOWNLOAD_RETRY_ATTEMPTS_FULL; attempt++) {
+        try {
+            console.log("Downloading:", filePath, fileSize, `(attempt ${attempt})`);
+            await mkdir(dirname(finalPath), { recursive: true });
+            if (existsSync(partialPath)) {
+                await unlink(partialPath);
+            }
+            const response = await downloadFile({
+                accessToken,
+                repo: modelSlug,
+                path: filePath
+            });
+            if (!response) {
+                throw new Error(`Requested file did not return a valid response: ${filePath}`);
+            }
+            const input = Readable.fromWeb(response.stream());
+            const meter = watchStreamProgress(25 * 1024 * 1024); // 25 MiB intervals
+            const output = createWriteStream(partialPath, { flags: "w" });
+            let progressTimeout = null;
+            let lastPercentage = "0.0";
+            let lastProgressBytes = 0;
+            meter.progress.on("progress", (totalBytes) => {
+                lastProgressBytes = totalBytes;
+                const percentComplete = ((totalBytes / fileSize) * 100).toFixed(1);
+                if (lastPercentage !== percentComplete) {
+                    console.log(` => ${percentComplete}% (${totalBytes} / ${fileSize})`);
+                }
+                lastPercentage = percentComplete;
+                clearTimeout(progressTimeout);
+                progressTimeout = setTimeout(() => {
+                    input.destroy(new Error(`Timed out with no progress for ${DOWNLOAD_PROGRESS_TIMEOUT}ms while downloading ${filePath}. Last progress: ${lastPercentage}% (${lastProgressBytes} / ${fileSize})`));
+                }, DOWNLOAD_PROGRESS_TIMEOUT);
+            });
+            try {
+                await pipeline(input, meter, output);
+            }
+            finally {
+                clearTimeout(progressTimeout);
+            }
+            await rename(partialPath, finalPath);
+            return;
+        }
+        catch (error) {
+            lastError = asError(error);
+            if (attempt < DOWNLOAD_RETRY_ATTEMPTS_FULL) {
+                console.warn(`Retrying full download (${attempt}/${DOWNLOAD_RETRY_ATTEMPTS_FULL}) for ${filePath} due to error: ${lastError.message}`);
+                continue;
+            }
+        }
+    }
+    const errorMessage = `Failed downloading ${filePath} (${fileSize} bytes) after ${DOWNLOAD_RETRY_ATTEMPTS_FULL} attempts. Last error: ${lastError?.message ?? "Unknown error"}`;
+    throw new Error(errorMessage);
+}
+async function downloadFileWithRange({ accessToken, filePath, fileSize, modelSlug, revision, targetDirectory }) {
+    const { finalPath, partialPath } = getDownloadPaths({ filePath, targetDirectory });
+    const url = getResolveURL({ filePath, modelSlug, revision });
+    let lastError = null;
+    for (let attempt = 1; attempt <= DOWNLOAD_RETRY_ATTEMPTS_RANGE; attempt++) {
+        let startOffset = 0;
+        if (existsSync(partialPath)) {
+            const currentStats = await stat(partialPath);
+            startOffset = currentStats.size;
+            if (startOffset > fileSize) {
+                await unlink(partialPath);
+                startOffset = 0;
+            }
+            if (startOffset === fileSize) {
+                await rename(partialPath, finalPath);
+                return;
+            }
+        }
+        try {
+            const resumeLabel = startOffset > 0 ? `resuming at ${startOffset}` : "starting";
+            console.log("Downloading:", filePath, fileSize, `(attempt ${attempt}, ${resumeLabel})`);
+            await mkdir(dirname(finalPath), { recursive: true });
+            const response = await undiciExports.fetch(url, {
+                headers: {
+                    ...getAuthHeaders(accessToken),
+                    Range: `bytes=${startOffset}-`
+                }
+            });
+            if (!response.ok) {
+                throw new Error(`Range request failed with status ${response.status} for ${filePath}`);
+            }
+            if (startOffset > 0 && response.status !== 206) {
+                throw new RangeNotSupportedError(`Server did not honor range request (status ${response.status})`);
+            }
+            if (!response.body) {
+                throw new Error(`Range request returned no body for ${filePath}`);
+            }
+            const input = Readable.fromWeb(response.body);
+            const meter = watchStreamProgress(25 * 1024 * 1024); // 25 MiB intervals
+            const output = createWriteStream(partialPath, { flags: "a" });
+            let progressTimeout = null;
+            let lastPercentage = ((startOffset / fileSize) * 100).toFixed(1);
+            let lastProgressBytes = startOffset;
+            meter.progress.on("progress", (totalBytes) => {
+                lastProgressBytes = startOffset + totalBytes;
+                const percentComplete = ((lastProgressBytes / fileSize) * 100).toFixed(1);
+                if (lastPercentage !== percentComplete) {
+                    console.log(` => ${percentComplete}% (${lastProgressBytes} / ${fileSize})`);
+                }
+                lastPercentage = percentComplete;
+                clearTimeout(progressTimeout);
+                progressTimeout = setTimeout(() => {
+                    input.destroy(new Error(`Timed out with no progress for ${DOWNLOAD_PROGRESS_TIMEOUT}ms while downloading ${filePath}. Last progress: ${lastPercentage}% (${lastProgressBytes} / ${fileSize})`));
+                }, DOWNLOAD_PROGRESS_TIMEOUT);
+            });
+            try {
+                await pipeline(input, meter, output);
+            }
+            finally {
+                clearTimeout(progressTimeout);
+            }
+            const updatedStats = await stat(partialPath);
+            if (updatedStats.size < fileSize) {
+                throw new Error(`Download incomplete for ${filePath}. Received ${updatedStats.size} / ${fileSize} bytes`);
+            }
+            await rename(partialPath, finalPath);
+            return;
+        }
+        catch (error) {
+            lastError = asError(error);
+            if (attempt < DOWNLOAD_RETRY_ATTEMPTS_RANGE) {
+                console.warn(`Retrying range download (${attempt}/${DOWNLOAD_RETRY_ATTEMPTS_RANGE}) for ${filePath} due to error: ${lastError.message}`);
+                continue;
+            }
+        }
+    }
+    const errorMessage = `Failed downloading ${filePath} (${fileSize} bytes) after ${DOWNLOAD_RETRY_ATTEMPTS_RANGE} attempts. Last error: ${lastError?.message ?? "Unknown error"}`;
+    throw new Error(errorMessage);
+}
 
 const balanced = (a, b, str) => {
     const ma = a instanceof RegExp ? maybeMatch(a, str) : a;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infersec/conduit",
   "description": "End user conduit agent for connecting local LLMs to the cloud.",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "bin": {
     "infersec-conduit": "./dist/cli.js"
   },