Merge pull request #1005 from JavaZeroo/add_news

feat: 添加多个新闻源，并修复大模型意图识别没有处理ActionResponse的问题

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

@@ -55,6 +55,7 @@ class FunctionHandler:
         self.function_registry.register_function("get_time")
         self.function_registry.register_function("get_lunar")
         self.function_registry.register_function("handle_device")
+        self.function_registry.register_function("get_news_from_different_source")
 
     def register_config_functions(self):
         """注册配置中的函数,可以不同客户端使用不同的配置"""

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

@@ -5,6 +5,8 @@ from core.handle.sendAudioHandle import send_stt_message
 from core.handle.helloHandle import checkWakeupWords
 from core.utils.util import remove_punctuation_and_length
 from core.utils.dialogue import Message
+from plugins_func.register import Action
+from loguru import logger
 
 TAG = __name__
 
@@ -100,24 +102,63 @@ async def process_intent_result(conn, intent_result, original_text):
                 result = conn.func_handler.handle_llm_function_call(
                     conn, function_call_data
                 )
-                if result and function_name != "play_music":
-                    # 获取当前最新的文本索引
-                    text = result.response
-                    if text is None:
+                logger.bind(tag=TAG).debug(f"检测到Action : {result.action}")
+                
+                if result:
+                    if result.action == Action.RESPONSE:  # 直接回复前端
+                        text = result.response
+                        if text is not None:
+                            text_index = (
+                                conn.tts_last_text_index + 1
+                                if hasattr(conn, "tts_last_text_index")
+                                else 0
+                            )
+                            conn.recode_first_last_text(text, text_index)
+                            future = conn.executor.submit(
+                                conn.speak_and_play, text, text_index
+                            )
+                            conn.llm_finish_task = True
+                            conn.tts_queue.put(future)
+                            conn.dialogue.put(Message(role="assistant", content=text))
+                    elif result.action == Action.REQLLM:  # 调用函数后再请求llm生成回复
                         text = result.result
-                    if text is not None:
-                        text_index = (
-                            conn.tts_last_text_index + 1
-                            if hasattr(conn, "tts_last_text_index")
-                            else 0
-                        )
-                        conn.recode_first_last_text(text, text_index)
-                        future = conn.executor.submit(
-                            conn.speak_and_play, text, text_index
-                        )
-                        conn.llm_finish_task = True
-                        conn.tts_queue.put((future, text_index))
-                        conn.dialogue.put(Message(role="assistant", content=text))
+                        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:
+                        text = result.result
+                        if text is not None:
+                            text_index = (
+                                conn.tts_last_text_index + 1
+                                if hasattr(conn, "tts_last_text_index")
+                                else 0
+                            )
+                            conn.recode_first_last_text(text, text_index)
+                            future = conn.executor.submit(
+                                conn.speak_and_play, text, text_index
+                            )
+                            conn.llm_finish_task = True
+                            conn.tts_queue.put((future, text_index))
+                            conn.dialogue.put(Message(role="assistant", content=text))
+                    elif function_name != "play_music":
+                        # For backward compatibility with original code
+                        # 获取当前最新的文本索引
+                        text = result.response
+                        if text is None:
+                            text = result.result
+                        if text is not None:
+                            text_index = (
+                                conn.tts_last_text_index + 1
+                                if hasattr(conn, "tts_last_text_index")
+                                else 0
+                            )
+                            conn.recode_first_last_text(text, text_index)
+                            future = conn.executor.submit(
+                                conn.speak_and_play, text, text_index
+                            )
+                            conn.llm_finish_task = True
+                            conn.tts_queue.put(future)
+                            conn.dialogue.put(Message(role="assistant", content=text))
 
             # 将函数执行放在线程池中
             conn.executor.submit(process_function_call)

main/xiaozhi-server/core/providers/intent/intent_llm/intent_llm.py

@@ -41,6 +41,7 @@ class IntentProvider(IntentProviderBase):
             '2. 结束对话意图: {"function_call": {"name": "handle_exit_intent", "arguments": {"say_goodbye": "goodbye"}}}\n'
             '3. 获取当天日期时间: {"function_call": {"name": "get_time"}}\n'
             '4. 继续聊天意图: {"function_call": {"name": "continue_chat"}}\n'
+            '5. 查询新闻意图: {"function_call": {"name": "get_news_from_different_source", "arguments":{"source": {"type": "string","description": "新闻源，可选项有{"thepaper": "澎湃新闻","wallstreetcn-quick": "华尔街见闻","ithome": "IT之家","zhihu": "知乎"}。可选参数，如果不提供则使用默认新闻源"},"detail": {"type": "boolean","description": "是否获取详细内容，默认为false。如果为true，则获取上一条新闻的详细内容"}}}\n'
             "\n"
             "注意:\n"
             '- 播放音乐：无歌名时，song_name设为"random"\n'
@@ -53,6 +54,14 @@ class IntentProvider(IntentProviderBase):
             '返回: {"function_call": {"name": "continue_chat"}}\n'
             "```\n"
             "```\n"
+            "用户: 最近有什么新闻吗\n"
+            '返回: {"function_call": {"name": "get_news_from_different_source", "arguments": {"source":"thepaper", "detail":"False"}}}\n'
+            "```\n"
+            "```\n"
+            "用户: 详细说说这个新闻\n"
+            '返回: {"function_call": {"name": "get_news_from_different_source", "arguments": {"source":"thepaper", "detail":"True"}}}\n'
+            "```\n"
+            "```\n"
             "用户: 现在是几号了?现在几点了？\n"
             '返回: {"function_call": {"name": "get_time"}}\n'
             "```\n"