node-llama-cpp 3.0.0-beta.38 → 3.0.0-beta.39

package/dist/chatWrappers/Llama3_1ChatWrapper.js

@@ -0,0 +1,223 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
+import { defaultChatSystemPrompt } from "../config.js";
+import { ChatModelFunctionsDocumentationGenerator } from "./utils/ChatModelFunctionsDocumentationGenerator.js";
+import { jsonDumps } from "./utils/jsonDumps.js";
+// source: https://llama.meta.com/docs/model-cards-and-prompt-formats/llama3_1
+export class Llama3_1ChatWrapper extends ChatWrapper {
+    wrapperName = "Llama 3.1";
+    cuttingKnowledgeDate;
+    todayDate;
+    settings = {
+        supportsSystemMessages: true,
+        functions: {
+            call: {
+                optionalPrefixSpace: true,
+                prefix: LlamaText(new SpecialTokensText("<function=")),
+                paramsPrefix: LlamaText(new SpecialTokensText(">")),
+                suffix: LlamaText(new SpecialTokensText("</function><|eom_id|>"))
+            },
+            result: {
+                prefix: LlamaText(new SpecialTokensText("\n<|start_header_id|>ipython<|end_header_id|>\n\n")),
+                suffix: LlamaText(new SpecialToken("EOT"), new SpecialTokensText("<|start_header_id|>assistant<|end_header_id|>\n\n"))
+            }
+        }
+    };
+    /**
+     * @param options
+     */
+    constructor({ cuttingKnowledgeDate = new Date("2023-12-01T00:00:00Z"), todayDate = new Date() } = {}) {
+        super();
+        this.cuttingKnowledgeDate = cuttingKnowledgeDate == null
+            ? null
+            : new Date(cuttingKnowledgeDate);
+        this.todayDate = todayDate == null
+            ? null
+            : new Date(todayDate);
+    }
+    addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, { documentParams = true } = {}) {
+        const availableFunctionNames = Object.keys(availableFunctions ?? {});
+        if (availableFunctions == null || availableFunctionNames.length === 0)
+            return history;
+        const res = history.slice();
+        const functionsSystemMessage = {
+            type: "system",
+            text: this.generateAvailableFunctionsSystemText(availableFunctions, { documentParams }).toJSON()
+        };
+        if (res.length >= 2 && res[0].type === "system" && res[1].type === "system")
+            res.splice(1, 0, functionsSystemMessage);
+        else
+            res.unshift({
+                type: "system",
+                text: this.generateAvailableFunctionsSystemText(availableFunctions, { documentParams }).toJSON()
+            });
+        return res;
+    }
+    generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
+        const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(chatHistory, availableFunctions, {
+            documentParams: documentFunctionParams
+        });
+        const resultItems = [];
+        let systemTexts = [];
+        let userTexts = [];
+        let modelTexts = [];
+        let currentAggregateFocus = null;
+        function flush() {
+            if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0)
+                resultItems.push({
+                    system: systemTexts.length === 0
+                        ? null
+                        : LlamaText.joinValues("\n\n", systemTexts),
+                    user: userTexts.length === 0
+                        ? null
+                        : LlamaText.joinValues("\n\n", userTexts),
+                    model: modelTexts.length === 0
+                        ? null
+                        : LlamaText.joinValues("\n\n", modelTexts)
+                });
+            systemTexts = [];
+            userTexts = [];
+            modelTexts = [];
+        }
+        for (const item of historyWithFunctions) {
+            if (item.type === "system") {
+                if (currentAggregateFocus !== "system")
+                    flush();
+                currentAggregateFocus = "system";
+                systemTexts.push(LlamaText.fromJSON(item.text));
+            }
+            else if (item.type === "user") {
+                if (currentAggregateFocus !== "user")
+                    flush();
+                currentAggregateFocus = "user";
+                userTexts.push(LlamaText(item.text));
+            }
+            else if (item.type === "model") {
+                if (currentAggregateFocus !== "model")
+                    flush();
+                currentAggregateFocus = "model";
+                modelTexts.push(this.generateModelResponseText(item.response));
+            }
+            else
+                void (item);
+        }
+        flush();
+        const contextText = LlamaText(new SpecialToken("BOS"), resultItems.map((item, index) => {
+            const isLastItem = index === resultItems.length - 1;
+            const res = [];
+            if (item.system != null) {
+                res.push(LlamaText([
+                    new SpecialTokensText("<|start_header_id|>system<|end_header_id|>\n\n"),
+                    item.system,
+                    new SpecialToken("EOT")
+                ]));
+            }
+            if (item.user != null) {
+                res.push(LlamaText([
+                    new SpecialTokensText("<|start_header_id|>user<|end_header_id|>\n\n"),
+                    item.user,
+                    new SpecialToken("EOT")
+                ]));
+            }
+            if (item.model != null) {
+                res.push(LlamaText([
+                    new SpecialTokensText("<|start_header_id|>assistant<|end_header_id|>\n\n"),
+                    item.model,
+                    isLastItem
+                        ? LlamaText([])
+                        : new SpecialToken("EOT")
+                ]));
+            }
+            return LlamaText(res);
+        }));
+        return {
+            contextText,
+            stopGenerationTriggers: [
+                LlamaText(new SpecialToken("EOS")),
+                LlamaText(new SpecialToken("EOT")),
+                LlamaText(new SpecialTokensText("<|eot_id|>")),
+                LlamaText(new SpecialTokensText("<|end_of_text|>")),
+                LlamaText("<|eot_id|>"),
+                LlamaText("<|end_of_text|>")
+            ]
+        };
+    }
+    generateAvailableFunctionsSystemText(availableFunctions, { documentParams = true }) {
+        const functionsDocumentationGenerator = new ChatModelFunctionsDocumentationGenerator(availableFunctions);
+        if (!functionsDocumentationGenerator.hasAnyFunctions)
+            return LlamaText([]);
+        return LlamaText.joinValues("\n", [
+            "You have access to the following functions:",
+            "",
+            functionsDocumentationGenerator.getLlama3_1FunctionSignatures({ documentParams }),
+            "",
+            "",
+            "If you choose to call a function ONLY reply in the following format:",
+            "<{start_tag}={function_name}>{parameters}{end_tag}",
+            "where",
+            "",
+            "start_tag => `<function`",
+            "parameters => a JSON dict with the function argument name as key and function argument value as value.",
+            "end_tag => `</function>`",
+            "",
+            "Here is an example,",
+            LlamaText([
+                new SpecialTokensText("<function="),
+                "example_function_name",
+                new SpecialTokensText(">"),
+                jsonDumps({ "example_name": "example_value" }),
+                new SpecialTokensText("</function>")
+            ]),
+            "",
+            "Reminder:",
+            "- Function calls MUST follow the specified format",
+            "- Only call one function at a time",
+            "- Put the entire function call reply on one line",
+            "- Always add your sources when using search results to answer the user query"
+        ]);
+    }
+    generateInitialChatHistory({ systemPrompt = defaultChatSystemPrompt }) {
+        const res = [];
+        function formatDate(date) {
+            const day = date.toLocaleDateString("en-US", { day: "numeric", timeZone: "UTC" });
+            const month = date.toLocaleDateString("en-US", { month: "short", timeZone: "UTC" });
+            const year = date.toLocaleDateString("en-US", { year: "numeric", timeZone: "UTC" });
+            return `${day} ${month} ${year}`;
+        }
+        const formatMonthDate = (date) => {
+            const today = this.todayDate ?? new Date();
+            if (today.getUTCMonth() === date.getUTCMonth() && today.getUTCFullYear() === date.getUTCFullYear())
+                return formatDate(date);
+            const month = date.toLocaleDateString("en-US", { month: "long", timeZone: "UTC" });
+            const year = date.toLocaleDateString("en-US", { year: "numeric", timeZone: "UTC" });
+            return `${month} ${year}`;
+        };
+        const lines = [];
+        if (this.cuttingKnowledgeDate != null)
+            lines.push(`Cutting Knowledge Date: ${formatMonthDate(this.cuttingKnowledgeDate)}`);
+        if (this.todayDate != null)
+            lines.push(`Today Date: ${formatDate(this.todayDate)}`);
+        lines.push("");
+        lines.push("# Tool Instructions");
+        lines.push("- When looking for real time information use relevant functions if available");
+        lines.push("");
+        lines.push("");
+        res.push({
+            type: "system",
+            text: LlamaText.joinValues("\n", lines).toJSON()
+        }, {
+            type: "system",
+            text: LlamaText(systemPrompt ?? defaultChatSystemPrompt).toJSON()
+        });
+        return res;
+    }
+    /** @internal */
+    static _checkModelCompatibility(options) {
+        if (options.tokenizer != null) {
+            const tokens = options.tokenizer("<|eom_id|>", true, "trimLeadingSpace");
+            return tokens.length === 1 && options.tokenizer.isSpecialToken(tokens[0]);
+        }
+        return true;
+    }
+}
+//# sourceMappingURL=Llama3_1ChatWrapper.js.map

package/dist/chatWrappers/Llama3_1ChatWrapper.js.map

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

package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.d.ts

@@ -9,7 +9,7 @@ export declare class ChatModelFunctionsDocumentationGenerator {
     constructor(chatModelFunctions: ChatModelFunctions | undefined);
     /**
      * Example:
-     * ```typescript
+     * ```ts
      * // Retrieve the current date
      * function getDate();
      *
@@ -24,7 +24,7 @@ export declare class ChatModelFunctionsDocumentationGenerator {
     }): string;
     /**
      * Example:
-     * ```typescript
+     * ```ts
      * // Retrieve the current date
      * type getDate = () => any;
      *
@@ -39,4 +39,19 @@ export declare class ChatModelFunctionsDocumentationGenerator {
         documentParams?: boolean;
         reservedFunctionNames?: string[];
     }): string;
+    /**
+     * Example:
+     * ```
+     * Use the function 'getDate' to: Retrieve the current date
+     * {"name": "getDate", "description": "Retrieve the current date"}
+     *
+     * Use the function 'getTime' to: Retrieve the current time
+     * {"name": "getTime", "description": "Retrieve the current time", "parameters": {"type": "object", "properties": {"hours": {"enum": ["24", "12"]}, "seconds": {"type": "boolean"}}}}
+     * ```
+     * @param options
+     * @param [options.documentParams] - Whether to document the parameters of the functions
+     */
+    getLlama3_1FunctionSignatures({ documentParams }?: {
+        documentParams?: boolean;
+    }): string;
 }

package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js

@@ -1,4 +1,5 @@
 import { getTypeScriptTypeStringForGbnfJsonSchema } from "../../utils/getTypeScriptTypeStringForGbnfJsonSchema.js";
+import { jsonDumps } from "./jsonDumps.js";
 /**
  * Generate documentation about the functions that are available for a model to call.
  * Useful for generating a system message with information about the available functions as part of a chat wrapper.
@@ -12,7 +13,7 @@ export class ChatModelFunctionsDocumentationGenerator {
     }
     /**
      * Example:
-     * ```typescript
+     * ```ts
      * // Retrieve the current date
      * function getDate();
      *
@@ -45,7 +46,7 @@ export class ChatModelFunctionsDocumentationGenerator {
     }
     /**
      * Example:
-     * ```typescript
+     * ```ts
      * // Retrieve the current date
      * type getDate = () => any;
      *
@@ -78,5 +79,41 @@ export class ChatModelFunctionsDocumentationGenerator {
         })
             .join("\n\n");
     }
+    /* eslint-disable max-len */
+    /**
+     * Example:
+     * ```
+     * Use the function 'getDate' to: Retrieve the current date
+     * {"name": "getDate", "description": "Retrieve the current date"}
+     *
+     * Use the function 'getTime' to: Retrieve the current time
+     * {"name": "getTime", "description": "Retrieve the current time", "parameters": {"type": "object", "properties": {"hours": {"enum": ["24", "12"]}, "seconds": {"type": "boolean"}}}}
+     * ```
+     * @param options
+     * @param [options.documentParams] - Whether to document the parameters of the functions
+     */
+    getLlama3_1FunctionSignatures({ documentParams = true } = {}) {
+        const chatModelFunctions = this.chatModelFunctions;
+        if (!this.hasAnyFunctions || chatModelFunctions == null)
+            return "";
+        const functionNames = Object.keys(chatModelFunctions);
+        return functionNames
+            .map((functionName) => {
+            const functionDefinition = chatModelFunctions[functionName];
+            let res = `Use the function '${functionName}'`;
+            const addDescription = functionDefinition?.description != null && functionDefinition.description.trim() !== "";
+            if (addDescription)
+                res += " to: " + functionDefinition.description.split("\n").join("\n// ") + "\n";
+            else
+                res += ".\n";
+            res += jsonDumps({
+                name: functionName,
+                ...(addDescription ? { description: functionDefinition.description } : {}),
+                ...(documentParams && functionDefinition?.params != null ? { parameters: functionDefinition.params } : {})
+            });
+            return res;
+        })
+            .join("\n\n");
+    }
 }
 //# sourceMappingURL=ChatModelFunctionsDocumentationGenerator.js.map

package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js.map

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

package/dist/chatWrappers/utils/jsonDumps.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Like `JSON.stringify` but results in a value formatted in the format that Python produces when using `json.dumps(value)`.
+ *
+ * We need to format results this way since this is what many models use in their training data,
+ * so this is what many models expect to have in their context state.
+ */
+export declare function jsonDumps(result: any): string;

package/dist/chatWrappers/utils/jsonDumps.js

@@ -0,0 +1,18 @@
+/**
+ * Like `JSON.stringify` but results in a value formatted in the format that Python produces when using `json.dumps(value)`.
+ *
+ * We need to format results this way since this is what many models use in their training data,
+ * so this is what many models expect to have in their context state.
+ */
+export function jsonDumps(result) {
+    return JSON.stringify(result, null, 1)
+        .split("\n")
+        .map((line) => {
+        line = line.trim();
+        if (line.endsWith(","))
+            line += " ";
+        return line;
+    })
+        .join("");
+}
+//# sourceMappingURL=jsonDumps.js.map

package/dist/chatWrappers/utils/jsonDumps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonDumps.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/jsonDumps.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,MAAW;IACjC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;SACjC,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACV,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAEnB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAClB,IAAI,IAAI,GAAG,CAAC;QAEhB,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC"}

package/dist/chatWrappers/utils/resolveChatWrapper.d.ts

@@ -8,17 +8,19 @@ import { AlpacaChatWrapper } from "../AlpacaChatWrapper.js";
 import { GemmaChatWrapper } from "../GemmaChatWrapper.js";
 import { JinjaTemplateChatWrapper } from "../generic/JinjaTemplateChatWrapper.js";
 import { TemplateChatWrapper } from "../generic/TemplateChatWrapper.js";
+import { Llama3_1ChatWrapper } from "../Llama3_1ChatWrapper.js";
 import { Tokenizer } from "../../types.js";
 import type { GgufFileInfo } from "../../gguf/types/GgufFileInfoTypes.js";
-export declare const specializedChatWrapperTypeNames: readonly ["general", "llama3Chat", "llama2Chat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"];
+export declare const specializedChatWrapperTypeNames: readonly ["general", "llama3.1", "llama3", "llama2Chat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"];
 export type SpecializedChatWrapperTypeName = (typeof specializedChatWrapperTypeNames)[number];
 export declare const templateChatWrapperTypeNames: readonly ["template", "jinjaTemplate"];
 export type TemplateChatWrapperTypeName = (typeof templateChatWrapperTypeNames)[number];
-export declare const resolvableChatWrapperTypeNames: readonly ["auto", "general", "llama3Chat", "llama2Chat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma", "template", "jinjaTemplate"];
+export declare const resolvableChatWrapperTypeNames: readonly ["auto", "general", "llama3.1", "llama3", "llama2Chat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma", "template", "jinjaTemplate"];
 export type ResolvableChatWrapperTypeName = (typeof resolvableChatWrapperTypeNames)[number];
 declare const chatWrappers: {
     readonly general: typeof GeneralChatWrapper;
-    readonly llama3Chat: typeof Llama3ChatWrapper;
+    readonly "llama3.1": typeof Llama3_1ChatWrapper;
+    readonly llama3: typeof Llama3ChatWrapper;
     readonly llama2Chat: typeof Llama2ChatWrapper;
     readonly alpacaChat: typeof AlpacaChatWrapper;
     readonly functionary: typeof FunctionaryChatWrapper;

package/dist/chatWrappers/utils/resolveChatWrapper.js

@@ -10,9 +10,10 @@ import { GemmaChatWrapper } from "../GemmaChatWrapper.js";
 import { JinjaTemplateChatWrapper } from "../generic/JinjaTemplateChatWrapper.js";
 import { TemplateChatWrapper } from "../generic/TemplateChatWrapper.js";
 import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
+import { Llama3_1ChatWrapper } from "../Llama3_1ChatWrapper.js";
 import { isJinjaTemplateEquivalentToSpecializedChatWrapper } from "./isJinjaTemplateEquivalentToSpecializedChatWrapper.js";
 export const specializedChatWrapperTypeNames = Object.freeze([
-    "general", "llama3Chat", "llama2Chat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"
+    "general", "llama3.1", "llama3", "llama2Chat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"
 ]);
 export const templateChatWrapperTypeNames = Object.freeze([
     "template", "jinjaTemplate"
@@ -24,7 +25,8 @@ export const resolvableChatWrapperTypeNames = Object.freeze([
 ]);
 const chatWrappers = {
     "general": GeneralChatWrapper,
-    "llama3Chat": Llama3ChatWrapper,
+    "llama3.1": Llama3_1ChatWrapper,
+    "llama3": Llama3ChatWrapper,
     "llama2Chat": Llama2ChatWrapper,
     "alpacaChat": AlpacaChatWrapper,
     "functionary": FunctionaryChatWrapper,
@@ -58,6 +60,23 @@ export function resolveChatWrapper({ type = "auto", bosString, filename, fileInf
             ...(chatWrapperSettings ?? {})
         });
     }
+    function getModelLinageNames() {
+        const res = [];
+        if (fileInfo == null)
+            return res;
+        const currentModelInfo = [fileInfo.metadata?.general?.name, fileInfo.metadata?.general?.basename]
+            .filter((v) => v != null);
+        if (currentModelInfo.length > 0)
+            res.push(currentModelInfo);
+        if (typeof fileInfo.metadata?.general?.base_model?.count === "number") {
+            for (let i = 0; i < fileInfo.metadata.general.base_model.count; i++) {
+                const baseModel = fileInfo.metadata.general.base_model[String(i)];
+                if (baseModel?.name != null)
+                    res.push([baseModel.name]);
+            }
+        }
+        return res;
+    }
     if (type !== "auto" && type != null) {
         if (isTemplateChatWrapperType(type)) {
             const Wrapper = chatWrappers[type];
@@ -111,6 +130,12 @@ export function resolveChatWrapper({ type = "auto", bosString, filename, fileInf
         for (const specializedChatWrapperTypeName of chatWrapperNamesToCheck) {
             const Wrapper = chatWrappers[specializedChatWrapperTypeName];
             const wrapperSettings = customWrapperSettings?.[specializedChatWrapperTypeName];
+            const isCompatible = Wrapper._checkModelCompatibility({
+                tokenizer,
+                fileInfo
+            });
+            if (!isCompatible)
+                continue;
             const testOptionConfigurations = Wrapper._getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate?.() ?? [];
             if (testOptionConfigurations.length === 0)
                 testOptionConfigurations.push({});
@@ -144,11 +169,21 @@ export function resolveChatWrapper({ type = "auto", bosString, filename, fileInf
             return createSpecializedChatWrapper(Llama2ChatWrapper, {
                 addSpaceBeforeEos: modelJinjaTemplate.includes("' ' + eos_token")
             });
-        else if (modelJinjaTemplate.includes("<|start_header_id|>") && modelJinjaTemplate.includes("<|end_header_id|>"))
-            return createSpecializedChatWrapper(Llama3ChatWrapper);
+        else if (modelJinjaTemplate.includes("<|start_header_id|>") && modelJinjaTemplate.includes("<|end_header_id|>")) {
+            if (Llama3_1ChatWrapper._checkModelCompatibility({ tokenizer, fileInfo }))
+                return createSpecializedChatWrapper(Llama3_1ChatWrapper);
+            else
+                return createSpecializedChatWrapper(Llama3ChatWrapper);
+        }
         else if (modelJinjaTemplate.includes("<start_of_turn>"))
             return createSpecializedChatWrapper(GemmaChatWrapper);
     }
+    for (const modelNames of getModelLinageNames()) {
+        if (includesText(modelNames, ["llama 3.1", "llama-3.1", "llama3.1"]) && Llama3_1ChatWrapper._checkModelCompatibility({ tokenizer, fileInfo }))
+            return createSpecializedChatWrapper(Llama3_1ChatWrapper);
+        else if (includesText(modelNames, ["llama 3", "llama-3", "llama3"]))
+            return createSpecializedChatWrapper(Llama3ChatWrapper);
+    }
     if (filename != null) {
         const { name, subType, fileType, otherInfo } = parseModelFileName(filename);
         if (fileType?.toLowerCase() === "gguf") {
@@ -208,6 +243,17 @@ export function isSpecializedChatWrapperType(type) {
 export function isTemplateChatWrapperType(type) {
     return templateChatWrapperTypeNames.includes(type);
 }
+function includesText(value, textToCheckFor, strictCase = false) {
+    if (value instanceof Array)
+        return value.some((v) => includesText(v, textToCheckFor, strictCase));
+    else if (typeof value !== "string")
+        return false;
+    if (textToCheckFor instanceof Array)
+        return textToCheckFor.some((t) => includesText(value, t, strictCase));
+    if (strictCase)
+        return value.includes(textToCheckFor);
+    return value.toLowerCase().includes(textToCheckFor.toLowerCase());
+}
 // this is needed because TypeScript guards don't work automatically with class references
 function isClassReference(value, classReference) {
     return value === classReference;

package/dist/chatWrappers/utils/resolveChatWrapper.js.map

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

package/dist/cli/commands/ChatCommand.d.ts

@@ -7,7 +7,7 @@ type ChatCommand = {
     header?: string[];
     gpu?: BuildGpu | "auto";
     systemInfo: boolean;
-    systemPrompt: string;
+    systemPrompt?: string;
     systemPromptFile?: string;
     prompt?: string;
     promptFile?: string;

package/dist/cli/commands/ChatCommand.js

@@ -60,8 +60,6 @@ export const ChatCommand = {
             .option("systemPrompt", {
             alias: "s",
             type: "string",
-            default: defaultChatSystemPrompt,
-            defaultDescription: " ",
             description: "System prompt to use against the model" +
                 (isInDocumentationMode ? "" : (". [default value: " + defaultChatSystemPrompt.split("\n").join(" ") + "]"))
         })
@@ -461,8 +459,8 @@ async function RunChat({ modelPath: modelArg, header: headerArg, gpu, systemInfo
                 : maxTokens <= 0
                     ? undefined
                     : maxTokens,
-            onToken(chunk) {
-                let text = nextPrintLeftovers + model.detokenize(chunk);
+            onTextChunk(chunk) {
+                let text = nextPrintLeftovers + chunk;
                 nextPrintLeftovers = "";
                 if (trimWhitespace) {
                     if (!hadNoWhitespaceTextInThisIteration) {