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

package/dist/chatWrappers/FunctionaryChatWrapper.js

@@ -0,0 +1,200 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { isChatModelResponseFunctionCall } from "../types.js";
+import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
+import { getTypeScriptTypeStringForGbnfJsonSchema } from "../utils/getTypeScriptTypeStringForGbnfJsonSchema.js";
+// source: https://github.com/MeetKai/functionary/blob/main/tests/prompt_test_v2.txt
+export class FunctionaryChatWrapper extends ChatWrapper {
+    wrapperName = "Functionary";
+    settings = {
+        functions: {
+            call: {
+                optionalPrefixSpace: true,
+                prefix: "\n\n<|from|>assistant\n<|recipient|>",
+                paramsPrefix: "\n<|content|>",
+                suffix: "\n\n"
+            },
+            result: {
+                prefix: "<|from|>{{functionName}}\n<|recipient|>all\n<|content|>",
+                suffix: "\n\n"
+            }
+        }
+    };
+    generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
+        const hasFunctions = Object.keys(availableFunctions ?? {}).length > 0;
+        const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
+            documentParams: documentFunctionParams
+        });
+        const contextText = LlamaText(new BuiltinSpecialToken("BOS"), historyWithFunctions.map((item, index) => {
+            const isFirstItem = index === 0;
+            const isLastItem = index === historyWithFunctions.length - 1;
+            if (item.type === "system") {
+                if (item.text.length === 0)
+                    return "";
+                return LlamaText([
+                    isFirstItem
+                        ? LlamaText([])
+                        : "\n\n",
+                    "<|from|>system\n",
+                    "<|recipient|>all\n",
+                    "<|content|>",
+                    item.text
+                ]);
+            }
+            else if (item.type === "user") {
+                return LlamaText([
+                    isFirstItem
+                        ? LlamaText([])
+                        : "\n\n",
+                    "<|from|>user\n",
+                    "<|recipient|>all\n",
+                    "<|content|>",
+                    item.text
+                ]);
+            }
+            else if (item.type === "model") {
+                if (isLastItem && item.response.length === 0 && !hasFunctions)
+                    return LlamaText([
+                        isFirstItem
+                            ? LlamaText([])
+                            : "\n\n",
+                        "<|from|>assistant\n",
+                        "<|recipient|>all\n",
+                        "<|content|>"
+                    ]);
+                return LlamaText(item.response.map((response, index) => {
+                    const isFirstResponse = index === 0;
+                    const isLastResponse = index === item.response.length - 1;
+                    if (typeof response === "string")
+                        return LlamaText([
+                            (isFirstItem && isFirstResponse)
+                                ? LlamaText([])
+                                : "\n\n",
+                            "<|from|>assistant\n",
+                            "<|recipient|>all\n",
+                            "<|content|>",
+                            response,
+                            (isLastResponse && isLastItem)
+                                ? ""
+                                : "<|stop|>"
+                        ]);
+                    else if (isChatModelResponseFunctionCall(response)) {
+                        return LlamaText([
+                            response.raw != null
+                                ? LlamaText(response.raw)
+                                : LlamaText([
+                                    (isFirstItem && isFirstResponse)
+                                        ? LlamaText([])
+                                        : "\n\n",
+                                    "<|from|>assistant\n",
+                                    `<|recipient|>${response.name}\n`,
+                                    "<|content|>",
+                                    response.params === undefined
+                                        ? ""
+                                        : JSON.stringify(response.params),
+                                    "<|stop|>",
+                                    "\n\n",
+                                    `<|from|>${response.name}\n`,
+                                    "<|recipient|>all\n",
+                                    "<|content|>",
+                                    response.result === undefined
+                                        ? "" // "void"
+                                        : JSON.stringify(response.result)
+                                ]),
+                            hasFunctions
+                                ? LlamaText([])
+                                : LlamaText([
+                                    "\n\n",
+                                    "<|from|>assistant\n",
+                                    "<|recipient|>all\n",
+                                    "<|content|>"
+                                ])
+                        ]);
+                    }
+                    void (response);
+                    return "";
+                }));
+            }
+            void (item);
+            return "";
+        }));
+        if (!hasFunctions) {
+            return {
+                contextText,
+                stopGenerationTriggers: [
+                    LlamaText(new BuiltinSpecialToken("EOS")),
+                    LlamaText(new SpecialToken("<|stop|>")),
+                    LlamaText(" <|stop|>"),
+                    LlamaText("<|stop|>"),
+                    LlamaText("\n\n<|from|>user"),
+                    LlamaText("\n\n<|from|>assistant"),
+                    LlamaText("\n\n<|from|>system")
+                ]
+            };
+        }
+        return {
+            contextText,
+            stopGenerationTriggers: [
+                LlamaText(new BuiltinSpecialToken("EOS")),
+                LlamaText(new SpecialToken("<|stop|>")),
+                LlamaText(" <|stop|>"),
+                LlamaText("<|stop|>"),
+                LlamaText("\n\n<|from|>user")
+            ],
+            ignoreStartText: [
+                LlamaText("\n\n<|from|>assistant\n<|recipient|>all\n<|content|>")
+            ],
+            functionCall: {
+                initiallyEngaged: true,
+                disengageInitiallyEngaged: [
+                    LlamaText("\n\n<|from|>assistant\n<|recipient|>all\n<|content|>")
+                ]
+            }
+        };
+    }
+    generateAvailableFunctionsSystemText(availableFunctions, { documentParams = true }) {
+        const availableFunctionNames = Object.keys(availableFunctions ?? {});
+        if (availableFunctionNames.length === 0)
+            return "";
+        return "// Supported function definitions that should be called when necessary.\n" +
+            "namespace functions {\n\n" +
+            availableFunctionNames
+                .map((functionName) => {
+                if (functionName === "all")
+                    throw new Error('Function name "all" is reserved and cannot be used');
+                const functionDefinition = availableFunctions[functionName];
+                let res = "";
+                if (functionDefinition?.description != null && functionDefinition.description.trim() !== "")
+                    res += "// " + functionDefinition.description.split("\n").join("\n// ") + "\n";
+                res += "type " + functionName + " = (";
+                if (documentParams && functionDefinition?.params != null)
+                    res += "_: " + getTypeScriptTypeStringForGbnfJsonSchema(functionDefinition.params);
+                res += ") => any;";
+                return res;
+            })
+                .join("\n\n") +
+            "\n\n} // namespace functions";
+    }
+    addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, { documentParams = true } = {}) {
+        const availableFunctionNames = Object.keys(availableFunctions ?? {});
+        if (availableFunctions == null || availableFunctionNames.length === 0)
+            return history;
+        const res = history.slice();
+        const firstSystemMessageIndex = res.findIndex((item) => item.type === "system");
+        res.splice(Math.max(0, firstSystemMessageIndex), 0, {
+            type: "system",
+            text: this.generateAvailableFunctionsSystemText(availableFunctions, { documentParams })
+        }, {
+            type: "system",
+            text: "The assistant calls functions with appropriate input when necessary. The assistant writes <|stop|> when finished answering."
+        });
+        return res;
+    }
+    getInternalBuiltinFunctions({ initialFunctionCallEngaged }) {
+        if (initialFunctionCallEngaged)
+            return {
+                all: {}
+            };
+        return {};
+    }
+}
+//# sourceMappingURL=FunctionaryChatWrapper.js.map

package/dist/chatWrappers/FunctionaryChatWrapper.js.map

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

package/dist/chatWrappers/GeneralChatWrapper.d.ts

@@ -0,0 +1,21 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
+import { LlamaText } from "../utils/LlamaText.js";
+export declare class GeneralChatWrapper extends ChatWrapper {
+    readonly wrapperName: string;
+    constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle }?: {
+        userMessageTitle?: string;
+        modelResponseTitle?: string;
+        middleSystemMessageTitle?: string;
+    });
+    get userMessageTitle(): string;
+    get modelResponseTitle(): string;
+    get middleSystemMessageTitle(): string;
+    generateContextText(history: readonly ChatHistoryItem[], { availableFunctions, documentFunctionParams }?: {
+        availableFunctions?: ChatModelFunctions;
+        documentFunctionParams?: boolean;
+    }): {
+        contextText: LlamaText;
+        stopGenerationTriggers: LlamaText[];
+    };
+}

package/dist/chatWrappers/GeneralChatWrapper.js

@@ -0,0 +1,112 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
+export class GeneralChatWrapper extends ChatWrapper {
+    wrapperName = "General";
+    /** @internal */ _userMessageTitle;
+    /** @internal */ _modelResponseTitle;
+    /** @internal */ _middleSystemMessageTitle;
+    constructor({ userMessageTitle = "Human", modelResponseTitle = "Assistant", middleSystemMessageTitle = "System" } = {}) {
+        super();
+        this._userMessageTitle = userMessageTitle;
+        this._modelResponseTitle = modelResponseTitle;
+        this._middleSystemMessageTitle = middleSystemMessageTitle;
+    }
+    get userMessageTitle() {
+        return this._userMessageTitle;
+    }
+    get modelResponseTitle() {
+        return this._modelResponseTitle;
+    }
+    get middleSystemMessageTitle() {
+        return this._middleSystemMessageTitle;
+    }
+    generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
+        const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, 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.join("\n\n"),
+                    user: userTexts.join("\n\n"),
+                    model: modelTexts.join("\n\n")
+                });
+            systemTexts = [];
+            userTexts = [];
+            modelTexts = [];
+        }
+        for (const item of historyWithFunctions) {
+            if (item.type === "system") {
+                if (currentAggregateFocus !== "system")
+                    flush();
+                currentAggregateFocus = "system";
+                systemTexts.push(item.text);
+            }
+            else if (item.type === "user") {
+                flush();
+                currentAggregateFocus = null;
+                userTexts.push(item.text);
+            }
+            else if (item.type === "model") {
+                flush();
+                currentAggregateFocus = null;
+                modelTexts.push(this.generateModelResponseText(item.response));
+            }
+        }
+        flush();
+        const contextText = LlamaText(new BuiltinSpecialToken("BOS"), resultItems.map(({ system, user, model }, index) => {
+            const isFirstItem = index === 0;
+            const isLastItem = index === resultItems.length - 1;
+            return LlamaText([
+                (system.length === 0)
+                    ? LlamaText([])
+                    : LlamaText([
+                        isFirstItem
+                            ? LlamaText([])
+                            : `### ${this._middleSystemMessageTitle}\n`,
+                        system,
+                        "\n\n"
+                    ]),
+                (user.length === 0)
+                    ? LlamaText([])
+                    : LlamaText([
+                        `### ${this._userMessageTitle}\n`,
+                        user,
+                        "\n\n"
+                    ]),
+                (model.length === 0 && !isLastItem)
+                    ? LlamaText([])
+                    : LlamaText([
+                        `### ${this._modelResponseTitle}\n`,
+                        model,
+                        isLastItem
+                            ? LlamaText([])
+                            : "\n\n"
+                    ])
+            ]);
+        }));
+        return {
+            contextText,
+            stopGenerationTriggers: [
+                LlamaText(new BuiltinSpecialToken("EOS")),
+                LlamaText(new SpecialToken("<end>")),
+                LlamaText("<end>"),
+                LlamaText(`### ${this._userMessageTitle}`),
+                LlamaText(`\n### ${this._userMessageTitle}`),
+                LlamaText(`\n\n### ${this._userMessageTitle}`),
+                LlamaText(`### ${this._modelResponseTitle}`),
+                LlamaText(`\n### ${this._modelResponseTitle}`),
+                LlamaText(`\n\n### ${this._modelResponseTitle}`),
+                LlamaText(`### ${this._middleSystemMessageTitle}`),
+                LlamaText(`\n### ${this._middleSystemMessageTitle}`),
+                LlamaText(`\n\n### ${this._middleSystemMessageTitle}`)
+            ]
+        };
+    }
+}
+//# sourceMappingURL=GeneralChatWrapper.js.map

package/dist/chatWrappers/GeneralChatWrapper.js.map

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

package/dist/chatWrappers/LlamaChatWrapper.d.ts

@@ -0,0 +1,13 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
+import { LlamaText } from "../utils/LlamaText.js";
+export declare class LlamaChatWrapper extends ChatWrapper {
+    readonly wrapperName: string;
+    generateContextText(history: readonly ChatHistoryItem[], { availableFunctions, documentFunctionParams }?: {
+        availableFunctions?: ChatModelFunctions;
+        documentFunctionParams?: boolean;
+    }): {
+        contextText: LlamaText;
+        stopGenerationTriggers: LlamaText[];
+    };
+}

package/dist/chatWrappers/LlamaChatWrapper.js

@@ -0,0 +1,78 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
+// source: https://huggingface.co/blog/llama2#how-to-prompt-llama-2
+export class LlamaChatWrapper extends ChatWrapper {
+    wrapperName = "LlamaChat";
+    generateContextText(history, { availableFunctions, documentFunctionParams } = {}) {
+        const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, 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.join("\n\n"),
+                    user: userTexts.join("\n\n"),
+                    model: modelTexts.join("\n\n")
+                });
+            systemTexts = [];
+            userTexts = [];
+            modelTexts = [];
+        }
+        for (const item of historyWithFunctions) {
+            if (item.type === "system") {
+                if (currentAggregateFocus !== "system")
+                    flush();
+                currentAggregateFocus = "system";
+                systemTexts.push(item.text);
+            }
+            else if (item.type === "user") {
+                if (currentAggregateFocus !== "system" && currentAggregateFocus !== "user")
+                    flush();
+                currentAggregateFocus = "user";
+                userTexts.push(item.text);
+            }
+            else if (item.type === "model") {
+                currentAggregateFocus = "model";
+                modelTexts.push(this.generateModelResponseText(item.response));
+            }
+        }
+        flush();
+        const contextText = LlamaText(resultItems.map(({ system, user, model }, index) => {
+            const isLastItem = index === resultItems.length - 1;
+            return LlamaText([
+                new BuiltinSpecialToken("BOS"),
+                (system.length === 0 && user.length === 0)
+                    ? LlamaText([])
+                    : LlamaText([
+                        new SpecialToken("[INST] "),
+                        system.length === 0
+                            ? LlamaText([])
+                            : LlamaText([
+                                new SpecialToken("<<SYS>>\n"),
+                                system,
+                                new SpecialToken("\n<</SYS>>\n\n")
+                            ]),
+                        user,
+                        new SpecialToken(" [/INST]\n\n")
+                    ]),
+                model,
+                isLastItem
+                    ? LlamaText([])
+                    : new BuiltinSpecialToken("EOS")
+            ]);
+        }));
+        return {
+            contextText,
+            stopGenerationTriggers: [
+                LlamaText(new BuiltinSpecialToken("EOS")),
+                LlamaText("</s>")
+            ]
+        };
+    }
+}
+//# sourceMappingURL=LlamaChatWrapper.js.map

package/dist/chatWrappers/LlamaChatWrapper.js.map

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

package/dist/chatWrappers/resolveChatWrapperBasedOnModel.d.ts

@@ -1,6 +1,6 @@
-import { LlamaChatPromptWrapper } from "./LlamaChatPromptWrapper.js";
-import { GeneralChatPromptWrapper } from "./GeneralChatPromptWrapper.js";
-import { FalconChatPromptWrapper } from "./FalconChatPromptWrapper.js";
+import { LlamaChatWrapper } from "./LlamaChatWrapper.js";
+import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
+import { FalconChatWrapper } from "./FalconChatWrapper.js";
 import type { ModelTypeDescription } from "../utils/getBin.js";
 /**
  * @param options
@@ -10,4 +10,4 @@ export declare function resolveChatWrapperBasedOnModel({ bosString, filename, ty
     filename?: string;
     /** @hidden this type alias is too long in the documentation */
     typeDescription?: ModelTypeDescription;
-}): typeof GeneralChatPromptWrapper | typeof LlamaChatPromptWrapper | typeof FalconChatPromptWrapper | null;
+}): typeof LlamaChatWrapper | typeof GeneralChatWrapper | typeof FalconChatWrapper | null;

package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js

@@ -1,9 +1,11 @@
 import { parseModelFileName } from "../utils/parseModelFileName.js";
 import { parseModelTypeDescription } from "../utils/parseModelTypeDescription.js";
-import { LlamaChatPromptWrapper } from "./LlamaChatPromptWrapper.js";
-import { ChatMLChatPromptWrapper } from "./ChatMLChatPromptWrapper.js";
-import { GeneralChatPromptWrapper } from "./GeneralChatPromptWrapper.js";
-import { FalconChatPromptWrapper } from "./FalconChatPromptWrapper.js";
+import { LlamaChatWrapper } from "./LlamaChatWrapper.js";
+import { ChatMLChatWrapper } from "./ChatMLChatWrapper.js";
+import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
+import { FalconChatWrapper } from "./FalconChatWrapper.js";
+import { FunctionaryChatWrapper } from "./FunctionaryChatWrapper.js";
+import { AlpacaChatWrapper } from "./AlpacaChatWrapper.js";
 /**
  * @param options
  */
@@ -16,33 +18,37 @@ export function resolveChatWrapperBasedOnModel({ bosString, filename, typeDescri
             const splitLowercaseSubType = lowercaseSubType?.split("-");
             const firstSplitLowercaseSubType = splitLowercaseSubType?.[0];
             if (lowercaseName === "llama")
-                return LlamaChatPromptWrapper;
+                return LlamaChatWrapper;
             else if (lowercaseName === "yarn" && firstSplitLowercaseSubType === "llama")
-                return LlamaChatPromptWrapper;
+                return LlamaChatWrapper;
             else if (lowercaseName === "orca")
-                return ChatMLChatPromptWrapper;
+                return ChatMLChatWrapper;
             else if (lowercaseName === "phind" && lowercaseSubType === "codellama")
-                return LlamaChatPromptWrapper;
+                return LlamaChatWrapper;
             else if (lowercaseName === "mistral")
-                return GeneralChatPromptWrapper;
+                return GeneralChatWrapper;
             else if (firstSplitLowercaseSubType === "llama")
-                return LlamaChatPromptWrapper;
+                return LlamaChatWrapper;
+            else if (lowercaseSubType === "alpaca")
+                return AlpacaChatWrapper;
+            else if (lowercaseName === "functionary")
+                return FunctionaryChatWrapper;
         }
     }
     if (typeDescription != null) {
         const { arch } = parseModelTypeDescription(typeDescription);
         if (arch === "llama")
-            return LlamaChatPromptWrapper;
+            return LlamaChatWrapper;
         else if (arch === "falcon")
-            return FalconChatPromptWrapper;
+            return FalconChatWrapper;
     }
     if (bosString === "" || bosString == null)
         return null;
     if ("<s>[INST] <<SYS>>\n".startsWith(bosString)) {
-        return LlamaChatPromptWrapper;
+        return LlamaChatWrapper;
     }
     else if ("<|im_start|>system\n".startsWith(bosString)) {
-        return ChatMLChatPromptWrapper;
+        return ChatMLChatWrapper;
     }
     return null;
 }

package/dist/chatWrappers/resolveChatWrapperBasedOnModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveChatWrapperBasedOnModel.js","sourceRoot":"","sources":["../../src/chatWrappers/resolveChatWrapperBasedOnModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,yBAAyB,EAAC,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAIrE;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAAC,EAC3C,SAAS,EACT,QAAQ,EACR,eAAe,EAOlB;IACG,IAAI,QAAQ,IAAI,IAAI,EAAE;QAClB,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE/D,IAAI,QAAQ,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE;YACpC,MAAM,aAAa,GAAG,IAAI,EAAE,WAAW,EAAE,CAAC;YAC1C,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,EAAE,CAAC;YAChD,MAAM,qBAAqB,GAAG,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3D,MAAM,0BAA0B,GAAG,qBAAqB,EAAE,CAAC,CAAC,CAAC,CAAC;YAE9D,IAAI,aAAa,KAAK,OAAO;gBACzB,OAAO,sBAAsB,CAAC;iBAC7B,IAAI,aAAa,KAAK,MAAM,IAAI,0BAA0B,KAAK,OAAO;gBACvE,OAAO,sBAAsB,CAAC;iBAC7B,IAAI,aAAa,KAAK,MAAM;gBAC7B,OAAO,uBAAuB,CAAC;iBAC9B,IAAI,aAAa,KAAK,OAAO,IAAI,gBAAgB,KAAK,WAAW;gBAClE,OAAO,sBAAsB,CAAC;iBAC7B,IAAI,aAAa,KAAK,SAAS;gBAChC,OAAO,wBAAwB,CAAC;iBAC/B,IAAI,0BAA0B,KAAK,OAAO;gBAC3C,OAAO,sBAAsB,CAAC;SACrC;KACJ;IAED,IAAI,eAAe,IAAI,IAAI,EAAE;QACzB,MAAM,EAAC,IAAI,EAAC,GAAG,yBAAyB,CAAC,eAAe,CAAC,CAAC;QAE1D,IAAI,IAAI,KAAK,OAAO;YAChB,OAAO,sBAAsB,CAAC;aAC7B,IAAI,IAAI,KAAK,QAAQ;YACtB,OAAO,uBAAuB,CAAC;KACtC;IAED,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,IAAI,IAAI;QACrC,OAAO,IAAI,CAAC;IAEhB,IAAI,qBAAqB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC7C,OAAO,sBAAsB,CAAC;KACjC;SAAM,IAAI,sBAAsB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QACrD,OAAO,uBAAuB,CAAC;KAClC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"resolveChatWrapperBasedOnModel.js","sourceRoot":"","sources":["../../src/chatWrappers/resolveChatWrapperBasedOnModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,yBAAyB,EAAC,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAIzD;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAAC,EAC3C,SAAS,EACT,QAAQ,EACR,eAAe,EAOlB;IACG,IAAI,QAAQ,IAAI,IAAI,EAAE;QAClB,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE/D,IAAI,QAAQ,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE;YACpC,MAAM,aAAa,GAAG,IAAI,EAAE,WAAW,EAAE,CAAC;YAC1C,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,EAAE,CAAC;YAChD,MAAM,qBAAqB,GAAG,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3D,MAAM,0BAA0B,GAAG,qBAAqB,EAAE,CAAC,CAAC,CAAC,CAAC;YAE9D,IAAI,aAAa,KAAK,OAAO;gBACzB,OAAO,gBAAgB,CAAC;iBACvB,IAAI,aAAa,KAAK,MAAM,IAAI,0BAA0B,KAAK,OAAO;gBACvE,OAAO,gBAAgB,CAAC;iBACvB,IAAI,aAAa,KAAK,MAAM;gBAC7B,OAAO,iBAAiB,CAAC;iBACxB,IAAI,aAAa,KAAK,OAAO,IAAI,gBAAgB,KAAK,WAAW;gBAClE,OAAO,gBAAgB,CAAC;iBACvB,IAAI,aAAa,KAAK,SAAS;gBAChC,OAAO,kBAAkB,CAAC;iBACzB,IAAI,0BAA0B,KAAK,OAAO;gBAC3C,OAAO,gBAAgB,CAAC;iBACvB,IAAI,gBAAgB,KAAK,QAAQ;gBAClC,OAAO,iBAAiB,CAAC;iBACxB,IAAI,aAAa,KAAK,aAAa;gBACpC,OAAO,sBAAsB,CAAC;SACrC;KACJ;IAED,IAAI,eAAe,IAAI,IAAI,EAAE;QACzB,MAAM,EAAC,IAAI,EAAC,GAAG,yBAAyB,CAAC,eAAe,CAAC,CAAC;QAE1D,IAAI,IAAI,KAAK,OAAO;YAChB,OAAO,gBAAgB,CAAC;aACvB,IAAI,IAAI,KAAK,QAAQ;YACtB,OAAO,iBAAiB,CAAC;KAChC;IAED,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,IAAI,IAAI;QACrC,OAAO,IAAI,CAAC;IAEhB,IAAI,qBAAqB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC7C,OAAO,gBAAgB,CAAC;KAC3B;SAAM,IAAI,sBAAsB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QACrD,OAAO,iBAAiB,CAAC;KAC5B;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}

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

@@ -1,6 +1,6 @@
 import { CommandModule } from "yargs";
 import type { LlamaGrammar } from "../../llamaEvaluator/LlamaGrammar.js";
-declare const modelWrappers: readonly ["auto", "general", "llamaChat", "chatML", "falconChat"];
+declare const modelWrappers: readonly ["auto", "general", "llamaChat", "alpacaChat", "functionary", "chatML", "falconChat"];
 type ChatCommand = {
     model: string;
     systemInfo: boolean;
@@ -22,6 +22,7 @@ type ChatCommand = {
     repeatPresencePenalty?: number;
     maxTokens: number;
     noHistory: boolean;
+    environmentFunctions: boolean;
 };
 export declare const ChatCommand: CommandModule<object, ChatCommand>;
 export {};