node-llama-cpp 3.4.3 → 3.5.0

package/dist/utils/resolveModelFile.d.ts

@@ -90,7 +90,7 @@ export type ResolveModelFileOptions = {
  *
  * // resolve a model from Hugging Face to the models directory
  * const modelPath = await resolveModelFile(
- *     "hf:user/model/model-file.gguf",
+ *     "hf:user/model:quant",
  *     path.join(__dirname, "models")
  * );
  *

package/dist/utils/resolveModelFile.js

@@ -6,6 +6,9 @@ import { getReadablePath } from "../cli/utils/getReadablePath.js";
 import { resolveSplitGgufParts } from "../gguf/utils/resolveSplitGgufParts.js";
 import { resolveModelDestination } from "./resolveModelDestination.js";
 import { createModelDownloader } from "./createModelDownloader.js";
+import { genericFilePartNumber } from "./parseModelUri.js";
+import { isFilePartText } from "./parseModelFileName.js";
+import { pushAll } from "./pushAll.js";
 /**
  * Resolves a local model file path from a URI or file path, and downloads the necessary files first if needed.
  *
@@ -28,7 +31,7 @@ import { createModelDownloader } from "./createModelDownloader.js";
  *
  * // resolve a model from Hugging Face to the models directory
  * const modelPath = await resolveModelFile(
- *     "hf:user/model/model-file.gguf",
+ *     "hf:user/model:quant",
  *     path.join(__dirname, "models")
  * );
  *
@@ -87,20 +90,29 @@ export async function resolveModelFile(uriOrPath, optionsOrDirectory) {
             return resolvedFilePath;
         throw new Error(`No model file found at "${resolvedFilePath}"`);
     }
-    let expectedFilePath = fileName != null
-        ? path.join(resolvedDirectory, fileName)
-        : undefined;
-    if (expectedFilePath == null && resolvedModelDestination.type === "uri")
-        expectedFilePath = path.join(resolvedDirectory, resolvedModelDestination.parsedUri.fullFilename);
-    else if (expectedFilePath == null && resolvedModelDestination.type === "url") {
+    const expectedFileNames = fileName != null
+        ? [fileName]
+        : [];
+    if (expectedFileNames.length === 0 && resolvedModelDestination.type === "uri") {
+        if (resolvedModelDestination.parsedUri.type === "resolved")
+            expectedFileNames.push(resolvedModelDestination.parsedUri.fullFilename);
+        else
+            pushAll(expectedFileNames, resolvedModelDestination.parsedUri.possibleFullFilenames);
+    }
+    else if (expectedFileNames.length === 0 && resolvedModelDestination.type === "url") {
         const enforcedParsedUrl = resolveModelDestination(uriOrPath, true);
-        if (enforcedParsedUrl != null && enforcedParsedUrl.type === "uri")
-            expectedFilePath = path.join(resolvedDirectory, enforcedParsedUrl.parsedUri.filename);
+        if (enforcedParsedUrl != null && enforcedParsedUrl.type === "uri") {
+            if (enforcedParsedUrl.parsedUri.type === "resolved")
+                expectedFileNames.push(enforcedParsedUrl.parsedUri.fullFilename);
+            else
+                pushAll(expectedFileNames, enforcedParsedUrl.parsedUri.possibleFullFilenames);
+        }
     }
-    if (expectedFilePath != null && !resolvedVerify && await fs.pathExists(expectedFilePath)) {
-        const allGgufParts = resolveSplitGgufParts(expectedFilePath);
-        if (allGgufParts.length === 1 && allGgufParts[0] === expectedFilePath)
-            return expectedFilePath;
+    const foundExpectedFilePath = await findMatchingFilesInDirectory(resolvedDirectory, expectedFileNames);
+    if (foundExpectedFilePath != null && !resolvedVerify) {
+        const allGgufParts = resolveSplitGgufParts(foundExpectedFilePath);
+        if (allGgufParts.length === 1 && allGgufParts[0] === foundExpectedFilePath)
+            return foundExpectedFilePath;
         const allPartsExist = await Promise.all(allGgufParts.map((part) => fs.pathExists(part)));
         if (allGgufParts.length > 0) {
             if (allPartsExist.every((exists) => exists))
@@ -110,10 +122,12 @@ export async function resolveModelFile(uriOrPath, optionsOrDirectory) {
         }
     }
     if (download === false) {
-        if (expectedFilePath != null)
-            throw new Error(`No model file found at "${expectedFilePath}" and download is disabled`);
-        throw new Error(`No model file found for "${uriOrPath}" and download is disabled`);
+        if (expectedFileNames.length === 1)
+            throw new Error(`No model file found at "${path.join(resolvedDirectory, expectedFileNames[0])}" and download is disabled`);
+        throw new Error(`No model file found for "${uriOrPath}" at "${resolvedDirectory}" and download is disabled`);
     }
+    if (signal?.aborted)
+        throw signal.reason;
     const downloader = await createModelDownloader({
         modelUri: resolvedModelDestination.type === "uri"
             ? resolvedModelDestination.uri
@@ -128,12 +142,11 @@ export async function resolveModelFile(uriOrPath, optionsOrDirectory) {
         onProgress,
         tokens
     });
-    if (expectedFilePath != null && downloader.totalFiles === 1 && await fs.pathExists(downloader.entrypointFilePath)) {
-        const fileStats = await fs.stat(expectedFilePath);
+    if (foundExpectedFilePath != null && downloader.totalFiles === 1 && await fs.pathExists(downloader.entrypointFilePath)) {
+        const fileStats = await fs.stat(foundExpectedFilePath);
         if (downloader.totalSize === fileStats.size) {
             await downloader.cancel({ deleteTempFile: false });
-            console.log("download canceled");
-            return expectedFilePath;
+            return foundExpectedFilePath;
         }
     }
     if (resolvedCli)
@@ -145,4 +158,30 @@ export async function resolveModelFile(uriOrPath, optionsOrDirectory) {
         console.info(`Downloaded to ${chalk.yellow(getReadablePath(downloader.entrypointFilePath))}`);
     return downloader.entrypointFilePath;
 }
+async function findMatchingFilesInDirectory(dirPath, fileNames) {
+    let directoryFileNames = undefined;
+    for (const expectedFileName of fileNames) {
+        if (expectedFileName.includes(genericFilePartNumber)) {
+            const [firstPart, ...restParts] = expectedFileName.split(genericFilePartNumber);
+            const resolvedFirstPart = firstPart || "";
+            const resolvedLastParts = restParts.join(genericFilePartNumber);
+            if (directoryFileNames == null)
+                directoryFileNames = (await fs.readdir(dirPath, { withFileTypes: true }))
+                    .filter((item) => item.isFile())
+                    .map((item) => item.name);
+            for (const directoryFileName of directoryFileNames) {
+                if (directoryFileName.startsWith(resolvedFirstPart) && directoryFileName.endsWith(resolvedLastParts)) {
+                    const numberPart = directoryFileName.slice(resolvedFirstPart.length, -resolvedLastParts.length);
+                    if (isFilePartText(numberPart))
+                        return path.join(dirPath, directoryFileName);
+                }
+            }
+            continue;
+        }
+        const testPath = path.join(dirPath, expectedFileName);
+        if (await fs.pathExists(testPath))
+            return testPath;
+    }
+    return undefined;
+}
 //# sourceMappingURL=resolveModelFile.js.map

package/dist/utils/resolveModelFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveModelFile.js","sourceRoot":"","sources":["../../src/utils/resolveModelFile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveModelFile.js","sourceRoot":"","sources":["../../src/utils/resolveModelFile.ts"],"names":[],"mappings":"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"}

package/llama/binariesGithubRelease.json

@@ -1,3 +1,3 @@
 {
-    "release": "b4599"
+    "release": "b4600"
 }

package/llama/llama.cpp.info.json

@@ -1,4 +1,4 @@
 {
-    "tag": "b4599",
+    "tag": "b4600",
     "llamaCppGithubRepo": "ggerganov/llama.cpp"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-llama-cpp",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "description": "Run AI models locally on your machine with node.js bindings for llama.cpp. Enforce a JSON schema on the model output on the generation level",
   "main": "./dist/index.js",
   "type": "module",
@@ -67,7 +67,7 @@
     "dev:build": "npm run build && node ./dist/cli/cli.js source build --noUsageExample",
     "clean": "rm -rf ./node_modules ./dist ./tsconfig.tsbuildinfo ./test/.models ./docs/api ./docs/api-overrides ./templates/packed",
     "docs:generateTypedoc": "typedoc && rimraf ./docs/api/index.md ./docs/api/globals.md ./docs/api/functions/LlamaText.md",
-    "docs:dev": "npm run docs:generateTypedoc && vitepress dev",
+    "docs:dev": "npm run docs:generateTypedoc && vitepress dev --cors",
     "docs:build": "npm run docs:generateTypedoc && vitepress build",
     "docs:preview": "npm run docs:generateTypedoc && vitepress preview"
   },
@@ -132,33 +132,33 @@
   "devDependencies": {
     "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
-    "@eslint/compat": "^1.2.4",
+    "@eslint/compat": "^1.2.5",
     "@fontsource/inter": "^5.1.1",
-    "@nolebase/vitepress-plugin-git-changelog": "^2.12.0",
-    "@nolebase/vitepress-plugin-og-image": "^2.12.0",
+    "@nolebase/vitepress-plugin-git-changelog": "^2.12.1",
+    "@nolebase/vitepress-plugin-og-image": "^2.12.1",
     "@resvg/resvg-js": "^2.6.2",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/github": "11.0.1",
     "@semantic-release/npm": "12.0.1",
-    "@shikijs/vitepress-twoslash": "^1.26.1",
-    "@stylistic/eslint-plugin": "^2.12.1",
+    "@shikijs/vitepress-twoslash": "^2.2.0",
+    "@stylistic/eslint-plugin": "^3.0.1",
     "@types/async-retry": "^1.4.9",
     "@types/bytes": "^3.1.5",
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.10.5",
+    "@types/node": "^22.12.0",
     "@types/proper-lockfile": "^4.1.4",
     "@types/semver": "^7.5.8",
     "@types/validate-npm-package-name": "^4.0.2",
     "@types/which": "^3.0.4",
     "@types/yargs": "^17.0.33",
-    "@vitest/coverage-v8": "^2.1.8",
-    "@vitest/ui": "^2.1.8",
-    "electron": "^33.3.1",
-    "eslint": "^9.17.0",
+    "@vitest/coverage-v8": "^3.0.4",
+    "@vitest/ui": "^3.0.4",
+    "electron": "^34.0.2",
+    "eslint": "^9.19.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jsdoc": "^50.6.1",
+    "eslint-plugin-jsdoc": "^50.6.3",
     "eslint-plugin-n": "^17.15.1",
     "feed": "^4.2.2",
     "husky": "^9.1.7",
@@ -169,17 +169,17 @@
     "tslib": "^2.8.1",
     "typedoc": "^0.27.6",
     "typedoc-plugin-markdown": "^4.4.1",
-    "typedoc-plugin-mdn-links": "^4.0.7",
+    "typedoc-plugin-mdn-links": "^4.0.10",
     "typedoc-vitepress-theme": "^1.1.2",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.19.1",
-    "vite-node": "^2.1.8",
-    "vitepress": "^1.5.0",
-    "vitest": "^2.1.8",
-    "zx": "^8.3.0"
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.22.0",
+    "vite-node": "^3.0.4",
+    "vitepress": "^1.6.3",
+    "vitest": "^3.0.4",
+    "zx": "^8.3.1"
   },
   "dependencies": {
-    "@huggingface/jinja": "^0.3.2",
+    "@huggingface/jinja": "^0.3.3",
     "async-retry": "^1.3.3",
     "bytes": "^3.1.2",
     "chalk": "^5.4.1",
@@ -189,7 +189,7 @@
     "cross-spawn": "^7.0.6",
     "env-var": "^7.5.0",
     "filenamify": "^6.0.0",
-    "fs-extra": "^11.2.0",
+    "fs-extra": "^11.3.0",
     "ignore": "^7.0.0",
     "ipull": "^3.9.2",
     "is-unicode-supported": "^2.1.0",
@@ -197,11 +197,11 @@
     "log-symbols": "^7.0.0",
     "nanoid": "^5.0.9",
     "node-addon-api": "^8.3.0",
-    "octokit": "^4.0.3",
+    "octokit": "^4.1.0",
     "ora": "^8.1.1",
     "pretty-ms": "^9.2.0",
     "proper-lockfile": "^4.1.2",
-    "semver": "^7.6.3",
+    "semver": "^7.7.0",
     "simple-git": "^3.27.0",
     "slice-ansi": "^7.1.0",
     "stdout-update": "^4.0.1",
@@ -219,16 +219,16 @@
     }
   },
   "optionalDependencies": {
-    "@node-llama-cpp/linux-arm64": "3.4.3",
-    "@node-llama-cpp/linux-armv7l": "3.4.3",
-    "@node-llama-cpp/linux-x64": "3.4.3",
-    "@node-llama-cpp/linux-x64-cuda": "3.4.3",
-    "@node-llama-cpp/linux-x64-vulkan": "3.4.3",
-    "@node-llama-cpp/mac-arm64-metal": "3.4.3",
-    "@node-llama-cpp/mac-x64": "3.4.3",
-    "@node-llama-cpp/win-arm64": "3.4.3",
-    "@node-llama-cpp/win-x64": "3.4.3",
-    "@node-llama-cpp/win-x64-cuda": "3.4.3",
-    "@node-llama-cpp/win-x64-vulkan": "3.4.3"
+    "@node-llama-cpp/linux-arm64": "3.5.0",
+    "@node-llama-cpp/linux-armv7l": "3.5.0",
+    "@node-llama-cpp/linux-x64": "3.5.0",
+    "@node-llama-cpp/linux-x64-cuda": "3.5.0",
+    "@node-llama-cpp/linux-x64-vulkan": "3.5.0",
+    "@node-llama-cpp/mac-arm64-metal": "3.5.0",
+    "@node-llama-cpp/mac-x64": "3.5.0",
+    "@node-llama-cpp/win-arm64": "3.5.0",
+    "@node-llama-cpp/win-x64": "3.5.0",
+    "@node-llama-cpp/win-x64-cuda": "3.5.0",
+    "@node-llama-cpp/win-x64-vulkan": "3.5.0"
   }
 }