From 3666157d14201d39a0e61588582fee97fac95ad1 Mon Sep 17 00:00:00 2001
From: Albert <janzhou123@users.noreply.github.com>
Date: 星期二, 13 五月 2025 09:59:36 +0800
Subject: [PATCH] Merge pull request #1 from ageerle/main
---
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OllamaServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OllamaServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OllamaServiceImpl.java
index f06461b..532b052 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OllamaServiceImpl.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OllamaServiceImpl.java
@@ -7,6 +7,8 @@
import io.github.ollama4j.models.chat.OllamaChatRequestModel;
import io.github.ollama4j.models.generate.OllamaStreamHandler;
import lombok.extern.slf4j.Slf4j;
+import org.ruoyi.chat.enums.ChatModeType;
+import org.ruoyi.chat.service.chat.IChatService;
import org.ruoyi.chat.util.SSEUtil;
import org.ruoyi.common.chat.entity.chat.Message;
import org.ruoyi.common.chat.request.ChatRequest;
@@ -22,14 +24,18 @@
import java.util.concurrent.CompletableFuture;
+/**
+ * @author ageer
+ */
@Service
@Slf4j
-public class OllamaServiceImpl {
+public class OllamaServiceImpl implements IChatService {
- @Autowired
- private IChatModelService chatModelService;
+ @Autowired
+ private IChatModelService chatModelService;
- public SseEmitter chat(ChatRequest chatRequest,SseEmitter emitter) {
+ @Override
+ public SseEmitter chat(ChatRequest chatRequest, SseEmitter emitter) {
ChatModelVo chatModelVo = chatModelService.selectModelByName(chatRequest.getModel());
String host = chatModelVo.getApiHost();
List<Message> msgList = chatRequest.getMessages();
@@ -56,7 +62,6 @@
OllamaStreamHandler streamHandler = (s) -> {
String substr = s.substring(response.length());
response.append(substr);
- System.out.println(substr);
try {
emitter.send(substr);
} catch (IOException e) {
@@ -73,4 +78,8 @@
return emitter;
}
+ @Override
+ public String getCategory() {
+ return ChatModeType.OLLAMA.getCode();
+ }
}
--
Gitblit v1.9.3