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}"