Merge branch 'main' into agent-plugin

main/xiaozhi-server/core/connection.py

@@ -617,7 +617,7 @@ class ConnectionHandler:
             uuid_str = str(uuid.uuid4()).replace("-", "")
             self.sentence_id = uuid_str
 
-            if functions is not None:
+            if self.intent_type == "function_call" and functions is not None:
                 # 使用支持functions的streaming接口
                 llm_responses = self.llm.response_with_functions(
                     self.session_id,
@@ -644,7 +644,7 @@ class ConnectionHandler:
         for response in llm_responses:
             if self.client_abort:
                 break
-            if functions is not None:
+            if self.intent_type == "function_call" and functions is not None:
                 content, tools_call = response
                 if "content" in response:
                     content = response["content"]