node-llama-cpp 3.0.0-beta.1 → 3.0.0-beta.2

package/dist/utils/truncateTextAndRoundToWords.js

@@ -0,0 +1,27 @@
+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 maxRound - The maximum number of extra characters to delete to round to the nearest word
+ * @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)
+            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);
+}
+//# sourceMappingURL=truncateTextAndRoundToWords.js.map

package/dist/utils/truncateTextAndRoundToWords.js.map

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

package/llama/addon.cpp

@@ -95,8 +95,9 @@ class AddonModel : public Napi::ObjectWrap<AddonModel> {
             }
 
             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, true, true);
+            std::vector<llama_token> tokens = llama_tokenize(model, text, false, specialTokens);
 
             Napi::Uint32Array result = Napi::Uint32Array::New(info.Env(), tokens.size());
             for (size_t i = 0; i < tokens.size(); ++i) {
@@ -162,7 +163,7 @@ class AddonModel : public Napi::ObjectWrap<AddonModel> {
                 Napi::Error::New(info.Env(), "Context is disposed").ThrowAsJavaScriptException();
                 return info.Env().Undefined();
             }
-            
+
             char model_desc[128];
             int actual_length = llama_model_desc(model, model_desc, sizeof(model_desc));
 
@@ -352,25 +353,21 @@ class AddonContext : public Napi::ObjectWrap<AddonContext> {
             context_params.seed = -1;
             context_params.n_ctx = 4096;
             context_params.n_threads = 6;
-            context_params.n_threads_batch == -1 ? context_params.n_threads : context_params.n_threads_batch;
+            context_params.n_threads_batch = context_params.n_threads;
 
             if (info.Length() > 1 && info[1].IsObject()) {
                 Napi::Object options = info[1].As<Napi::Object>();
 
                 if (options.Has("seed")) {
-                    context_params.seed = options.Get("seed").As<Napi::Number>().Int32Value();
+                    context_params.seed = options.Get("seed").As<Napi::Number>().Uint32Value();
                 }
 
                 if (options.Has("contextSize")) {
-                    context_params.n_ctx = options.Get("contextSize").As<Napi::Number>().Int32Value();
+                    context_params.n_ctx = options.Get("contextSize").As<Napi::Number>().Uint32Value();
                 }
 
                 if (options.Has("batchSize")) {
-                    context_params.n_batch = options.Get("batchSize").As<Napi::Number>().Int32Value();
-                }
-
-                if (options.Has("f16Kv")) {
-                    context_params.f16_kv = options.Get("f16Kv").As<Napi::Boolean>().Value();
+                    context_params.n_batch = options.Get("batchSize").As<Napi::Number>().Uint32Value();
                 }
 
                 if (options.Has("logitsAll")) {
@@ -382,8 +379,11 @@ class AddonContext : public Napi::ObjectWrap<AddonContext> {
                 }
 
                 if (options.Has("threads")) {
-                    context_params.n_threads = options.Get("threads").As<Napi::Number>().Int32Value();
-                    context_params.n_threads_batch == -1 ? context_params.n_threads : context_params.n_threads_batch;
+                    const auto n_threads = options.Get("threads").As<Napi::Number>().Uint32Value();
+                    const auto resolved_n_threads = n_threads == 0 ? std::thread::hardware_concurrency() : n_threads;
+
+                    context_params.n_threads = resolved_n_threads;
+                    context_params.n_threads_batch = resolved_n_threads;
                 }
             }
 
@@ -533,6 +533,17 @@ class AddonContext : public Napi::ObjectWrap<AddonContext> {
         Napi::Value DecodeBatch(const Napi::CallbackInfo& info);
         Napi::Value SampleToken(const Napi::CallbackInfo& info);
 
+        Napi::Value AcceptGrammarEvaluationStateToken(const Napi::CallbackInfo& info) {
+            AddonGrammarEvaluationState* grammar_evaluation_state = Napi::ObjectWrap<AddonGrammarEvaluationState>::Unwrap(info[0].As<Napi::Object>());
+            llama_token tokenId = info[1].As<Napi::Number>().Int32Value();
+
+            if ((grammar_evaluation_state)->grammar != nullptr) {
+                llama_grammar_accept_token(ctx, (grammar_evaluation_state)->grammar, tokenId);
+            }
+
+            return info.Env().Undefined();
+        }
+
         static void init(Napi::Object exports) {
             exports.Set(
                 "AddonContext",
@@ -548,6 +559,7 @@ class AddonContext : public Napi::ObjectWrap<AddonContext> {
                         InstanceMethod("shiftSequenceTokenCells", &AddonContext::ShiftSequenceTokenCells),
                         InstanceMethod("decodeBatch", &AddonContext::DecodeBatch),
                         InstanceMethod("sampleToken", &AddonContext::SampleToken),
+                        InstanceMethod("acceptGrammarEvaluationStateToken", &AddonContext::AcceptGrammarEvaluationStateToken),
                         InstanceMethod("dispose", &AddonContext::Dispose)
                     }
                 )

package/llama/binariesGithubRelease.json

@@ -1,3 +1,3 @@
 {
-    "release": "b1567"
+    "release": "b1892"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-llama-cpp",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "Run AI models locally on your machine with node.js bindings for llama.cpp. Force a JSON schema on the model output on the generation level",
   "main": "dist/index.js",
   "type": "module",
@@ -47,16 +47,19 @@
     "prewatch": "rimraf ./dist ./tsconfig.tsbuildinfo",
     "watch": "tsc --build tsconfig.json --watch --force",
     "cmake-js-llama": "cd llama && cmake-js",
-    "test": "npm run test:typescript && npm run lint:eslint && npm run test:standalone",
-    "test:standalone": "vitest run ./test",
-    "test:standalone:interactive": "vitest watch ./test",
+    "test": "npm run test:typescript && npm run lint:eslint && npm run test:standalone && npm run test:modelDependent",
+    "test:standalone": "vitest run ./test/standalone",
+    "test:standalone:interactive": "vitest watch ./test/standalone",
+    "test:modelDependent": "vitest run ./test/modelDependent",
+    "test:modelDependent:interactive": "vitest watch ./test/modelDependent",
     "test:typescript": "tsc --build tsconfig.json --dry --force",
     "lint": "npm run lint:eslint",
     "lint:eslint": "eslint --ext .js --ext .ts .",
     "format": "npm run lint:eslint -- --fix",
-    "dev:setup": "npm run build && node ./dist/cli/cli.js download && npm run docs:generateTypedoc",
+    "dev:setup:downloadAllTestModels": "node --loader ts-node/esm test/utils/scripts/downloadAllTestModels.ts",
+    "dev:setup": "npm run build && node ./dist/cli/cli.js download && npm run docs:generateTypedoc && npm run dev:setup:downloadAllTestModels",
     "dev:build": "npm run build && node ./dist/cli/cli.js build",
-    "clean": "rm -rf ./node_modules ./dist ./tsconfig.tsbuildinfo",
+    "clean": "rm -rf ./node_modules ./dist ./tsconfig.tsbuildinfo ./test/.models",
     "docs:generateTypedoc": "typedoc && rimraf ./docs/api/index.md ./docs/api/exports.md",
     "docs:dev": "npm run docs:generateTypedoc && vitepress dev",
     "docs:build": "npm run docs:generateTypedoc && vitepress build",
@@ -121,16 +124,17 @@
     "eslint-plugin-jsdoc": "^46.9.0",
     "eslint-plugin-n": "^16.3.1",
     "husky": "^8.0.3",
+    "ipull": "^1.2.1",
     "rimraf": "^5.0.1",
     "semantic-release": "^22.0.8",
     "ts-node": "^10.9.1",
     "tslib": "^2.6.1",
     "typedoc": "^0.25.3",
-    "typedoc-plugin-markdown": "4.0.0-next.30",
+    "typedoc-plugin-markdown": "4.0.0-next.41",
     "typedoc-plugin-mdn-links": "^3.1.5",
-    "typedoc-vitepress-theme": "^1.0.0-next.3",
+    "typedoc-vitepress-theme": "^1.0.0-next.7",
     "typescript": "^5.2.2",
-    "vitepress": "^1.0.0-rc.20",
+    "vitepress": "1.0.0-rc.22",
     "vitest": "^0.34.6",
     "zx": "^7.2.3"
   },
@@ -152,5 +156,13 @@
     "uuid": "^9.0.0",
     "which": "^4.0.0",
     "yargs": "^17.7.2"
+  },
+  "peerDependencies": {
+    "typescript": ">=5.0.0"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
   }
 }

package/dist/ChatPromptWrapper.d.ts

@@ -1,11 +0,0 @@
-export declare abstract class ChatPromptWrapper {
-    abstract readonly wrapperName: string;
-    wrapPrompt(prompt: string, { systemPrompt, promptIndex }: {
-        systemPrompt: string;
-        promptIndex: number;
-        lastStopString: string | null;
-        lastStopStringSuffix: string | null;
-    }): string;
-    getStopStrings(): string[];
-    getDefaultStopString(): string;
-}

package/dist/ChatPromptWrapper.js

@@ -1,20 +0,0 @@
-export class ChatPromptWrapper {
-    wrapPrompt(prompt, { systemPrompt, promptIndex }) {
-        if (promptIndex === 0) {
-            return systemPrompt + "\n" + prompt;
-        }
-        else {
-            return prompt;
-        }
-    }
-    getStopStrings() {
-        return [];
-    }
-    getDefaultStopString() {
-        const stopString = this.getStopStrings()[0];
-        if (stopString == null || stopString.length === 0)
-            throw new Error(`Prompt wrapper "${this.wrapperName}" has no stop strings`);
-        return stopString;
-    }
-}
-//# sourceMappingURL=ChatPromptWrapper.js.map

package/dist/ChatPromptWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChatPromptWrapper.js","sourceRoot":"","sources":["../src/ChatPromptWrapper.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,iBAAiB;IAG5B,UAAU,CAAC,MAAc,EAAE,EAAC,YAAY,EAAE,WAAW,EAE3D;QACG,IAAI,WAAW,KAAK,CAAC,EAAE;YACnB,OAAO,YAAY,GAAG,IAAI,GAAG,MAAM,CAAC;SACvC;aAAM;YACH,OAAO,MAAM,CAAC;SACjB;IACL,CAAC;IAEM,cAAc;QACjB,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,oBAAoB;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;QAE5C,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,CAAC,WAAW,uBAAuB,CAAC,CAAC;QAEhF,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ"}

package/dist/chatWrappers/ChatMLChatPromptWrapper.d.ts

@@ -1,12 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-export declare class ChatMLChatPromptWrapper extends ChatPromptWrapper {
-    readonly wrapperName: string;
-    wrapPrompt(prompt: string, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }: {
-        systemPrompt: string;
-        promptIndex: number;
-        lastStopString: string | null;
-        lastStopStringSuffix: string | null;
-    }): string;
-    getStopStrings(): string[];
-    getDefaultStopString(): string;
-}

package/dist/chatWrappers/ChatMLChatPromptWrapper.js

@@ -1,22 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-import { getTextCompletion } from "../utils/getTextCompletion.js";
-// source: https://github.com/openai/openai-python/blob/120d225b91a8453e15240a49fb1c6794d8119326/chatml.md
-export class ChatMLChatPromptWrapper extends ChatPromptWrapper {
-    wrapperName = "ChatML";
-    wrapPrompt(prompt, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }) {
-        const previousCompletionEnd = (lastStopString ?? "") + (lastStopStringSuffix ?? "");
-        if (promptIndex === 0 && systemPrompt != "")
-            return (getTextCompletion(previousCompletionEnd, "<|im_start|>system\n") ?? "<|im_start|>system\n") +
-                systemPrompt + "<|im_end|>\n<|im_start|>user\n" + prompt + "<|im_end|>\n<|im_start|>assistant\n";
-        else
-            return (getTextCompletion(previousCompletionEnd, "<|im_end|>\n<|im_start|>user\n") ?? "<|im_end|>\n<|im_start|>user\n") +
-                prompt + "<|im_end|>\n<|im_start|>assistant\n";
-    }
-    getStopStrings() {
-        return ["<|im_end|>"];
-    }
-    getDefaultStopString() {
-        return "<|im_end|>";
-    }
-}
-//# sourceMappingURL=ChatMLChatPromptWrapper.js.map

package/dist/chatWrappers/ChatMLChatPromptWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChatMLChatPromptWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/ChatMLChatPromptWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAEhE,0GAA0G;AAC1G,MAAM,OAAO,uBAAwB,SAAQ,iBAAiB;IAC1C,WAAW,GAAW,QAAQ,CAAC;IAE/B,UAAU,CAAC,MAAc,EAAE,EAAC,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,oBAAoB,EAE1G;QACG,MAAM,qBAAqB,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;QAEpF,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,IAAI,EAAE;YACvC,OAAO,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,sBAAsB,CAAC,IAAI,sBAAsB,CAAC;gBAC/F,YAAY,GAAG,gCAAgC,GAAG,MAAM,GAAG,qCAAqC,CAAC;;YAErG,OAAO,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,gCAAgC,CAAC,IAAI,gCAAgC,CAAC;gBACnH,MAAM,GAAG,qCAAqC,CAAC;IAC3D,CAAC;IAEe,cAAc;QAC1B,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;IAEe,oBAAoB;QAChC,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ"}

package/dist/chatWrappers/EmptyChatPromptWrapper.d.ts

@@ -1,4 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-export declare class EmptyChatPromptWrapper extends ChatPromptWrapper {
-    readonly wrapperName: string;
-}

package/dist/chatWrappers/EmptyChatPromptWrapper.js

@@ -1,5 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-export class EmptyChatPromptWrapper extends ChatPromptWrapper {
-    wrapperName = "Empty";
-}
-//# sourceMappingURL=EmptyChatPromptWrapper.js.map

package/dist/chatWrappers/EmptyChatPromptWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EmptyChatPromptWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/EmptyChatPromptWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAE1D,MAAM,OAAO,sBAAuB,SAAQ,iBAAiB;IACzC,WAAW,GAAW,OAAO,CAAC;CACjD"}

package/dist/chatWrappers/FalconChatPromptWrapper.d.ts

@@ -1,19 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-export declare class FalconChatPromptWrapper extends ChatPromptWrapper {
-    readonly wrapperName: string;
-    private readonly _instructionName;
-    private readonly _responseName;
-    constructor({ instructionName, responseName }?: {
-        instructionName?: string;
-        responseName?: string;
-    });
-    wrapPrompt(prompt: string, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }: {
-        systemPrompt: string;
-        promptIndex: number;
-        lastStopString: string | null;
-        lastStopStringSuffix: string | null;
-    }): string;
-    getStopStrings(): string[];
-    getDefaultStopString(): string;
-    private _getPromptPrefix;
-}

package/dist/chatWrappers/FalconChatPromptWrapper.js

@@ -1,33 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-import { getTextCompletion } from "../utils/getTextCompletion.js";
-export class FalconChatPromptWrapper extends ChatPromptWrapper {
-    wrapperName = "Falcon";
-    _instructionName;
-    _responseName;
-    constructor({ instructionName = "User", responseName = "Assistant" } = {}) {
-        super();
-        this._instructionName = instructionName;
-        this._responseName = responseName;
-    }
-    wrapPrompt(prompt, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }) {
-        if (promptIndex === 0)
-            return systemPrompt + `\n${this._instructionName}: ` + prompt + `\n${this._responseName}: `;
-        return this._getPromptPrefix(lastStopString, lastStopStringSuffix) + prompt + `\n${this._responseName}: `;
-    }
-    getStopStrings() {
-        return [
-            `\n${this._instructionName}: `,
-            `\n${this._responseName}:`
-        ];
-    }
-    getDefaultStopString() {
-        return `\n${this._instructionName}: `;
-    }
-    _getPromptPrefix(lastStopString, lastStopStringSuffix) {
-        return getTextCompletion((lastStopString ?? "") + (lastStopStringSuffix ?? ""), [
-            `\n${this._instructionName}: `,
-            `${this._instructionName}: `
-        ]) ?? `\n${this._instructionName}: `;
-    }
-}
-//# sourceMappingURL=FalconChatPromptWrapper.js.map

package/dist/chatWrappers/FalconChatPromptWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FalconChatPromptWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/FalconChatPromptWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAEhE,MAAM,OAAO,uBAAwB,SAAQ,iBAAiB;IAC1C,WAAW,GAAW,QAAQ,CAAC;IAC9B,gBAAgB,CAAS;IACzB,aAAa,CAAS;IAEvC,YAAmB,EAAC,eAAe,GAAG,MAAM,EAAE,YAAY,GAAG,WAAW,KAAuD,EAAE;QAC7H,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACtC,CAAC;IAEe,UAAU,CAAC,MAAc,EAAE,EAAC,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,oBAAoB,EAE1G;QACG,IAAI,WAAW,KAAK,CAAC;YACjB,OAAO,YAAY,GAAG,KAAK,IAAI,CAAC,gBAAgB,IAAI,GAAG,MAAM,GAAG,KAAK,IAAI,CAAC,aAAa,IAAI,CAAC;QAEhG,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,oBAAoB,CAAC,GAAG,MAAM,GAAG,KAAK,IAAI,CAAC,aAAa,IAAI,CAAC;IAC9G,CAAC;IAEe,cAAc;QAC1B,OAAO;YACH,KAAK,IAAI,CAAC,gBAAgB,IAAI;YAC9B,KAAK,IAAI,CAAC,aAAa,GAAG;SAC7B,CAAC;IACN,CAAC;IAEe,oBAAoB;QAChC,OAAO,KAAK,IAAI,CAAC,gBAAgB,IAAI,CAAC;IAC1C,CAAC;IAEO,gBAAgB,CAAC,cAA6B,EAAE,oBAAmC;QACvF,OAAO,iBAAiB,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,EAAE;YAC5E,KAAK,IAAI,CAAC,gBAAgB,IAAI;YAC9B,GAAG,IAAI,CAAC,gBAAgB,IAAI;SAC/B,CAAC,IAAI,KAAK,IAAI,CAAC,gBAAgB,IAAI,CAAC;IACzC,CAAC;CACJ"}

package/dist/chatWrappers/GeneralChatPromptWrapper.d.ts

@@ -1,19 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-export declare class GeneralChatPromptWrapper extends ChatPromptWrapper {
-    readonly wrapperName: string;
-    private readonly _instructionName;
-    private readonly _responseName;
-    constructor({ instructionName, responseName }?: {
-        instructionName?: string;
-        responseName?: string;
-    });
-    wrapPrompt(prompt: string, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }: {
-        systemPrompt: string;
-        promptIndex: number;
-        lastStopString: string | null;
-        lastStopStringSuffix: string | null;
-    }): string;
-    getStopStrings(): string[];
-    getDefaultStopString(): string;
-    private _getPromptPrefix;
-}

package/dist/chatWrappers/GeneralChatPromptWrapper.js

@@ -1,38 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-import { getTextCompletion } from "../utils/getTextCompletion.js";
-export class GeneralChatPromptWrapper extends ChatPromptWrapper {
-    wrapperName = "General";
-    _instructionName;
-    _responseName;
-    constructor({ instructionName = "Human", responseName = "Assistant" } = {}) {
-        super();
-        this._instructionName = instructionName;
-        this._responseName = responseName;
-    }
-    wrapPrompt(prompt, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }) {
-        if (promptIndex === 0)
-            return systemPrompt + `\n\n### ${this._instructionName}:\n` + prompt + `\n\n### ${this._responseName}:\n`;
-        return this._getPromptPrefix(lastStopString, lastStopStringSuffix) + prompt + `\n\n### ${this._responseName}:\n`;
-    }
-    getStopStrings() {
-        return [
-            `\n\n### ${this._instructionName}`,
-            `### ${this._instructionName}`,
-            `\n\n### ${this._responseName}`,
-            `### ${this._responseName}`,
-            "<end>"
-        ];
-    }
-    getDefaultStopString() {
-        return `\n\n### ${this._instructionName}`;
-    }
-    _getPromptPrefix(lastStopString, lastStopStringSuffix) {
-        return getTextCompletion(lastStopString === "<end>"
-            ? lastStopStringSuffix
-            : ((lastStopString ?? "") + (lastStopStringSuffix ?? "")), [
-            `\n\n### ${this._instructionName}:\n`,
-            `### ${this._instructionName}:\n`
-        ]) ?? `\n\n### ${this._instructionName}:\n`;
-    }
-}
-//# sourceMappingURL=GeneralChatPromptWrapper.js.map

package/dist/chatWrappers/GeneralChatPromptWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GeneralChatPromptWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/GeneralChatPromptWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAEhE,MAAM,OAAO,wBAAyB,SAAQ,iBAAiB;IAC3C,WAAW,GAAW,SAAS,CAAC;IAC/B,gBAAgB,CAAS;IACzB,aAAa,CAAS;IAEvC,YAAmB,EAAC,eAAe,GAAG,OAAO,EAAE,YAAY,GAAG,WAAW,KAAuD,EAAE;QAC9H,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACtC,CAAC;IAEe,UAAU,CAAC,MAAc,EAAE,EAAC,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,oBAAoB,EAE1G;QACG,IAAI,WAAW,KAAK,CAAC;YACjB,OAAO,YAAY,GAAG,WAAW,IAAI,CAAC,gBAAgB,KAAK,GAAG,MAAM,GAAG,WAAW,IAAI,CAAC,aAAa,KAAK,CAAC;QAE9G,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,oBAAoB,CAAC,GAAG,MAAM,GAAG,WAAW,IAAI,CAAC,aAAa,KAAK,CAAC;IACrH,CAAC;IAEe,cAAc;QAC1B,OAAO;YACH,WAAW,IAAI,CAAC,gBAAgB,EAAE;YAClC,OAAO,IAAI,CAAC,gBAAgB,EAAE;YAC9B,WAAW,IAAI,CAAC,aAAa,EAAE;YAC/B,OAAO,IAAI,CAAC,aAAa,EAAE;YAC3B,OAAO;SACV,CAAC;IACN,CAAC;IAEe,oBAAoB;QAChC,OAAO,WAAW,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC9C,CAAC;IAEO,gBAAgB,CAAC,cAA6B,EAAE,oBAAmC;QACvF,OAAO,iBAAiB,CACpB,cAAc,KAAK,OAAO;YACtB,CAAC,CAAC,oBAAoB;YACtB,CAAC,CAAC,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,EAC7D;YACI,WAAW,IAAI,CAAC,gBAAgB,KAAK;YACrC,OAAO,IAAI,CAAC,gBAAgB,KAAK;SACpC,CACJ,IAAI,WAAW,IAAI,CAAC,gBAAgB,KAAK,CAAC;IAC/C,CAAC;CACJ"}

package/dist/chatWrappers/LlamaChatPromptWrapper.d.ts

@@ -1,12 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-export declare class LlamaChatPromptWrapper extends ChatPromptWrapper {
-    readonly wrapperName: string;
-    wrapPrompt(prompt: string, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }: {
-        systemPrompt: string;
-        promptIndex: number;
-        lastStopString: string | null;
-        lastStopStringSuffix: string | null;
-    }): string;
-    getStopStrings(): string[];
-    getDefaultStopString(): string;
-}

package/dist/chatWrappers/LlamaChatPromptWrapper.js

@@ -1,23 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-import { getTextCompletion } from "../utils/getTextCompletion.js";
-// source: https://huggingface.co/blog/llama2#how-to-prompt-llama-2
-export class LlamaChatPromptWrapper extends ChatPromptWrapper {
-    wrapperName = "LlamaChat";
-    wrapPrompt(prompt, { systemPrompt, promptIndex, lastStopString, lastStopStringSuffix }) {
-        const previousCompletionEnd = (lastStopString ?? "") + (lastStopStringSuffix ?? "");
-        if (promptIndex === 0 && systemPrompt != "") {
-            return (getTextCompletion(previousCompletionEnd, "<s>[INST] <<SYS>>\n") ?? "<s>[INST] <<SYS>>\n") + systemPrompt +
-                "\n<</SYS>>\n\n" + prompt + " [/INST]\n\n";
-        }
-        else {
-            return (getTextCompletion(previousCompletionEnd, "</s><s>[INST] ") ?? "<s>[INST] ") + prompt + " [/INST]\n\n";
-        }
-    }
-    getStopStrings() {
-        return ["</s>"];
-    }
-    getDefaultStopString() {
-        return "</s>";
-    }
-}
-//# sourceMappingURL=LlamaChatPromptWrapper.js.map

package/dist/chatWrappers/LlamaChatPromptWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LlamaChatPromptWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/LlamaChatPromptWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAEhE,mEAAmE;AACnE,MAAM,OAAO,sBAAuB,SAAQ,iBAAiB;IACzC,WAAW,GAAW,WAAW,CAAC;IAElC,UAAU,CAAC,MAAc,EAAE,EAAC,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,oBAAoB,EAE1G;QACG,MAAM,qBAAqB,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;QAEpF,IAAI,WAAW,KAAK,CAAC,IAAI,YAAY,IAAI,EAAE,EAAE;YACzC,OAAO,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,IAAI,qBAAqB,CAAC,GAAG,YAAY;gBAC5G,gBAAgB,GAAG,MAAM,GAAG,cAAc,CAAC;SAClD;aAAM;YACH,OAAO,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,IAAI,YAAY,CAAC,GAAG,MAAM,GAAG,cAAc,CAAC;SACjH;IACL,CAAC;IAEe,cAAc;QAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAEe,oBAAoB;QAChC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}

package/dist/chatWrappers/generateContextTextFromConversationHistory.d.ts

@@ -1,15 +0,0 @@
-import { ChatPromptWrapper } from "../ChatPromptWrapper.js";
-import { ConversationInteraction } from "../types.js";
-/**
- * Generate context text to load into a model context from a conversation history.
- */
-export declare function generateContextTextFromConversationHistory(chatPromptWrapper: ChatPromptWrapper, conversationHistory: readonly ConversationInteraction[], { systemPrompt, currentPromptIndex, lastStopString, lastStopStringSuffix }?: {
-    systemPrompt?: string;
-    currentPromptIndex?: number;
-    lastStopString?: string | null;
-    lastStopStringSuffix?: string | null;
-}): {
-    text: string;
-    stopString: string | null;
-    stopStringSuffix: string | null;
-};

package/dist/chatWrappers/generateContextTextFromConversationHistory.js

@@ -1,39 +0,0 @@
-import { defaultChatSystemPrompt } from "../config.js";
-/**
- * Generate context text to load into a model context from a conversation history.
- */
-export function generateContextTextFromConversationHistory(chatPromptWrapper, conversationHistory, { systemPrompt = defaultChatSystemPrompt, currentPromptIndex = 0, lastStopString = null, lastStopStringSuffix = null } = {}) {
-    let res = "";
-    for (let i = 0; i < conversationHistory.length; i++) {
-        const interaction = conversationHistory[i];
-        const wrappedPrompt = chatPromptWrapper.wrapPrompt(interaction.prompt, {
-            systemPrompt,
-            promptIndex: currentPromptIndex,
-            lastStopString,
-            lastStopStringSuffix
-        });
-        const stopStrings = chatPromptWrapper.getStopStrings();
-        const defaultStopString = chatPromptWrapper.getDefaultStopString();
-        const stopStringsToCheckInResponse = new Set([...stopStrings, defaultStopString]);
-        currentPromptIndex++;
-        lastStopString = null;
-        lastStopStringSuffix = null;
-        res += wrappedPrompt;
-        for (const stopString of stopStringsToCheckInResponse) {
-            if (interaction.response.includes(stopString)) {
-                console.error(`Stop string "${stopString}" was found in model response of conversation interaction index ${i}`, { interaction, stopString });
-                throw new Error("A stop string cannot be in a conversation history interaction model response");
-            }
-        }
-        res += interaction.response;
-        res += defaultStopString;
-        lastStopString = defaultStopString;
-        lastStopStringSuffix = "";
-    }
-    return {
-        text: res,
-        stopString: lastStopString,
-        stopStringSuffix: lastStopStringSuffix
-    };
-}
-//# sourceMappingURL=generateContextTextFromConversationHistory.js.map

package/dist/chatWrappers/generateContextTextFromConversationHistory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateContextTextFromConversationHistory.js","sourceRoot":"","sources":["../../src/chatWrappers/generateContextTextFromConversationHistory.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,cAAc,CAAC;AAIrD;;GAEG;AACH,MAAM,UAAU,0CAA0C,CACtD,iBAAoC,EACpC,mBAAuD,EACvD,EACI,YAAY,GAAG,uBAAuB,EAAE,kBAAkB,GAAG,CAAC,EAAE,cAAc,GAAG,IAAI,EAAE,oBAAoB,GAAG,IAAI,KAGlH,EAAE;IAMN,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjD,MAAM,WAAW,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,EAAE;YACnE,YAAY;YACZ,WAAW,EAAE,kBAAkB;YAC/B,cAAc;YACd,oBAAoB;SACvB,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAc,EAAE,CAAC;QACvD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;QACnE,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAElF,kBAAkB,EAAE,CAAC;QACrB,cAAc,GAAG,IAAI,CAAC;QACtB,oBAAoB,GAAG,IAAI,CAAC;QAE5B,GAAG,IAAI,aAAa,CAAC;QAErB,KAAK,MAAM,UAAU,IAAI,4BAA4B,EAAE;YACnD,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAC3C,OAAO,CAAC,KAAK,CACT,gBAAgB,UAAU,mEAAmE,CAAC,EAAE,EAChG,EAAC,WAAW,EAAE,UAAU,EAAC,CAC5B,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;aACnG;SACJ;QAED,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC;QAC5B,GAAG,IAAI,iBAAiB,CAAC;QACzB,cAAc,GAAG,iBAAiB,CAAC;QACnC,oBAAoB,GAAG,EAAE,CAAC;KAC7B;IAED,OAAO;QACH,IAAI,EAAE,GAAG;QACT,UAAU,EAAE,cAAc;QAC1B,gBAAgB,EAAE,oBAAoB;KACzC,CAAC;AACN,CAAC"}