node-llama-cpp 3.1.1 → 3.3.0

package/dist/utils/truncateTextAndRoundToWords.js

@@ -3,55 +3,106 @@ const truncatePrefix = "...";
 /**
  * Truncate the given text starting from the specified index and try to round to the nearest word.
  * @param text - The text to truncate and round
- * @param truncateStartIndex - The index to start truncating the text at
+ * @param truncateSize - The size of the text to truncate
  * @param maxRound - The maximum number of extra characters to delete to round to the nearest word
+ * @param truncateStart - Whether to truncate from the start of the text. If false, truncate from the end.
  * @returns - The truncated and rounded text
  */
-export function truncateTextAndRoundToWords(text, truncateStartIndex, maxRound = 6) {
-    const res = text.slice(truncateStartIndex);
-    if (res.length === 0)
-        return res;
-    if (truncateStartIndex === 0 || text[truncateStartIndex - 1] === " ")
-        return res;
-    const nextSpaceIndex = res.indexOf(" ");
-    if (nextSpaceIndex < 0) {
-        if (res.length <= maxRound || res.length < truncatePrefix.length)
+export function truncateTextAndRoundToWords(text, truncateSize, maxRound = 6, truncateStart = false) {
+    if (truncateStart) {
+        const res = text.slice(truncateSize);
+        if (res.length === 0)
+            return res;
+        if (truncateSize === 0 || text[truncateSize - 1] === " ")
+            return res;
+        const nextSpaceIndex = res.indexOf(" ");
+        if (nextSpaceIndex < 0) {
+            if (res.length <= maxRound || res.length < truncatePrefix.length)
+                return "";
+            return truncatePrefix + res.slice(truncatePrefix.length);
+        }
+        if (nextSpaceIndex <= maxRound)
+            return res.slice(nextSpaceIndex + 1);
+        if (res.length < truncatePrefix.length)
             return "";
         return truncatePrefix + res.slice(truncatePrefix.length);
     }
-    if (nextSpaceIndex <= maxRound)
-        return res.slice(nextSpaceIndex + 1);
-    if (res.length < truncatePrefix.length)
-        return "";
-    return truncatePrefix + res.slice(truncatePrefix.length);
+    else {
+        const res = text.slice(0, -truncateSize);
+        if (res.length === 0)
+            return res;
+        if (truncateSize === 0 || (text.length === res.length || text[res.length] === " "))
+            return res;
+        const nextSpaceIndex = res.lastIndexOf(" ");
+        if (nextSpaceIndex < 0) {
+            if (res.length <= maxRound || res.length < truncatePrefix.length)
+                return "";
+            return res.slice(truncatePrefix.length) + truncatePrefix;
+        }
+        if (nextSpaceIndex <= maxRound)
+            return res.slice(0, nextSpaceIndex);
+        if (res.length < truncatePrefix.length)
+            return "";
+        return res.slice(truncatePrefix.length) + truncatePrefix;
+    }
 }
-export function truncateLlamaTextAndRoundToWords(llamaText, truncateStartIndex, maxRound = 6) {
-    if (truncateStartIndex <= 0)
+export function truncateLlamaTextAndRoundToWords(llamaText, truncateSize, maxRound = 6, truncateStart = false) {
+    if (truncateSize <= 0)
         return llamaText;
-    for (let i = 0; i < llamaText.values.length; i++) {
-        const value = llamaText.values[i];
-        if (value == null)
-            continue;
-        if (typeof value === "string") {
-            if (value.length > truncateStartIndex) {
-                return LlamaText([
-                    truncateTextAndRoundToWords(value, truncateStartIndex, maxRound),
-                    ...llamaText.values.slice(i + 1)
-                ]);
+    if (truncateStart) {
+        for (let i = 0; i < llamaText.values.length; i++) {
+            const value = llamaText.values[i];
+            if (value == null)
+                continue;
+            if (typeof value === "string") {
+                if (value.length > truncateSize) {
+                    return LlamaText([
+                        truncateTextAndRoundToWords(value, truncateSize, maxRound, true),
+                        ...llamaText.values.slice(i + 1)
+                    ]);
+                }
+                truncateSize -= value.length;
+            }
+            else if (value instanceof SpecialToken) {
+                truncateSize--;
+                if (truncateSize <= 0)
+                    return LlamaText(llamaText.values.slice(i + 1));
+            }
+            else {
+                void value;
+                // SpecialTokensText shouldn't be truncated
+                if (value.value.length > truncateSize)
+                    return LlamaText(llamaText.values.slice(i + 1));
+                truncateSize -= value.value.length;
             }
-            truncateStartIndex -= value.length;
-        }
-        else if (value instanceof SpecialToken) {
-            truncateStartIndex--;
-            if (truncateStartIndex <= 0)
-                return LlamaText(llamaText.values.slice(i + 1));
         }
-        else {
-            void value;
-            // SpecialTokensText shouldn't be truncated
-            if (value.value.length > truncateStartIndex)
-                return LlamaText(llamaText.values.slice(i + 1));
-            truncateStartIndex -= value.value.length;
+    }
+    else {
+        for (let i = llamaText.values.length - 1; i >= 0; i--) {
+            const value = llamaText.values[i];
+            if (value == null)
+                continue;
+            if (typeof value === "string") {
+                if (value.length > truncateSize) {
+                    return LlamaText([
+                        ...llamaText.values.slice(0, i),
+                        truncateTextAndRoundToWords(value, truncateSize, maxRound, false)
+                    ]);
+                }
+                truncateSize -= value.length;
+            }
+            else if (value instanceof SpecialToken) {
+                truncateSize--;
+                if (truncateSize <= 0)
+                    return LlamaText(llamaText.values.slice(0, i));
+            }
+            else {
+                void value;
+                // SpecialTokensText shouldn't be truncated
+                if (value.value.length > truncateSize)
+                    return LlamaText(llamaText.values.slice(0, i));
+                truncateSize -= value.value.length;
+            }
         }
     }
     return LlamaText([]);

package/dist/utils/truncateTextAndRoundToWords.js.map

@@ -1 +1 @@
-{"version":3,"file":"truncateTextAndRoundToWords.js","sourceRoot":"","sources":["../../src/utils/truncateTextAndRoundToWords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAE1E,MAAM,cAAc,GAAG,KAAK,CAAC;AAE7B;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CAAC,IAAY,EAAE,kBAA0B,EAAE,WAAmB,CAAC;IACtG,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAE3C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAChB,OAAO,GAAG,CAAC;IAEf,IAAI,kBAAkB,KAAK,CAAC,IAAI,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC,KAAK,GAAG;QAChE,OAAO,GAAG,CAAC;IAEf,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAExC,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,GAAG,CAAC,MAAM,IAAI,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM;YAC5D,OAAO,EAAE,CAAC;QAEd,OAAO,cAAc,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,cAAc,IAAI,QAAQ;QAC1B,OAAO,GAAG,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;IAEzC,IAAI,GAAG,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM;QAClC,OAAO,EAAE,CAAC;IAEd,OAAO,cAAc,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,SAAoB,EAAE,kBAA0B,EAAE,WAAmB,CAAC;IACnH,IAAI,kBAAkB,IAAI,CAAC;QACvB,OAAO,SAAS,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAElC,IAAI,KAAK,IAAI,IAAI;YACb,SAAS;QAEb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;gBACpC,OAAO,SAAS,CAAC;oBACb,2BAA2B,CAAC,KAAK,EAAE,kBAAkB,EAAE,QAAQ,CAAC;oBAChE,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;iBACnC,CAAC,CAAC;YACP,CAAC;YAED,kBAAkB,IAAI,KAAK,CAAC,MAAM,CAAC;QACvC,CAAC;aAAM,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YACvC,kBAAkB,EAAE,CAAC;YACrB,IAAI,kBAAkB,IAAI,CAAC;gBACvB,OAAO,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACJ,KAAM,KAAkC,CAAC;YAEzC,2CAA2C;YAC3C,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,kBAAkB;gBACvC,OAAO,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAEpD,kBAAkB,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;QAC7C,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;AACzB,CAAC"}
+{"version":3,"file":"truncateTextAndRoundToWords.js","sourceRoot":"","sources":["../../src/utils/truncateTextAndRoundToWords.ts"],"names":[],"mappings":"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"}

package/dist/utils/waitForLockfileRelease.js

@@ -2,7 +2,6 @@ import lockfile from "proper-lockfile";
 import { isLockActive, waitForLockRelease } from "lifecycle-utils";
 import { lockfileLockScope } from "./withLockfile.js";
 export async function waitForLockfileRelease({ resourcePath, checkInterval = 1000 * 5.5, staleDuration = 1000 * 10 }) {
-    // eslint-disable-next-line no-constant-condition
     while (true) {
         if (isLockActive(lockfileLockScope, resourcePath)) {
             await waitForLockRelease(lockfileLockScope, resourcePath);

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,iDAAiD;IACjD,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,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"}

package/dist/utils/wrapAbortSignal.d.ts

@@ -1 +1 @@
-export declare function wrapAbortSignal(abortSignal?: AbortSignal): AbortController;
+export declare function wrapAbortSignal(abortSignal?: AbortSignal): [controller: AbortController, dispose: (() => void)];

package/dist/utils/wrapAbortSignal.js

@@ -1,9 +1,14 @@
 export function wrapAbortSignal(abortSignal) {
     const controller = new AbortController();
+    function onAbort() {
+        controller.abort(abortSignal.reason);
+    }
+    function dispose() {
+        if (abortSignal != null)
+            abortSignal.removeEventListener("abort", onAbort);
+    }
     if (abortSignal != null)
-        abortSignal.addEventListener("abort", () => {
-            controller.abort(abortSignal.reason);
-        });
-    return controller;
+        abortSignal.addEventListener("abort", onAbort);
+    return [controller, dispose];
 }
 //# sourceMappingURL=wrapAbortSignal.js.map

package/dist/utils/wrapAbortSignal.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapAbortSignal.js","sourceRoot":"","sources":["../../src/utils/wrapAbortSignal.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,eAAe,CAAC,WAAyB;IACrD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IAEzC,IAAI,WAAW,IAAI,IAAI;QACnB,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACvC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IAEP,OAAO,UAAU,CAAC;AACtB,CAAC"}
+{"version":3,"file":"wrapAbortSignal.js","sourceRoot":"","sources":["../../src/utils/wrapAbortSignal.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,eAAe,CAAC,WAAyB;IACrD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IAEzC,SAAS,OAAO;QACZ,UAAU,CAAC,KAAK,CAAC,WAAY,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,SAAS,OAAO;QACZ,IAAI,WAAW,IAAI,IAAI;YACnB,WAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,WAAW,IAAI,IAAI;QACnB,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEnD,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AACjC,CAAC"}

package/llama/CMakeLists.txt

@@ -22,6 +22,22 @@ execute_process(COMMAND node -p "require('node-addon-api').include.slice(1,-1)"
                 OUTPUT_VARIABLE NODE_ADDON_API_DIR
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+set(LLAMA_BUILD_COMMON ON)
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    add_compile_options(-Wno-c++17-extensions)
+endif()
+
+if(APPLE)
+    set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+    set(CMAKE_BUILD_RPATH "@loader_path")
+    set(CMAKE_INSTALL_RPATH "@loader_path")
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+else()
+    set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
+endif()
+
 include_directories(${NODE_ADDON_API_DIR} ${CMAKE_JS_INC})
 
 add_subdirectory("llama.cpp")
@@ -33,41 +49,6 @@ unset(GPU_INFO_HEADERS)
 unset(GPU_INFO_SOURCES)
 unset(GPU_INFO_EXTRA_LIBS)
 
-if (GGML_CUDA)
-    cmake_minimum_required(VERSION 3.17)
-
-    find_package(CUDAToolkit)
-    if (CUDAToolkit_FOUND)
-        message(STATUS "Using CUDA for GPU info")
-
-        enable_language(CUDA)
-
-        list(APPEND GPU_INFO_HEADERS gpuInfo/cuda-gpu-info.h)
-        list(APPEND GPU_INFO_SOURCES gpuInfo/cuda-gpu-info.cu)
-
-        add_compile_definitions(GPU_INFO_USE_CUDA)
-
-        if (GGML_STATIC)
-            list(APPEND GPU_INFO_EXTRA_LIBS CUDA::cudart_static)
-        else()
-            list(APPEND GPU_INFO_EXTRA_LIBS CUDA::cudart)
-        endif()
-
-        list(APPEND GPU_INFO_EXTRA_LIBS CUDA::cuda_driver)
-
-        if (NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-            # copied from llama.cpp/CMakLists.txt under "if (NOT DEFINED CMAKE_CUDA_ARCHITECTURES)"
-            if (GGML_CUDA_F16 OR GGML_CUDA_DMMV_F16)
-                set(CMAKE_CUDA_ARCHITECTURES "60;61;70;75")
-            else()
-                set(CMAKE_CUDA_ARCHITECTURES "52;61;70;75")
-            endif()
-        endif()
-    else()
-        message(FATAL_ERROR "CUDA was not found")
-    endif()
-endif()
-
 if (GGML_VULKAN OR GGML_KOMPUTE)
     find_package(Vulkan)
     if (Vulkan_FOUND)
@@ -88,67 +69,12 @@ if (GGML_VULKAN OR GGML_KOMPUTE)
     endif()
 endif()
 
-if (GGML_HIPBLAS)
-    list(APPEND CMAKE_PREFIX_PATH /opt/rocm)
-
-    if (NOT ${CMAKE_C_COMPILER_ID} MATCHES "Clang")
-        message(WARNING "Only LLVM is supported for HIP, hint: CC=/opt/rocm/llvm/bin/clang")
-    endif()
-    if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-        message(WARNING "Only LLVM is supported for HIP, hint: CXX=/opt/rocm/llvm/bin/clang++")
-    endif()
-
-    find_package(hip)
-    find_package(hipblas)
-    find_package(rocblas)
-
-    if (${hipblas_FOUND} AND ${hip_FOUND})
-        message(STATUS "Using HIP and hipBLAS for GPU info")
-        add_compile_definitions(GPU_INFO_USE_HIPBLAS GPU_INFO_USE_CUDA)
-        add_library(gpu-info-rocm OBJECT gpuInfo/cuda-gpu-info.cu gpuInfo/cuda-gpu-info.h)
-        set_source_files_properties(gpuInfo/cuda-gpu-info.cu PROPERTIES LANGUAGE CXX)
-        target_link_libraries(gpu-info-rocm PRIVATE hip::device PUBLIC hip::host roc::rocblas roc::hipblas)
-
-        list(APPEND GPU_INFO_EXTRA_LIBS gpu-info-rocm)
-    else()
-        message(FATAL_ERROR "hipBLAS or HIP was not found. Try setting CMAKE_PREFIX_PATH=/opt/rocm")
-    endif()
-endif()
-
-if (GGML_METAL)
-    find_library(FOUNDATION_LIBRARY Foundation REQUIRED)
-    find_library(METAL_FRAMEWORK    Metal      REQUIRED)
-    find_library(METALKIT_FRAMEWORK MetalKit   REQUIRED)
-
-    message(STATUS "Using Metal for GPU info")
-    list(APPEND GPU_INFO_HEADERS gpuInfo/metal-gpu-info.h)
-    list(APPEND GPU_INFO_SOURCES gpuInfo/metal-gpu-info.mm)
-
-    add_compile_definitions(GPU_INFO_USE_METAL)
-
-    list(APPEND GPU_INFO_EXTRA_LIBS
-        ${FOUNDATION_LIBRARY}
-        ${METAL_FRAMEWORK}
-        ${METALKIT_FRAMEWORK}
-        )
-endif()
-
 list(REMOVE_DUPLICATES GPU_INFO_HEADERS)
 list(REMOVE_DUPLICATES GPU_INFO_SOURCES)
 list(REMOVE_DUPLICATES GPU_INFO_EXTRA_LIBS)
 
 file(GLOB SOURCE_FILES "addon/*.cpp" "addon/**/*.cpp" ${GPU_INFO_SOURCES})
 
-if(APPLE)
-    set(CMAKE_SKIP_BUILD_RPATH  FALSE)
-    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-    set(CMAKE_BUILD_RPATH "@loader_path")
-    set(CMAKE_INSTALL_RPATH "@loader_path")
-    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-else()
-    set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
-endif()
-
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC} ${GPU_INFO_HEADERS})
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})

package/llama/addon/AddonContext.cpp

@@ -447,7 +447,7 @@ Napi::Value AddonContext::AddToBatch(const Napi::CallbackInfo& info) {
     GGML_ASSERT(batch.n_tokens + tokensLength <= batch_n_tokens);
 
     for (size_t i = 0; i < tokensLength; i++) {
-        llama_batch_add(batch, static_cast<llama_token>(tokens[i]), firstTokenContextIndex + i, { sequenceId }, false);
+        common_batch_add(batch, static_cast<llama_token>(tokens[i]), firstTokenContextIndex + i, { sequenceId }, false);
     }
 
     if (generateLogitAtTheEnd) {

package/llama/addon/AddonGrammar.cpp

@@ -34,6 +34,54 @@ AddonGrammar::~AddonGrammar() {
     }
 }
 
+Napi::Value AddonGrammar::isTextCompatible(const Napi::CallbackInfo& info) {
+    const std::string testText = info[0].As<Napi::String>().Utf8Value();
+
+    auto parsed_grammar = llama_grammar_init_impl(nullptr, grammarCode.c_str(), rootRuleName.c_str());
+    
+    // will be empty if there are parse errors
+    if (parsed_grammar == nullptr) {
+        Napi::Error::New(info.Env(), "Failed to parse grammar").ThrowAsJavaScriptException();
+        return Napi::Boolean::New(info.Env(), false);
+    }
+
+    const auto cpts = unicode_cpts_from_utf8(testText);
+    const llama_grammar_rules  & rules = llama_grammar_get_rules(parsed_grammar);
+    llama_grammar_stacks & stacks_cur = llama_grammar_get_stacks(parsed_grammar);
+
+    for (const auto & cpt : cpts) {
+        const llama_grammar_stacks stacks_prev = llama_grammar_get_stacks(parsed_grammar);
+
+        llama_grammar_accept(rules, stacks_prev, cpt, stacks_cur);
+
+        if (stacks_cur.empty()) {
+            // no stacks means that the grammar failed to match at this point
+            llama_grammar_free_impl(parsed_grammar);
+            return Napi::Boolean::New(info.Env(), false);
+        }
+    }
+
+    for (const auto & stack : stacks_cur) {
+        if (stack.empty()) {
+            // an empty stack means that the grammar has been completed
+            llama_grammar_free_impl(parsed_grammar);
+            return Napi::Boolean::New(info.Env(), true);
+        }
+    }
+
+    llama_grammar_free_impl(parsed_grammar);
+    return Napi::Boolean::New(info.Env(), false);
+}
+
 void AddonGrammar::init(Napi::Object exports) {
-    exports.Set("AddonGrammar", DefineClass(exports.Env(), "AddonGrammar", {}));
+    exports.Set(
+        "AddonGrammar",
+        DefineClass(
+            exports.Env(),
+            "AddonGrammar",
+            {
+                InstanceMethod("isTextCompatible", &AddonGrammar::isTextCompatible),
+            }
+        )
+    );
 }

package/llama/addon/AddonGrammar.h

@@ -2,6 +2,7 @@
 #include "llama.h"
 #include "common/common.h"
 #include "llama-grammar.h"
+#include "unicode.h"
 #include "napi.h"
 #include "addonGlobals.h"
 
@@ -15,5 +16,7 @@ class AddonGrammar : public Napi::ObjectWrap<AddonGrammar> {
         AddonGrammar(const Napi::CallbackInfo& info);
         ~AddonGrammar();
 
+        Napi::Value isTextCompatible(const Napi::CallbackInfo& info);
+
         static void init(Napi::Object exports);
 };

package/llama/addon/AddonModel.cpp

@@ -426,7 +426,7 @@ Napi::Value AddonModel::Tokenize(const Napi::CallbackInfo& info) {
     std::string text = info[0].As<Napi::String>().Utf8Value();
     bool specialTokens = info[1].As<Napi::Boolean>().Value();
 
-    std::vector<llama_token> tokens = llama_tokenize(model, text, false, specialTokens);
+    std::vector<llama_token> tokens = common_tokenize(model, text, false, specialTokens);
 
     Napi::Uint32Array result = Napi::Uint32Array::New(info.Env(), tokens.size());
     for (size_t i = 0; i < tokens.size(); ++i) {
@@ -539,7 +539,7 @@ Napi::Value AddonModel::PrefixToken(const Napi::CallbackInfo& info) {
         return info.Env().Undefined();
     }
 
-    return getNapiToken(info, model, llama_token_prefix(model));
+    return getNapiToken(info, model, llama_token_fim_pre(model));
 }
 Napi::Value AddonModel::MiddleToken(const Napi::CallbackInfo& info) {
     if (disposed) {
@@ -547,7 +547,7 @@ Napi::Value AddonModel::MiddleToken(const Napi::CallbackInfo& info) {
         return info.Env().Undefined();
     }
 
-    return getNapiToken(info, model, llama_token_middle(model));
+    return getNapiToken(info, model, llama_token_fim_mid(model));
 }
 Napi::Value AddonModel::SuffixToken(const Napi::CallbackInfo& info) {
     if (disposed) {
@@ -555,7 +555,7 @@ Napi::Value AddonModel::SuffixToken(const Napi::CallbackInfo& info) {
         return info.Env().Undefined();
     }
 
-    return getNapiToken(info, model, llama_token_suffix(model));
+    return getNapiToken(info, model, llama_token_fim_suf(model));
 }
 Napi::Value AddonModel::EotToken(const Napi::CallbackInfo& info) {
     if (disposed) {

package/llama/addon/AddonSampler.cpp

@@ -52,11 +52,6 @@ void AddonSampler::dispose() {
         topPSampler = nullptr;
     }
 
-    if (softmaxSampler != nullptr) {
-        llama_sampler_free(softmaxSampler);
-        softmaxSampler = nullptr;
-    }
-
     if (seedSampler != nullptr) {
         llama_sampler_free(seedSampler);
         seedSampler = nullptr;
@@ -135,10 +130,6 @@ void AddonSampler::rebuildChainIfNeeded() {
             llama_sampler_chain_add(chain, temperatureSampler);
         }
 
-        if (softmaxSampler != nullptr) {
-            llama_sampler_chain_add(chain, softmaxSampler);
-        }
-
         if (seedSampler != nullptr) {
             llama_sampler_chain_add(chain, seedSampler);
         }
@@ -206,10 +197,6 @@ Napi::Value AddonSampler::ApplyConfig(const Napi::CallbackInfo& info) {
         }
     }
 
-    if (softmaxSampler == nullptr) {
-        softmaxSampler = llama_sampler_init_softmax();
-    }
-
     if (config.Has("minP")) {
         auto minP = config.Get("minP").As<Napi::Number>().FloatValue();
         if (minP != minPSampler_minP) {

package/llama/addon/AddonSampler.h

@@ -25,8 +25,6 @@ class AddonSampler : public Napi::ObjectWrap<AddonSampler> {
 
         llama_sampler * topPSampler = nullptr;
         float topPSampler_topP = 0.0f; // Top p sampling >=1.0 = disabled
-
-        llama_sampler * softmaxSampler = nullptr;
         
         llama_sampler * seedSampler = nullptr;
         uint32_t seedSampler_seed = 0;

package/llama/addon/addon.cpp

@@ -8,6 +8,7 @@
 #include "globals/addonLog.h"
 #include "globals/addonProgress.h"
 #include "globals/getGpuInfo.h"
+#include "globals/getSwapInfo.h"
 
 bool backendInitialized = false;
 bool backendDisposed = false;
@@ -150,6 +151,22 @@ class AddonBackendUnloadWorker : public Napi::AsyncWorker {
         }
 };
 
+Napi::Value addonLoadBackends(const Napi::CallbackInfo& info) {
+    const bool forceLoadLibraries = info.Length() == 0
+        ? false
+        : info[0].IsBoolean()
+            ? info[0].As<Napi::Boolean>().Value()
+            : false;
+
+    ggml_backend_reg_count();
+
+    if (forceLoadLibraries) {
+        ggml_backend_load_all();
+    }
+
+    return info.Env().Undefined();
+}
+
 Napi::Value addonInit(const Napi::CallbackInfo& info) {
     if (backendInitialized) {
         Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(info.Env());
@@ -203,6 +220,8 @@ Napi::Object registerCallback(Napi::Env env, Napi::Object exports) {
         Napi::PropertyDescriptor::Function("getGpuVramInfo", getGpuVramInfo),
         Napi::PropertyDescriptor::Function("getGpuDeviceInfo", getGpuDeviceInfo),
         Napi::PropertyDescriptor::Function("getGpuType", getGpuType),
+        Napi::PropertyDescriptor::Function("getSwapInfo", getSwapInfo),
+        Napi::PropertyDescriptor::Function("loadBackends", addonLoadBackends),
         Napi::PropertyDescriptor::Function("init", addonInit),
         Napi::PropertyDescriptor::Function("dispose", addonDispose),
     });