mirror of
https://gitcode.com/ageerle/ruoyi-ai.git
synced 2026-03-13 20:53:42 +08:00
feat: 功能优化
This commit is contained in:
@@ -1,9 +1,16 @@
|
||||
package org.ruoyi.chat.service.chat;
|
||||
|
||||
import dev.langchain4j.data.message.AiMessage;
|
||||
import dev.langchain4j.data.message.ChatMessage;
|
||||
import dev.langchain4j.data.message.SystemMessage;
|
||||
import dev.langchain4j.data.message.UserMessage;
|
||||
import dev.langchain4j.model.chat.response.StreamingChatResponseHandler;
|
||||
import org.ruoyi.common.chat.request.ChatRequest;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 对话Service接口
|
||||
*
|
||||
@@ -23,12 +30,27 @@ public interface IChatService {
|
||||
* 工作流场景:支持 langchain4j 的 StreamingChatResponseHandler
|
||||
*
|
||||
* @param chatRequest ruoyi-ai 的请求对象
|
||||
* @param handler langchain4j 的流式响应处理器
|
||||
* @param handler langchain4j 的流式响应处理器
|
||||
*/
|
||||
default void chat(ChatRequest chatRequest, StreamingChatResponseHandler handler) {
|
||||
throw new UnsupportedOperationException("此服务暂不支持工作流场景");
|
||||
}
|
||||
|
||||
default dev.langchain4j.model.chat.request.ChatRequest convertToLangchainRequest(ChatRequest request) {
|
||||
List<ChatMessage> messages = new ArrayList<>();
|
||||
for (org.ruoyi.common.chat.entity.chat.Message msg : request.getMessages()) {
|
||||
// 简单转换,您可以根据实际需求调整
|
||||
if ("user".equals(msg.getRole())) {
|
||||
messages.add(UserMessage.from(msg.getContent().toString()));
|
||||
} else if ("system".equals(msg.getRole())) {
|
||||
messages.add(SystemMessage.from(msg.getContent().toString()));
|
||||
} else if ("assistant".equals(msg.getRole())) {
|
||||
messages.add(AiMessage.from(msg.getContent().toString()));
|
||||
}
|
||||
}
|
||||
return dev.langchain4j.model.chat.request.ChatRequest.builder().messages(messages).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取此服务支持的模型类别
|
||||
*/
|
||||
|
||||
@@ -92,37 +92,19 @@ public class DeepSeekChatImpl implements IChatService {
|
||||
.modelName(chatModelVo.getModelName())
|
||||
.logRequests(true)
|
||||
.logResponses(true)
|
||||
.temperature(0.8)
|
||||
.temperature(0.7)
|
||||
.build();
|
||||
|
||||
try {
|
||||
// 将 ruoyi-ai 的 ChatRequest 转换为 langchain4j 的格式
|
||||
dev.langchain4j.model.chat.request.ChatRequest langchainRequest = convertToLangchainRequest(request);
|
||||
chatModel.chat(langchainRequest, handler);
|
||||
dev.langchain4j.model.chat.request.ChatRequest chatRequest = convertToLangchainRequest(request);
|
||||
chatModel.chat(chatRequest, handler);
|
||||
} catch (Exception e) {
|
||||
log.error("workflow deepseek请求失败:{}", e.getMessage(), e);
|
||||
throw new RuntimeException("DeepSeek workflow chat failed: " + e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换请求格式
|
||||
*/
|
||||
private dev.langchain4j.model.chat.request.ChatRequest convertToLangchainRequest(ChatRequest request) {
|
||||
List<ChatMessage> messages = new ArrayList<>();
|
||||
for (org.ruoyi.common.chat.entity.chat.Message msg : request.getMessages()) {
|
||||
// 简单转换,您可以根据实际需求调整
|
||||
if ("user".equals(msg.getRole())) {
|
||||
messages.add(UserMessage.from(msg.getContent().toString()));
|
||||
} else if ("system".equals(msg.getRole())) {
|
||||
messages.add(SystemMessage.from(msg.getContent().toString()));
|
||||
} else if ("assistant".equals(msg.getRole())) {
|
||||
messages.add(AiMessage.from(msg.getContent().toString()));
|
||||
}
|
||||
}
|
||||
return dev.langchain4j.model.chat.request.ChatRequest.builder().messages(messages).build();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCategory() {
|
||||
return ChatModeType.DEEPSEEK.getCode();
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
package org.ruoyi.chat.service.chat.impl;
|
||||
|
||||
import dev.langchain4j.community.model.dashscope.QwenStreamingChatModel;
|
||||
import dev.langchain4j.data.message.AiMessage;
|
||||
import dev.langchain4j.data.message.ChatMessage;
|
||||
import dev.langchain4j.data.message.SystemMessage;
|
||||
import dev.langchain4j.data.message.UserMessage;
|
||||
import dev.langchain4j.model.chat.StreamingChatModel;
|
||||
import dev.langchain4j.model.chat.response.ChatResponse;
|
||||
import dev.langchain4j.model.chat.response.StreamingChatResponseHandler;
|
||||
@@ -20,9 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 阿里通义千问
|
||||
@@ -92,33 +85,14 @@ public class QianWenAiChatServiceImpl implements IChatService {
|
||||
|
||||
try {
|
||||
// 将 ruoyi-ai 的 ChatRequest 转换为 langchain4j 的格式
|
||||
dev.langchain4j.model.chat.request.ChatRequest langchainRequest = convertToLangchainRequest(request);
|
||||
model.chat(langchainRequest, handler);
|
||||
dev.langchain4j.model.chat.request.ChatRequest chatRequest = convertToLangchainRequest(request);
|
||||
model.chat(chatRequest, handler);
|
||||
} catch (Exception e) {
|
||||
log.error("workflow 千问请求失败:{}", e.getMessage(), e);
|
||||
throw new RuntimeException("QianWen workflow chat failed: " + e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换请求格式
|
||||
*/
|
||||
private dev.langchain4j.model.chat.request.ChatRequest convertToLangchainRequest(ChatRequest request) {
|
||||
List<ChatMessage> messages = new ArrayList<>();
|
||||
for (org.ruoyi.common.chat.entity.chat.Message msg : request.getMessages()) {
|
||||
if ("user".equals(msg.getRole())) {
|
||||
messages.add(UserMessage.from(msg.getContent().toString()));
|
||||
} else if ("system".equals(msg.getRole())) {
|
||||
messages.add(SystemMessage.from(msg.getContent().toString()));
|
||||
} else if ("assistant".equals(msg.getRole())) {
|
||||
messages.add(AiMessage.from(msg.getContent().toString()));
|
||||
}
|
||||
}
|
||||
return dev.langchain4j.model.chat.request.ChatRequest.builder()
|
||||
.messages(messages)
|
||||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCategory() {
|
||||
return ChatModeType.QIANWEN.getCode();
|
||||
|
||||
Reference in New Issue
Block a user