@infersec/conduit 1.5.1 → 1.5.3

package/dist/cli.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { fileURLToPath as __fileURLToPath } from 'url';
-import { dirname } from 'path';
+import { fileURLToPath as __fileURLToPath } from 'node:url';
+import { dirname as __pathDirname } from 'node:path';
 const __filename = __fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = __pathDirname(__filename);
 
 import { parseArgs } from 'node:util';
 import 'node:crypto';
-import { a as asError, s as startInferenceAgent } from './start-Cs0zWiJW.js';
+import { a as asError, s as startInferenceAgent } from './start-C7RTzXTv.js';
 import 'argon2';
 import 'node:child_process';
 import 'node:stream';

package/dist/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { fileURLToPath as __fileURLToPath } from 'url';
-import { dirname } from 'path';
+import { fileURLToPath as __fileURLToPath } from 'node:url';
+import { dirname as __pathDirname } from 'node:path';
 const __filename = __fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = __pathDirname(__filename);
 
 import 'node:crypto';
-import { s as startInferenceAgent, a as asError } from './start-Cs0zWiJW.js';
+import { s as startInferenceAgent, a as asError } from './start-C7RTzXTv.js';
 import 'argon2';
 import 'node:child_process';
 import 'node:stream';

package/dist/{start-Cs0zWiJW.js → start-C7RTzXTv.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { fileURLToPath as __fileURLToPath } from 'url';
-import { dirname } from 'path';
+import { fileURLToPath as __fileURLToPath } from 'node:url';
+import { dirname as __pathDirname } from 'node:path';
 const __filename = __fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = __pathDirname(__filename);
 
 import require$$0$5 from 'os';
 import require$$1$2, { realpathSync as realpathSync$1, readlinkSync, readdirSync, readdir as readdir$1, lstatSync } from 'fs';
@@ -31,7 +31,7 @@ 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, { realpath, readlink, readdir, lstat, mkdir, readFile, writeFile } from 'node:fs/promises';
-import path$1, { win32, posix, join } from 'node:path';
+import path$1, { win32, posix, dirname, join } from 'node:path';
 import require$$1$8 from 'node:dns';
 import require$$2$4 from 'node:sqlite';
 import require$$0$c from 'path';
@@ -94890,7 +94890,8 @@ const ModelDownloadProgressSchema = object({
     completedFiles: array(string().min(1))
 });
 
-const DOWNLOAD_PROGRESS_TIMEOUT = 15000;
+const DOWNLOAD_PROGRESS_TIMEOUT = 30000;
+const DOWNLOAD_RETRY_ATTEMPTS = 3;
 async function downloadModelViaHuggingFace({ format, huggingFaceToken, modelSlug: rawModelSlug, progressFilePath, targetDirectory }) {
     // Sanitise model ID
     const [modelSlug, variant = null] = rawModelSlug.split(":");
@@ -94911,9 +94912,13 @@ async function downloadModelViaHuggingFace({ format, huggingFaceToken, modelSlug
     // Get all files in model
     for await (const file of listFiles({
         accessToken,
+        recursive: true,
         repo: modelSlug
     })) {
         const filePath = file.path.toLowerCase();
+        if (format === "gguf" && filePath.endsWith(".gguf") === false) {
+            continue;
+        }
         if (variant &&
             filePath.endsWith(".gguf") &&
             filePath.includes(variant.toLowerCase()) === false) {
@@ -94924,36 +94929,60 @@ async function downloadModelViaHuggingFace({ format, huggingFaceToken, modelSlug
             console.log("Skipping due to already having completed file:", file.path, file.size);
             continue;
         }
-        console.log("Downloading:", file.path, file.size);
-        const response = await downloadFile({
-            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 = "";
-        meter.progress.on("progress", (totalBytes) => {
-            const percentComplete = ((totalBytes / file.size) * 100).toFixed(1);
-            if (lastPercentage !== percentComplete) {
-                console.log(` => ${percentComplete}% (${totalBytes} / ${file.size})`);
+        let downloaded = false;
+        let lastError = null;
+        for (let attempt = 1; attempt <= DOWNLOAD_RETRY_ATTEMPTS; attempt++) {
+            try {
+                console.log("Downloading:", file.path, file.size, `(attempt ${attempt})`);
+                await mkdir(dirname(join(targetDirectory, file.path)), { recursive: true });
+                const response = await downloadFile({
+                    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);
+                });
+                try {
+                    await pipeline(input, meter, output);
+                }
+                finally {
+                    clearTimeout(progressTimeout);
+                }
+                downloaded = true;
+                break;
             }
-            lastPercentage = percentComplete;
-            clearTimeout(progressTimeout);
-            progressTimeout = setTimeout(() => {
-                input.destroy(new Error(`Timed out with no progress in: ${DOWNLOAD_PROGRESS_TIMEOUT}ms`));
-            }, DOWNLOAD_PROGRESS_TIMEOUT);
-        });
-        await pipeline(input, meter, output);
-        // const stream = Readable.fromWeb(response.stream()).pipe(createWriteStream(join(targetDirectory, file.path)));
-        // await finished(stream);
-        clearTimeout(progressTimeout);
+            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 (!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);
+        }
         // Update progress
         progress.completedFiles.push(file.path);
         await writeFile(progressFilePath, JSON.stringify(progress, undefined, 4));

package/package.json

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