xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-17 13:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 根据不同的模型构建对话客户端

Browse Source
This commit is contained in:
ageerle
2025-04-22 11:28:10 +08:00
parent 620ea1fc76
commit 15c306eca2
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/OpenAIServiceImpl.java
View File

@@ -2,12 +2,15 @@ package org.ruoyi.chat.service.chat.impl;
import io.modelcontextprotocol.client.McpSyncClient; import io.modelcontextprotocol.client.McpSyncClient;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.ruoyi.chat.config.ChatConfig;
import org.ruoyi.chat.listener.SSEEventSourceListener; import org.ruoyi.chat.listener.SSEEventSourceListener;
import org.ruoyi.chat.service.chat.IChatService; import org.ruoyi.chat.service.chat.IChatService;
import org.ruoyi.common.chat.entity.chat.ChatCompletion; import org.ruoyi.common.chat.entity.chat.ChatCompletion;
import org.ruoyi.common.chat.entity.chat.Message; import org.ruoyi.common.chat.entity.chat.Message;
import org.ruoyi.common.chat.openai.OpenAiStreamClient; import org.ruoyi.common.chat.openai.OpenAiStreamClient;
import org.ruoyi.common.chat.request.ChatRequest; import org.ruoyi.common.chat.request.ChatRequest;
import org.ruoyi.domain.vo.ChatModelVo;
import org.ruoyi.service.IChatModelService;
import org.springframework.ai.chat.client.ChatClient; import org.springframework.ai.chat.client.ChatClient;
import org.springframework.ai.mcp.SyncMcpToolCallbackProvider; import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
import org.springframework.ai.openai.OpenAiChatOptions; import org.springframework.ai.openai.OpenAiChatOptions;
@@ -22,6 +25,8 @@ import java.util.List;
public class OpenAIServiceImpl implements IChatService { public class OpenAIServiceImpl implements IChatService {
@Autowired @Autowired
private IChatModelService chatModelService;
private OpenAiStreamClient openAiStreamClient; private OpenAiStreamClient openAiStreamClient;
private final ChatClient chatClient; private final ChatClient chatClient;
@@ -36,6 +41,8 @@ public class OpenAIServiceImpl implements IChatService {
@Override @Override
public SseEmitter chat(ChatRequest chatRequest,SseEmitter emitter) { public SseEmitter chat(ChatRequest chatRequest,SseEmitter emitter) {
ChatModelVo chatModelVo = chatModelService.selectModelByName(chatRequest.getModel());
openAiStreamClient = ChatConfig.createOpenAiStreamClient(chatModelVo.getApiHost(), chatModelVo.getApiKey());
String toolString = mcpChat(chatRequest.getPrompt()); String toolString = mcpChat(chatRequest.getPrompt());
Message userMessage = Message.builder().content("工具返回信息："+toolString).role(Message.Role.USER).build(); Message userMessage = Message.builder().content("工具返回信息："+toolString).role(Message.Role.USER).build();
List<Message> messages = chatRequest.getMessages(); List<Message> messages = chatRequest.getMessages();

2
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java
View File

@@ -71,7 +71,7 @@ public class SseServiceImpl implements ISseService {
@Override @Override
public SseEmitter sseChat(ChatRequest chatRequest, HttpServletRequest request) { public SseEmitter sseChat(ChatRequest chatRequest, HttpServletRequest request) {
SseEmitter sseEmitter = new SseEmitter(); SseEmitter sseEmitter = new SseEmitter(0L);
try { try {
// 构建消息列表 // 构建消息列表
buildChatMessageList(chatRequest); buildChatMessageList(chatRequest);