skip fncall postprocessing when not in fncall mode

qwen_agent/llm/base.py

@@ -71,25 +71,29 @@ def chat(
 
         messages = self._preprocess_messages(messages)
         if functions:
+            fncall_mode = True
             output = self._chat_with_functions(
                 messages=messages,
                 functions=functions,
                 stream=stream,
                 delta_stream=delta_stream,
             )
         else:
+            fncall_mode = False
             output = self._chat(
                 messages,
                 stream=stream,
                 delta_stream=delta_stream,
             )
 
         if isinstance(output, list):
-            output = self._postprocess_messages(output)
+            output = self._postprocess_messages(output,
+                                                fncall_mode=fncall_mode)
             return self._convert_messages_to_target_type(
                 output, _return_message_type)
         else:
-            output = self._postprocess_messages_iterator(output)
+            output = self._postprocess_messages_iterator(
+                output, fncall_mode=fncall_mode)
             return self._convert_messages_iterator_to_target_type(
                 output, _return_message_type)
 
@@ -132,16 +136,19 @@ def _chat_no_stream(
     def _preprocess_messages(self, messages: List[Message]) -> List[Message]:
         return self._format_as_multimodal_messages(messages)
 
-    def _postprocess_messages(self, messages: List[Message]) -> List[Message]:
+    def _postprocess_messages(self, messages: List[Message],
+                              fncall_mode: bool) -> List[Message]:
         messages = self._format_as_multimodal_messages(messages)
         messages = self._postprocess_stop_words(messages)
         return messages
 
     def _postprocess_messages_iterator(
-            self,
-            messages: Iterator[List[Message]]) -> Iterator[List[Message]]:
+        self,
+        messages: Iterator[List[Message]],
+        fncall_mode: bool,
+    ) -> Iterator[List[Message]]:
         for m in messages:
-            m = self._postprocess_messages(m)
+            m = self._postprocess_messages(m, fncall_mode=fncall_mode)
             if m:
                 yield m
 
@@ -219,7 +226,8 @@ def _format_as_multimodal_messages(
 
         return multimodal_messages
 
-    def _postprocess_stop_words(self, messages: List[Message]) -> List[Message]:
+    def _postprocess_stop_words(self,
+                                messages: List[Message]) -> List[Message]:
         messages = copy.deepcopy(messages)
         stop = self.generate_cfg.get('stop', [])
 
@@ -231,7 +239,8 @@ def _postprocess_stop_words(self, messages: List[Message]) -> List[Message]:
             for i, item in enumerate(msg.content):
                 item_type, item_text = item.get_type_and_value()
                 if item_type == 'text':
-                    truncated, item.text = _truncate_at_stop_word(text=item_text, stop=stop)
+                    truncated, item.text = _truncate_at_stop_word(
+                        text=item_text, stop=stop)
                 trunc_content.append(item)
                 if truncated:
                     break
@@ -261,11 +270,12 @@ def _postprocess_stop_words(self, messages: List[Message]) -> List[Message]:
 
         return messages
 
+
 def _truncate_at_stop_word(text: str, stop: List[str]):
     truncated = False
     for s in stop:
         k = text.find(s)
         if k >= 0:
             truncated = True
             text = text[:k]
-    return truncated, text
+    return truncated, text

qwen_agent/llm/function_calling.py

@@ -52,9 +52,11 @@ def _preprocess_messages(self, messages: List[Message]) -> List[Message]:
         messages = self._preprocess_fncall_messages(messages)
         return messages
 
-    def _postprocess_messages(self, messages: List[Message]) -> List[Message]:
-        messages = super()._postprocess_messages(messages)
-        messages = self._postprocess_fncall_messages(messages)
+    def _postprocess_messages(self, messages: List[Message],
+                              fncall_mode: bool) -> List[Message]:
+        messages = super()._postprocess_messages(messages, fncall_mode=fncall_mode)
+        if fncall_mode:
+            messages = self._postprocess_fncall_messages(messages)
         return messages
 
     def _prepend_fncall_system(self, messages: List[Message],

qwen_agent/llm/qwenvl_dashscope.py

@@ -1,11 +1,13 @@
 import os
 from http import HTTPStatus
+from pprint import pformat
 from typing import Dict, Iterator, List, Optional
 
 import dashscope
 
 from qwen_agent.llm.base import ModelServiceError, register_llm
 from qwen_agent.llm.function_calling import BaseFnCallModel
+from qwen_agent.log import logger
 
 from .schema import CONTENT, ROLE, ContentItem, Message
 
@@ -33,6 +35,7 @@ def _chat_stream(
             raise NotImplementedError
 
         messages = [msg.model_dump() for msg in messages]
+        logger.debug(f'*{pformat(messages, indent=2)}*')
         response = dashscope.MultiModalConversation.call(
             model=self.model,
             messages=messages,
@@ -55,6 +58,7 @@ def _chat_no_stream(
         messages: List[Message],
     ) -> List[Message]:
         messages = [msg.model_dump() for msg in messages]
+        logger.debug(f'*{pformat(messages, indent=2)}*')
         response = dashscope.MultiModalConversation.call(
             model=self.model,
             messages=messages,

qwen_agent/llm/text_base.py

@@ -13,8 +13,9 @@ def _preprocess_messages(self, messages: List[Message]) -> List[Message]:
         messages = self._format_as_text_messages(messages)
         return messages
 
-    def _postprocess_messages(self, messages: List[Message]) -> List[Message]:
-        messages = super()._postprocess_messages(messages)
+    def _postprocess_messages(self, messages: List[Message],
+                              fncall_mode: bool) -> List[Message]:
+        messages = super()._postprocess_messages(messages, fncall_mode=fncall_mode)
         messages = self._format_as_text_messages(messages)
         return messages