node-llama-cpp 3.0.0-beta.14 → 3.0.0-beta.16

package/dist/bindings/utils/MemoryOrchestrator.js

@@ -0,0 +1,49 @@
+import { EventRelay } from "lifecycle-utils";
+export class MemoryOrchestrator {
+    /** @internal */ _getMemoryState;
+    /** @internal */ _reservedMemory = 0;
+    onMemoryReservationRelease = new EventRelay();
+    constructor(getMemoryState) {
+        this._getMemoryState = getMemoryState;
+    }
+    reserveMemory(bytes) {
+        this._reservedMemory += bytes;
+        return MemoryReservation._create(bytes, () => {
+            this._reservedMemory -= bytes;
+            this.onMemoryReservationRelease.dispatchEvent();
+        });
+    }
+    getMemoryState() {
+        const { free, total } = this._getMemoryState();
+        return {
+            free: Math.max(0, free - this._reservedMemory),
+            total
+        };
+    }
+}
+export class MemoryReservation {
+    /** @internal */ _size;
+    /** @internal */ _dispose;
+    constructor(size, dispose) {
+        this._size = size;
+        this._dispose = dispose;
+    }
+    get size() {
+        return this._size;
+    }
+    get disposed() {
+        return this._dispose == null;
+    }
+    [Symbol.dispose]() {
+        this.dispose();
+    }
+    dispose() {
+        if (this._dispose != null)
+            this._dispose();
+        this._dispose = null;
+    }
+    static _create(bytes, dispose) {
+        return new MemoryReservation(bytes, dispose);
+    }
+}
+//# sourceMappingURL=MemoryOrchestrator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"MemoryOrchestrator.js","sourceRoot":"","sources":["../../../src/bindings/utils/MemoryOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAE3C,MAAM,OAAO,kBAAkB;IAC3B,gBAAgB,CAAkB,eAAe,CAAsC;IACvF,gBAAgB,CAAS,eAAe,GAAW,CAAC,CAAC;IAErC,0BAA0B,GAAG,IAAI,UAAU,EAAQ,CAAC;IAEpE,YAAmB,cAAmD;QAClE,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;IAC1C,CAAC;IAEM,aAAa,CAAC,KAAa;QAC9B,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC;QAE9B,OAAO,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE;YACzC,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC;YAC9B,IAAI,CAAC,0BAA0B,CAAC,aAAa,EAAE,CAAC;QACpD,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,cAAc;QACjB,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7C,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC;YAC9C,KAAK;SACR,CAAC;IACN,CAAC;CACJ;AAED,MAAM,OAAO,iBAAiB;IAC1B,gBAAgB,CAAkB,KAAK,CAAS;IAChD,gBAAgB,CAAS,QAAQ,CAAsB;IAEvD,YAAoB,IAAY,EAAE,OAAmB;QACjD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC;IACjC,CAAC;IAEM,CAAC,MAAM,CAAC,OAAO,CAAC;QACnB,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAEM,OAAO;QACV,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI;YACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,KAAa,EAAE,OAAmB;QACpD,OAAO,IAAI,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ"}

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

@@ -2,7 +2,7 @@ type ClonedLlamaCppRepoTagFile = {
     tag: string;
     llamaCppGithubRepo: string;
 };
-export declare function cloneLlamaCppRepo(githubOwner: string, githubRepo: string, tag: string, useBundles?: boolean, progressLogs?: boolean): Promise<void>;
+export declare function cloneLlamaCppRepo(githubOwner: string, githubRepo: string, tag: string, useBundles?: boolean, progressLogs?: boolean, recursive?: boolean): Promise<void>;
 export declare function getClonedLlamaCppRepoReleaseInfo(): Promise<ClonedLlamaCppRepoTagFile | null>;
 export declare function isLlamaCppRepoCloned(waitForLock?: boolean): Promise<boolean>;
 export declare function ensureLlamaCppRepoIsCloned({ progressLogs }?: {

package/dist/bindings/utils/cloneLlamaCppRepo.js

@@ -1,10 +1,9 @@
 import path from "path";
 import simpleGit from "simple-git";
-import cliProgress from "cli-progress";
 import chalk from "chalk";
 import fs from "fs-extra";
 import which from "which";
-import { defaultLlamaCppGitHubRepo, defaultLlamaCppRelease, llamaCppDirectory, llamaCppDirectoryInfoFilePath } from "../../config.js";
+import { defaultLlamaCppGitHubRepo, defaultLlamaCppRelease, enableRecursiveClone, llamaCppDirectory, llamaCppDirectoryInfoFilePath } from "../../config.js";
 import { getGitBundlePathForRelease } from "../../utils/gitReleaseBundles.js";
 import { withLockfile } from "../../utils/withLockfile.js";
 import { waitForLockfileRelease } from "../../utils/waitForLockfileRelease.js";
@@ -12,37 +11,38 @@ import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
 import { isLockfileActive } from "../../utils/isLockfileActive.js";
 import { isGithubReleaseNeedsResolving, resolveGithubRelease } from "../../utils/resolveGithubRelease.js";
 import withStatusLogs from "../../utils/withStatusLogs.js";
+import { withProgressLog } from "../../utils/withProgressLog.js";
 import { logDistroInstallInstruction } from "./logDistroInstallInstruction.js";
-export async function cloneLlamaCppRepo(githubOwner, githubRepo, tag, useBundles = true, progressLogs = true) {
+export async function cloneLlamaCppRepo(githubOwner, githubRepo, tag, useBundles = true, progressLogs = true, recursive = enableRecursiveClone) {
     const gitBundleForTag = !useBundles ? null : await getGitBundlePathForRelease(githubOwner, githubRepo, tag);
     const remoteGitUrl = `https://github.com/${githubOwner}/${githubRepo}.git`;
     async function withGitCloneProgress(cloneName, callback) {
         if (!progressLogs)
             return await callback(simpleGit({}));
-        const progressBar = new cliProgress.Bar({
-            clearOnComplete: false,
-            hideCursor: true,
-            autopadding: true,
-            format: getConsoleLogPrefix() + `${chalk.bold("Clone {repo}")}  ${chalk.yellow("{percentage}%")} ${chalk.cyan("{bar}")} ${chalk.grey("{eta_formatted}")}`
-        }, cliProgress.Presets.shades_classic);
-        progressBar.start(100, 0, {
-            speed: "",
-            repo: `${githubOwner}/${githubRepo} (${cloneName})`
-        });
-        const gitWithCloneProgress = simpleGit({
-            progress({ progress, total, processed }) {
-                const totalProgress = (processed / 100) + (progress / total);
-                progressBar.update(Math.floor(totalProgress * 10000) / 100);
-            }
-        });
-        try {
+        const repoText = `${githubOwner}/${githubRepo} (${cloneName})`;
+        let lastProgress = 0;
+        let stages = 1;
+        return await withProgressLog({
+            loadingText: chalk.bold("Cloning " + repoText),
+            successText: chalk.blue("Cloned " + repoText),
+            failText: chalk.blue("Failed to clone " + repoText),
+            progressFractionDigits: false
+        }, async (progressUpdater) => {
+            const gitWithCloneProgress = simpleGit({
+                progress({ progress }) {
+                    const currentProgress = progress / 100;
+                    if (currentProgress < lastProgress)
+                        stages++;
+                    lastProgress = currentProgress;
+                    progressUpdater.setProgress(currentProgress, stages > 1
+                        ? `(Stage ${stages})`
+                        : undefined);
+                }
+            });
             const res = await callback(gitWithCloneProgress);
-            progressBar.update(100);
+            progressUpdater.setProgress(1);
             return res;
-        }
-        finally {
-            progressBar.stop();
-        }
+        });
     }
     await withLockfile({
         resourcePath: llamaCppDirectory
@@ -73,6 +73,7 @@ export async function cloneLlamaCppRepo(githubOwner, githubRepo, tag, useBundles
                 await gitWithCloneProgress.clone(remoteGitUrl, llamaCppDirectory, {
                     "--depth": 1,
                     "--branch": tag,
+                    ...(recursive ? { "--recursive": null } : {}),
                     "--quiet": null
                 });
             });

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

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

package/dist/bindings/utils/compileLLamaCpp.js

@@ -45,8 +45,8 @@ export async function compileLlamaCpp(buildOptions, compileOptions) {
                     cmakeCustomOptions.set("LLAMA_METAL", "1");
                 else if (!cmakeCustomOptions.has("LLAMA_METAL"))
                     cmakeCustomOptions.set("LLAMA_METAL", "OFF");
-                if (buildOptions.gpu === "cuda" && !cmakeCustomOptions.has("LLAMA_CUBLAS"))
-                    cmakeCustomOptions.set("LLAMA_CUBLAS", "1");
+                if (buildOptions.gpu === "cuda" && !cmakeCustomOptions.has("LLAMA_CUDA"))
+                    cmakeCustomOptions.set("LLAMA_CUDA", "1");
                 if (buildOptions.gpu === "vulkan" && !cmakeCustomOptions.has("LLAMA_VULKAN"))
                     cmakeCustomOptions.set("LLAMA_VULKAN", "1");
                 if (!cmakeCustomOptions.has("LLAMA_CCACHE"))

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

@@ -1 +1 @@
-{"version":3,"file":"compileLLamaCpp.js","sourceRoot":"","sources":["../../../src/bindings/utils/compileLLamaCpp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compileLLamaCpp.js","sourceRoot":"","sources":["../../../src/bindings/utils/compileLLamaCpp.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/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":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAC,8BAA8B,EAAC,MAAM,iBAAiB,CAAC;AAE/D,MAAM,UAAU,yBAAyB,CAAC,kBAA2C;IACjF,MAAM,qBAAqB,GAAwB,kBAAkB,IAAI,IAAI;QACzE,CAAC,CAAC,IAAI,GAAG,EAAE;QACX,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAElD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,GAAG;QAAE,qBAAqB,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IACnF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG;QAAE,qBAAqB,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IACrF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG;QAAE,qBAAqB,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAErF,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,GAAG;QAAE,qBAAqB,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAC/E,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,GAAG;QAAE,qBAAqB,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACzF,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,IAAI;QAAE,qBAAqB,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzH,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,IAAI;QAAE,qBAAqB,CAAC,GAAG,CAAC,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACrI,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,IAAI;QAAE,qBAAqB,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACzH,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI;QAAE,qBAAqB,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtH,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI;QAAE,qBAAqB,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChH,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,IAAI;QAAE,qBAAqB,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC3I,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,IAAI;QAAE,qBAAqB,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAChK,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG;QAAE,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IACvF,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG;QAAE,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAEvF,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;QAC3B,IAAI,GAAG,CAAC,UAAU,CAAC,8BAA8B,CAAC,IAAI,GAAG,KAAK,8BAA8B,EAAE;YAC1F,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;YAChE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAM,CAAC,CAAC;SAC7C;KACJ;IAED,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEjC,OAAO,qBAAqB,CAAC;AACjC,CAAC"}
+{"version":3,"file":"resolveCustomCmakeOptions.js","sourceRoot":"","sources":["../../../src/bindings/utils/resolveCustomCmakeOptions.ts"],"names":[],"mappings":"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"}

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":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAC,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnF,0GAA0G;AAC1G,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAC9B,WAAW,GAAW,QAAQ,CAAC;IAE/B,mBAAmB,CAAC,OAAmC,EAAE,EAAC,kBAAkB,EAAE,sBAAsB,KAGhH,EAAE;QASF,MAAM,oBAAoB,GAAG,IAAI,CAAC,2CAA2C,CAAC,OAAO,EAAE,kBAAkB,EAAE;YACvG,cAAc,EAAE,sBAAsB;SACzC,CAAC,CAAC;QAEH,MAAM,WAAW,GAIZ,EAAE,CAAC;QAER,IAAI,WAAW,GAAa,EAAE,CAAC;QAC/B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,UAAU,GAAa,EAAE,CAAC;QAC9B,IAAI,qBAAqB,GAAoB,IAAI,CAAC;QAElD,SAAS,KAAK;YACV,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;gBACvE,WAAW,CAAC,IAAI,CAAC;oBACb,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC;oBAChC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC5B,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;iBACjC,CAAC,CAAC;YAEP,WAAW,GAAG,EAAE,CAAC;YACjB,SAAS,GAAG,EAAE,CAAC;YACf,UAAU,GAAG,EAAE,CAAC;QACpB,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE;YACrC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACxB,IAAI,qBAAqB,KAAK,QAAQ;oBAClC,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,QAAQ,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC/B;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;gBAC7B,KAAK,EAAE,CAAC;gBAER,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC9B,KAAK,EAAE,CAAC;gBAER,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;aAClE;SACJ;QAED,KAAK,EAAE,CAAC;QAER,MAAM,WAAW,GAAG,SAAS,CACzB,WAAW,CAAC,GAAG,CAAC,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,MAAM,UAAU,GAAG,KAAK,KAAK,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YAEpD,OAAO,SAAS,CAAC;gBACb,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;oBACjB,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,YAAY,CAAC,sBAAsB,CAAC;wBACxC,MAAM;wBACN,IAAI,YAAY,CAAC,cAAc,CAAC;qBACnC,CAAC;gBAEN,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,YAAY,CAAC,oBAAoB,CAAC;wBACtC,IAAI;wBACJ,IAAI,YAAY,CAAC,cAAc,CAAC;qBACnC,CAAC;gBAEN,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;oBAC/B,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,YAAY,CAAC,yBAAyB,CAAC;wBAC3C,KAAK;wBAEL,UAAU;4BACN,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BACf,CAAC,CAAC,IAAI,YAAY,CAAC,cAAc,CAAC;qBACzC,CAAC;aACT,CAAC,CAAC;QACP,CAAC,CAAC,CACL,CAAC;QAEF,OAAO;YACH,WAAW;YACX,sBAAsB,EAAE;gBACpB,SAAS,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBACzC,SAAS,CAAC,IAAI,YAAY,CAAC,YAAY,CAAC,CAAC;gBACzC,SAAS,CAAC,YAAY,CAAC;aAC1B;SACJ,CAAC;IACN,CAAC;CACJ"}
+{"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;

package/dist/chatWrappers/FalconChatWrapper.js

@@ -1,15 +1,17 @@
 import { ChatWrapper } from "../ChatWrapper.js";
-import { LlamaText, BuiltinSpecialToken } from "../utils/LlamaText.js";
+import { LlamaText, SpecialToken, SpecialTokensText } from "../utils/LlamaText.js";
 export class FalconChatWrapper extends ChatWrapper {
     wrapperName = "Falcon";
     /** @internal */ _userMessageTitle;
     /** @internal */ _modelResponseTitle;
     /** @internal */ _middleSystemMessageTitle;
-    constructor({ userMessageTitle = "User", modelResponseTitle = "Assistant", middleSystemMessageTitle = "System" } = {}) {
+    /** @internal */ _allowSpecialTokensInTitles;
+    constructor({ userMessageTitle = "User", modelResponseTitle = "Assistant", middleSystemMessageTitle = "System", allowSpecialTokensInTitles = false } = {}) {
         super();
         this._userMessageTitle = userMessageTitle;
         this._modelResponseTitle = modelResponseTitle;
         this._middleSystemMessageTitle = middleSystemMessageTitle;
+        this._allowSpecialTokensInTitles = allowSpecialTokensInTitles;
     }
     get userMessageTitle() {
         return this._userMessageTitle;
@@ -57,9 +59,11 @@ export class FalconChatWrapper extends ChatWrapper {
                 currentAggregateFocus = null;
                 modelTexts.push(this.generateModelResponseText(item.response));
             }
+            else
+                void (item);
         }
         flush();
-        const contextText = LlamaText(new BuiltinSpecialToken("BOS"), resultItems.map(({ system, user, model }, index) => {
+        const contextText = LlamaText(new SpecialToken("BOS"), resultItems.map(({ system, user, model }, index) => {
             const isFirstItem = index === 0;
             const isLastItem = index === resultItems.length - 1;
             return LlamaText([
@@ -68,37 +72,50 @@ export class FalconChatWrapper extends ChatWrapper {
                     : LlamaText([
                         isFirstItem
                             ? LlamaText([])
-                            : `${this._middleSystemMessageTitle}: `,
+                            : SpecialTokensText.wrapIf(this._allowSpecialTokensInTitles, `${this._middleSystemMessageTitle}: `),
                         system,
-                        "\n\n"
+                        SpecialTokensText.wrapIf(this._allowSpecialTokensInTitles, "\n\n")
                     ]),
                 (user.length === 0)
                     ? LlamaText([])
                     : LlamaText([
-                        `${this._userMessageTitle}: `,
+                        SpecialTokensText.wrapIf(this._allowSpecialTokensInTitles, `${this._userMessageTitle}: `),
                         user,
-                        "\n\n"
+                        SpecialTokensText.wrapIf(this._allowSpecialTokensInTitles, "\n\n")
                     ]),
                 (model.length === 0 && !isLastItem)
                     ? LlamaText([])
                     : LlamaText([
-                        `${this._modelResponseTitle}: `,
+                        SpecialTokensText.wrapIf(this._allowSpecialTokensInTitles, `${this._modelResponseTitle}: `),
                         model,
                         isLastItem
                             ? LlamaText([])
-                            : "\n\n"
+                            : SpecialTokensText.wrapIf(this._allowSpecialTokensInTitles, "\n\n")
                     ])
             ]);
         }));
         return {
             contextText,
             stopGenerationTriggers: [
-                LlamaText(new BuiltinSpecialToken("EOS")),
+                LlamaText(new SpecialToken("EOS")),
                 LlamaText(`\n${this._userMessageTitle}:`),
                 LlamaText(`\n${this._modelResponseTitle}:`),
-                LlamaText(`\n${this._middleSystemMessageTitle}:`)
+                LlamaText(`\n${this._middleSystemMessageTitle}:`),
+                ...(!this._allowSpecialTokensInTitles
+                    ? []
+                    : [
+                        LlamaText(new SpecialTokensText(`\n${this._userMessageTitle}:`)),
+                        LlamaText(new SpecialTokensText(`\n${this._modelResponseTitle}:`)),
+                        LlamaText(new SpecialTokensText(`\n${this._middleSystemMessageTitle}:`))
+                    ])
             ]
         };
     }
+    /** @internal */
+    static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
+        return [{}, {
+                allowSpecialTokensInTitles: true
+            }];
+    }
 }
 //# sourceMappingURL=FalconChatWrapper.js.map

package/dist/chatWrappers/FalconChatWrapper.js.map

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