From bc15521b3aabf7d65cf442260f8776e200366f40 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 12 May 2025 11:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20defaultPromptTemplate=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=97=AE=E9=A2=98=E5=9B=9E=E7=AD=94=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/ai/properties/CmsAiProperties.java | 10 +++++ .../cms/ai/service/CmsAiChatService.java | 9 ++++- .../main/resources/config/jeesite-cms-ai.yml | 38 +++++++++++-------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java index d9c26847..07646b90 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java +++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/properties/CmsAiProperties.java @@ -9,6 +9,8 @@ public class CmsAiProperties { private String defaultSystem = ""; + private String defaultPromptTemplate = ""; + public Boolean getToolCalls() { return toolCalls; } @@ -24,4 +26,12 @@ public class CmsAiProperties { public void setDefaultSystem(String defaultSystem) { this.defaultSystem = defaultSystem; } + + public String getDefaultPromptTemplate() { + return defaultPromptTemplate; + } + + public void setDefaultPromptTemplate(String defaultPromptTemplate) { + this.defaultPromptTemplate = defaultPromptTemplate; + } } diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java index 3bc3cdc2..33419055 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java +++ b/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CmsAiChatService.java @@ -10,6 +10,7 @@ import com.jeesite.common.idgen.IdGen; import com.jeesite.common.lang.DateUtils; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.service.BaseService; +import com.jeesite.modules.cms.ai.properties.CmsAiProperties; import com.jeesite.modules.sys.utils.UserUtils; import jakarta.servlet.http.HttpServletRequest; import org.springframework.ai.chat.client.ChatClient; @@ -21,6 +22,7 @@ import org.springframework.ai.chat.messages.Message; import org.springframework.ai.chat.messages.UserMessage; import org.springframework.ai.chat.model.ChatResponse; import org.springframework.ai.chat.model.Generation; +import org.springframework.ai.chat.prompt.PromptTemplate; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +51,8 @@ public class CmsAiChatService extends BaseService { private ChatMemory chatMemory; @Autowired private VectorStore vectorStore; + @Autowired + private CmsAiProperties properties; /** * 获取聊天对话消息 @@ -116,7 +120,10 @@ public class CmsAiChatService extends BaseService { ) .advisors( new MessageChatMemoryAdvisor(chatMemory, conversationId, 1024), - new QuestionAnswerAdvisor(vectorStore, SearchRequest.builder().similarityThreshold(0.6F).topK(6).build()) + QuestionAnswerAdvisor.builder(vectorStore) + .searchRequest(SearchRequest.builder().similarityThreshold(0.6F).topK(6).build()) + .promptTemplate(new PromptTemplate(properties.getDefaultPromptTemplate())) + .build() ) .stream() .chatResponse() diff --git a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml index 698dfe0b..f4faceda 100644 --- a/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml +++ b/modules/cms-ai/src/main/resources/config/jeesite-cms-ai.yml @@ -5,18 +5,18 @@ spring: # 在线大模型【请在 pom.xml 中打开 openai 的注释，并注释上其它模型】 openai: - base-url: https://api.siliconflow.cn - api-key: ${SFLOW_APP_KEY} - #base-url: https://ai.gitee.com - #api-key: ${GITEE_APP_KEY} - #base-url: https://dashscope.aliyuncs.com/compatible-mode - #api-key: ${BAILIAN_APP_KEY} +# base-url: https://api.siliconflow.cn +# api-key: ${SFLOW_APP_KEY} +# base-url: https://ai.gitee.com +# api-key: ${GITEE_APP_KEY} + base-url: https://dashscope.aliyuncs.com/compatible-mode + api-key: ${BAILIAN_APP_KEY} # 聊天对话模型 chat: options: - model: deepseek-ai/DeepSeek-R1-Distill-Qwen-7B - #model: DeepSeek-R1-Distill-Qwen-14B - #model: deepseek-r1-distill-llama-8b +# model: deepseek-ai/DeepSeek-R1-Distill-Qwen-7B +# model: DeepSeek-R1-Distill-Qwen-14B + model: deepseek-r1-distill-llama-8b max-tokens: 1024 temperature: 0.6 top-p: 0.9 @@ -25,11 +25,11 @@ spring: # 向量库知识库模型（注意：不同的模型维度不同） embedding: options: - model: BAAI/bge-m3 - #model: bge-large-zh-v1.5 - dimensions: 512 - #model: text-embedding-v3 - #dimensions: 1024 +# model: BAAI/bge-m3 +# model: bge-large-zh-v1.5 +# dimensions: 512 + model: text-embedding-v3 + dimensions: 1024 # 本地大模型配置【请在 pom.xml 中打开 ollama 的注释，并注释上其它模型】 ollama: @@ -112,7 +112,15 @@ spring: 2. 使用幽默有趣的方式与我沟通。 3. 可以用少量表情，避免过多表情。 4. 增加互动，如 “您的看法如何？” - + + # 默认问题回答模板 + default-prompt-template: | + 上下文信息如下，用---------------------符号标出： + --------------------- + {question_answer_context} + --------------------- + 在提供上下文和历史信息的基础上，并且不使用先前知识的前提下回答用户的问题。 + 如果问题的答案不在上下文中，请告知用户你无法回答该问题。 # ========= Postgresql 向量数据库数据源 =========