update:intent_llm加载动态插件

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

@@ -19,7 +19,7 @@ async def handle_user_intent(conn, text):
     if await checkWakeupWords(conn, text):
         return True
 
-    if conn.use_function_call_mode:
+    if conn.intent_type == "function_call":
         # 使用支持function calling的聊天方法,不再进行意图分析
         return False
     # 使用LLM进行意图分析
@@ -103,7 +103,7 @@ async def process_intent_result(conn, intent_result, original_text):
                     conn, function_call_data
                 )
                 logger.bind(tag=TAG).debug(f"检测到Action : {result.action}")
-                
+
                 if result:
                     if result.action == Action.RESPONSE:  # 直接回复前端
                         text = result.response
@@ -118,14 +118,19 @@ async def process_intent_result(conn, intent_result, original_text):
                                 conn.speak_and_play, text, text_index
                             )
                             conn.llm_finish_task = True
-                            conn.tts_queue.put(future)
+                            conn.tts_queue.put((future, text_index))
                             conn.dialogue.put(Message(role="assistant", content=text))
                     elif result.action == Action.REQLLM:  # 调用函数后再请求llm生成回复
                         text = result.result
                         if text is not None and len(text) > 0:
                             conn.dialogue.put(Message(role="tool", content=text))
-                            conn.executor.submit(conn.chat_with_function_calling, text, True)
-                    elif result.action == Action.NOTFOUND or result.action == Action.ERROR:
+                            conn.executor.submit(
+                                conn.chat_with_function_calling, text, True
+                            )
+                    elif (
+                        result.action == Action.NOTFOUND
+                        or result.action == Action.ERROR
+                    ):
                         text = result.result
                         if text is not None:
                             text_index = (
@@ -157,7 +162,7 @@ async def process_intent_result(conn, intent_result, original_text):
                                 conn.speak_and_play, text, text_index
                             )
                             conn.llm_finish_task = True
-                            conn.tts_queue.put(future)
+                            conn.tts_queue.put((future, text_index))
                             conn.dialogue.put(Message(role="assistant", content=text))
 
             # 将函数执行放在线程池中

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

@@ -317,7 +317,7 @@ async def handleIotDescriptors(conn, descriptors):
         )
         conn.iot_descriptors[descriptor["name"]] = iot_descriptor
 
-        if conn.use_function_call_mode:
+        if conn.load_function_plugin:
             # 注册或获取设备类型
             type_id = register_device_type(descriptor)
             device_functions = device_type_registry.get_device_functions(type_id)

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

@@ -76,7 +76,7 @@ async def startToChat(conn, text):
 
     # 意图未被处理，继续常规聊天流程
     await send_stt_message(conn, text)
-    if conn.use_function_call_mode:
+    if conn.intent_type == "function_call":
         # 使用支持function calling的聊天方法
         conn.executor.submit(conn.chat_with_function_calling, text)
     else: