node-llama-cpp 3.10.0 → 3.12.0

package/dist/utils/utilTypes.d.ts

@@ -1,6 +1,16 @@
 export type Writable<T> = {
     -readonly [P in keyof T]: T[P];
 };
+/**
+ * Omit all the keys from `Value` that are not present in `Options` and are `true`.
+ *
+ * For example:
+ * ```ts
+ * type Value = {a: number, b: string, c: boolean};
+ * type Options = {a: true, b: false, c: true};
+ * type Result = PickOptions<Value, Options>; // {a: number, c: boolean}
+ * ```
+ */
 export type PickOptions<Value extends Readonly<Record<string, any>>, Options extends {
     readonly [key: string]: boolean | undefined;
 }> = Pick<Value, {

package/dist/utils/waitForLockfileRelease.js

@@ -3,12 +3,12 @@ import { isLockActive, waitForLockRelease } from "lifecycle-utils";
 import { lockfileLockScope } from "./withLockfile.js";
 export async function waitForLockfileRelease({ resourcePath, checkInterval = 1000 * 5.5, staleDuration = 1000 * 10 }) {
     while (true) {
-        if (isLockActive(lockfileLockScope, resourcePath)) {
-            await waitForLockRelease(lockfileLockScope, resourcePath);
+        if (isLockActive([lockfileLockScope, resourcePath])) {
+            await waitForLockRelease([lockfileLockScope, resourcePath]);
             continue;
         }
         const lockfileActive = await lockfile.check(resourcePath, { stale: staleDuration, realpath: false });
-        const lockIsActive = isLockActive(lockfileLockScope, resourcePath);
+        const lockIsActive = isLockActive([lockfileLockScope, resourcePath]);
         if (lockIsActive)
             continue;
         if (!lockfileActive)

package/dist/utils/waitForLockfileRelease.js.map

@@ -1 +1 @@
-{"version":3,"file":"waitForLockfileRelease.js","sourceRoot":"","sources":["../../src/utils/waitForLockfileRelease.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EACzC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,GAAG,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAGtE;IACG,OAAO,IAAI,EAAE,CAAC;QACV,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAAC;YAChD,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;YAC1D,SAAS;QACb,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QAEnE,IAAI,YAAY;YACZ,SAAS;QAEb,IAAI,CAAC,cAAc;YACf,OAAO;QAEX,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IACvE,CAAC;AACL,CAAC"}
+{"version":3,"file":"waitForLockfileRelease.js","sourceRoot":"","sources":["../../src/utils/waitForLockfileRelease.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EACzC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,GAAG,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAGtE;IACG,OAAO,IAAI,EAAE,CAAC;QACV,IAAI,YAAY,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;YAClD,MAAM,kBAAkB,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;YAC5D,SAAS;QACb,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;QAErE,IAAI,YAAY;YACZ,SAAS;QAEb,IAAI,CAAC,cAAc;YACf,OAAO;QAEX,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IACvE,CAAC;AACL,CAAC"}

package/dist/utils/withLockfile.js

@@ -3,7 +3,7 @@ import { withLock } from "lifecycle-utils";
 import { getConsoleLogPrefix } from "./getConsoleLogPrefix.js";
 export const lockfileLockScope = {};
 export async function withLockfile({ resourcePath, staleDuration = 1000 * 10, updateInterval = staleDuration / 2, retries = 2 }, callback) {
-    return await withLock(lockfileLockScope, resourcePath, async () => {
+    return await withLock([lockfileLockScope, resourcePath], async () => {
         let releaseLock;
         let res;
         const lockPromise = lockfile.lock(resourcePath, {

package/dist/utils/withLockfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"withLockfile.js","sourceRoot":"","sources":["../../src/utils/withLockfile.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,EACI,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAAE,cAAc,GAAG,aAAa,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAG3F,EACD,QAA8B;IAE9B,OAAO,MAAM,QAAQ,CAAC,iBAAiB,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE;QAC9D,IAAI,WAAgC,CAAC;QACrC,IAAI,GAAM,CAAC;QAEX,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE;YAC5C,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,cAAc;YACtB,OAAO;YACP,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC;YACD,WAAW,GAAG,MAAM,WAAW,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,CAAC;gBACD,MAAM,WAAW,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YACnG,CAAC;YAED,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,MAAM,WAAW,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"withLockfile.js","sourceRoot":"","sources":["../../src/utils/withLockfile.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,EACI,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAAE,cAAc,GAAG,aAAa,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAG3F,EACD,QAA8B;IAE9B,OAAO,MAAM,QAAQ,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,KAAK,IAAI,EAAE;QAChE,IAAI,WAAgC,CAAC;QACrC,IAAI,GAAM,CAAC;QAEX,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE;YAC5C,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,cAAc;YACtB,OAAO;YACP,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC;YACD,WAAW,GAAG,MAAM,WAAW,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,CAAC;gBACD,MAAM,WAAW,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YACnG,CAAC;YAED,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,MAAM,WAAW,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC"}

package/llama/addon/addon.cpp

@@ -196,6 +196,36 @@ Napi::Value addonLoadBackends(const Napi::CallbackInfo& info) {
     return info.Env().Undefined();
 }
 
+Napi::Value addonSetNuma(const Napi::CallbackInfo& info) {
+    const bool numaDisabled = info.Length() == 0
+        ? true
+        : info[0].IsBoolean()
+            ? !info[0].As<Napi::Boolean>().Value()
+            : false;
+
+    if (numaDisabled)
+        return info.Env().Undefined();
+
+    const auto numaType = info[0].IsString()
+        ? info[0].As<Napi::String>().Utf8Value()
+        : "";
+
+    if (numaType == "distribute") {
+        llama_numa_init(GGML_NUMA_STRATEGY_DISTRIBUTE);
+    } else if (numaType == "isolate") {
+        llama_numa_init(GGML_NUMA_STRATEGY_ISOLATE);
+    } else if (numaType == "numactl") {
+        llama_numa_init(GGML_NUMA_STRATEGY_NUMACTL);
+    } else if (numaType == "mirror") {
+        llama_numa_init(GGML_NUMA_STRATEGY_MIRROR);
+    } else {
+        Napi::Error::New(info.Env(), std::string("Invalid NUMA strategy \"") + numaType + "\"").ThrowAsJavaScriptException();
+        return info.Env().Undefined();
+    }
+
+    return info.Env().Undefined();
+}
+
 Napi::Value addonInit(const Napi::CallbackInfo& info) {
     if (backendInitialized) {
         Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(info.Env());
@@ -255,6 +285,7 @@ Napi::Object registerCallback(Napi::Env env, Napi::Object exports) {
         Napi::PropertyDescriptor::Function("getSwapInfo", getSwapInfo),
         Napi::PropertyDescriptor::Function("getMemoryInfo", getMemoryInfo),
         Napi::PropertyDescriptor::Function("loadBackends", addonLoadBackends),
+        Napi::PropertyDescriptor::Function("setNuma", addonSetNuma),
         Napi::PropertyDescriptor::Function("init", addonInit),
         Napi::PropertyDescriptor::Function("dispose", addonDispose),
     });

package/llama/binariesGithubRelease.json

@@ -1,3 +1,3 @@
 {
-    "release": "b5640"
+    "release": "b6122"
 }

package/llama/llama.cpp.info.json

@@ -1,4 +1,4 @@
 {
-    "tag": "b5640",
+    "tag": "b6122",
     "llamaCppGithubRepo": "ggml-org/llama.cpp"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-llama-cpp",
-  "version": "3.10.0",
+  "version": "3.12.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",
@@ -113,6 +113,8 @@
     "deepseek",
     "qwen",
     "qwq",
+    "gpt",
+    "gpt-oss",
     "typescript",
     "lora",
     "batching",
@@ -155,9 +157,9 @@
     "@types/validate-npm-package-name": "^4.0.2",
     "@types/which": "^3.0.4",
     "@types/yargs": "^17.0.33",
-    "@vitest/coverage-v8": "^3.1.3",
-    "@vitest/ui": "^3.1.3",
-    "electron": "^36.2.0",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/ui": "^3.2.4",
+    "electron": "^37.2.4",
     "eslint": "^9.26.0",
     "eslint-import-resolver-typescript": "^4.3.4",
     "eslint-plugin-import": "^2.31.0",
@@ -176,14 +178,14 @@
     "typedoc-vitepress-theme": "^1.1.2",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.32.0",
-    "vite-node": "^3.1.3",
+    "vite-node": "^3.2.4",
     "vitepress": "^1.6.3",
-    "vitepress-plugin-llms": "https://pkg.pr.new/vitepress-plugin-llms@51",
-    "vitest": "^3.1.3",
+    "vitepress-plugin-llms": "^1.7.2",
+    "vitest": "^3.2.4",
     "zx": "^8.5.4"
   },
   "dependencies": {
-    "@huggingface/jinja": "^0.5.0",
+    "@huggingface/jinja": "^0.5.1",
     "async-retry": "^1.3.3",
     "bytes": "^3.1.2",
     "chalk": "^5.4.1",
@@ -197,7 +199,7 @@
     "ignore": "^7.0.4",
     "ipull": "^3.9.2",
     "is-unicode-supported": "^2.1.0",
-    "lifecycle-utils": "^2.0.1",
+    "lifecycle-utils": "^3.0.1",
     "log-symbols": "^7.0.0",
     "nanoid": "^5.1.5",
     "node-addon-api": "^8.3.1",
@@ -223,16 +225,16 @@
     }
   },
   "optionalDependencies": {
-    "@node-llama-cpp/linux-arm64": "3.10.0",
-    "@node-llama-cpp/linux-armv7l": "3.10.0",
-    "@node-llama-cpp/linux-x64": "3.10.0",
-    "@node-llama-cpp/linux-x64-cuda": "3.10.0",
-    "@node-llama-cpp/linux-x64-vulkan": "3.10.0",
-    "@node-llama-cpp/mac-arm64-metal": "3.10.0",
-    "@node-llama-cpp/mac-x64": "3.10.0",
-    "@node-llama-cpp/win-arm64": "3.10.0",
-    "@node-llama-cpp/win-x64": "3.10.0",
-    "@node-llama-cpp/win-x64-cuda": "3.10.0",
-    "@node-llama-cpp/win-x64-vulkan": "3.10.0"
+    "@node-llama-cpp/linux-arm64": "3.12.0",
+    "@node-llama-cpp/linux-armv7l": "3.12.0",
+    "@node-llama-cpp/linux-x64": "3.12.0",
+    "@node-llama-cpp/linux-x64-cuda": "3.12.0",
+    "@node-llama-cpp/linux-x64-vulkan": "3.12.0",
+    "@node-llama-cpp/mac-arm64-metal": "3.12.0",
+    "@node-llama-cpp/mac-x64": "3.12.0",
+    "@node-llama-cpp/win-arm64": "3.12.0",
+    "@node-llama-cpp/win-x64": "3.12.0",
+    "@node-llama-cpp/win-x64-cuda": "3.12.0",
+    "@node-llama-cpp/win-x64-vulkan": "3.12.0"
   }
 }