知识库对话修改

ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java

@@ -1,16 +1,14 @@
 package org.ruoyi.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
-import org.ruoyi.common.chat.config.ChatConfig;
 import org.ruoyi.common.chat.domain.request.ChatRequest;
-import org.ruoyi.common.chat.entity.chat.ChatCompletion;
 import org.ruoyi.common.chat.entity.chat.Message;
-import org.ruoyi.common.chat.openai.OpenAiStreamClient;
 import org.ruoyi.common.core.domain.R;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.excel.utils.ExcelUtil;
@@ -20,6 +18,7 @@ import org.ruoyi.common.mybatis.core.page.PageQuery;
 import org.ruoyi.common.mybatis.core.page.TableDataInfo;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
 import org.ruoyi.knowledge.domain.bo.KnowledgeAttachBo;
 import org.ruoyi.knowledge.domain.bo.KnowledgeFragmentBo;
 import org.ruoyi.knowledge.domain.bo.KnowledgeInfoBo;
@@ -31,11 +30,9 @@ import org.ruoyi.knowledge.service.EmbeddingService;
 import org.ruoyi.knowledge.service.IKnowledgeAttachService;
 import org.ruoyi.knowledge.service.IKnowledgeFragmentService;
 import org.ruoyi.knowledge.service.IKnowledgeInfoService;
-import org.ruoyi.system.listener.SSEEventSourceListener;
 import org.ruoyi.system.service.ISseService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.util.List;
@@ -63,47 +60,27 @@ public class KnowledgeController extends BaseController {
 
     private final EmbeddingService embeddingService;
 
-    private OpenAiStreamClient openAiStreamClient;
-
-    private final ChatConfig chatConfig;
-
     private final ISseService sseService;
 
     /**
      * 知识库对话
      */
     @PostMapping("/send")
-    public SseEmitter send(@RequestBody @Valid ChatRequest chatRequest) {
+    public SseEmitter send(@RequestBody @Valid ChatRequest chatRequest, HttpServletRequest request) {
-
-        openAiStreamClient = chatConfig.getOpenAiStreamClient();
-        SseEmitter sseEmitter = new SseEmitter(0L);
-        SSEEventSourceListener openAIEventSourceListener = new SSEEventSourceListener(sseEmitter);
         List<Message> messages = chatRequest.getMessages();
-        String content = messages.get(messages.size() - 1).getContent().toString();
+        // 获取知识库信息
+        Message message = messages.get(messages.size() - 1);
+        StringBuilder sb = new StringBuilder(message.getContent().toString());
         List<String> nearestList;
-        List<Double> queryVector = embeddingService.getQueryVector(content, chatRequest.getKid());
+        List<Double> queryVector = embeddingService.getQueryVector(message.getContent().toString(), chatRequest.getKid());
-        nearestList = vectorStore.nearest(queryVector,chatRequest.getKid());
+        nearestList = vectorStore.nearest(queryVector, chatRequest.getKid());
         for (String prompt : nearestList) {
-            Message sysMessage = Message.builder().content(prompt).role(Message.Role.USER).build();
+            sb.append("\n####").append(prompt);
-            messages.add(sysMessage);
         }
-        Message userMessage = Message.builder().content(content + (nearestList.size() > 0 ? "\n\n注意：回答问题时，须严格根据我给你的系统上下文内容原文进行回答，请不要自己发挥,回答时保持原来文本的段落层级" : "") ).role(Message.Role.USER).build();
+        sb.append( (nearestList.size() > 0 ? "\n\n注意：回答问题时，须严格根据我给你的系统上下文内容原文进行回答，请不要自己发挥,回答时保持原来文本的段落层级" : ""));
-        messages.add(userMessage);
+        message.setRole(Message.Role.USER.getName());
-        if (chatRequest.getModel().startsWith("ollama")) {
+        message.setContent(sb.toString());
-            return sseService.ollamaChat(chatRequest);
+        return sseService.sseChat(chatRequest, request);
-        }
-
-        ChatCompletion completion = ChatCompletion
-            .builder()
-            .messages(messages)
-            .model(chatRequest.getModel())
-            .temperature(chatRequest.getTemperature())
-            .topP(chatRequest.getTop_p())
-            .stream(true)
-            .build();
-        openAiStreamClient.streamChatCompletion(completion, openAIEventSourceListener);
-
-        return sseEmitter;
     }
 
     /**