node-llama-cpp 3.0.0-beta.13 → 3.0.0-beta.15

package/dist/bindings/utils/detectAvailableComputeLayers.js

@@ -1,5 +1,7 @@
 import process from "process";
+import path from "path";
 import fs from "fs-extra";
+import semver from "semver";
 import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
 import { getPlatform } from "./getPlatform.js";
 import { hasFileInPath } from "./hasFileInPath.js";
@@ -19,13 +21,12 @@ export async function detectAvailableComputeLayers({ platform = getPlatform() }
 }
 async function detectCudaSupport({ platform }) {
     if (platform === "win") {
-        const librarySearchPaths = [
-            process.env.CUDA_PATH
-        ];
+        const librarySearchPaths = await getCudaInstallationPaths({ platform });
+        const windir = getWindir();
         const [hasNvidiaDriver, hasCudaRuntime] = await Promise.all([
             asyncSome([
                 hasFileInPath("nvml.dll"),
-                fs.pathExists("c:\\Windows\\System32\\nvml.dll")
+                fs.pathExists(path.join(windir, "System32", "nvml.dll"))
             ]),
             asyncEvery([
                 asyncSome([
@@ -103,10 +104,11 @@ async function detectCudaSupport({ platform }) {
 }
 async function detectVulkanSupport({ platform }) {
     if (platform === "win") {
+        const windir = getWindir();
         return await asyncSome([
             hasFileInPath("vulkan-1.dll"),
-            fs.pathExists("c:\\Windows\\System32\\vulkan-1.dll"),
-            fs.pathExists("c:\\Windows\\SysWOW64\\vulkan-1.dll")
+            fs.pathExists(path.join(windir, "System32", "vulkan-1.dll")),
+            fs.pathExists(path.join(windir, "SysWOW64", "vulkan-1.dll"))
         ]);
     }
     else if (platform === "linux") {
@@ -136,16 +138,13 @@ async function detectMetalSupport({ platform }) {
     return platform === "mac";
 }
 async function getLinuxCudaLibraryPaths() {
-    if (!(await fs.pathExists("/usr/local/")))
-        return [];
     const res = [];
     try {
-        const usrLocal = "/usr/local";
-        for (const usrLocalFolderName in await fs.readdir(usrLocal)) {
-            if (!usrLocalFolderName.toLowerCase().startsWith("cuda-"))
+        for (const cudaInstallationPath of await getCudaInstallationPaths({ platform: "linux" })) {
+            const cudaTargetsFolder = `${cudaInstallationPath}/targets`;
+            if (!(await fs.pathExists(cudaTargetsFolder)))
                 continue;
-            const cudaTargetsFolder = `${usrLocal}/${usrLocalFolderName}/targets`;
-            for (const cudaTargetFolderName in await fs.readdir(cudaTargetsFolder)) {
+            for (const cudaTargetFolderName of await fs.readdir(cudaTargetsFolder)) {
                 res.push(`${cudaTargetsFolder}/${cudaTargetFolderName}/lib`, `${cudaTargetsFolder}/${cudaTargetFolderName}/lib/stubs`);
             }
         }
@@ -155,4 +154,147 @@ async function getLinuxCudaLibraryPaths() {
     }
     return res;
 }
+async function getCudaInstallationPaths({ platform }) {
+    if (platform === "win") {
+        try {
+            const programFilesPaths = await getWindowsProgramFilesPaths();
+            const potentialCudaInstallationsContainerPaths = programFilesPaths
+                .map((programFilesPath) => `${programFilesPath}/NVIDIA GPU Computing Toolkit/CUDA`);
+            const cudaInstallationsContainerPaths = (await Promise.all(potentialCudaInstallationsContainerPaths.map(async (potentialCudaInstallationsContainerPath) => {
+                if (await fs.pathExists(potentialCudaInstallationsContainerPath))
+                    return potentialCudaInstallationsContainerPath;
+                return null;
+            }))).filter((path) => path != null);
+            const potentialCudaInstallations = (await Promise.all(cudaInstallationsContainerPaths.map(async (cudaInstallationsContainerPath) => {
+                const cudaFolderPrefix = "v";
+                return (await fs.pathExists(cudaInstallationsContainerPath)
+                    ? await fs.readdir(cudaInstallationsContainerPath)
+                    : [])
+                    .filter((installationFolderName) => installationFolderName.toLowerCase()
+                    .startsWith(cudaFolderPrefix))
+                    .sort((a, b) => {
+                    const aVersion = a.slice(cudaFolderPrefix.length);
+                    const bVersion = b.slice(cudaFolderPrefix.length);
+                    try {
+                        const aVersionValid = semver.valid(semver.coerce(aVersion));
+                        const bVersionValid = semver.valid(semver.coerce(bVersion));
+                        if (aVersionValid && bVersionValid)
+                            return semver.compare(aVersionValid, bVersionValid);
+                        else if (aVersionValid)
+                            return -1;
+                        else if (bVersionValid)
+                            return 1;
+                        else
+                            return 0;
+                    }
+                    catch (err) {
+                        return 0;
+                    }
+                })
+                    .reverse()
+                    .map((installationFolderName) => `${cudaInstallationsContainerPath}/${installationFolderName}`);
+            }))).flat();
+            if (process.env.CUDA_PATH != null && process.env.CUDA_PATH !== "")
+                potentialCudaInstallations.unshift(process.env.CUDA_PATH);
+            return (await Promise.all(potentialCudaInstallations.map(async (cudaFolder) => {
+                if (await fs.pathExists(cudaFolder))
+                    return cudaFolder;
+                return null;
+            }))).filter((cudaFolder) => cudaFolder != null);
+        }
+        catch (err) {
+            console.error(getConsoleLogPrefix() + 'Failed to search "Program Files" for CUDA installations', err);
+        }
+        return [];
+    }
+    else if (platform === "linux") {
+        const res = [];
+        try {
+            const usrLocal = "/usr/local";
+            const cudaFolderPrefix = "cuda-";
+            const potentialCudaFolders = (await fs.pathExists(usrLocal)
+                ? await fs.readdir(usrLocal)
+                : [])
+                .filter((usrLocalFolderName) => usrLocalFolderName.toLowerCase().startsWith(cudaFolderPrefix))
+                .sort((a, b) => {
+                const aVersion = a.slice(cudaFolderPrefix.length);
+                const bVersion = b.slice(cudaFolderPrefix.length);
+                try {
+                    const aVersionValid = semver.valid(semver.coerce(aVersion));
+                    const bVersionValid = semver.valid(semver.coerce(bVersion));
+                    if (aVersionValid && bVersionValid)
+                        return semver.compare(aVersionValid, bVersionValid);
+                    else if (aVersionValid)
+                        return -1;
+                    else if (bVersionValid)
+                        return 1;
+                    else
+                        return 0;
+                }
+                catch (err) {
+                    return 0;
+                }
+            })
+                .reverse()
+                .map((usrLocalFolderName) => `${usrLocal}/${usrLocalFolderName}`);
+            potentialCudaFolders.unshift(`${usrLocal}/cuda`);
+            if (process.env.CUDA_PATH != null && process.env.CUDA_PATH !== "")
+                potentialCudaFolders.unshift(process.env.CUDA_PATH);
+            for (const cudaFolder of potentialCudaFolders) {
+                const cudaTargetsFolder = `${cudaFolder}/targets`;
+                if (!(await fs.pathExists(cudaTargetsFolder)))
+                    continue;
+                res.push(cudaFolder);
+            }
+        }
+        catch (err) {
+            console.error(getConsoleLogPrefix() + 'Failed to search "/usr/local/" for CUDA installations', err);
+        }
+        return res;
+    }
+    return [];
+}
+export async function getCudaNvccPaths({ platform = getPlatform() } = {}) {
+    const cudaInstallationPaths = await getCudaInstallationPaths({ platform });
+    const nvccPotentialPaths = cudaInstallationPaths
+        .map((cudaInstallationPath) => {
+        if (platform === "win")
+            return path.join(cudaInstallationPath, "bin", "nvcc.exe");
+        return path.join(cudaInstallationPath, "bin", "nvcc");
+    });
+    try {
+        const resolvedNvccPaths = await Promise.all(nvccPotentialPaths.map(async (nvccPotentialPath) => {
+            if (await fs.pathExists(nvccPotentialPath))
+                return nvccPotentialPath;
+            return null;
+        }));
+        return resolvedNvccPaths.filter((nvccPath) => nvccPath != null);
+    }
+    catch (err) {
+        console.error(getConsoleLogPrefix() + `Failed to search for "nvcc${platform === "win" ? ".exe" : ""}" in CUDA installation paths`, err);
+    }
+    return [];
+}
+function getWindir() {
+    return process.env.windir || process.env.WINDIR || process.env.SystemRoot || process.env.systemroot || process.env.SYSTEMROOT ||
+        "C:\\Windows";
+}
+async function getWindowsProgramFilesPaths() {
+    const potentialPaths = await Promise.all([
+        process.env.ProgramFiles,
+        process.env["ProgramFiles(x86)"],
+        process.env["ProgramFiles(Arm)"],
+        `${process.env.SystemDrive ?? "C:"}\\Program Files`,
+        `${process.env.SystemDrive ?? "C:"}\\Program Files (x86)`,
+        `${process.env.SystemDrive ?? "C:"}\\Program Files (Arm)`
+    ]
+        .map(async (programFilesPath) => {
+        if (programFilesPath == null)
+            return null;
+        if (await fs.pathExists(programFilesPath))
+            return programFilesPath;
+        return null;
+    }));
+    return Array.from(new Set(potentialPaths.filter((potentialPath) => potentialPath != null)));
+}
 //# sourceMappingURL=detectAvailableComputeLayers.js.map

package/dist/bindings/utils/detectAvailableComputeLayers.js.map

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

package/dist/bindings/utils/getLlamaWithoutBackend.d.ts

@@ -0,0 +1,5 @@
+import { Llama } from "../Llama.js";
+/**
+ * This is used to access various methods in the addon side without actually using a backend
+ */
+export declare function getLlamaWithoutBackend(): Promise<Llama>;

package/dist/bindings/utils/getLlamaWithoutBackend.js

@@ -0,0 +1,27 @@
+import { withLock } from "lifecycle-utils";
+import { getLlamaForOptions } from "../getLlama.js";
+import { LlamaLogLevel } from "../types.js";
+let sharedLlamaWithoutBackend = null;
+/**
+ * This is used to access various methods in the addon side without actually using a backend
+ */
+export async function getLlamaWithoutBackend() {
+    if (sharedLlamaWithoutBackend != null)
+        return sharedLlamaWithoutBackend;
+    return await withLock(getLlamaWithoutBackend, "loadAddon", async () => {
+        if (sharedLlamaWithoutBackend != null)
+            return sharedLlamaWithoutBackend;
+        sharedLlamaWithoutBackend = await getLlamaForOptions({
+            gpu: false,
+            progressLogs: false,
+            logLevel: LlamaLogLevel.error,
+            build: "never",
+            usePrebuiltBinaries: true,
+            vramPadding: 0
+        }, {
+            skipLlamaInit: true
+        });
+        return sharedLlamaWithoutBackend;
+    });
+}
+//# sourceMappingURL=getLlamaWithoutBackend.js.map

package/dist/bindings/utils/getLlamaWithoutBackend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLlamaWithoutBackend.js","sourceRoot":"","sources":["../../../src/bindings/utils/getLlamaWithoutBackend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAG1C,IAAI,yBAAyB,GAAiB,IAAI,CAAC;AAEnD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB;IACxC,IAAI,yBAAyB,IAAI,IAAI;QACjC,OAAO,yBAAyB,CAAC;IAErC,OAAO,MAAM,QAAQ,CAAC,sBAAsB,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE;QAClE,IAAI,yBAAyB,IAAI,IAAI;YACjC,OAAO,yBAAyB,CAAC;QAErC,yBAAyB,GAAG,MAAM,kBAAkB,CAAC;YACjD,GAAG,EAAE,KAAK;YACV,YAAY,EAAE,KAAK;YACnB,QAAQ,EAAE,aAAa,CAAC,KAAK;YAC7B,KAAK,EAAE,OAAO;YACd,mBAAmB,EAAE,IAAI;YACzB,WAAW,EAAE,CAAC;SACjB,EAAE;YACC,aAAa,EAAE,IAAI;SACtB,CAAC,CAAC;QAEH,OAAO,yBAAyB,CAAC;IACrC,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/bindings/utils/logDistroInstallInstruction.d.ts

@@ -1,6 +1,7 @@
 type DistroPackages = {
     linuxPackages?: {
         apt?: string[];
+        apk?: string[];
     };
     macOsPackages?: {
         brew?: string[];

package/dist/bindings/utils/logDistroInstallInstruction.js

@@ -18,20 +18,30 @@ export async function getDistroInstallInstruction({ linuxPackages, macOsPackages
                 which("sudo", { nothrow: true }),
                 which("apt", { nothrow: true })
             ]);
-            if (aptPath == null)
-                return null;
-            return 'you can run "' + (sudoPath != null ? "sudo " : "") + "apt install " + linuxPackages.apt.join(" ") + '"';
+            if (aptPath != null) {
+                const aptCommand = (sudoPath != null ? "sudo " : "") + "apt";
+                return 'you can run "' + aptCommand + " update && " + aptCommand + " install -y " + linuxPackages.apt.join(" ") + '"';
+            }
         }
+        if (linuxPackages.apk != null && linuxPackages.apk.length > 0) {
+            const [sudoPath, apkPath] = await Promise.all([
+                which("sudo", { nothrow: true }),
+                which("apk", { nothrow: true })
+            ]);
+            if (apkPath != null)
+                return 'you can run "' + (sudoPath != null ? "sudo " : "") + "apk add " + linuxPackages.apk.join(" ") + '"';
+        }
+        return null;
     }
     else if (platform === "mac") {
         if (macOsPackages == null)
             return null;
         if (macOsPackages.brew != null && macOsPackages.brew.length > 0) {
             const brewPath = await which("brew", { nothrow: true });
-            if (brewPath == null)
-                return null;
-            return 'you can run "brew install ' + macOsPackages.brew.join(" ") + '"';
+            if (brewPath != null)
+                return 'you can run "brew install ' + macOsPackages.brew.join(" ") + '"';
         }
+        return null;
     }
     return null;
 }

package/dist/bindings/utils/logDistroInstallInstruction.js.map

@@ -1 +1 @@
-{"version":3,"file":"logDistroInstallInstruction.js","sourceRoot":"","sources":["../../../src/bindings/utils/logDistroInstallInstruction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAW7C,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,UAAkB,EAAE,cAA8B,EAAE,EAClG,cAAc,GAAG,KAAK,KAGtB,EAAE;IACF,MAAM,WAAW,GAAG,MAAM,2BAA2B,CAAC,cAAc,CAAC,CAAC;IAEtE,IAAI,WAAW,IAAI,IAAI;QACnB,OAAO;IAEX,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC;AAC/F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,EAC9C,aAAa,EACb,aAAa,EACA;IACb,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,IAAI,QAAQ,KAAK,OAAO,EAAE;QACtB,IAAI,aAAa,IAAI,IAAI;YACrB,OAAO,IAAI,CAAC;QAEhB,IAAI,aAAa,CAAC,GAAG,IAAI,IAAI,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,MAAM,CACF,QAAQ,EACR,OAAO,CACV,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAClB,KAAK,CAAC,MAAM,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC;gBAC9B,KAAK,CAAC,KAAK,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC;aAChC,CAAC,CAAC;YAEH,IAAI,OAAO,IAAI,IAAI;gBACf,OAAO,IAAI,CAAC;YAEhB,OAAO,eAAe,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SACnH;KACJ;SAAM,IAAI,QAAQ,KAAK,KAAK,EAAE;QAC3B,IAAI,aAAa,IAAI,IAAI;YACrB,OAAO,IAAI,CAAC;QAEhB,IAAI,aAAa,CAAC,IAAI,IAAI,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;YAEtD,IAAI,QAAQ,IAAI,IAAI;gBAChB,OAAO,IAAI,CAAC;YAEhB,OAAO,4BAA4B,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SAC5E;KACJ;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"logDistroInstallInstruction.js","sourceRoot":"","sources":["../../../src/bindings/utils/logDistroInstallInstruction.ts"],"names":[],"mappings":"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"}

package/dist/bindings/utils/resolveCustomCmakeOptions.js

@@ -6,8 +6,8 @@ export function resolveCustomCmakeOptions(customCmakeOptions) {
         : new Map(Object.entries(customCmakeOptions));
     if (process.env.LLAMA_METAL === "1")
         newCustomCmakeOptions.set("LLAMA_METAL", "1");
-    if (process.env.LLAMA_CUBLAS === "1")
-        newCustomCmakeOptions.set("LLAMA_CUBLAS", "1");
+    if (process.env.LLAMA_CUDA === "1")
+        newCustomCmakeOptions.set("LLAMA_CUDA", "1");
     if (process.env.LLAMA_VULKAN === "1")
         newCustomCmakeOptions.set("LLAMA_VULKAN", "1");
     if (process.env.LLAMA_MPI === "1")

package/dist/bindings/utils/resolveCustomCmakeOptions.js.map

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

package/dist/bindings/utils/testBindingBinary.js

@@ -75,13 +75,13 @@ export function testBindingBinary(bindingBinaryPath, testTimeout = 1000 * 60 * 5
     ]);
 }
 if (process.env.TEST_BINDING_CP === "true" && process.send != null) {
-    process.on("message", (message) => {
+    process.on("message", async (message) => {
         if (message.type === "start") {
             if (process.send == null)
                 process.exit(1);
             try {
                 const binding = require(message.bindingBinaryPath);
-                binding.init();
+                await binding.init();
                 process.send({ type: "done" });
             }
             catch (err) {

package/dist/bindings/utils/testBindingBinary.js.map

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

package/dist/bindings/utils/testCmakeBinary.d.ts

@@ -0,0 +1,5 @@
+import process from "process";
+export declare function testCmakeBinary(cmakeBinaryPath?: string, { cwd, env }?: {
+    cwd?: string;
+    env?: typeof process.env;
+}): Promise<boolean>;

package/dist/bindings/utils/testCmakeBinary.js

@@ -0,0 +1,32 @@
+import process from "process";
+import { execFile } from "node:child_process";
+import path from "path";
+import { fileURLToPath } from "url";
+import fs from "fs-extra";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+export async function testCmakeBinary(cmakeBinaryPath, { cwd = __dirname, env = process.env } = {}) {
+    if (cmakeBinaryPath == null || !(await fs.pathExists(cmakeBinaryPath)))
+        return false;
+    return new Promise((resolve, reject) => {
+        const child = execFile(cmakeBinaryPath, ["--version"], {
+            cwd,
+            env,
+            windowsHide: true
+        });
+        child.on("exit", (code) => {
+            if (code == 0)
+                resolve(true);
+            else
+                reject(false);
+        });
+        child.on("error", reject);
+        child.on("disconnect", () => resolve(false));
+        child.on("close", code => {
+            if (code == 0)
+                resolve(true);
+            else
+                resolve(false);
+        });
+    });
+}
+//# sourceMappingURL=testCmakeBinary.js.map

package/dist/bindings/utils/testCmakeBinary.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"testCmakeBinary.js","sourceRoot":"","sources":["../../../src/bindings/utils/testCmakeBinary.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,eAAwB,EAAE,EAC5D,GAAG,GAAG,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,KAGlC,EAAE;IACF,IAAI,eAAe,IAAI,IAAI,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC;IAEjB,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,WAAW,CAAC,EAAE;YACnD,GAAG;YACH,GAAG;YACH,WAAW,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,CAAC;;gBAEd,MAAM,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1B,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7C,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;YACrB,IAAI,IAAI,IAAI,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,CAAC;;gBAEd,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/chatWrappers/AlpacaChatWrapper.d.ts

@@ -1,10 +1,11 @@
 import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
 export declare class AlpacaChatWrapper extends GeneralChatWrapper {
     readonly wrapperName: string;
-    constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle }?: {
+    constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle, allowSpecialTokensInTitles }?: {
         userMessageTitle?: string;
         modelResponseTitle?: string;
         middleSystemMessageTitle?: string;
+        allowSpecialTokensInTitles?: boolean;
     });
     get userMessageTitle(): string;
     get modelResponseTitle(): string;

package/dist/chatWrappers/AlpacaChatWrapper.js

@@ -1,11 +1,12 @@
 import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
 export class AlpacaChatWrapper extends GeneralChatWrapper {
     wrapperName = "AlpacaChat";
-    constructor({ userMessageTitle = "Instruction", modelResponseTitle = "Response", middleSystemMessageTitle = "System" } = {}) {
+    constructor({ userMessageTitle = "Instruction", modelResponseTitle = "Response", middleSystemMessageTitle = "System", allowSpecialTokensInTitles = false } = {}) {
         super({
             userMessageTitle: userMessageTitle + ":",
             modelResponseTitle: modelResponseTitle + ":",
-            middleSystemMessageTitle: middleSystemMessageTitle + ":"
+            middleSystemMessageTitle: middleSystemMessageTitle + ":",
+            allowSpecialTokensInTitles
         });
     }
     get userMessageTitle() {
@@ -17,5 +18,11 @@ export class AlpacaChatWrapper extends GeneralChatWrapper {
     get middleSystemMessageTitle() {
         return super.middleSystemMessageTitle.slice(0, -1);
     }
+    /** @internal */
+    static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
+        return [{}, {
+                allowSpecialTokensInTitles: true
+            }];
+    }
 }
 //# sourceMappingURL=AlpacaChatWrapper.js.map

package/dist/chatWrappers/AlpacaChatWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlpacaChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/AlpacaChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAE3D,MAAM,OAAO,iBAAkB,SAAQ,kBAAkB;IAC5B,WAAW,GAAW,YAAY,CAAC;IAE5D,YAAmB,EACf,gBAAgB,GAAG,aAAa,EAAE,kBAAkB,GAAG,UAAU,EAAE,wBAAwB,GAAG,QAAQ,KAGtG,EAAE;QACF,KAAK,CAAC;YACF,gBAAgB,EAAE,gBAAgB,GAAG,GAAG;YACxC,kBAAkB,EAAE,kBAAkB,GAAG,GAAG;YAC5C,wBAAwB,EAAE,wBAAwB,GAAG,GAAG;SAC3D,CAAC,CAAC;IACP,CAAC;IAED,IAAoB,gBAAgB;QAChC,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,IAAoB,kBAAkB;QAClC,OAAO,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAoB,wBAAwB;QACxC,OAAO,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;CACJ"}
+{"version":3,"file":"AlpacaChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/AlpacaChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAE3D,MAAM,OAAO,iBAAkB,SAAQ,kBAAkB;IAC5B,WAAW,GAAW,YAAY,CAAC;IAE5D,YAAmB,EACf,gBAAgB,GAAG,aAAa,EAAE,kBAAkB,GAAG,UAAU,EAAE,wBAAwB,GAAG,QAAQ,EACtG,0BAA0B,GAAG,KAAK,KAGlC,EAAE;QACF,KAAK,CAAC;YACF,gBAAgB,EAAE,gBAAgB,GAAG,GAAG;YACxC,kBAAkB,EAAE,kBAAkB,GAAG,GAAG;YAC5C,wBAAwB,EAAE,wBAAwB,GAAG,GAAG;YACxD,0BAA0B;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,IAAoB,gBAAgB;QAChC,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,IAAoB,kBAAkB;QAClC,OAAO,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAoB,wBAAwB;QACxC,OAAO,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,gBAAgB;IACT,MAAM,CAAU,yDAAyD;QAC5E,OAAO,CAAC,EAAE,EAAE;gBACR,0BAA0B,EAAE,IAAI;aACnC,CAA4D,CAAC;IAClE,CAAC;CACJ"}

package/dist/chatWrappers/ChatMLChatWrapper.js

@@ -1,5 +1,5 @@
 import { ChatWrapper } from "../ChatWrapper.js";
-import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
+import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
 // source: https://github.com/openai/openai-python/blob/120d225b91a8453e15240a49fb1c6794d8119326/chatml.md
 export class ChatMLChatWrapper extends ChatWrapper {
     wrapperName = "ChatML";
@@ -40,41 +40,43 @@ export class ChatMLChatWrapper extends ChatWrapper {
                 currentAggregateFocus = null;
                 modelTexts.push(this.generateModelResponseText(item.response));
             }
+            else
+                void (item);
         }
         flush();
-        const contextText = LlamaText(resultItems.map(({ system, user, model }, index) => {
+        const contextText = LlamaText(new SpecialToken("BOS"), resultItems.map(({ system, user, model }, index) => {
             const isLastItem = index === resultItems.length - 1;
             return LlamaText([
                 (system.length === 0)
                     ? LlamaText([])
                     : LlamaText([
-                        new SpecialToken("<|im_start|>system\n"),
+                        new SpecialTokensText("<|im_start|>system\n"),
                         system,
-                        new SpecialToken("<|im_end|>\n")
+                        new SpecialTokensText("<|im_end|>\n")
                     ]),
                 (user.length === 0)
                     ? LlamaText([])
                     : LlamaText([
-                        new SpecialToken("<|im_start|>user\n"),
+                        new SpecialTokensText("<|im_start|>user\n"),
                         user,
-                        new SpecialToken("<|im_end|>\n")
+                        new SpecialTokensText("<|im_end|>\n")
                     ]),
                 (model.length === 0 && !isLastItem)
                     ? LlamaText([])
                     : LlamaText([
-                        new SpecialToken("<|im_start|>assistant\n"),
+                        new SpecialTokensText("<|im_start|>assistant\n"),
                         model,
                         isLastItem
                             ? LlamaText([])
-                            : new SpecialToken("<|im_end|>\n")
+                            : new SpecialTokensText("<|im_end|>\n")
                     ])
             ]);
         }));
         return {
             contextText,
             stopGenerationTriggers: [
-                LlamaText(new BuiltinSpecialToken("EOS")),
-                LlamaText(new SpecialToken("<|im_end|>")),
+                LlamaText(new SpecialToken("EOS")),
+                LlamaText(new SpecialTokensText("<|im_end|>")),
                 LlamaText("<|im_end|>")
             ]
         };

package/dist/chatWrappers/ChatMLChatWrapper.js.map

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

package/dist/chatWrappers/FalconChatWrapper.d.ts

@@ -3,10 +3,11 @@ import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
 import { LlamaText } from "../utils/LlamaText.js";
 export declare class FalconChatWrapper extends ChatWrapper {
     readonly wrapperName: string;
-    constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle }?: {
+    constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle, allowSpecialTokensInTitles }?: {
         userMessageTitle?: string;
         modelResponseTitle?: string;
         middleSystemMessageTitle?: string;
+        allowSpecialTokensInTitles?: boolean;
     });
     get userMessageTitle(): string;
     get modelResponseTitle(): string;