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

package/dist/chatWrappers/AlpacaChatWrapper.js

@@ -1,11 +1,12 @@
 import { GeneralChatWrapper } from "./GeneralChatWrapper.js";
 export class AlpacaChatWrapper extends GeneralChatWrapper {
     wrapperName = "AlpacaChat";
-    constructor({ userMessageTitle = "Instruction", modelResponseTitle = "Response", middleSystemMessageTitle = "System" } = {}) {
+    constructor({ userMessageTitle = "Instruction", modelResponseTitle = "Response", middleSystemMessageTitle = "System", allowSpecialTokensInTitles = false } = {}) {
         super({
             userMessageTitle: userMessageTitle + ":",
             modelResponseTitle: modelResponseTitle + ":",
-            middleSystemMessageTitle: middleSystemMessageTitle + ":"
+            middleSystemMessageTitle: middleSystemMessageTitle + ":",
+            allowSpecialTokensInTitles
         });
     }
     get userMessageTitle() {
@@ -17,5 +18,11 @@ export class AlpacaChatWrapper extends GeneralChatWrapper {
     get middleSystemMessageTitle() {
         return super.middleSystemMessageTitle.slice(0, -1);
     }
+    /** @internal */
+    static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
+        return [{}, {
+                allowSpecialTokensInTitles: true
+            }];
+    }
 }
 //# sourceMappingURL=AlpacaChatWrapper.js.map

package/dist/chatWrappers/AlpacaChatWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"AlpacaChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/AlpacaChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAE3D,MAAM,OAAO,iBAAkB,SAAQ,kBAAkB;IAC5B,WAAW,GAAW,YAAY,CAAC;IAE5D,YAAmB,EACf,gBAAgB,GAAG,aAAa,EAAE,kBAAkB,GAAG,UAAU,EAAE,wBAAwB,GAAG,QAAQ,KAGtG,EAAE;QACF,KAAK,CAAC;YACF,gBAAgB,EAAE,gBAAgB,GAAG,GAAG;YACxC,kBAAkB,EAAE,kBAAkB,GAAG,GAAG;YAC5C,wBAAwB,EAAE,wBAAwB,GAAG,GAAG;SAC3D,CAAC,CAAC;IACP,CAAC;IAED,IAAoB,gBAAgB;QAChC,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,IAAoB,kBAAkB;QAClC,OAAO,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAoB,wBAAwB;QACxC,OAAO,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;CACJ"}
+{"version":3,"file":"AlpacaChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/AlpacaChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAE3D,MAAM,OAAO,iBAAkB,SAAQ,kBAAkB;IAC5B,WAAW,GAAW,YAAY,CAAC;IAE5D,YAAmB,EACf,gBAAgB,GAAG,aAAa,EAAE,kBAAkB,GAAG,UAAU,EAAE,wBAAwB,GAAG,QAAQ,EACtG,0BAA0B,GAAG,KAAK,KAGlC,EAAE;QACF,KAAK,CAAC;YACF,gBAAgB,EAAE,gBAAgB,GAAG,GAAG;YACxC,kBAAkB,EAAE,kBAAkB,GAAG,GAAG;YAC5C,wBAAwB,EAAE,wBAAwB,GAAG,GAAG;YACxD,0BAA0B;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,IAAoB,gBAAgB;QAChC,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,IAAoB,kBAAkB;QAClC,OAAO,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAoB,wBAAwB;QACxC,OAAO,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,gBAAgB;IACT,MAAM,CAAU,yDAAyD;QAC5E,OAAO,CAAC,EAAE,EAAE;gBACR,0BAA0B,EAAE,IAAI;aACnC,CAA4D,CAAC;IAClE,CAAC;CACJ"}

package/dist/chatWrappers/ChatMLChatWrapper.d.ts

@@ -9,5 +9,10 @@ export declare class ChatMLChatWrapper extends ChatWrapper {
     }): {
         contextText: LlamaText;
         stopGenerationTriggers: LlamaText[];
+        ignoreStartText?: LlamaText[];
+        functionCall?: {
+            initiallyEngaged: boolean;
+            disengageInitiallyEngaged: LlamaText[];
+        };
     };
 }

package/dist/chatWrappers/ChatMLChatWrapper.js

@@ -1,5 +1,5 @@
 import { ChatWrapper } from "../ChatWrapper.js";
-import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
+import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
 // source: https://github.com/openai/openai-python/blob/120d225b91a8453e15240a49fb1c6794d8119326/chatml.md
 export class ChatMLChatWrapper extends ChatWrapper {
     wrapperName = "ChatML";
@@ -40,41 +40,43 @@ export class ChatMLChatWrapper extends ChatWrapper {
                 currentAggregateFocus = null;
                 modelTexts.push(this.generateModelResponseText(item.response));
             }
+            else
+                void (item);
         }
         flush();
-        const contextText = LlamaText(resultItems.map(({ system, user, model }, index) => {
+        const contextText = LlamaText(new SpecialToken("BOS"), resultItems.map(({ system, user, model }, index) => {
             const isLastItem = index === resultItems.length - 1;
             return LlamaText([
                 (system.length === 0)
                     ? LlamaText([])
                     : LlamaText([
-                        new SpecialToken("<|im_start|>system\n"),
+                        new SpecialTokensText("<|im_start|>system\n"),
                         system,
-                        new SpecialToken("<|im_end|>\n")
+                        new SpecialTokensText("<|im_end|>\n")
                     ]),
                 (user.length === 0)
                     ? LlamaText([])
                     : LlamaText([
-                        new SpecialToken("<|im_start|>user\n"),
+                        new SpecialTokensText("<|im_start|>user\n"),
                         user,
-                        new SpecialToken("<|im_end|>\n")
+                        new SpecialTokensText("<|im_end|>\n")
                     ]),
                 (model.length === 0 && !isLastItem)
                     ? LlamaText([])
                     : LlamaText([
-                        new SpecialToken("<|im_start|>assistant\n"),
-                        user,
+                        new SpecialTokensText("<|im_start|>assistant\n"),
+                        model,
                         isLastItem
                             ? LlamaText([])
-                            : new SpecialToken("<|im_end|>\n")
+                            : new SpecialTokensText("<|im_end|>\n")
                     ])
             ]);
         }));
         return {
             contextText,
             stopGenerationTriggers: [
-                LlamaText(new BuiltinSpecialToken("EOS")),
-                LlamaText(new SpecialToken("<|im_end|>")),
+                LlamaText(new SpecialToken("EOS")),
+                LlamaText(new SpecialTokensText("<|im_end|>")),
                 LlamaText("<|im_end|>")
             ]
         };

package/dist/chatWrappers/ChatMLChatWrapper.js.map

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

package/dist/chatWrappers/FalconChatWrapper.d.ts

@@ -3,10 +3,11 @@ import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
 import { LlamaText } from "../utils/LlamaText.js";
 export declare class FalconChatWrapper extends ChatWrapper {
     readonly wrapperName: string;
-    constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle }?: {
+    constructor({ userMessageTitle, modelResponseTitle, middleSystemMessageTitle, allowSpecialTokensInTitles }?: {
         userMessageTitle?: string;
         modelResponseTitle?: string;
         middleSystemMessageTitle?: string;
+        allowSpecialTokensInTitles?: boolean;
     });
     get userMessageTitle(): string;
     get modelResponseTitle(): string;

package/dist/chatWrappers/FalconChatWrapper.js

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

package/dist/chatWrappers/FalconChatWrapper.js.map

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

package/dist/chatWrappers/FunctionaryChatWrapper.js

@@ -1,7 +1,7 @@
 import { ChatWrapper } from "../ChatWrapper.js";
 import { isChatModelResponseFunctionCall } from "../types.js";
-import { BuiltinSpecialToken, LlamaText, SpecialToken } from "../utils/LlamaText.js";
-import { getTypeScriptTypeStringForGbnfJsonSchema } from "../utils/getTypeScriptTypeStringForGbnfJsonSchema.js";
+import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
+import { ChatModelFunctionsDocumentationGenerator } from "./utils/ChatModelFunctionsDocumentationGenerator.js";
 // source: https://github.com/MeetKai/functionary/blob/main/tests/prompt_test_v2.txt
 export class FunctionaryChatWrapper extends ChatWrapper {
     wrapperName = "Functionary";
@@ -9,13 +9,13 @@ export class FunctionaryChatWrapper extends ChatWrapper {
         functions: {
             call: {
                 optionalPrefixSpace: true,
-                prefix: "\n\n<|from|>assistant\n<|recipient|>",
+                prefix: "\n<|from|>assistant\n<|recipient|>",
                 paramsPrefix: "\n<|content|>",
-                suffix: "\n\n"
+                suffix: "\n"
             },
             result: {
                 prefix: "<|from|>{{functionName}}\n<|recipient|>all\n<|content|>",
-                suffix: "\n\n"
+                suffix: "\n"
             }
         }
     };
@@ -24,7 +24,7 @@ export class FunctionaryChatWrapper extends ChatWrapper {
         const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, {
             documentParams: documentFunctionParams
         });
-        const contextText = LlamaText(new BuiltinSpecialToken("BOS"), historyWithFunctions.map((item, index) => {
+        const contextText = LlamaText(new SpecialToken("BOS"), historyWithFunctions.map((item, index) => {
             const isFirstItem = index === 0;
             const isLastItem = index === historyWithFunctions.length - 1;
             if (item.type === "system") {
@@ -33,10 +33,10 @@ export class FunctionaryChatWrapper extends ChatWrapper {
                 return LlamaText([
                     isFirstItem
                         ? LlamaText([])
-                        : "\n\n",
-                    "<|from|>system\n",
-                    "<|recipient|>all\n",
-                    "<|content|>",
+                        : new SpecialTokensText("\n"),
+                    new SpecialTokensText("<|from|>system\n"),
+                    new SpecialTokensText("<|recipient|>all\n"),
+                    new SpecialTokensText("<|content|>"),
                     item.text
                 ]);
             }
@@ -44,10 +44,10 @@ export class FunctionaryChatWrapper extends ChatWrapper {
                 return LlamaText([
                     isFirstItem
                         ? LlamaText([])
-                        : "\n\n",
-                    "<|from|>user\n",
-                    "<|recipient|>all\n",
-                    "<|content|>",
+                        : new SpecialTokensText("\n"),
+                    new SpecialTokensText("<|from|>user\n"),
+                    new SpecialTokensText("<|recipient|>all\n"),
+                    new SpecialTokensText("<|content|>"),
                     item.text
                 ]);
             }
@@ -56,10 +56,10 @@ export class FunctionaryChatWrapper extends ChatWrapper {
                     return LlamaText([
                         isFirstItem
                             ? LlamaText([])
-                            : "\n\n",
-                        "<|from|>assistant\n",
-                        "<|recipient|>all\n",
-                        "<|content|>"
+                            : new SpecialTokensText("\n"),
+                        new SpecialTokensText("<|from|>assistant\n"),
+                        new SpecialTokensText("<|recipient|>all\n"),
+                        new SpecialTokensText("<|content|>")
                     ]);
                 return LlamaText(item.response.map((response, index) => {
                     const isFirstResponse = index === 0;
@@ -68,46 +68,53 @@ export class FunctionaryChatWrapper extends ChatWrapper {
                         return LlamaText([
                             (isFirstItem && isFirstResponse)
                                 ? LlamaText([])
-                                : "\n\n",
-                            "<|from|>assistant\n",
-                            "<|recipient|>all\n",
-                            "<|content|>",
+                                : new SpecialTokensText("\n"),
+                            new SpecialTokensText("<|from|>assistant\n"),
+                            new SpecialTokensText("<|recipient|>all\n"),
+                            new SpecialTokensText("<|content|>"),
                             response,
                             (isLastResponse && isLastItem)
                                 ? ""
-                                : "<|stop|>"
+                                : new SpecialTokensText("<|stop|>")
                         ]);
                     else if (isChatModelResponseFunctionCall(response)) {
                         return LlamaText([
                             response.raw != null
-                                ? LlamaText(response.raw)
+                                ? LlamaText(response.raw.endsWith("\n")
+                                    ? response.raw.slice(0, -"\n".length)
+                                    : response.raw)
                                 : LlamaText([
                                     (isFirstItem && isFirstResponse)
                                         ? LlamaText([])
-                                        : "\n\n",
-                                    "<|from|>assistant\n",
-                                    `<|recipient|>${response.name}\n`,
-                                    "<|content|>",
+                                        : new SpecialTokensText("\n"),
+                                    new SpecialTokensText("<|from|>assistant\n"),
+                                    new SpecialTokensText("<|recipient|>"), response.name, new SpecialTokensText("\n"),
+                                    new SpecialTokensText("<|content|>"),
                                     response.params === undefined
                                         ? ""
                                         : JSON.stringify(response.params),
-                                    "<|stop|>",
-                                    "\n\n",
-                                    `<|from|>${response.name}\n`,
-                                    "<|recipient|>all\n",
-                                    "<|content|>",
+                                    new SpecialTokensText("<|stop|>"),
+                                    new SpecialTokensText("\n"),
+                                    new SpecialTokensText("<|from|>"), response.name, new SpecialTokensText("\n"),
+                                    new SpecialTokensText("<|recipient|>all\n"),
+                                    new SpecialTokensText("<|content|>"),
                                     response.result === undefined
                                         ? "" // "void"
                                         : JSON.stringify(response.result)
                                 ]),
-                            hasFunctions
-                                ? LlamaText([])
-                                : LlamaText([
-                                    "\n\n",
-                                    "<|from|>assistant\n",
-                                    "<|recipient|>all\n",
-                                    "<|content|>"
-                                ])
+                            (isLastResponse && isLastItem)
+                                ? hasFunctions
+                                    ? LlamaText([
+                                        new SpecialTokensText("\n"),
+                                        new SpecialTokensText("<|from|>assistant\n")
+                                    ])
+                                    : LlamaText([
+                                        new SpecialTokensText("\n"),
+                                        new SpecialTokensText("<|from|>assistant\n"),
+                                        new SpecialTokensText("<|recipient|>all\n"),
+                                        new SpecialTokensText("<|content|>")
+                                    ])
+                                : LlamaText([])
                         ]);
                     }
                     void (response);
@@ -121,58 +128,64 @@ export class FunctionaryChatWrapper extends ChatWrapper {
             return {
                 contextText,
                 stopGenerationTriggers: [
-                    LlamaText(new BuiltinSpecialToken("EOS")),
-                    LlamaText(new SpecialToken("<|stop|>")),
+                    LlamaText(new SpecialToken("EOS")),
+                    LlamaText(new SpecialTokensText("<|stop|>")),
                     LlamaText(" <|stop|>"),
                     LlamaText("<|stop|>"),
-                    LlamaText("\n\n<|from|>user"),
-                    LlamaText("\n\n<|from|>assistant"),
-                    LlamaText("\n\n<|from|>system")
+                    LlamaText("\n<|from|>user"),
+                    LlamaText("\n<|from|>assistant"),
+                    LlamaText("\n<|from|>system"),
+                    LlamaText(new SpecialTokensText(" <|stop|>")),
+                    LlamaText(new SpecialTokensText("<|stop|>")),
+                    LlamaText(new SpecialTokensText("\n<|from|>user")),
+                    LlamaText(new SpecialTokensText("\n<|from|>assistant")),
+                    LlamaText(new SpecialTokensText("\n<|from|>system"))
                 ]
             };
         }
+        const textResponseStart = [
+            " \n",
+            " \n\n",
+            "\n",
+            "n\n"
+        ].flatMap((prefix) => [
+            LlamaText(prefix + "<|from|>assistant\n<|recipient|>all\n<|content|>"),
+            LlamaText(new SpecialTokensText(prefix + "<|from|>assistant\n<|recipient|>all\n<|content|>"))
+        ]);
         return {
             contextText,
             stopGenerationTriggers: [
-                LlamaText(new BuiltinSpecialToken("EOS")),
-                LlamaText(new SpecialToken("<|stop|>")),
+                LlamaText(new SpecialToken("EOS")),
+                LlamaText(new SpecialTokensText("<|stop|>")),
                 LlamaText(" <|stop|>"),
                 LlamaText("<|stop|>"),
-                LlamaText("\n\n<|from|>user")
-            ],
-            ignoreStartText: [
-                LlamaText("\n\n<|from|>assistant\n<|recipient|>all\n<|content|>")
+                LlamaText("\n<|from|>user"),
+                LlamaText(new SpecialTokensText(" <|stop|>")),
+                LlamaText(new SpecialTokensText("<|stop|>")),
+                LlamaText(new SpecialTokensText("\n<|from|>user"))
             ],
+            ignoreStartText: textResponseStart,
             functionCall: {
                 initiallyEngaged: true,
-                disengageInitiallyEngaged: [
-                    LlamaText("\n\n<|from|>assistant\n<|recipient|>all\n<|content|>")
-                ]
+                disengageInitiallyEngaged: textResponseStart
             }
         };
     }
     generateAvailableFunctionsSystemText(availableFunctions, { documentParams = true }) {
+        const functionsDocumentationGenerator = new ChatModelFunctionsDocumentationGenerator(availableFunctions);
+        if (!functionsDocumentationGenerator.hasAnyFunctions)
+            return "";
         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";
+        return [
+            "// Supported function definitions that should be called when necessary.",
+            "namespace functions {",
+            "",
+            functionsDocumentationGenerator.getTypeScriptFunctionTypes({ documentParams, reservedFunctionNames: ["all"] }),
+            "",
+            "} // namespace functions"
+        ].join("\n");
     }
     addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, { documentParams = true } = {}) {
         const availableFunctionNames = Object.keys(availableFunctions ?? {});

package/dist/chatWrappers/FunctionaryChatWrapper.js.map

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

package/dist/chatWrappers/{LlamaChatWrapper.d.ts → GemmaChatWrapper.d.ts}

@@ -1,7 +1,7 @@
 import { ChatWrapper } from "../ChatWrapper.js";
 import { ChatHistoryItem, ChatModelFunctions } from "../types.js";
 import { LlamaText } from "../utils/LlamaText.js";
-export declare class LlamaChatWrapper extends ChatWrapper {
+export declare class GemmaChatWrapper extends ChatWrapper {
     readonly wrapperName: string;
     generateContextText(history: readonly ChatHistoryItem[], { availableFunctions, documentFunctionParams }?: {
         availableFunctions?: ChatModelFunctions;
@@ -9,5 +9,10 @@ export declare class LlamaChatWrapper extends ChatWrapper {
     }): {
         contextText: LlamaText;
         stopGenerationTriggers: LlamaText[];
+        ignoreStartText?: LlamaText[];
+        functionCall?: {
+            initiallyEngaged: boolean;
+            disengageInitiallyEngaged: LlamaText[];
+        };
     };
 }