Merge branch 'main' into tts-response

# Conflicts:
#	main/manager-web/.env.development

main/xiaozhi-server/core/handle/intentHandler.py

@@ -69,12 +69,13 @@ async def process_intent_result(conn, intent_result, original_text):
         # 检查是否有function_call
         if "function_call" in intent_data:
             # 直接从意图识别获取了function_call
-            logger.bind(tag=TAG).info(
+            logger.bind(tag=TAG).debug(
                 f"检测到function_call格式的意图结果: {intent_data['function_call']['name']}"
             )
             function_name = intent_data["function_call"]["name"]
             if function_name == "continue_chat":
                 return False
+
             function_args = None
             if "arguments" in intent_data["function_call"]:
                 function_args = intent_data["function_call"]["arguments"]

main/xiaozhi-server/core/handle/iotHandle.py

@@ -50,6 +50,12 @@ def create_iot_function(device_name, method_name, method_info):
         conn, response_success=None, response_failure=None, **params
     ):
         try:
+            # 设置默认响应消息
+            if not response_success:
+                response_success = "操作成功"
+            if not response_failure:
+                response_failure = "操作失败"
+
             # 打印响应参数
             logger.bind(tag=TAG).info(
                 f"控制函数接收到的响应参数: success='{response_success}', failure='{response_failure}'"
@@ -263,6 +269,8 @@ def register_device_type(descriptor):
 
 # 用于接受前端设备推送的搜索iot描述
 async def handleIotDescriptors(conn, descriptors):
+    if not conn.use_function_call_mode:
+        return
     wait_max_time = 5
     while conn.func_handler is None or not conn.func_handler.finish_init:
         await asyncio.sleep(1)