node-llama-cpp 3.17.1 → 3.18.0

package/dist/chatWrappers/QwenChatWrapper.js

@@ -6,57 +6,99 @@ import { ChatModelFunctionsDocumentationGenerator } from "./utils/ChatModelFunct
 // source: https://huggingface.co/Qwen/Qwen2.5-14B-Instruct-1M/blob/main/tokenizer_config.json#L197
 export class QwenChatWrapper extends ChatWrapper {
     wrapperName = "Qwen";
+    variation;
     keepOnlyLastThought;
     thoughts;
     /** @internal */ _flatFunctionResultString;
+    /** @internal */ _ensureModelThoughtBeforeTextOnLastResponse;
     settings;
     constructor(options = {}) {
         super();
-        const { keepOnlyLastThought = true, thoughts = "auto", _lineBreakBeforeFunctionCallPrefix = false, _flatFunctionResultString = false } = options;
+        const { keepOnlyLastThought = true, thoughts = "auto", variation = "3", _lineBreakBeforeFunctionCallPrefix = false, _flatFunctionResultString = false, _ensureModelThoughtBeforeTextOnLastResponse = false } = options;
         this.keepOnlyLastThought = keepOnlyLastThought;
         this.thoughts = thoughts;
+        this.variation = variation;
         this._flatFunctionResultString = _flatFunctionResultString;
-        this.settings = {
-            supportsSystemMessages: true,
-            functions: {
-                call: {
-                    optionalPrefixSpace: true,
-                    prefix: LlamaText([
-                        _lineBreakBeforeFunctionCallPrefix
-                            ? "\n"
-                            : "",
-                        new SpecialTokensText("<tool_call>"), '\n{"name": "'
-                    ]),
-                    paramsPrefix: '", "arguments": ',
-                    suffix: LlamaText("}\n", new SpecialTokensText("</tool_call>")),
-                    emptyCallParamsPlaceholder: {}
-                },
-                result: {
-                    prefix: LlamaText(new SpecialTokensText("\n<tool_response>\n")),
-                    suffix: LlamaText(new SpecialTokensText("\n</tool_response>"))
-                },
-                parallelism: {
+        this._ensureModelThoughtBeforeTextOnLastResponse = _ensureModelThoughtBeforeTextOnLastResponse;
+        if (variation === "3")
+            this.settings = {
+                supportsSystemMessages: true,
+                functions: {
                     call: {
-                        sectionPrefix: "",
-                        betweenCalls: _lineBreakBeforeFunctionCallPrefix
-                            ? ""
-                            : "\n",
-                        sectionSuffix: LlamaText(new SpecialTokensText("<|im_end|>\n"))
+                        optionalPrefixSpace: true,
+                        prefix: LlamaText([
+                            _lineBreakBeforeFunctionCallPrefix
+                                ? "\n"
+                                : "",
+                            new SpecialTokensText("<tool_call>"), '\n{"name": "'
+                        ]),
+                        paramsPrefix: '", "arguments": ',
+                        suffix: LlamaText("}\n", new SpecialTokensText("</tool_call>")),
+                        emptyCallParamsPlaceholder: {}
                     },
                     result: {
-                        sectionPrefix: LlamaText(new SpecialTokensText("<|im_start|>user")),
-                        sectionSuffix: LlamaText(new SpecialTokensText("<|im_end|>\n<|im_start|>assistant\n"))
+                        prefix: LlamaText(new SpecialTokensText("\n<tool_response>\n")),
+                        suffix: LlamaText(new SpecialTokensText("\n</tool_response>"))
+                    },
+                    parallelism: {
+                        call: {
+                            sectionPrefix: "",
+                            betweenCalls: _lineBreakBeforeFunctionCallPrefix
+                                ? ""
+                                : "\n",
+                            sectionSuffix: LlamaText(new SpecialTokensText("<|im_end|>\n"))
+                        },
+                        result: {
+                            sectionPrefix: LlamaText(new SpecialTokensText("<|im_start|>user")),
+                            sectionSuffix: LlamaText(new SpecialTokensText("<|im_end|>\n<|im_start|>assistant\n"))
+                        }
+                    }
+                },
+                segments: {
+                    reiterateStackAfterFunctionCalls: true,
+                    thought: {
+                        prefix: LlamaText(new SpecialTokensText("<think>\n")),
+                        suffix: LlamaText(new SpecialTokensText("\n</think>"))
                     }
                 }
-            },
-            segments: {
-                reiterateStackAfterFunctionCalls: true,
-                thought: {
-                    prefix: LlamaText(new SpecialTokensText("<think>\n")),
-                    suffix: LlamaText(new SpecialTokensText("\n</think>"))
+            };
+        else
+            this.settings = {
+                supportsSystemMessages: true,
+                functions: {
+                    call: {
+                        optionalPrefixSpace: true,
+                        prefix: LlamaText(new SpecialTokensText("<tool_call>\n<function=")),
+                        paramsPrefix: ">\n<parameter=params>\n",
+                        suffix: LlamaText(new SpecialTokensText("\n</parameter>\n</function>\n</tool_call>")),
+                        emptyCallParamsPlaceholder: {}
+                    },
+                    result: {
+                        prefix: LlamaText(new SpecialTokensText("\n<tool_response>\n")),
+                        suffix: LlamaText(new SpecialTokensText("\n</tool_response>"))
+                    },
+                    parallelism: {
+                        call: {
+                            sectionPrefix: _lineBreakBeforeFunctionCallPrefix
+                                ? "\n\n"
+                                : "",
+                            betweenCalls: "\n",
+                            sectionSuffix: LlamaText(new SpecialTokensText("<|im_end|>\n"))
+                        },
+                        result: {
+                            sectionPrefix: LlamaText(new SpecialTokensText("<|im_start|>user")),
+                            sectionSuffix: LlamaText(new SpecialTokensText("<|im_end|>\n<|im_start|>assistant\n"))
+                        }
+                    }
+                },
+                segments: {
+                    reiterateStackAfterFunctionCalls: true,
+                    thought: {
+                        prefix: LlamaText(new SpecialTokensText("<think>\n")),
+                        suffix: LlamaText(new SpecialTokensText("\n</think>"))
+                    }
                 }
-            }
-        };
+            };
     }
     generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
         const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(chatHistory, availableFunctions, {
@@ -94,13 +136,29 @@ export class QwenChatWrapper extends ChatWrapper {
             }
             else if (item.type === "model") {
                 flush();
-                const transformedModelResponse = (this.thoughts === "discourage" && isLastItem)
+                let transformedModelResponse = (this.thoughts === "discourage" && isLastItem)
                     ? discourageThoughtsInModelResponse(item.response)
                     : item.response;
+                if (this.keepOnlyLastThought && !isLastItem)
+                    transformedModelResponse = transformedModelResponse.filter((response) => (!isChatModelResponseSegment(response) || response.segmentType !== "thought"));
+                else if (isLastItem && this._ensureModelThoughtBeforeTextOnLastResponse) {
+                    transformedModelResponse = transformedModelResponse.flatMap((response, index) => {
+                        if (typeof response !== "string")
+                            return [response];
+                        const previousResponse = transformedModelResponse[index - 1];
+                        if (previousResponse != null && isChatModelResponseSegment(previousResponse) && previousResponse.segmentType === "thought")
+                            return [response];
+                        return [{
+                                type: "segment",
+                                segmentType: "thought",
+                                text: "",
+                                ended: true,
+                                raw: LlamaText(new SpecialTokensText("<think>\n\n</think>\n\n")).toJSON()
+                            }, response];
+                    });
+                }
                 currentAggregateFocus = null;
-                modelTexts.push(this.generateModelResponseText((this.keepOnlyLastThought && !isLastItem)
-                    ? transformedModelResponse.filter((response) => (!isChatModelResponseSegment(response) || response.segmentType !== "thought"))
-                    : transformedModelResponse));
+                modelTexts.push(this.generateModelResponseText(transformedModelResponse));
             }
             else
                 void item;
@@ -152,21 +210,61 @@ export class QwenChatWrapper extends ChatWrapper {
         const functionsDocumentationGenerator = new ChatModelFunctionsDocumentationGenerator(availableFunctions);
         if (!functionsDocumentationGenerator.hasAnyFunctions)
             return LlamaText([]);
-        return LlamaText.joinValues("\n", [
-            "# Tools",
-            "",
-            "You may call one or more functions to assist with the user query.",
-            "",
-            LlamaText("You are provided with function signatures within ", new SpecialTokensText("<tools></tools>"), " XML tags:"),
-            LlamaText(new SpecialTokensText("<tools>")),
-            functionsDocumentationGenerator.getQwenFunctionSignatures({ documentParams }),
-            LlamaText(new SpecialTokensText("</tools>")),
-            "",
-            LlamaText("For each function call, return a json object with function name and arguments within ", new SpecialTokensText("<tool_call></tool_call>"), " XML tags:"),
-            LlamaText(new SpecialTokensText("<tool_call>")),
-            '{"name": <function-name>, "arguments": <args-json-object>}',
-            LlamaText(new SpecialTokensText("</tool_call>"))
-        ]);
+        if (this.variation === "3")
+            return LlamaText.joinValues("\n", [
+                "# Tools",
+                "",
+                "You may call one or more functions to assist with the user query.",
+                "",
+                LlamaText("You are provided with function signatures within ", new SpecialTokensText("<tools></tools>"), " XML tags:"),
+                LlamaText(new SpecialTokensText("<tools>")),
+                functionsDocumentationGenerator.getQwenFunctionSignatures({ documentParams }),
+                LlamaText(new SpecialTokensText("</tools>")),
+                "",
+                LlamaText("For each function call, return a json object with function name and arguments within ", new SpecialTokensText("<tool_call></tool_call>"), " XML tags:"),
+                LlamaText(new SpecialTokensText("<tool_call>")),
+                '{"name": <function-name>, "arguments": <args-json-object>}',
+                LlamaText(new SpecialTokensText("</tool_call>"))
+            ]);
+        else
+            return LlamaText.joinValues("\n", [
+                "# Tools",
+                "",
+                "You have access to the following functions:",
+                "",
+                LlamaText(new SpecialTokensText("<tools>")),
+                functionsDocumentationGenerator.getQwenFunctionSignatures({ documentParams }),
+                LlamaText(new SpecialTokensText("</tools>")),
+                "",
+                LlamaText("If you choose to call a function ONLY reply in the following format with NO suffix:"),
+                "",
+                LlamaText(new SpecialTokensText("<tool_call>")),
+                LlamaText(new SpecialTokensText("<function="), "example_function_name", new SpecialTokensText(">")),
+                LlamaText(new SpecialTokensText("<parameter="), "example_parameter_1", new SpecialTokensText(">")),
+                "value_1",
+                LlamaText(new SpecialTokensText("</parameter>")),
+                LlamaText(new SpecialTokensText("<parameter="), "example_parameter_2", new SpecialTokensText(">")),
+                "This is the value for the second parameter",
+                "that can span",
+                "multiple lines",
+                LlamaText(new SpecialTokensText("</parameter>")),
+                LlamaText(new SpecialTokensText("</function>")),
+                LlamaText(new SpecialTokensText("</tool_call>")),
+                "",
+                LlamaText(new SpecialTokensText("<IMPORTANT>")),
+                "Reminder:",
+                LlamaText([
+                    "- Function calls MUST follow the specified format: an inner ",
+                    new SpecialTokensText("<function=...></function>"),
+                    " block must be nested within ",
+                    new SpecialTokensText("<tool_call></tool_call>"),
+                    " XML tags"
+                ]),
+                "- Required parameters MUST be specified",
+                "- You may provide optional reasoning for your function call in natural language BEFORE the function call, but NOT after",
+                "- If there is no function call available, answer the question like normal with your current knowledge and do not tell the user about function calls",
+                LlamaText(new SpecialTokensText("</IMPORTANT>"))
+            ]);
     }
     /** @internal */
     static _checkModelCompatibility(options) {
@@ -178,7 +276,9 @@ export class QwenChatWrapper extends ChatWrapper {
             architecture === GgufArchitectureType.qwen3 ||
             architecture === GgufArchitectureType.qwen3moe ||
             architecture === GgufArchitectureType.qwen3vl ||
-            architecture === GgufArchitectureType.qwen3vlmoe);
+            architecture === GgufArchitectureType.qwen3vlmoe ||
+            architecture === GgufArchitectureType.qwen35 ||
+            architecture === GgufArchitectureType.qwen35moe);
     }
     /** @internal */
     static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
@@ -198,6 +298,26 @@ export class QwenChatWrapper extends ChatWrapper {
                 { _flatFunctionResultString: true, thoughts: "discourage", _lineBreakBeforeFunctionCallPrefix: true },
                 {},
                 { _requireFunctionCallSettingsExtraction: true }
+            ],
+            [
+                { variation: "3.5" },
+                { variation: "3.5" },
+                { _requireFunctionCallSettingsExtraction: true, _functionCallExtractionExamineNonFirst: true }
+            ],
+            [
+                { variation: "3.5", _lineBreakBeforeFunctionCallPrefix: true },
+                { variation: "3.5" },
+                { _requireFunctionCallSettingsExtraction: true, _functionCallExtractionExamineNonFirst: true }
+            ],
+            [
+                { variation: "3.5", _ensureModelThoughtBeforeTextOnLastResponse: true, _lineBreakBeforeFunctionCallPrefix: true },
+                { variation: "3.5" },
+                { _requireFunctionCallSettingsExtraction: true, _functionCallExtractionExamineNonFirst: true }
+            ],
+            [
+                { variation: "3.5", _ensureModelThoughtBeforeTextOnLastResponse: true },
+                { variation: "3.5" },
+                { _requireFunctionCallSettingsExtraction: true, _functionCallExtractionExamineNonFirst: true }
             ]
         ];
     }

package/dist/chatWrappers/QwenChatWrapper.js.map

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

package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js

@@ -9,7 +9,7 @@ import { tryMatrix } from "../../utils/optionsMatrix.js";
 import { parseFunctionCallMessageTemplate } from "./utils/chatHistoryFunctionCallMessageTemplate.js";
 import { templateSegmentOptionsToChatWrapperSettings } from "./utils/templateSegmentOptionsToChatWrapperSettings.js";
 import { UniqueIdGenerator } from "./utils/UniqueIdGenerator.js";
-import { extractFunctionCallSettingsFromJinjaTemplate } from "./utils/extractFunctionCallSettingsFromJinjaTemplate.js";
+import { detectNeedToWrapFunctionArgumentsWithMap, extractFunctionCallSettingsFromJinjaTemplate } from "./utils/extractFunctionCallSettingsFromJinjaTemplate.js";
 import { squashChatHistoryItems } from "./utils/squashChatHistoryItems.js";
 import { extractSegmentSettingsFromTokenizerAndChatTemplate } from "./utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js";
 const defaultConvertUnsupportedSystemMessagesToUserMessagesFormat = {
@@ -58,6 +58,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
     /** @internal */ _jinjaTemplate;
     /** @internal */ _usingJinjaFunctionCallTemplate = false;
     /** @internal */ _stringifyFunctionParams = false;
+    /** @internal */ _wrapFunctionParamsInsideMapKey;
     /** @internal */ _stringifyFunctionResult = false;
     /** @internal */ _combineJinjaModelMessageAndToolCalls = true;
     /** @internal */ _endJinjaMessagesWithUserMessage = false;
@@ -66,7 +67,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
      */
     constructor(options) {
         super();
-        const { template, modelRoleName = "assistant", userRoleName = "user", systemRoleName = "system", convertUnsupportedSystemMessagesToUserMessages = defaultConvertUnsupportedSystemMessagesToUserMessagesFormat, functionCallMessageTemplate = "auto", joinAdjacentMessagesOfTheSameType = true, trimLeadingWhitespaceInResponses = true, additionalRenderParameters, segments, tokenizer, _requireFunctionCallSettingsExtraction = false } = options;
+        const { template, modelRoleName = "assistant", userRoleName = "user", systemRoleName = "system", convertUnsupportedSystemMessagesToUserMessages = defaultConvertUnsupportedSystemMessagesToUserMessagesFormat, functionCallMessageTemplate = "auto", joinAdjacentMessagesOfTheSameType = true, trimLeadingWhitespaceInResponses = true, additionalRenderParameters, segments, tokenizer, _requireFunctionCallSettingsExtraction = false, _functionCallExtractionExamineNonFirst = false } = options;
         if (template == null)
             throw new Error("template cannot be null");
         this.template = template;
@@ -101,87 +102,107 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
             : functionCallMessageTemplate);
         if (functionCallSettings == null && functionCallMessageTemplate !== "noJinja") {
             try {
-                const idsGenerator = new UniqueIdGenerator(this.template + this.modelRoleName + this.userRoleName + this.systemRoleName +
-                    (this.convertUnsupportedSystemMessagesToUserMessages?.format ?? ""));
-                const extractedSettings = extractFunctionCallSettingsFromJinjaTemplate({
-                    idsGenerator,
-                    renderTemplate: ({ chatHistory, functions, additionalParams, stringifyFunctionParams, stringifyFunctionResults, combineModelMessageAndToolCalls, squashModelTextResponses = true }) => {
-                        const render = (convertSystemMessagesToUserMessagesFormat, wipeFunctionCallIds) => {
-                            const { messages: intermediateMessages, tools } = fromChatHistoryToIntermediateOpenAiMessages({
-                                chatHistory: this._transformChatHistory(chatHistory, {
-                                    convertSystemMessagesToUserMessagesFormat,
-                                    joinAdjacentMessagesOfTheSameType: !squashModelTextResponses
-                                        ? false
-                                        : undefined
-                                }).transformedHistory,
-                                chatWrapperSettings: this.settings,
-                                useRawValues: false,
-                                functions,
-                                stringifyFunctionParams,
-                                stringifyFunctionResults,
-                                combineModelMessageAndToolCalls,
-                                squashModelTextResponses
-                            });
-                            const messages = fromIntermediateToCompleteOpenAiMessages(intermediateMessages)
-                                .map((item) => {
-                                if (!wipeFunctionCallIds)
+                const renderTemplate = ({ chatHistory, functions, additionalParams, stringifyFunctionParams, stringifyFunctionResults, combineModelMessageAndToolCalls, squashModelTextResponses = true }) => {
+                    const render = (convertSystemMessagesToUserMessagesFormat, wipeFunctionCallIds) => {
+                        let inputChatHistory = chatHistory;
+                        if (this._wrapFunctionParamsInsideMapKey != null)
+                            inputChatHistory = inputChatHistory.map((item) => {
+                                if (item.type !== "model")
                                     return item;
-                                if (item.role === "assistant" && item["tool_calls"] != null && item["tool_calls"].length > 0) {
-                                    for (const toolCall of item["tool_calls"]) {
-                                        if (wipeFunctionCallIds === "align")
-                                            toolCall.id = "fc_1_0001";
-                                        else
-                                            delete toolCall.id;
-                                    }
-                                }
-                                else if (item.role === "tool") {
+                                return {
+                                    ...item,
+                                    response: item.response.map((response) => {
+                                        if (typeof response === "string" || response.type !== "functionCall")
+                                            return response;
+                                        return {
+                                            ...response,
+                                            params: { [this._wrapFunctionParamsInsideMapKey]: response.params }
+                                        };
+                                    })
+                                };
+                            });
+                        const { messages: intermediateMessages, tools } = fromChatHistoryToIntermediateOpenAiMessages({
+                            chatHistory: this._transformChatHistory(inputChatHistory, {
+                                convertSystemMessagesToUserMessagesFormat,
+                                joinAdjacentMessagesOfTheSameType: !squashModelTextResponses
+                                    ? false
+                                    : undefined
+                            }).transformedHistory,
+                            chatWrapperSettings: this.settings,
+                            useRawValues: false,
+                            functions,
+                            stringifyFunctionParams,
+                            stringifyFunctionResults,
+                            combineModelMessageAndToolCalls,
+                            squashModelTextResponses
+                        });
+                        const messages = fromIntermediateToCompleteOpenAiMessages(intermediateMessages)
+                            .map((item) => {
+                            if (!wipeFunctionCallIds)
+                                return item;
+                            if (item.role === "assistant" && item["tool_calls"] != null && item["tool_calls"].length > 0) {
+                                for (const toolCall of item["tool_calls"]) {
                                     if (wipeFunctionCallIds === "align")
-                                        item["tool_call_id"] = "fc_1_0001";
+                                        toolCall.id = "fc_1_0001";
                                     else
-                                        delete item["tool_call_id"];
+                                        delete toolCall.id;
                                 }
-                                return item;
-                            });
-                            const lastJinjaItem = messages.at(-1);
-                            let eraseRenderedJinjaFromId;
-                            if (this._endJinjaMessagesWithUserMessage && lastJinjaItem?.role === this.modelRoleName &&
-                                typeof lastJinjaItem.content === "string" &&
-                                lastJinjaItem.content.length > 0 &&
-                                (lastJinjaItem["tool_calls"] == null ||
-                                    lastJinjaItem["tool_calls"]?.length === 0)) {
-                                eraseRenderedJinjaFromId = lastJinjaItem.content;
-                                messages.push({
-                                    role: this.userRoleName,
-                                    content: idsGenerator.generateId()
-                                });
                             }
-                            let res = this._jinjaTemplate.render({
-                                ...(this.additionalRenderParameters == null
-                                    ? {}
-                                    : structuredClone(this.additionalRenderParameters)),
-                                ...additionalParams,
-                                messages,
-                                ...removeUndefinedFields({ tools })
-                            });
-                            if (eraseRenderedJinjaFromId != null) {
-                                const eraseIndex = res.lastIndexOf(eraseRenderedJinjaFromId);
-                                if (eraseIndex >= 0)
-                                    res = res.slice(0, eraseIndex + eraseRenderedJinjaFromId.length);
+                            else if (item.role === "tool") {
+                                if (wipeFunctionCallIds === "align")
+                                    item["tool_call_id"] = "fc_1_0001";
+                                else
+                                    delete item["tool_call_id"];
                             }
-                            // attempt to remove the ID pattern from the output
-                            if (wipeFunctionCallIds === "align")
-                                res = res
-                                    .replaceAll(/,\s*"(tool_call_id|call_id|id)":\s*"fc_1_0001"/g, "")
-                                    .replaceAll(/"(tool_call_id|call_id|id)":\s*"fc_1_0001"\s*,/g, "");
-                            return res;
-                        };
-                        return tryMatrix({
-                            convertSystemMessagesToUserMessagesFormat: getConvertUnsupportedSystemMessagesToUserMessagesTryOptions(this.convertUnsupportedSystemMessagesToUserMessages),
-                            wipeFunctionCallIds: [true, "align", false]
-                        }, ({ convertSystemMessagesToUserMessagesFormat, wipeFunctionCallIds }) => {
-                            return render(convertSystemMessagesToUserMessagesFormat, wipeFunctionCallIds);
+                            return item;
                         });
-                    }
+                        const lastJinjaItem = messages.at(-1);
+                        let eraseRenderedJinjaFromId;
+                        if (this._endJinjaMessagesWithUserMessage && lastJinjaItem?.role === this.modelRoleName &&
+                            typeof lastJinjaItem.content === "string" &&
+                            lastJinjaItem.content.length > 0 &&
+                            (lastJinjaItem["tool_calls"] == null ||
+                                lastJinjaItem["tool_calls"]?.length === 0)) {
+                            eraseRenderedJinjaFromId = lastJinjaItem.content;
+                            messages.push({
+                                role: this.userRoleName,
+                                content: idsGenerator.generateId()
+                            });
+                        }
+                        let res = this._jinjaTemplate.render({
+                            ...(this.additionalRenderParameters == null
+                                ? {}
+                                : structuredClone(this.additionalRenderParameters)),
+                            ...additionalParams,
+                            messages,
+                            ...removeUndefinedFields({ tools })
+                        });
+                        if (eraseRenderedJinjaFromId != null) {
+                            const eraseIndex = res.lastIndexOf(eraseRenderedJinjaFromId);
+                            if (eraseIndex >= 0)
+                                res = res.slice(0, eraseIndex + eraseRenderedJinjaFromId.length);
+                        }
+                        // attempt to remove the ID pattern from the output
+                        if (wipeFunctionCallIds === "align")
+                            res = res
+                                .replaceAll(/,\s*"(tool_call_id|call_id|id)":\s*"fc_1_0001"/g, "")
+                                .replaceAll(/"(tool_call_id|call_id|id)":\s*"fc_1_0001"\s*,/g, "");
+                        return res;
+                    };
+                    return tryMatrix({
+                        convertSystemMessagesToUserMessagesFormat: getConvertUnsupportedSystemMessagesToUserMessagesTryOptions(this.convertUnsupportedSystemMessagesToUserMessages),
+                        wipeFunctionCallIds: [true, "align", false]
+                    }, ({ convertSystemMessagesToUserMessagesFormat, wipeFunctionCallIds }) => {
+                        return render(convertSystemMessagesToUserMessagesFormat, wipeFunctionCallIds);
+                    });
+                };
+                const idsGenerator = new UniqueIdGenerator(this.template + this.modelRoleName + this.userRoleName + this.systemRoleName +
+                    (this.convertUnsupportedSystemMessagesToUserMessages?.format ?? ""));
+                this._wrapFunctionParamsInsideMapKey = detectNeedToWrapFunctionArgumentsWithMap({ idsGenerator, renderTemplate });
+                const extractedSettings = extractFunctionCallSettingsFromJinjaTemplate({
+                    idsGenerator,
+                    renderTemplate,
+                    examineNonFirstFunctionCall: _functionCallExtractionExamineNonFirst
                 });
                 functionCallSettings = extractedSettings.settings;
                 if (functionCallSettings != null) {
@@ -332,18 +353,36 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
             }),
             tools: undefined
         });
-        const generateMessagesWithTools = (chatHistory) => (fromChatHistoryToIntermediateOpenAiMessages({
-            chatHistory,
-            chatWrapperSettings: this.settings,
-            useRawValues: false,
-            functions: (availableFunctions != null && !documentFunctionParams)
-                ? Object.fromEntries(Object.entries(availableFunctions)
-                    .map(([funcName, { description, ...func }]) => [funcName, func]))
-                : availableFunctions,
-            stringifyFunctionParams: this._stringifyFunctionParams,
-            stringifyFunctionResults: this._stringifyFunctionResult,
-            combineModelMessageAndToolCalls: this._combineJinjaModelMessageAndToolCalls
-        }));
+        const generateMessagesWithTools = (chatHistory) => {
+            if (this._wrapFunctionParamsInsideMapKey != null)
+                chatHistory = chatHistory.map((item) => {
+                    if (item.type !== "model")
+                        return item;
+                    return {
+                        ...item,
+                        response: item.response.map((response) => {
+                            if (typeof response === "string" || response.type !== "functionCall")
+                                return response;
+                            return {
+                                ...response,
+                                params: { [this._wrapFunctionParamsInsideMapKey]: response.params }
+                            };
+                        })
+                    };
+                });
+            return fromChatHistoryToIntermediateOpenAiMessages({
+                chatHistory,
+                chatWrapperSettings: this.settings,
+                useRawValues: false,
+                functions: (availableFunctions != null && !documentFunctionParams)
+                    ? Object.fromEntries(Object.entries(availableFunctions)
+                        .map(([funcName, { description, ...func }]) => [funcName, func]))
+                    : availableFunctions,
+                stringifyFunctionParams: this._stringifyFunctionParams,
+                stringifyFunctionResults: this._stringifyFunctionResult,
+                combineModelMessageAndToolCalls: this._combineJinjaModelMessageAndToolCalls
+            });
+        };
         const lastItemIsModelMessage = transformedHistory.at(-1)?.type === "model";
         const { messages: intermediateMessages, tools } = this._usingJinjaFunctionCallTemplate
             ? useMessagesWithEmbeddedTools