node-llama-cpp 3.6.0 → 3.8.0

package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js

@@ -16,7 +16,8 @@ export class Llama3_2LightweightChatWrapper extends ChatWrapper {
                 optionalPrefixSpace: true,
                 prefix: '{"name": "',
                 paramsPrefix: '", "parameters": ',
-                suffix: LlamaText("}", new SpecialToken("EOT"))
+                suffix: LlamaText("}", new SpecialToken("EOT")),
+                emptyCallParamsPlaceholder: {}
             },
             result: {
                 prefix: LlamaText(new SpecialToken("EOT"), new SpecialTokensText("<|start_header_id|>ipython<|end_header_id|>\n\n")),
@@ -215,13 +216,17 @@ export class Llama3_2LightweightChatWrapper extends ChatWrapper {
     /** @internal */
     static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
         return [
-            {},
-            [{ todayDate: null }, {}],
-            [{ cuttingKnowledgeDate: null }, {}],
-            [{ noToolInstructions: true }, {}],
-            [{ todayDate: null, cuttingKnowledgeDate: null }, {}],
-            [{ todayDate: null, cuttingKnowledgeDate: null, noToolInstructions: true }, {}],
-            [{ todayDate: new Date("2024-07-26T00:00:00"), cuttingKnowledgeDate: null, noToolInstructions: true }, {}],
+            [{}, undefined, { functionCallMessageTemplate: "noJinja" }],
+            [{ todayDate: null }, {}, { functionCallMessageTemplate: "noJinja" }],
+            [{ cuttingKnowledgeDate: null }, {}, { functionCallMessageTemplate: "noJinja" }],
+            [{ noToolInstructions: true }, {}, { functionCallMessageTemplate: "noJinja" }],
+            [{ todayDate: null, cuttingKnowledgeDate: null }, {}, { functionCallMessageTemplate: "noJinja" }],
+            [{ todayDate: null, cuttingKnowledgeDate: null, noToolInstructions: true }, {}, { functionCallMessageTemplate: "noJinja" }],
+            [
+                { todayDate: new Date("2024-07-26T00:00:00"), cuttingKnowledgeDate: null, noToolInstructions: true },
+                {},
+                { functionCallMessageTemplate: "noJinja" }
+            ],
             [
                 {
                     todayDate: new Date("2024-07-26T00:00:00"),
@@ -229,7 +234,10 @@ export class Llama3_2LightweightChatWrapper extends ChatWrapper {
                     noToolInstructions: true
                 },
                 { cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z") },
-                { "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) }
+                {
+                    additionalRenderParameters: { "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) },
+                    functionCallMessageTemplate: "noJinja"
+                }
             ],
             [
                 {
@@ -239,7 +247,10 @@ export class Llama3_2LightweightChatWrapper extends ChatWrapper {
                     _specialTokensTextForPreamble: true
                 },
                 { cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z") },
-                { "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) }
+                {
+                    additionalRenderParameters: { "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) },
+                    functionCallMessageTemplate: "noJinja"
+                }
             ]
         ];
     }

package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"Llama3_2LightweightChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/Llama3_2LightweightChatWrapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Llama3_2LightweightChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/Llama3_2LightweightChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAqC,MAAM,mBAAmB,CAAC;AAKlF,OAAO,EAAC,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAC,wCAAwC,EAAC,MAAM,qDAAqD,CAAC;AAC7G,OAAO,EAAC,0BAA0B,EAAC,MAAM,uCAAuC,CAAC;AAEjF,+EAA+E;AAC/E,MAAM,OAAO,8BAA+B,SAAQ,WAAW;IAC3C,WAAW,GAAW,uBAAuB,CAAC;IAE9C,oBAAoB,CAA8B;IAClD,SAAS,CAA6B;IACtC,kBAAkB,CAAU;IAE5C,gBAAgB,CAAkB,6BAA6B,CAAU;IAEhD,QAAQ,GAAwB;QACrD,sBAAsB,EAAE,IAAI;QAC5B,SAAS,EAAE;YACP,IAAI,EAAE;gBACF,mBAAmB,EAAE,IAAI;gBACzB,MAAM,EAAE,YAAY;gBACpB,YAAY,EAAE,mBAAmB;gBACjC,MAAM,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC/C,0BAA0B,EAAE,EAAE;aACjC;YACD,MAAM,EAAE;gBACJ,MAAM,EAAE,SAAS,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,IAAI,iBAAiB,CAAC,iDAAiD,CAAC,CAAC;gBACpH,MAAM,EAAE,SAAS,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,IAAI,iBAAiB,CAAC,mDAAmD,CAAC,CAAC;aACzH;SACJ;KACJ,CAAC;IAEF;;OAEG;IACH,YAAmB,UAmBf,EAAE;QACF,KAAK,EAAE,CAAC;QAER,MAAM,EACF,oBAAoB,GAAG,IAAI,IAAI,CAAC,sBAAsB,CAAC,EACvD,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAC5B,kBAAkB,GAAG,KAAK,EAE1B,6BAA6B,GAAG,KAAK,EACxC,GAAG,OAAO,CAAC;QAEZ,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,IAAI,IAAI;YACpD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,oBAAoB,YAAY,QAAQ;gBACtC,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI;YAC9B,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,SAAS,YAAY,QAAQ;gBAC3B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAE7C,IAAI,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;IACvE,CAAC;IAEe,2CAA2C,CACvD,OAAmC,EACnC,kBAAuC,EAAE,EACrC,cAAc,GAAG,IAAI,KAGrB,EAAE;QAEN,MAAM,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAErE,IAAI,kBAAkB,IAAI,IAAI,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC;YACjE,OAAO,OAAO,CAAC;QAEnB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE5B,MAAM,sBAAsB,GAAsB;YAC9C,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAI,CAAC,oCAAoC,CAAC,kBAAkB,EAAE,EAAC,cAAc,EAAC,CAAC,CAAC,MAAM,EAAE;SACjG,CAAC;QAEF,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAE,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAE,CAAC,IAAI,KAAK,QAAQ;YACzE,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,sBAAsB,CAAC,CAAC;;YAEzC,GAAG,CAAC,OAAO,CAAC;gBACR,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,IAAI,CAAC,oCAAoC,CAAC,kBAAkB,EAAE,EAAC,cAAc,EAAC,CAAC,CAAC,MAAM,EAAE;aACjG,CAAC,CAAC;QAEP,OAAO,GAAG,CAAC;IACf,CAAC;IAEe,oBAAoB,CAAC,EACjC,WAAW,EAAE,kBAAkB,EAAE,sBAAsB,EAClB;QACrC,MAAM,uBAAuB,GAAG,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC,CAAC;QAC/E,MAAM,oBAAoB,GAAG,IAAI,CAAC,2CAA2C,CAAC,uBAAuB,EAAE,kBAAkB,EAAE;YACvH,cAAc,EAAE,sBAAsB;SACzC,CAAC,CAAC;QAEH,MAAM,WAAW,GAIZ,EAAE,CAAC;QAER,IAAI,WAAW,GAAgB,EAAE,CAAC;QAClC,IAAI,SAAS,GAAgB,EAAE,CAAC;QAChC,IAAI,UAAU,GAAgB,EAAE,CAAC;QACjC,IAAI,qBAAqB,GAAuC,IAAI,CAAC;QAErE,MAAM,KAAK,GAAG,GAAG,EAAE;YACf,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;gBACvE,WAAW,CAAC,IAAI,CAAC;oBACb,MAAM,EAAE,WAAW,CAAC,MAAM,KAAK,CAAC;wBAC5B,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,SAAS,CAAC,UAAU,CAClB,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,6BAA6B;4BAC1D,CAAC,CAAC,SAAS,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;4BAC1C,CAAC,CAAC,MAAM,EACZ,WAAW,CACd;oBACL,IAAI,EAAE,SAAS,CAAC,MAAM,KAAK,CAAC;wBACxB,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC;oBAC7C,KAAK,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC;wBAC1B,CAAC,CAAC,IAAI;wBACN,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC;iBACjD,CAAC,CAAC;YAEP,WAAW,GAAG,EAAE,CAAC;YACjB,SAAS,GAAG,EAAE,CAAC;YACf,UAAU,GAAG,EAAE,CAAC;QACpB,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE,CAAC;YACtC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACzB,IAAI,qBAAqB,KAAK,QAAQ;oBAClC,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,QAAQ,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC9B,IAAI,qBAAqB,KAAK,MAAM;oBAChC,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,MAAM,CAAC;gBAC/B,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC/B,IAAI,qBAAqB,KAAK,OAAO;oBACjC,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,OAAO,CAAC;gBAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnE,CAAC;;gBACG,KAAM,IAAqB,CAAC;QACpC,CAAC;QAED,KAAK,EAAE,CAAC;QAER,MAAM,WAAW,GAAG,SAAS,CACzB,IAAI,YAAY,CAAC,KAAK,CAAC,EACvB,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC5B,MAAM,UAAU,GAAG,KAAK,KAAK,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YACpD,MAAM,GAAG,GAAgB,EAAE,CAAC;YAE5B,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBACtB,GAAG,CAAC,IAAI,CACJ,SAAS,CAAC;oBACN,IAAI,iBAAiB,CAAC,gDAAgD,CAAC;oBACvE,IAAI,CAAC,MAAM;oBACX,IAAI,YAAY,CAAC,KAAK,CAAC;iBAC1B,CAAC,CACL,CAAC;YACN,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBACpB,GAAG,CAAC,IAAI,CACJ,SAAS,CAAC;oBACN,IAAI,iBAAiB,CAAC,8CAA8C,CAAC;oBACrE,IAAI,CAAC,IAAI;oBACT,IAAI,YAAY,CAAC,KAAK,CAAC;iBAC1B,CAAC,CACL,CAAC;YACN,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;gBACrB,GAAG,CAAC,IAAI,CACJ,SAAS,CAAC;oBACN,IAAI,iBAAiB,CAAC,mDAAmD,CAAC;oBAC1E,IAAI,CAAC,KAAK;oBACV,UAAU;wBACN,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;wBACf,CAAC,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC;iBAChC,CAAC,CACL,CAAC;YACN,CAAC;YAED,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC,CACL,CAAC;QAEF,OAAO;YACH,WAAW;YACX,sBAAsB,EAAE;gBACpB,SAAS,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;gBAClC,SAAS,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;gBAClC,SAAS,CAAC,IAAI,iBAAiB,CAAC,YAAY,CAAC,CAAC;gBAC9C,SAAS,CAAC,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;gBACnD,SAAS,CAAC,YAAY,CAAC;gBACvB,SAAS,CAAC,iBAAiB,CAAC;aAC/B;SACJ,CAAC;IACN,CAAC;IAEe,oCAAoC,CAAC,kBAAsC,EAAE,EAAC,cAAc,GAAG,IAAI,EAElH;QACG,MAAM,+BAA+B,GAAG,IAAI,wCAAwC,CAAC,kBAAkB,CAAC,CAAC;QAEzG,IAAI,CAAC,+BAA+B,CAAC,eAAe;YAChD,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;QAEzB,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE;YAC9B,+GAA+G;YAC/G,wFAAwF;YACxF,uBAAuB;YACvB,EAAE;YACF,+BAA+B,CAAC,wCAAwC,CAAC,EAAC,cAAc,EAAC,CAAC;YAC1F,EAAE;YACF,yFAAyF;YACzF,gFAAgF;YAChF,yDAAyD;YACzD,kCAAkC;SACrC,CAAC,CAAC;IACP,CAAC;IAEM,4BAA4B,CAAC,WAAuC;QACvE,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;QAEhC,MAAM,eAAe,GAAG,CAAC,IAAU,EAAE,QAAgB,EAAE,EAAE;YACrD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,YAAY,QAAQ;gBAC5C,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE;gBAClB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;YAErC,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,cAAc,EAAE,KAAK,IAAI,CAAC,cAAc,EAAE;gBAC9F,OAAO,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEtC,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;YACpF,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;YACrF,OAAO,GAAG,KAAK,IAAI,IAAI,EAAE,CAAC;QAC9B,CAAC,CAAC;QAEF,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,YAAY,QAAQ;gBACtD,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;YAEhC,KAAK,CAAC,IAAI,CAAC,2BAA2B,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,YAAY,QAAQ;gBAC3C,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE;gBAClB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,eAAe,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAChB,GAAG,CAAC,OAAO,CAAC;gBACR,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,IAAI,CAAC,6BAA6B;oBACpC,CAAC,CAAC,SAAS,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;oBAC7D,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE;aACnD,CAAC,CAAC;QAEP,OAAO,GAAG,CAAC;IACf,CAAC;IAED,gBAAgB;IACT,MAAM,CAAU,wBAAwB,CAAC,OAAiD;QAC7F,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;YACzE,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,IAAI,0BAA0B,CAAC,OAAO,CAAC,CAAC;QACtH,CAAC;QAED,OAAO,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB;IACT,MAAM,CAAU,yDAAyD;QAC5E,OAAO;YACH,CAAC,EAAE,EAAE,SAAS,EAAE,EAAC,2BAA2B,EAAE,SAAS,EAAC,CAAC;YACzD,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,EAAE,EAAE,EAAE,EAAC,2BAA2B,EAAE,SAAS,EAAC,CAAC;YACjE,CAAC,EAAC,oBAAoB,EAAE,IAAI,EAAC,EAAE,EAAE,EAAE,EAAC,2BAA2B,EAAE,SAAS,EAAC,CAAC;YAC5E,CAAC,EAAC,kBAAkB,EAAE,IAAI,EAAC,EAAE,EAAE,EAAE,EAAC,2BAA2B,EAAE,SAAS,EAAC,CAAC;YAC1E,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAC,EAAE,EAAE,EAAE,EAAC,2BAA2B,EAAE,SAAS,EAAC,CAAC;YAC7F,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAC,EAAE,EAAE,EAAE,EAAC,2BAA2B,EAAE,SAAS,EAAC,CAAC;YACvH;gBACI,EAAC,SAAS,EAAE,IAAI,IAAI,CAAC,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAC;gBAClG,EAAE;gBACF,EAAC,2BAA2B,EAAE,SAAS,EAAC;aAC3C;YAED;gBACI;oBACI,SAAS,EAAE,IAAI,IAAI,CAAC,qBAAqB,CAAC;oBAC1C,oBAAoB,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC;oBACtD,kBAAkB,EAAE,IAAI;iBAC3B;gBACD,EAAC,oBAAoB,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC,EAAC;gBACxD;oBACI,0BAA0B,EAAE,EAAC,aAAa,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,qBAAqB,CAAC,EAAE,SAAS,CAAC,EAAC;oBACnG,2BAA2B,EAAE,SAAS;iBACzC;aACJ;YAED;gBACI;oBACI,SAAS,EAAE,IAAI,IAAI,CAAC,qBAAqB,CAAC;oBAC1C,oBAAoB,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC;oBACtD,kBAAkB,EAAE,IAAI;oBACxB,6BAA6B,EAAE,IAAI;iBACtC;gBACD,EAAC,oBAAoB,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC,EAAC;gBACxD;oBACI,0BAA0B,EAAE,EAAC,aAAa,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,qBAAqB,CAAC,EAAE,SAAS,CAAC,EAAC;oBACnG,2BAA2B,EAAE,SAAS;iBACzC;aACJ;SACJ,CAAC;IACN,CAAC;CACJ;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,QAAgB;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;IACnF,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;IACrF,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAC,CAAC,CAAC;IACrF,OAAO,GAAG,GAAG,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;AACrC,CAAC"}

package/dist/chatWrappers/MistralChatWrapper.d.ts

@@ -3,7 +3,7 @@ import { ChatHistoryItem, ChatWrapperGenerateContextStateOptions, ChatWrapperGen
 export declare class MistralChatWrapper extends ChatWrapper {
     readonly wrapperName: string;
     readonly settings: ChatWrapperSettings;
-    constructor({ addSpaceBeforeEos }?: {
+    constructor(options?: {
         /**
          * Default to `true`
          */
@@ -12,4 +12,5 @@ export declare class MistralChatWrapper extends ChatWrapper {
     addAvailableFunctionsSystemMessageToHistory(history: readonly ChatHistoryItem[]): readonly ChatHistoryItem[];
     generateContextState({ chatHistory, availableFunctions, documentFunctionParams }: ChatWrapperGenerateContextStateOptions): ChatWrapperGeneratedContextState;
     generateInitialChatHistory({ systemPrompt }?: ChatWrapperGenerateInitialHistoryOptions): ChatHistoryItem[];
+    generateFunctionCallResult(functionName: string, functionParams: any, result: any): import("../utils/LlamaText.js")._LlamaText;
 }

package/dist/chatWrappers/MistralChatWrapper.js

@@ -8,37 +8,39 @@ import { chunkChatItems } from "./utils/chunkChatItems.js";
 // source: https://docs.mistral.ai/guides/tokenization/#v3-tokenizer
 export class MistralChatWrapper extends ChatWrapper {
     wrapperName = "Mistral";
-    settings = {
-        supportsSystemMessages: true,
-        functions: {
-            call: {
-                optionalPrefixSpace: true,
-                prefix: '{"name": "',
-                paramsPrefix: '", "arguments": ',
-                suffix: "}"
-            },
-            result: {
-                prefix: '{"name": "{{functionName}}", "content": ',
-                suffix: "}"
-            },
-            parallelism: {
+    settings;
+    /** @internal */ _addSpaceBeforeEos;
+    /** @internal */ _stringifyFunctionCallResult;
+    constructor(options = {}) {
+        super();
+        const { addSpaceBeforeEos = false, _noFunctionNameInResult = false, _stringifyFunctionCallResult = false } = options;
+        this._addSpaceBeforeEos = addSpaceBeforeEos;
+        this._stringifyFunctionCallResult = _stringifyFunctionCallResult;
+        this.settings = {
+            supportsSystemMessages: true,
+            functions: {
                 call: {
-                    sectionPrefix: LlamaText(new SpecialTokensText("[TOOL_CALLS]"), "["),
-                    betweenCalls: ", ",
-                    sectionSuffix: LlamaText("]", new SpecialToken("EOS"))
+                    optionalPrefixSpace: true,
+                    prefix: '{"name": "',
+                    paramsPrefix: '", "arguments": ',
+                    suffix: "}",
+                    emptyCallParamsPlaceholder: {}
                 },
                 result: {
-                    sectionPrefix: LlamaText(new SpecialTokensText("[TOOL_RESULTS]"), "["),
-                    betweenResults: ", ",
-                    sectionSuffix: LlamaText("]", new SpecialTokensText("[/TOOL_RESULTS]"))
+                    prefix: _noFunctionNameInResult
+                        ? LlamaText(new SpecialTokensText("[TOOL_RESULTS]"), '{"content": ')
+                        : LlamaText(new SpecialTokensText("[TOOL_RESULTS]"), '{"name": "{{functionName}}", "content": '),
+                    suffix: LlamaText("}", new SpecialTokensText("[/TOOL_RESULTS]"))
+                },
+                parallelism: {
+                    call: {
+                        sectionPrefix: LlamaText(new SpecialTokensText("[TOOL_CALLS]"), "["),
+                        betweenCalls: ", ",
+                        sectionSuffix: LlamaText("]", new SpecialToken("EOS"))
+                    }
                 }
             }
-        }
-    };
-    /** @internal */ _addSpaceBeforeEos;
-    constructor({ addSpaceBeforeEos = false } = {}) {
-        super();
-        this._addSpaceBeforeEos = addSpaceBeforeEos;
+        };
     }
     addAvailableFunctionsSystemMessageToHistory(history) {
         return history;
@@ -110,6 +112,11 @@ export class MistralChatWrapper extends ChatWrapper {
                 text: LlamaText(systemPrompt).toJSON()
             }];
     }
+    generateFunctionCallResult(functionName, functionParams, result) {
+        if (this._stringifyFunctionCallResult && result !== undefined)
+            return super.generateFunctionCallResult(functionName, functionParams, jsonDumps(result));
+        return super.generateFunctionCallResult(functionName, functionParams, result);
+    }
     /** @internal */
     _generateAvailableToolsText({ availableFunctions, documentFunctionParams = true }) {
         const availableFunctionNames = Object.keys(availableFunctions ?? {});
@@ -161,8 +168,12 @@ export class MistralChatWrapper extends ChatWrapper {
     /** @internal */
     static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
         return [
-            { addSpaceBeforeEos: false },
-            { addSpaceBeforeEos: true }
+            [{ addSpaceBeforeEos: false, _noFunctionNameInResult: true, _stringifyFunctionCallResult: true }, { addSpaceBeforeEos: false }],
+            [{ addSpaceBeforeEos: true, _noFunctionNameInResult: true, _stringifyFunctionCallResult: true }, { addSpaceBeforeEos: true }],
+            [{ addSpaceBeforeEos: false, _noFunctionNameInResult: true }, { addSpaceBeforeEos: false }],
+            [{ addSpaceBeforeEos: true, _noFunctionNameInResult: true }, { addSpaceBeforeEos: true }],
+            [{ addSpaceBeforeEos: false }, { addSpaceBeforeEos: false }],
+            [{ addSpaceBeforeEos: true }, { addSpaceBeforeEos: true }]
         ];
     }
 }

package/dist/chatWrappers/MistralChatWrapper.js.map

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

package/dist/chatWrappers/QwenChatWrapper.d.ts

@@ -0,0 +1,28 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { ChatModelFunctions, ChatWrapperGenerateContextStateOptions, ChatWrapperGeneratedContextState, ChatWrapperSettings } from "../types.js";
+export declare class QwenChatWrapper extends ChatWrapper {
+    readonly wrapperName: string;
+    readonly keepOnlyLastThought: boolean;
+    readonly thoughts: "auto" | "discourage";
+    readonly settings: ChatWrapperSettings;
+    constructor(options?: {
+        /**
+         * Whether to keep only the chain of thought from the last model response.
+         *
+         * Setting this to `false` will keep all the chain of thoughts from the model responses in the context state.
+         *
+         * Defaults to `true`.
+         */
+        keepOnlyLastThought?: boolean;
+        /**
+         * Control the usage of thoughts in the model responses.
+         *
+         * Defaults to `"auto"`.
+         */
+        thoughts?: "auto" | "discourage";
+    });
+    generateContextState({ chatHistory, availableFunctions, documentFunctionParams }: ChatWrapperGenerateContextStateOptions): ChatWrapperGeneratedContextState;
+    generateAvailableFunctionsSystemText(availableFunctions: ChatModelFunctions, { documentParams }: {
+        documentParams?: boolean;
+    }): import("../utils/LlamaText.js")._LlamaText;
+}

package/dist/chatWrappers/QwenChatWrapper.js

@@ -0,0 +1,201 @@
+import { ChatWrapper } from "../ChatWrapper.js";
+import { isChatModelResponseFunctionCall, isChatModelResponseSegment } from "../types.js";
+import { LlamaText, SpecialToken, SpecialTokensText } from "../utils/LlamaText.js";
+import { GgufArchitectureType } from "../gguf/types/GgufMetadataTypes.js";
+import { ChatModelFunctionsDocumentationGenerator } from "./utils/ChatModelFunctionsDocumentationGenerator.js";
+// source: https://huggingface.co/Qwen/Qwen2.5-14B-Instruct-1M/blob/main/tokenizer_config.json#L197
+export class QwenChatWrapper extends ChatWrapper {
+    wrapperName = "Qwen";
+    keepOnlyLastThought;
+    thoughts;
+    settings;
+    constructor(options = {}) {
+        super();
+        const { keepOnlyLastThought = true, thoughts = "auto", _lineBreakBeforeFunctionCallPrefix = false } = options;
+        this.keepOnlyLastThought = keepOnlyLastThought;
+        this.thoughts = thoughts;
+        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: {
+                    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>")),
+                    suffix: LlamaText(new SpecialTokensText("</think>"))
+                }
+            }
+        };
+    }
+    generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
+        const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(chatHistory, availableFunctions, {
+            documentParams: documentFunctionParams
+        });
+        const resultItems = [];
+        let systemTexts = [];
+        let userTexts = [];
+        let modelTexts = [];
+        let currentAggregateFocus = null;
+        function flush() {
+            if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0)
+                resultItems.push({
+                    system: LlamaText.joinValues("\n\n", systemTexts),
+                    user: LlamaText.joinValues("\n\n", userTexts),
+                    model: LlamaText.joinValues("\n\n", modelTexts)
+                });
+            systemTexts = [];
+            userTexts = [];
+            modelTexts = [];
+        }
+        for (let i = 0; i < historyWithFunctions.length; i++) {
+            const item = historyWithFunctions[i];
+            const isLastItem = i === historyWithFunctions.length - 1;
+            if (item.type === "system") {
+                if (currentAggregateFocus !== "system")
+                    flush();
+                currentAggregateFocus = "system";
+                systemTexts.push(LlamaText.fromJSON(item.text));
+            }
+            else if (item.type === "user") {
+                flush();
+                currentAggregateFocus = null;
+                userTexts.push(LlamaText(item.text));
+            }
+            else if (item.type === "model") {
+                flush();
+                const transformedModelResponse = (this.thoughts === "discourage" && isLastItem)
+                    ? discourageThoughtsInModelResponse(item.response)
+                    : item.response;
+                currentAggregateFocus = null;
+                modelTexts.push(this.generateModelResponseText((this.keepOnlyLastThought && !isLastItem)
+                    ? transformedModelResponse.filter((response) => (!isChatModelResponseSegment(response) || response.segmentType !== "thought"))
+                    : transformedModelResponse));
+            }
+            else
+                void item;
+        }
+        flush();
+        const contextText = LlamaText(resultItems.map(({ system, user, model }, index) => {
+            const isLastItem = index === resultItems.length - 1;
+            return LlamaText([
+                (system.values.length === 0)
+                    ? LlamaText([])
+                    : LlamaText([
+                        new SpecialTokensText("<|im_start|>system\n"),
+                        system,
+                        new SpecialTokensText("<|im_end|>\n")
+                    ]),
+                (user.values.length === 0)
+                    ? LlamaText([])
+                    : LlamaText([
+                        new SpecialTokensText("<|im_start|>user\n"),
+                        user,
+                        new SpecialTokensText("<|im_end|>\n")
+                    ]),
+                (model.values.length === 0 && !isLastItem)
+                    ? LlamaText([])
+                    : LlamaText([
+                        new SpecialTokensText("<|im_start|>assistant\n"),
+                        model,
+                        isLastItem
+                            ? LlamaText([])
+                            : new SpecialTokensText("<|im_end|>\n")
+                    ])
+            ]);
+        }));
+        return {
+            contextText,
+            stopGenerationTriggers: [
+                LlamaText(new SpecialToken("EOS")),
+                LlamaText(new SpecialTokensText("<|im_end|>")),
+                LlamaText("<|im_end|>")
+            ]
+        };
+    }
+    generateAvailableFunctionsSystemText(availableFunctions, { documentParams = true }) {
+        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>"))
+        ]);
+    }
+    /** @internal */
+    static _checkModelCompatibility(options) {
+        const architecture = options.fileInfo?.metadata.general.architecture;
+        return (architecture == null ||
+            architecture === GgufArchitectureType.qwen2 ||
+            architecture === GgufArchitectureType.qwen2moe ||
+            architecture === GgufArchitectureType.qwen2vl ||
+            architecture === GgufArchitectureType.qwen3 ||
+            architecture === GgufArchitectureType.qwen3moe);
+    }
+    /** @internal */
+    static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
+        return [
+            [{}, {}, { _requireFunctionCallSettingsExtraction: true }],
+            [{ _lineBreakBeforeFunctionCallPrefix: true }, {}, { _requireFunctionCallSettingsExtraction: true }]
+        ];
+    }
+}
+function discourageThoughtsInModelResponse(response) {
+    const emptyThought = {
+        type: "segment",
+        segmentType: "thought",
+        ended: true,
+        text: "\n\n",
+        raw: LlamaText(new SpecialTokensText("<think>\n\n</think>\n\n")).toJSON()
+    };
+    const res = [...response];
+    for (let i = res.length - 1; i >= 0; i--) {
+        const item = res[i];
+        if (isChatModelResponseFunctionCall(item)) {
+            res.splice(i + 1, 0, emptyThought);
+            return res;
+        }
+    }
+    res.unshift(emptyThought);
+    return res;
+}
+//# sourceMappingURL=QwenChatWrapper.js.map

package/dist/chatWrappers/QwenChatWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QwenChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/QwenChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAqC,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAE4F,+BAA+B,EAC9H,0BAA0B,EAC7B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,SAAS,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAC,wCAAwC,EAAC,MAAM,qDAAqD,CAAC;AAE7G,mGAAmG;AACnG,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC5B,WAAW,GAAW,MAAM,CAAC;IAE7B,mBAAmB,CAAU;IAC7B,QAAQ,CAAwB;IAEvB,QAAQ,CAAsB;IAEvD,YAAmB,UAmBf,EAAE;QACF,KAAK,EAAE,CAAC;QAER,MAAM,EACF,mBAAmB,GAAG,IAAI,EAC1B,QAAQ,GAAG,MAAM,EACjB,kCAAkC,GAAG,KAAK,EAC7C,GAAG,OAAO,CAAC;QAEZ,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,IAAI,CAAC,QAAQ,GAAG;YACZ,sBAAsB,EAAE,IAAI;YAC5B,SAAS,EAAE;gBACP,IAAI,EAAE;oBACF,mBAAmB,EAAE,IAAI;oBACzB,MAAM,EAAE,SAAS,CAAC;wBACd,kCAAkC;4BAC9B,CAAC,CAAC,IAAI;4BACN,CAAC,CAAC,EAAE;wBACR,IAAI,iBAAiB,CAAC,aAAa,CAAC,EAAE,cAAc;qBACvD,CAAC;oBACF,YAAY,EAAE,kBAAkB;oBAChC,MAAM,EAAE,SAAS,CAAC,KAAK,EAAE,IAAI,iBAAiB,CAAC,cAAc,CAAC,CAAC;oBAC/D,0BAA0B,EAAE,EAAE;iBACjC;gBACD,MAAM,EAAE;oBACJ,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;oBAC/D,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;iBACjE;gBACD,WAAW,EAAE;oBACT,IAAI,EAAE;wBACF,aAAa,EAAE,EAAE;wBACjB,YAAY,EAAE,kCAAkC;4BAC5C,CAAC,CAAC,EAAE;4BACJ,CAAC,CAAC,IAAI;wBACV,aAAa,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,cAAc,CAAC,CAAC;qBAClE;oBACD,MAAM,EAAE;wBACJ,aAAa,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;wBACnE,aAAa,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,qCAAqC,CAAC,CAAC;qBACzF;iBACJ;aACJ;YACD,QAAQ,EAAE;gBACN,gCAAgC,EAAE,IAAI;gBACtC,OAAO,EAAE;oBACL,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;oBACnD,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAAC;iBACvD;aACJ;SACJ,CAAC;IACN,CAAC;IAEe,oBAAoB,CAAC,EACjC,WAAW,EAAE,kBAAkB,EAAE,sBAAsB,EAClB;QACrC,MAAM,oBAAoB,GAAG,IAAI,CAAC,2CAA2C,CAAC,WAAW,EAAE,kBAAkB,EAAE;YAC3G,cAAc,EAAE,sBAAsB;SACzC,CAAC,CAAC;QAEH,MAAM,WAAW,GAIZ,EAAE,CAAC;QAER,IAAI,WAAW,GAAgB,EAAE,CAAC;QAClC,IAAI,SAAS,GAAgB,EAAE,CAAC;QAChC,IAAI,UAAU,GAAgB,EAAE,CAAC;QACjC,IAAI,qBAAqB,GAAoB,IAAI,CAAC;QAElD,SAAS,KAAK;YACV,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;gBACvE,WAAW,CAAC,IAAI,CAAC;oBACb,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC;oBACjD,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC;oBAC7C,KAAK,EAAE,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC;iBAClD,CAAC,CAAC;YAEP,WAAW,GAAG,EAAE,CAAC;YACjB,SAAS,GAAG,EAAE,CAAC;YACf,UAAU,GAAG,EAAE,CAAC;QACpB,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,oBAAoB,CAAC,CAAC,CAAE,CAAC;YACtC,MAAM,UAAU,GAAG,CAAC,KAAK,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;YAEzD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACzB,IAAI,qBAAqB,KAAK,QAAQ;oBAClC,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,QAAQ,CAAC;gBACjC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC9B,KAAK,EAAE,CAAC;gBAER,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC/B,KAAK,EAAE,CAAC;gBAER,MAAM,wBAAwB,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,YAAY,IAAI,UAAU,CAAC;oBAC3E,CAAC,CAAC,iCAAiC,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAClD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAEpB,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,UAAU,CAAC,IAAI,CACX,IAAI,CAAC,yBAAyB,CAC1B,CAAC,IAAI,CAAC,mBAAmB,IAAI,CAAC,UAAU,CAAC;oBACrC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAC5C,CAAC,0BAA0B,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,CAC9E,CAAC;oBACF,CAAC,CAAC,wBAAwB,CACjC,CACJ,CAAC;YACN,CAAC;;gBACG,KAAM,IAAqB,CAAC;QACpC,CAAC;QAED,KAAK,EAAE,CAAC;QAER,MAAM,WAAW,GAAG,SAAS,CACzB,WAAW,CAAC,GAAG,CAAC,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,MAAM,UAAU,GAAG,KAAK,KAAK,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YAEpD,OAAO,SAAS,CAAC;gBACb,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;oBACxB,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;wBAC7C,MAAM;wBACN,IAAI,iBAAiB,CAAC,cAAc,CAAC;qBACxC,CAAC;gBAEN,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;oBACtB,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,iBAAiB,CAAC,oBAAoB,CAAC;wBAC3C,IAAI;wBACJ,IAAI,iBAAiB,CAAC,cAAc,CAAC;qBACxC,CAAC;gBAEN,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;oBACtC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;oBACf,CAAC,CAAC,SAAS,CAAC;wBACR,IAAI,iBAAiB,CAAC,yBAAyB,CAAC;wBAChD,KAAK;wBAEL,UAAU;4BACN,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BACf,CAAC,CAAC,IAAI,iBAAiB,CAAC,cAAc,CAAC;qBAC9C,CAAC;aACT,CAAC,CAAC;QACP,CAAC,CAAC,CACL,CAAC;QAEF,OAAO;YACH,WAAW;YACX,sBAAsB,EAAE;gBACpB,SAAS,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;gBAClC,SAAS,CAAC,IAAI,iBAAiB,CAAC,YAAY,CAAC,CAAC;gBAC9C,SAAS,CAAC,YAAY,CAAC;aAC1B;SACJ,CAAC;IACN,CAAC;IAEe,oCAAoC,CAAC,kBAAsC,EAAE,EAAC,cAAc,GAAG,IAAI,EAElH;QACG,MAAM,+BAA+B,GAAG,IAAI,wCAAwC,CAAC,kBAAkB,CAAC,CAAC;QAEzG,IAAI,CAAC,+BAA+B,CAAC,eAAe;YAChD,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;QAEzB,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE;YAC9B,SAAS;YACT,EAAE;YACF,mEAAmE;YACnE,EAAE;YACF,SAAS,CAAC,mDAAmD,EAAE,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,YAAY,CAAC;YACtH,SAAS,CAAC,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAC3C,+BAA+B,CAAC,yBAAyB,CAAC,EAAC,cAAc,EAAC,CAAC;YAC3E,SAAS,CAAC,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAC5C,EAAE;YACF,SAAS,CAAC,uFAAuF,EAAE,IAAI,iBAAiB,CAAC,yBAAyB,CAAC,EAAE,YAAY,CAAC;YAClK,SAAS,CAAC,IAAI,iBAAiB,CAAC,aAAa,CAAC,CAAC;YAC/C,4DAA4D;YAC5D,SAAS,CAAC,IAAI,iBAAiB,CAAC,cAAc,CAAC,CAAC;SACnD,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB;IACT,MAAM,CAAU,wBAAwB,CAAC,OAAiD;QAC7F,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;QACrE,OAAO,CACH,YAAY,IAAI,IAAI;YACpB,YAAY,KAAK,oBAAoB,CAAC,KAAK;YAC3C,YAAY,KAAK,oBAAoB,CAAC,QAAQ;YAC9C,YAAY,KAAK,oBAAoB,CAAC,OAAO;YAC7C,YAAY,KAAK,oBAAoB,CAAC,KAAK;YAC3C,YAAY,KAAK,oBAAoB,CAAC,QAAQ,CACjD,CAAC;IACN,CAAC;IAED,gBAAgB;IACT,MAAM,CAAU,yDAAyD;QAC5E,OAAO;YACH,CAAC,EAAE,EAAE,EAAE,EAAE,EAAC,sCAAsC,EAAE,IAAI,EAAC,CAAC;YACxD,CAAC,EAAC,kCAAkC,EAAE,IAAI,EAAC,EAAE,EAAE,EAAE,EAAC,sCAAsC,EAAE,IAAI,EAAC,CAAC;SACnG,CAAC;IACN,CAAC;CACJ;AAED,SAAS,iCAAiC,CAAC,QAAuC;IAC9E,MAAM,YAAY,GAAqB;QACnC,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,SAAS;QACtB,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM,EAAE;KAC5E,CAAC;IACF,MAAM,GAAG,GAAkC,CAAC,GAAG,QAAQ,CAAC,CAAC;IAEzD,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAEpB,IAAI,+BAA+B,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;YACnC,OAAO,GAAG,CAAC;QACf,CAAC;IACL,CAAC;IAED,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC"}

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

@@ -1,4 +1,5 @@
-import { ChatWrapperGenerateContextStateOptions, ChatWrapperGeneratedContextState, ChatWrapperSettings } from "../../types.js";
+import { ChatHistoryItem, ChatModelFunctions, ChatWrapperGenerateContextStateOptions, ChatWrapperGeneratedContextState, ChatWrapperSettings, Tokenizer } from "../../types.js";
+import { LlamaText } from "../../utils/LlamaText.js";
 import { ChatWrapper } from "../../ChatWrapper.js";
 import { ChatHistoryFunctionCallMessageTemplate } from "./utils/chatHistoryFunctionCallMessageTemplate.js";
 import { TemplateChatWrapperSegmentsOptions } from "./utils/templateSegmentOptionsToChatWrapperSettings.js";
@@ -32,7 +33,18 @@ export type JinjaTemplateChatWrapperOptions = {
      * Defaults to `"auto"`.
      */
     convertUnsupportedSystemMessagesToUserMessages?: "auto" | boolean | JinjaTemplateChatWrapperOptionsConvertMessageFormat;
-    functionCallMessageTemplate?: ChatHistoryFunctionCallMessageTemplate;
+    /**
+     * Template format for how functions can be called by the model and how their results are fed to the model after function calls.
+     *
+     * - **`"auto"`**: Extract the function call message template from the Jinja template.
+     *   Fallback to the default template if not found.
+     * - **`"noJinja"`**: Use the default template.
+     * - **Custom template**: Use the specified {@link ChatHistoryFunctionCallMessageTemplate template}.
+     *   See {@link ChatHistoryFunctionCallMessageTemplate `ChatHistoryFunctionCallMessageTemplate`} for more details.
+     *
+     * Defaults to `"auto"`.
+     */
+    functionCallMessageTemplate?: "auto" | "noJinja" | ChatHistoryFunctionCallMessageTemplate;
     /**
      * Whether to join adjacent messages of the same type.
      * Some Jinja templates may throw an error if this is not set to `true`.
@@ -54,6 +66,12 @@ export type JinjaTemplateChatWrapperOptions = {
      * Format of the segments generated by the model (like thought segments)
      */
     segments?: TemplateChatWrapperSegmentsOptions;
+    /**
+     * Pass a model's tokenizer to attempt to detect common tokens used for chat formatting from it.
+     *
+     * Currently only used for detecting support for `<think>` tags for thought segments.
+     */
+    tokenizer?: Tokenizer;
 };
 export type JinjaTemplateChatWrapperOptionsConvertMessageFormat = {
     use?: "always" | "ifNeeded";
@@ -102,8 +120,19 @@ export declare class JinjaTemplateChatWrapper extends ChatWrapper {
     /**
      * @param options
      */
-    constructor({ template, modelRoleName, userRoleName, systemRoleName, convertUnsupportedSystemMessagesToUserMessages, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType, trimLeadingWhitespaceInResponses, additionalRenderParameters, segments }: JinjaTemplateChatWrapperOptions);
+    constructor(options: JinjaTemplateChatWrapperOptions);
+    /**
+     * Whether the function call syntax settings were extracted from the given Jinja template.
+     *
+     * The function call syntax settings can be accessed using the `.settings.functions` property.
+     */
+    get usingJinjaFunctionCallTemplate(): boolean;
     generateContextState({ chatHistory, availableFunctions, documentFunctionParams }: ChatWrapperGenerateContextStateOptions): ChatWrapperGeneratedContextState & {
         transformedSystemMessagesToUserMessages: boolean;
     };
+    addAvailableFunctionsSystemMessageToHistory(history: readonly ChatHistoryItem[], availableFunctions?: ChatModelFunctions, options?: {
+        documentParams?: boolean;
+    }): readonly ChatHistoryItem[];
+    generateFunctionCall(name: string, params: any): LlamaText;
+    generateFunctionCallResult(functionName: string, functionParams: any, result: any): LlamaText;
 }