test: fix tests (#528)

Author: giladgd

src/ChatWrapper.ts

@@ -122,6 +122,17 @@ export abstract class ChatWrapper {
     }
 
     public generateFunctionCallResult(functionName: string, functionParams: any, result: any): LlamaText {
+        return this._generateFunctionCallResult(
+            functionName,
+            functionParams,
+            result === undefined
+                ? "void"
+                : jsonDumps(result)
+        );
+    }
+
+    /** @internal */
+    protected _generateFunctionCallResult(functionName: string, functionParams: any, rawResult: string): LlamaText {
         function resolveParameters(text: string | LlamaText) {
             return LlamaText(text)
                 .mapValues((value) => {
@@ -136,11 +147,7 @@ export abstract class ChatWrapper {
 
         return LlamaText([
             resolveParameters(this.settings.functions.result.prefix),
-            (
-                result === undefined
-                    ? "void"
-                    : jsonDumps(result)
-            ),
+            rawResult,
             resolveParameters(this.settings.functions.result.suffix)
         ]);
     }

src/chatWrappers/QwenChatWrapper.ts

@@ -14,6 +14,7 @@ export class QwenChatWrapper extends ChatWrapper {
 
     public readonly keepOnlyLastThought: boolean;
     public readonly thoughts: "auto" | "discourage";
+    /** @internal */ private readonly _flatFunctionResultString: boolean;
 
     public override readonly settings: ChatWrapperSettings;
 
@@ -35,18 +36,23 @@ export class QwenChatWrapper extends ChatWrapper {
         thoughts?: "auto" | "discourage",
 
         /** @internal */
-        _lineBreakBeforeFunctionCallPrefix?: boolean
+        _lineBreakBeforeFunctionCallPrefix?: boolean,
+
+        /** @internal */
+        _flatFunctionResultString?: boolean
     } = {}) {
         super();
 
         const {
             keepOnlyLastThought = true,
             thoughts = "auto",
-            _lineBreakBeforeFunctionCallPrefix = false
+            _lineBreakBeforeFunctionCallPrefix = false,
+            _flatFunctionResultString = false
         } = options;
 
         this.keepOnlyLastThought = keepOnlyLastThought;
         this.thoughts = thoughts;
+        this._flatFunctionResultString = _flatFunctionResultString;
 
         this.settings = {
             supportsSystemMessages: true,
@@ -205,6 +211,13 @@ export class QwenChatWrapper extends ChatWrapper {
         };
     }
 
+    public override generateFunctionCallResult(functionName: string, functionParams: any, result: any) {
+        if (this._flatFunctionResultString && typeof result === "string")
+            return super._generateFunctionCallResult(functionName, functionParams, result);
+
+        return super.generateFunctionCallResult(functionName, functionParams, result);
+    }
+
     public override generateAvailableFunctionsSystemText(availableFunctions: ChatModelFunctions, {documentParams = true}: {
         documentParams?: boolean
     }) {
@@ -251,7 +264,20 @@ export class QwenChatWrapper extends ChatWrapper {
             [{}, {}, {_requireFunctionCallSettingsExtraction: true}],
             [{_lineBreakBeforeFunctionCallPrefix: true}, {}, {_requireFunctionCallSettingsExtraction: true}],
             [{thoughts: "discourage"}, {}, {_requireFunctionCallSettingsExtraction: true}],
-            [{thoughts: "discourage", _lineBreakBeforeFunctionCallPrefix: true}, {}, {_requireFunctionCallSettingsExtraction: true}]
+            [{thoughts: "discourage", _lineBreakBeforeFunctionCallPrefix: true}, {}, {_requireFunctionCallSettingsExtraction: true}],
+
+            [{_flatFunctionResultString: true}, {}, {_requireFunctionCallSettingsExtraction: true}],
+            [
+                {_flatFunctionResultString: true, _lineBreakBeforeFunctionCallPrefix: true},
+                {},
+                {_requireFunctionCallSettingsExtraction: true}
+            ],
+            [{_flatFunctionResultString: true, thoughts: "discourage"}, {}, {_requireFunctionCallSettingsExtraction: true}],
+            [
+                {_flatFunctionResultString: true, thoughts: "discourage", _lineBreakBeforeFunctionCallPrefix: true},
+                {},
+                {_requireFunctionCallSettingsExtraction: true}
+            ]
         ];
     }
 }