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

package/dist/chatWrappers/LlamaChatWrapper.js

@@ -1,8 +1,13 @@
 import { ChatWrapper } from "../ChatWrapper.js";
-import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
+import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
 // source: https://huggingface.co/blog/llama2#how-to-prompt-llama-2
 export class LlamaChatWrapper extends ChatWrapper {
     wrapperName = "LlamaChat";
+    /** @internal */ _addSpaceBeforeEos;
+    constructor({ addSpaceBeforeEos = false } = {}) {
+        super();
+        this._addSpaceBeforeEos = addSpaceBeforeEos;
+    }
     generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
         const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
             documentParams: documentFunctionParams
@@ -40,39 +45,52 @@ export class LlamaChatWrapper extends ChatWrapper {
                 currentAggregateFocus = "model";
                 modelTexts.push(this.generateModelResponseText(item.response));
             }
+            else
+                void (item);
         }
         flush();
         const contextText = LlamaText(resultItems.map(({ system, user, model }, index) => {
             const isLastItem = index === resultItems.length - 1;
             return LlamaText([
-                new BuiltinSpecialToken("BOS"),
+                new SpecialToken("BOS"),
                 (system.length === 0 && user.length === 0)
                     ? LlamaText([])
                     : LlamaText([
-                        new SpecialToken("[INST] "),
+                        new SpecialTokensText("[INST] "),
                         system.length === 0
                             ? LlamaText([])
                             : LlamaText([
-                                new SpecialToken("<<SYS>>\n"),
+                                new SpecialTokensText("<<SYS>>\n"),
                                 system,
-                                new SpecialToken("\n<</SYS>>\n\n")
+                                new SpecialTokensText("\n<</SYS>>\n\n")
                             ]),
                         user,
-                        new SpecialToken(" [/INST]\n\n")
+                        new SpecialTokensText(" [/INST] ")
                     ]),
                 model,
+                this._addSpaceBeforeEos
+                    ? " "
+                    : "",
                 isLastItem
                     ? LlamaText([])
-                    : new BuiltinSpecialToken("EOS")
+                    : new SpecialToken("EOS")
             ]);
         }));
         return {
             contextText,
             stopGenerationTriggers: [
-                LlamaText(new BuiltinSpecialToken("EOS")),
+                LlamaText(new SpecialToken("EOS")),
                 LlamaText("</s>")
             ]
         };
     }
+    /** @internal */
+    static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
+        return [{
+                addSpaceBeforeEos: false
+            }, {
+                addSpaceBeforeEos: true
+            }];
+    }
 }
 //# sourceMappingURL=LlamaChatWrapper.js.map

package/dist/chatWrappers/LlamaChatWrapper.js.map

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

package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.d.ts

@@ -0,0 +1,73 @@
+import { ChatHistoryItem, ChatModelFunctions } from "../../types.js";
+import { LlamaText } from "../../utils/LlamaText.js";
+import { ChatWrapper, ChatWrapperSettings } from "../../ChatWrapper.js";
+import { ChatHistoryFunctionCallMessageTemplate } from "./utils/chatHistoryFunctionCallMessageTemplate.js";
+export type JinjaTemplateChatWrapperOptions = {
+    template: string;
+    modelRoleName?: string;
+    userRoleName?: string;
+    systemRoleName?: string;
+    /**
+     * Some Jinja templates may not support system messages, and in such cases,
+     * it'll be detected and system messages can be converted to user messages.
+     *
+     * You can specify the format of the converted user message.
+     * - **"auto"**: Convert system messages to user messages only if the template does not support system messages.
+     * - **`true`**: Always convert system messages to user messages.
+     * - **`false`**: Never convert system messages to user messages.
+     * May throw an error if some system messages don't appear in the template.
+     * - **`{use: "ifNeeded", format: "..."}`**: Convert system messages to user messages only if the template does not support system
+     * messages with the specified format.
+     * - **`{use: "always", format: "..."}`**: Always convert system messages to user messages with the specified format.
+     *
+     * Defaults to `"auto"`.
+     */
+    convertUnsupportedSystemMessagesToUserMessages?: "auto" | boolean | ConvertMessageFormatOptions;
+    functionCallMessageTemplate?: ChatHistoryFunctionCallMessageTemplate;
+    /**
+     * Whether to join adjacent messages of the same type.
+     * Some Jinja templates may throw an error if this is not set to `true`.
+     *
+     * Defaults to `true`.
+     */
+    joinAdjacentMessagesOfTheSameType?: boolean;
+    /**
+     * Whether to trim leading whitespace in responses.
+     *
+     * Defaults to `true`.
+     */
+    trimLeadingWhitespaceInResponses?: boolean;
+};
+type ConvertMessageFormatOptions = {
+    use?: "always" | "ifNeeded";
+    format: `${string}{{message}}${string}`;
+};
+/**
+ * A chat wrapper based on a Jinja template.
+ * Useful for using the original model's Jinja template as-is without any additional conversion work to chat with a model.
+ *
+ * If you want to create a new chat wrapper from scratch, using this chat wrapper is not recommended, and instead you better inherit
+ * from the `ChatWrapper` class and implement a custom chat wrapper of your own in TypeScript.
+ *
+ * For a simpler way to create a chat wrapper, see the `TemplateChatWrapper` class.
+ */
+export declare class JinjaTemplateChatWrapper extends ChatWrapper {
+    readonly wrapperName = "JinjaTemplate";
+    readonly settings: ChatWrapperSettings;
+    readonly template: string;
+    readonly modelRoleName: string;
+    readonly userRoleName: string;
+    readonly systemRoleName: string;
+    readonly convertUnsupportedSystemMessagesToUserMessages?: ConvertMessageFormatOptions;
+    readonly joinAdjacentMessagesOfTheSameType: boolean;
+    readonly trimLeadingWhitespaceInResponses: boolean;
+    constructor({ template, modelRoleName, userRoleName, systemRoleName, convertUnsupportedSystemMessagesToUserMessages, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType, trimLeadingWhitespaceInResponses }: JinjaTemplateChatWrapperOptions);
+    generateContextText(history: readonly ChatHistoryItem[], { availableFunctions, documentFunctionParams }?: {
+        availableFunctions?: ChatModelFunctions;
+        documentFunctionParams?: boolean;
+    }): {
+        contextText: LlamaText;
+        stopGenerationTriggers: LlamaText[];
+    };
+}
+export {};

package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js

@@ -0,0 +1,355 @@
+import { Template } from "@huggingface/jinja";
+import { splitText } from "lifecycle-utils";
+import { SpecialToken, LlamaText, SpecialTokensText } from "../../utils/LlamaText.js";
+import { ChatWrapper } from "../../ChatWrapper.js";
+import { parseFunctionCallMessageTemplate } from "./utils/chatHistoryFunctionCallMessageTemplate.js";
+const defaultConvertUnsupportedSystemMessagesToUserMessagesFormat = {
+    format: "System: {{message}}"
+};
+/**
+ * A chat wrapper based on a Jinja template.
+ * Useful for using the original model's Jinja template as-is without any additional conversion work to chat with a model.
+ *
+ * If you want to create a new chat wrapper from scratch, using this chat wrapper is not recommended, and instead you better inherit
+ * from the `ChatWrapper` class and implement a custom chat wrapper of your own in TypeScript.
+ *
+ * For a simpler way to create a chat wrapper, see the `TemplateChatWrapper` class.
+ */
+export class JinjaTemplateChatWrapper extends ChatWrapper {
+    wrapperName = "JinjaTemplate";
+    settings;
+    template;
+    modelRoleName;
+    userRoleName;
+    systemRoleName;
+    convertUnsupportedSystemMessagesToUserMessages;
+    joinAdjacentMessagesOfTheSameType;
+    trimLeadingWhitespaceInResponses;
+    /** @internal */ _jinjaTemplate;
+    constructor({ template, modelRoleName = "assistant", userRoleName = "user", systemRoleName = "system", convertUnsupportedSystemMessagesToUserMessages = defaultConvertUnsupportedSystemMessagesToUserMessagesFormat, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType = true, trimLeadingWhitespaceInResponses = true }) {
+        super();
+        if (template == null)
+            throw new Error("template cannot be null");
+        this.template = template;
+        this.modelRoleName = modelRoleName;
+        this.userRoleName = userRoleName;
+        this.systemRoleName = systemRoleName;
+        this.convertUnsupportedSystemMessagesToUserMessages =
+            resolveConvertUnsupportedSystemMessagesToUserMessagesOption(convertUnsupportedSystemMessagesToUserMessages);
+        this.joinAdjacentMessagesOfTheSameType = joinAdjacentMessagesOfTheSameType;
+        this.trimLeadingWhitespaceInResponses = trimLeadingWhitespaceInResponses;
+        this.settings = {
+            ...super.settings,
+            functions: parseFunctionCallMessageTemplate(functionCallMessageTemplate) ?? ChatWrapper.defaultSetting.functions
+        };
+        if (this.convertUnsupportedSystemMessagesToUserMessages != null && !this.convertUnsupportedSystemMessagesToUserMessages.format.includes("{{message}}"))
+            throw new Error('convertUnsupportedSystemMessagesToUserMessages format must include "{{message}}"');
+        this._jinjaTemplate = new Template(this.template);
+        this._runSanityTest();
+    }
+    generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
+        const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
+            documentParams: documentFunctionParams
+        });
+        if (this.convertUnsupportedSystemMessagesToUserMessages == null) {
+            return this._generateContextText(historyWithFunctions, {
+                convertSystemMessagesToUserMessagesFormat: undefined
+            });
+        }
+        else if (this.convertUnsupportedSystemMessagesToUserMessages.use === "always") {
+            return this._generateContextText(historyWithFunctions, {
+                convertSystemMessagesToUserMessagesFormat: this.convertUnsupportedSystemMessagesToUserMessages.format
+            });
+        }
+        try {
+            return this._generateContextText(historyWithFunctions, {
+                convertSystemMessagesToUserMessagesFormat: undefined
+            });
+        }
+        catch (error) {
+            return this._generateContextText(historyWithFunctions, {
+                convertSystemMessagesToUserMessagesFormat: this.convertUnsupportedSystemMessagesToUserMessages.format
+            });
+        }
+    }
+    /** @internal */
+    _generateContextText(history, { convertSystemMessagesToUserMessagesFormat }) {
+        const transformedHistory = convertSystemMessagesToUserMessagesFormat == null
+            ? history
+            : history.map((item) => {
+                if (item.type === "system")
+                    return {
+                        type: "user",
+                        text: convertSystemMessagesToUserMessagesFormat.replaceAll("{{message}}", item.text)
+                    };
+                return item;
+            });
+        const resultItems = [];
+        const currentTexts = [];
+        let currentAggregateFocus = null;
+        function flush() {
+            if (currentTexts.length > 0 && currentAggregateFocus != null)
+                resultItems.push({ role: currentAggregateFocus, content: currentTexts.join("\n\n") });
+            currentTexts.length = 0;
+        }
+        for (const item of transformedHistory) {
+            if (item.type === "system") {
+                if (!this.joinAdjacentMessagesOfTheSameType || currentAggregateFocus !== "system")
+                    flush();
+                currentAggregateFocus = "system";
+                currentTexts.push(item.text);
+            }
+            else if (item.type === "user") {
+                if (!this.joinAdjacentMessagesOfTheSameType || currentAggregateFocus !== "user")
+                    flush();
+                currentAggregateFocus = "user";
+                currentTexts.push(item.text);
+            }
+            else if (item.type === "model") {
+                if (!this.joinAdjacentMessagesOfTheSameType || currentAggregateFocus !== "model")
+                    flush();
+                currentAggregateFocus = "model";
+                currentTexts.push(this.generateModelResponseText(item.response));
+            }
+            else
+                void (item);
+        }
+        const lastItemIsModelMessage = currentAggregateFocus === "model";
+        flush();
+        const idsGenerator = new UniqueTemplateId(this.template + this.modelRoleName + this.userRoleName + this.systemRoleName +
+            (convertSystemMessagesToUserMessagesFormat ?? "") + resultItems.map(({ content }) => content).join("\n\n"));
+        const jinjaItems = [];
+        const jinjaRoleMap = {
+            system: this.systemRoleName,
+            user: this.userRoleName,
+            model: this.modelRoleName
+        };
+        const idToContent = new Map();
+        const modelMessageIds = new Set();
+        const messageIds = new Set();
+        for (const resultItem of resultItems) {
+            const id = idsGenerator.generateId();
+            messageIds.add(id);
+            idToContent.set(id, resultItem.content);
+            jinjaItems.push({
+                role: jinjaRoleMap[resultItem.role],
+                content: id
+            });
+            if (resultItem.role === "model")
+                modelMessageIds.add(id);
+        }
+        const bosTokenId = idsGenerator.generateId();
+        const eosTokenId = idsGenerator.generateId();
+        idToContent.set(bosTokenId, new SpecialToken("BOS"));
+        idToContent.set(eosTokenId, new SpecialToken("EOS"));
+        const renderJinjaText = () => {
+            try {
+                return this._jinjaTemplate.render({
+                    messages: jinjaItems,
+                    "bos_token": bosTokenId,
+                    "eos_token": eosTokenId
+                });
+            }
+            catch (err) {
+                return this._jinjaTemplate.render({
+                    messages: jinjaItems,
+                    "bos_token": bosTokenId,
+                    "eos_token": eosTokenId,
+                    "add_generation_prompt": true
+                });
+            }
+        };
+        const validateThatAllMessageIdsAreUsed = (parts) => {
+            const messageIdsLeft = new Set(messageIds);
+            for (const part of parts) {
+                if (typeof part === "string")
+                    continue;
+                messageIdsLeft.delete(part.separator);
+            }
+            if (messageIdsLeft.size !== 0)
+                throw new Error("Some input messages are not present in the generated Jinja template output");
+        };
+        const renderJinjaAndSplitIntoParts = () => {
+            const splitJinjaParts = splitText(renderJinjaText(), [...idToContent.keys()]);
+            if (lastItemIsModelMessage) {
+                let lastModelResponseIndex = -1;
+                for (let i = splitJinjaParts.length - 1; i >= 0; i--) {
+                    const part = splitJinjaParts[i];
+                    if (typeof part === "string")
+                        continue;
+                    if (modelMessageIds.has(part.separator)) {
+                        lastModelResponseIndex = i;
+                        break;
+                    }
+                    else if (messageIds.has(part.separator)) {
+                        validateThatAllMessageIdsAreUsed(splitJinjaParts);
+                        throw new Error("Last message was expected to be a model message, but it was not");
+                    }
+                }
+                if (lastModelResponseIndex < 0) {
+                    validateThatAllMessageIdsAreUsed(splitJinjaParts);
+                    throw new Error("A model message was expected to be the last message, but it was not found");
+                }
+                return {
+                    splitJinjaParts: splitJinjaParts.slice(0, lastModelResponseIndex + 1),
+                    stopGenerationJinjaParts: splitJinjaParts.slice(lastModelResponseIndex + 1)
+                };
+            }
+            return {
+                splitJinjaParts,
+                stopGenerationJinjaParts: []
+            };
+        };
+        const { splitJinjaParts, stopGenerationJinjaParts } = renderJinjaAndSplitIntoParts();
+        const messageIdsLeftToProcess = new Set(messageIds);
+        const contextText = LlamaText(splitJinjaParts.map((part) => {
+            if (typeof part === "string")
+                return new SpecialTokensText(part); // things that are not message content can be tokenized with special tokens
+            const message = idToContent.get(part.separator);
+            if (message == null)
+                throw new Error(`Message with id "${part.separator}" not found`);
+            messageIdsLeftToProcess.delete(part.separator);
+            return message;
+        }));
+        if (messageIdsLeftToProcess.size !== 0)
+            throw new Error("Some input messages are not present in the generated Jinja template output");
+        return {
+            contextText,
+            ignoreStartText: !this.trimLeadingWhitespaceInResponses
+                ? []
+                : [
+                    // ignore up to 4 leading spaces
+                    ...Array(4).fill(0)
+                        .map((_, index) => LlamaText(" ".repeat(index + 1))),
+                    LlamaText("\t"),
+                    LlamaText("\t\t"),
+                    LlamaText("\t "),
+                    LlamaText(" \t")
+                ],
+            stopGenerationTriggers: [
+                LlamaText(new SpecialToken("EOS")),
+                ...(stopGenerationJinjaParts.length === 0
+                    ? []
+                    : [
+                        LlamaText(stopGenerationJinjaParts.map((part) => {
+                            if (typeof part === "string")
+                                return new SpecialTokensText(part);
+                            const message = idToContent.get(part.separator);
+                            if (message == null)
+                                throw new Error(`Message with id "${part.separator}" not found`);
+                            return message;
+                        }))
+                    ])
+            ]
+        };
+    }
+    /**
+     * Validate that this Jinja template can be rendered
+     * @internal
+     */
+    _runSanityTest() {
+        try {
+            for (const chatHistory of chatHistoriesForSanityTest) {
+                this.generateContextText(chatHistory);
+            }
+        }
+        catch (err) {
+            throw new Error("The provided Jinja template failed that sanity test: " + String(err));
+        }
+    }
+}
+class UniqueTemplateId {
+    antiText;
+    _ids = new Set();
+    constructor(antiText) {
+        this.antiText = antiText;
+    }
+    generateId() {
+        let id;
+        do {
+            id = "W" + (Math.random()
+                .toString(36)
+                .slice(2)) + "W";
+        } while (this._ids.has(id) || this.antiText.includes(id));
+        this._ids.add(id);
+        return id;
+    }
+    removeId(id) {
+        this._ids.delete(id);
+    }
+}
+function resolveConvertUnsupportedSystemMessagesToUserMessagesOption(convertUnsupportedSystemMessagesToUserMessages) {
+    if (convertUnsupportedSystemMessagesToUserMessages === false)
+        return undefined;
+    if (convertUnsupportedSystemMessagesToUserMessages === true)
+        return {
+            ...defaultConvertUnsupportedSystemMessagesToUserMessagesFormat,
+            use: "always"
+        };
+    if (convertUnsupportedSystemMessagesToUserMessages === "auto")
+        return {
+            ...defaultConvertUnsupportedSystemMessagesToUserMessagesFormat,
+            use: "ifNeeded"
+        };
+    if (typeof convertUnsupportedSystemMessagesToUserMessages === "object")
+        return {
+            ...convertUnsupportedSystemMessagesToUserMessages,
+            use: convertUnsupportedSystemMessagesToUserMessages.use ?? "ifNeeded"
+        };
+    return { ...defaultConvertUnsupportedSystemMessagesToUserMessagesFormat, use: "ifNeeded" };
+}
+const chatHistoriesForSanityTest = [
+    [{
+            type: "system",
+            text: "System message ~!@#$%^&*()\n*"
+        }, {
+            type: "user",
+            text: "Message 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
+        }, {
+            type: "model",
+            response: [""]
+        }],
+    [{
+            type: "system",
+            text: "System message ~!@#$%^&*()\n*"
+        }, {
+            type: "user",
+            text: "Message 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
+        }, {
+            type: "model",
+            response: ["Result 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"]
+        }],
+    [{
+            type: "system",
+            text: "System message ~!@#$%^&*()\n*"
+        }, {
+            type: "user",
+            text: "Message 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
+        }, {
+            type: "model",
+            response: ["Result 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"]
+        }, {
+            type: "user",
+            text: "Message2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
+        }, {
+            type: "model",
+            response: [""]
+        }],
+    [{
+            type: "system",
+            text: "System message ~!@#$%^&*()\n*"
+        }, {
+            type: "user",
+            text: "Message 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
+        }, {
+            type: "model",
+            response: ["Result 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"]
+        }, {
+            type: "user",
+            text: "Message2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
+        }, {
+            type: "model",
+            response: ["Result2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"]
+        }]
+];
+//# sourceMappingURL=JinjaTemplateChatWrapper.js.map

package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map

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

package/dist/{TemplateChatWrapper.d.ts → chatWrappers/generic/TemplateChatWrapper.d.ts}

@@ -1,6 +1,18 @@
-import { ChatHistoryItem, ChatModelFunctions } from "./types.js";
-import { LlamaText } from "./utils/LlamaText.js";
-import { ChatWrapper, ChatWrapperSettings } from "./ChatWrapper.js";
+import { ChatHistoryItem, ChatModelFunctions } from "../../types.js";
+import { LlamaText } from "../../utils/LlamaText.js";
+import { ChatWrapper, ChatWrapperSettings } from "../../ChatWrapper.js";
+import { ChatHistoryFunctionCallMessageTemplate } from "./utils/chatHistoryFunctionCallMessageTemplate.js";
+export type TemplateChatWrapperOptions = {
+    template: ChatTemplate;
+    historyTemplate: ChatHistoryTemplate;
+    modelRoleName: string;
+    userRoleName: string;
+    systemRoleName?: string;
+    functionCallMessageTemplate?: ChatHistoryFunctionCallMessageTemplate;
+    joinAdjacentMessagesOfTheSameType?: boolean;
+};
+type ChatTemplate = `${`${string}{{systemPrompt}}` | ""}${string}{{history}}${string}{{completion}}${string}`;
+type ChatHistoryTemplate = `${string}{{roleName}}${string}{{message}}${string}`;
 /**
  * A chat wrapper based on a simple template.
  *
@@ -41,15 +53,7 @@ export declare class TemplateChatWrapper extends ChatWrapper {
     readonly userRoleName: string;
     readonly systemRoleName: string;
     readonly joinAdjacentMessagesOfTheSameType: boolean;
-    constructor({ template, historyTemplate, modelRoleName, userRoleName, systemRoleName, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType }: {
-        template: ChatTemplate;
-        historyTemplate: ChatHistoryTemplate;
-        modelRoleName: string;
-        userRoleName: string;
-        systemRoleName?: string;
-        functionCallMessageTemplate?: ChatHistoryFunctionCallMessageTemplate;
-        joinAdjacentMessagesOfTheSameType?: boolean;
-    });
+    constructor({ template, historyTemplate, modelRoleName, userRoleName, systemRoleName, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType }: TemplateChatWrapperOptions);
     generateContextText(history: readonly ChatHistoryItem[], { availableFunctions, documentFunctionParams }?: {
         availableFunctions?: ChatModelFunctions;
         documentFunctionParams?: boolean;
@@ -58,10 +62,4 @@ export declare class TemplateChatWrapper extends ChatWrapper {
         stopGenerationTriggers: LlamaText[];
     };
 }
-type ChatTemplate = `${`${string}{{systemPrompt}}` | ""}${string}{{history}}${string}{{completion}}${string}`;
-type ChatHistoryTemplate = `${string}{{roleName}}${string}{{message}}${string}`;
-type ChatHistoryFunctionCallMessageTemplate = [
-    call: `${string}{{functionName}}${string}{{functionParams}}${string}`,
-    result: `${string}{{functionCallResult}}${string}`
-];
 export {};