From e5169be28a2e7cfe8d5e216e3f515b56ce8baafa Mon Sep 17 00:00:00 2001
From: Liuyang <2746366019@qq.com>
Date: Tue, 11 Mar 2025 17:55:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(llm):=20=E6=9A=82=E6=97=B6=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E6=8E=89=E8=81=8A=E5=A4=A9=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉了查询和处理聊天历史记录的相关代码- 保留了创建新系统消息的逻辑
- 此修改可能是为了调试或测试目的，暂时移除聊天历史记录的影响
---
 .../conversation/ConversationServiceImpl.java | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
index c9123e5ed..92c116f6d 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
@@ -434,40 +434,40 @@ public class ConversationServiceImpl implements ConversationService {
         String knowledgeBaseString="";
         if (chatReqVO.getKnowledge() != null) {
             StringBuilder knowledgeBase = getKnowledgeBase(chatReqVO);
-             knowledgeBaseString = knowledgeBase.toString();
+            knowledgeBaseString = knowledgeBase.toString();
 
-             if (org.apache.commons.lang3.StringUtils.isBlank(knowledgeBaseString)){
-                 knowledgeBaseString="";
-             }
+            // 处理 knowledgeBaseString
+            if (StringUtils.isNotBlank(knowledgeBaseString)) {
+                knowledgeBaseString = "<context>" + knowledgeBaseString + "</context>";
+            }
 
             // 处理 systemPrompt
-             systemPrompt = StringUtils.isBlank(chatReqVO.getSystemPrompt())
+            systemPrompt = StringUtils.isBlank(chatReqVO.getSystemPrompt())
                     ? PROMPT
                     : chatReqVO.getSystemPrompt() + "\n" + PROMPT;
-
         }
-        String mess = systemPrompt +  "<content>"+knowledgeBaseString+"</content>";
+        String mess = systemPrompt + knowledgeBaseString;
 
-        // 查询历史记录消息，并将查询出来的知识信息放入到 role = system 的消息中
-        List<String> messageHistoryList = stringRedisTemplate.opsForList().range(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, -1);
-        if (messageHistoryList != null && !messageHistoryList.isEmpty()) {
-            log.info("存在聊天历史记录，处理历史记录消息");
-            for (String messageHistory : messageHistoryList) {
-                ModelCompletionsReqVO.ModelCompletionsMessage modelCompletionsMessage = JsonUtils.parseObject(messageHistory, ModelCompletionsReqVO.ModelCompletionsMessage.class);
-                if ("system".equals(modelCompletionsMessage.getRole())) {
-                    modelCompletionsMessage.setContent(mess);
-                    stringRedisTemplate.opsForList().set(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, JsonUtils.toJsonString(modelCompletionsMessage));
-                }
-                messages.add(modelCompletionsMessage);
-            }
-        } else {
+//        // 查询历史记录消息，并将查询出来的知识信息放入到 role = system 的消息中
+//        List<String> messageHistoryList = stringRedisTemplate.opsForList().range(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, -1);
+//        if (messageHistoryList != null && !messageHistoryList.isEmpty()) {
+//            log.info("存在聊天历史记录，处理历史记录消息");
+//            for (String messageHistory : messageHistoryList) {
+//                ModelCompletionsReqVO.ModelCompletionsMessage modelCompletionsMessage = JsonUtils.parseObject(messageHistory, ModelCompletionsReqVO.ModelCompletionsMessage.class);
+//                if ("system".equals(modelCompletionsMessage.getRole())) {
+//                    modelCompletionsMessage.setContent(mess);
+//                    stringRedisTemplate.opsForList().set(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, JsonUtils.toJsonString(modelCompletionsMessage));
+//                }
+//                messages.add(modelCompletionsMessage);
+//            }
+//        } else {
             log.info("不存在聊天历史记录，创建新的系统消息");
             ModelCompletionsReqVO.ModelCompletionsMessage systemMessage = new ModelCompletionsReqVO.ModelCompletionsMessage();
             systemMessage.setRole("system");
             systemMessage.setContent(mess);
             stringRedisTemplate.opsForList().rightPush(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), JsonUtils.toJsonString(systemMessage));
             messages.add(systemMessage);
-        }
+//        }
 
         // 创建用户消息
         ModelCompletionsReqVO.ModelCompletionsMessage message = new ModelCompletionsReqVO.ModelCompletionsMessage();