From 32ecbe55fc080187ca33c0c729b9273a5b273f86 Mon Sep 17 00:00:00 2001
From: 3030332422 <3030332422@qq.com>
Date: Fri, 31 Oct 2025 20:36:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=85=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=97=B6=E7=BC=BA=E5=B0=91prompt=5Ftemplate=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config/config_loader.py      | 3 +++
 main/xiaozhi-server/config_from_api.yaml         | 4 +++-
 main/xiaozhi-server/core/utils/prompt_manager.py | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/main/xiaozhi-server/config/config_loader.py b/main/xiaozhi-server/config/config_loader.py
index 4f35b1fd..b70cf961 100644
--- a/main/xiaozhi-server/config/config_loader.py
+++ b/main/xiaozhi-server/config/config_loader.py
@@ -68,6 +68,9 @@ def get_config_from_api(config):
             "vision_explain": config["server"].get("vision_explain", ""),
             "auth_key": config["server"].get("auth_key", ""),
         }
+    # 如果服务器没有prompt_template，则从本地配置读取
+    if not config_data.get("prompt_template"):
+        config_data["prompt_template"] = config.get("prompt_template")
     return config_data
 
 
diff --git a/main/xiaozhi-server/config_from_api.yaml b/main/xiaozhi-server/config_from_api.yaml
index 283178d7..1f40d6c7 100644
--- a/main/xiaozhi-server/config_from_api.yaml
+++ b/main/xiaozhi-server/config_from_api.yaml
@@ -22,4 +22,6 @@ manager-api:
   # 如果使用docker部署，请使用填写成 http://xiaozhi-esp32-server-web:8002/xiaozhi
   url: http://127.0.0.1:8002/xiaozhi
   # 你的manager-api的token，就是刚才复制出来的server.secret
-  secret: 你的server.secret值
\ No newline at end of file
+  secret: 你的server.secret值
+# 默认系统提示词模板文件
+prompt_template: agent-base-prompt.txt
\ No newline at end of file
diff --git a/main/xiaozhi-server/core/utils/prompt_manager.py b/main/xiaozhi-server/core/utils/prompt_manager.py
index 0223f965..1e247d07 100644
--- a/main/xiaozhi-server/core/utils/prompt_manager.py
+++ b/main/xiaozhi-server/core/utils/prompt_manager.py
@@ -225,6 +225,7 @@ class PromptManager:
                 weather_info=weather_info,
                 emojiList=EMOJI_List,
                 device_id=device_id,
+                client_ip=client_ip,
                 *args, **kwargs
             )
             device_cache_key = f"device_prompt:{device_id}"