resolve merge conflict

main/xiaozhi-server/plugins_func/functions/get_news_from_chinanews.py

@@ -195,7 +195,7 @@ def get_news_from_chinanews(
 
         # 否则，获取新闻列表并随机选择一条
         # 从配置中获取RSS URL
-        rss_config = conn.config["plugins"]["get_news_from_chinanews"]
+        rss_config = conn.config.get("plugins", {}).get("get_news_from_chinanews", {})
         default_rss_url = rss_config.get(
             "default_rss_url", "https://www.chinanews.com.cn/rss/society.xml"
         )

main/xiaozhi-server/plugins_func/functions/get_news_from_newsnow.py

@@ -120,10 +120,10 @@ def fetch_news_from_api(conn, source="thepaper"):
     """从API获取新闻列表"""
     try:
         api_url = f"https://newsnow.busiyi.world/api/s?id={source}"
-        if conn.config["plugins"].get("get_news_from_newsnow") and conn.config[
-            "plugins"
-        ]["get_news_from_newsnow"].get("url"):
-            api_url = conn.config["plugins"]["get_news_from_newsnow"]["url"] + source
+
+        news_config = conn.config.get("plugins", {}).get("get_news_from_newsnow", {})
+        if news_config.get("url"):
+            api_url = news_config["url"] + source
 
         headers = {"User-Agent": "Mozilla/5.0"}
         response = requests.get(api_url, headers=headers, timeout=10)

main/xiaozhi-server/plugins_func/functions/get_weather.py

@@ -158,13 +158,10 @@ def parse_weather_info(soup):
 def get_weather(conn, location: str = None, lang: str = "zh_CN"):
     from core.utils.cache.manager import cache_manager, CacheType
 
-    api_host = conn.config["plugins"]["get_weather"].get(
-        "api_host", "mj7p3y7naa.re.qweatherapi.com"
-    )
-    api_key = conn.config["plugins"]["get_weather"].get(
-        "api_key", "a861d0d5e7bf4ee1a83d9a9e4f96d4da"
-    )
-    default_location = conn.config["plugins"]["get_weather"]["default_location"]
+    weather_config = conn.config.get("plugins", {}).get("get_weather", {})
+    api_host = weather_config.get("api_host", "mj7p3y7naa.re.qweatherapi.com")
+    api_key = weather_config.get("api_key", "a861d0d5e7bf4ee1a83d9a9e4f96d4da")
+    default_location = weather_config.get("default_location", "广州")
     client_ip = conn.client_ip
 
     # 优先使用用户提供的location参数

main/xiaozhi-server/plugins_func/functions/hass_init.py

@@ -11,15 +11,17 @@ def append_devices_to_prompt(conn):
             "functions", []
         )
 
+        # 安全地获取插件配置
+        plugins_config = conn.config.get("plugins", {})
         config_source = (
             "home_assistant"
-            if conn.config["plugins"].get("home_assistant")
+            if plugins_config.get("home_assistant")
             else "hass_get_state"
         )
 
         if "hass_get_state" in funcs or "hass_set_state" in funcs:
             prompt = "\n下面是我家智能设备列表（位置，设备名，entity_id），可以通过homeassistant控制\n"
-            deviceStr = conn.config["plugins"].get(config_source, {}).get("devices", "")
+            deviceStr = plugins_config.get(config_source, {}).get("devices", "")
             conn.prompt += prompt + deviceStr + "\n"
             # 更新提示词
             conn.dialogue.update_system_message(conn.prompt)
@@ -30,17 +32,17 @@ def initialize_hass_handler(conn):
     if not conn.load_function_plugin:
         return ha_config
 
+    # 安全地获取插件配置
+    plugins_config = conn.config.get("plugins", {})
     # 确定配置来源
     config_source = (
-        "home_assistant"
-        if conn.config["plugins"].get("home_assistant")
-        else "hass_get_state"
+        "home_assistant" if plugins_config.get("home_assistant") else "hass_get_state"
     )
-    if not conn.config["plugins"].get(config_source):
+    if not plugins_config.get(config_source):
         return ha_config
 
     # 统一获取配置
-    plugin_config = conn.config["plugins"][config_source]
+    plugin_config = plugins_config[config_source]
     ha_config["base_url"] = plugin_config.get("base_url")
     ha_config["api_key"] = plugin_config.get("api_key")
 

main/xiaozhi-server/plugins_func/functions/play_music.py

@@ -118,8 +118,9 @@ def get_music_files(music_dir, music_ext):
 def initialize_music_handler(conn):
     global MUSIC_CACHE
     if MUSIC_CACHE == {}:
-        if "play_music" in conn.config["plugins"]:
-            MUSIC_CACHE["music_config"] = conn.config["plugins"]["play_music"]
+        plugins_config = conn.config.get("plugins", {})
+        if "play_music" in plugins_config:
+            MUSIC_CACHE["music_config"] = plugins_config["play_music"]
             MUSIC_CACHE["music_dir"] = os.path.abspath(
                 MUSIC_CACHE["music_config"].get("music_dir", "./music")  # 默认路径修改
             )

main/xiaozhi-server/plugins_func/functions/search_from_ragflow.py

@@ -0,0 +1,100 @@
+import requests
+import sys
+from config.logger import setup_logging
+from plugins_func.register import register_function, ToolType, ActionResponse, Action
+
+TAG = __name__
+logger = setup_logging()
+
+# 定义基础的函数描述模板
+SEARCH_FROM_RAGFLOW_FUNCTION_DESC = {
+    "type": "function",
+    "function": {
+        "name": "search_from_ragflow",
+        "description": "从知识库中查询信息",
+        "parameters": {
+            "type": "object",
+            "properties": {"question": {"type": "string", "description": "查询的问题"}},
+            "required": ["question"],
+        },
+    },
+}
+
+
+@register_function(
+    "search_from_ragflow", SEARCH_FROM_RAGFLOW_FUNCTION_DESC, ToolType.SYSTEM_CTL
+)
+def search_from_ragflow(conn, question=None):
+    # 确保字符串参数正确处理编码
+    if question and isinstance(question, str):
+        # 确保问题参数是UTF-8编码的字符串
+        pass
+    else:
+        question = str(question) if question is not None else ""
+
+    ragflow_config = conn.config.get("plugins", {}).get("search_from_ragflow", {})
+    base_url = ragflow_config.get("base_url", "")
+    api_key = ragflow_config.get("api_key", "")
+    dataset_ids = ragflow_config.get("dataset_ids", [])
+
+    url = base_url + "/api/v1/retrieval"
+    headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+
+    # 确保payload中的字符串都是UTF-8编码
+    payload = {"question": question, "dataset_ids": dataset_ids}
+
+    try:
+        # 使用ensure_ascii=False确保JSON序列化时正确处理中文
+        response = requests.post(
+            url,
+            json=payload,
+            headers=headers,
+            timeout=5,
+            verify=False,
+        )
+
+        # 显式设置响应的编码为utf-8
+        response.encoding = "utf-8"
+
+        response.raise_for_status()
+
+        # 先获取文本内容，然后手动处理JSON解码
+        response_text = response.text
+        import json
+
+        result = json.loads(response_text)
+
+        if result.get("code") != 0:
+            error_detail = response.get("error", {}).get("detail", "")
+            # 安全地记录错误信息
+            logger.bind(tag=TAG).error(
+                "从RAGflow获取信息失败，原因：%s", str(error_detail)
+            )
+            return ActionResponse(Action.RESPONSE, None, "RAG接口返回异常")
+
+        chunks = result.get("data", {}).get("chunks", [])
+        contents = []
+        for chunk in chunks:
+            content = chunk.get("content", "")
+            if content:
+                # 安全地处理内容字符串
+                if isinstance(content, str):
+                    contents.append(content)
+                elif isinstance(content, bytes):
+                    contents.append(content.decode("utf-8", errors="replace"))
+                else:
+                    contents.append(str(content))
+
+        if contents:
+            # 组织知识库内容为引用模式
+            context_text = f"# 关于问题【{question}】查到知识库如下\n"
+            context_text += "```\n\n\n".join(contents[:5])
+            context_text += "\n```"
+        else:
+            context_text = "根据知识库查询结果，没有相关信息。"
+        return ActionResponse(Action.REQLLM, context_text, None)
+
+    except Exception as e:
+        # 使用安全的方式记录异常，避免编码问题
+        logger.bind(tag=TAG).error("从RAGflow获取信息失败，原因：%s", str(e))
+        return ActionResponse(Action.RESPONSE, None, "RAG接口返回异常")