mirror of
https://gitcode.com/ageerle/ruoyi-ai.git
synced 2026-04-14 12:23:39 +00:00
修改应用使用,通过配置的应用的appid modelname字段关联
This commit is contained in:
@@ -78,7 +78,6 @@ public class KnowledgeController extends BaseController {
|
|||||||
sb.append("\n####").append(prompt);
|
sb.append("\n####").append(prompt);
|
||||||
}
|
}
|
||||||
sb.append( (nearestList.size() > 0 ? "\n\n注意:回答问题时,须严格根据我给你的系统上下文内容原文进行回答,请不要自己发挥,回答时保持原来文本的段落层级" : ""));
|
sb.append( (nearestList.size() > 0 ? "\n\n注意:回答问题时,须严格根据我给你的系统上下文内容原文进行回答,请不要自己发挥,回答时保持原来文本的段落层级" : ""));
|
||||||
message.setRole(Message.Role.USER.getName());
|
|
||||||
message.setContent(sb.toString());
|
message.setContent(sb.toString());
|
||||||
return sseService.sseChat(chatRequest, request);
|
return sseService.sseChat(chatRequest, request);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,16 @@ public class ChatRequest {
|
|||||||
private String kid;
|
private String kid;
|
||||||
|
|
||||||
private String userId;
|
private String userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 1 联网搜索
|
||||||
|
*/
|
||||||
|
private int chat_type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用ID
|
||||||
|
*/
|
||||||
|
private String appId;
|
||||||
//
|
//
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -97,5 +97,10 @@ public class ChatGpts extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String updateIp;
|
private String updateIp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型名称
|
||||||
|
*/
|
||||||
|
private String modelName;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,5 +96,11 @@ public class ChatGptsVo implements Serializable {
|
|||||||
@ExcelProperty(value = "更新IP")
|
@ExcelProperty(value = "更新IP")
|
||||||
private String updateIp;
|
private String updateIp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型名称
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "模型名称")
|
||||||
|
private String modelName;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ import org.ruoyi.common.satoken.utils.LoginHelper;
|
|||||||
import org.ruoyi.system.domain.SysModel;
|
import org.ruoyi.system.domain.SysModel;
|
||||||
import org.ruoyi.system.domain.bo.ChatMessageBo;
|
import org.ruoyi.system.domain.bo.ChatMessageBo;
|
||||||
import org.ruoyi.system.domain.request.translation.TranslationRequest;
|
import org.ruoyi.system.domain.request.translation.TranslationRequest;
|
||||||
|
import org.ruoyi.system.domain.vo.ChatGptsVo;
|
||||||
import org.ruoyi.system.listener.SSEEventSourceListener;
|
import org.ruoyi.system.listener.SSEEventSourceListener;
|
||||||
import org.ruoyi.system.service.*;
|
import org.ruoyi.system.service.*;
|
||||||
import org.springframework.core.io.InputStreamResource;
|
import org.springframework.core.io.InputStreamResource;
|
||||||
@@ -88,6 +89,8 @@ public class SseServiceImpl implements ISseService {
|
|||||||
|
|
||||||
private final ConfigService configService;
|
private final ConfigService configService;
|
||||||
|
|
||||||
|
private final IChatGptsService chatGptsService;
|
||||||
|
|
||||||
static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
|
static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
|
||||||
|
|
||||||
private static final String requestIdTemplate = "mycompany-%d";
|
private static final String requestIdTemplate = "mycompany-%d";
|
||||||
@@ -132,20 +135,22 @@ public class SseServiceImpl implements ISseService {
|
|||||||
chatMessageBo.setContent(chatString);
|
chatMessageBo.setContent(chatString);
|
||||||
|
|
||||||
String model = chatRequest.getModel();
|
String model = chatRequest.getModel();
|
||||||
// 如果是gpts系列模型
|
|
||||||
if (chatRequest.getModel().startsWith("gpt-4-gizmo")) {
|
|
||||||
model = "gpt-4-gizmo";
|
|
||||||
}
|
|
||||||
SysModel sysModel = sysModelService.selectModelByName(model);
|
SysModel sysModel = sysModelService.selectModelByName(model);
|
||||||
if (sysModel == null) {
|
if (sysModel == null) {
|
||||||
// 如果模型不存在默认使用token扣费方式
|
// 如果模型不存在默认使用token扣费方式
|
||||||
processByToken(chatRequest.getModel(), chatString, chatMessageBo);
|
processByToken(chatRequest.getModel(), chatString, chatMessageBo);
|
||||||
} else {
|
} else {
|
||||||
openAiStreamClient = chatConfig.createOpenAiStreamClient(sysModel.getApiHost(), sysModel.getApiKey());
|
openAiStreamClient = chatConfig.createOpenAiStreamClient(sysModel.getApiHost(), sysModel.getApiKey());
|
||||||
// 模型设置默认提示词
|
if (StringUtils.isNotEmpty(chatRequest.getAppId())) { // 设置应用的系统角色为描述
|
||||||
if (StringUtils.isNotEmpty(sysModel.getSystemPrompt())) {
|
ChatGptsVo chatGptsVo = chatGptsService.queryById(Long.valueOf(chatRequest.getAppId()));
|
||||||
Message sysMessage = Message.builder().content(sysModel.getSystemPrompt()).role(Message.Role.SYSTEM).build();
|
Message sysMessage = Message.builder().content(chatGptsVo.getInfo()).role(Message.Role.SYSTEM).build();
|
||||||
messages.add(sysMessage);
|
messages.add(0,sysMessage);
|
||||||
|
} else {
|
||||||
|
// 模型设置默认提示词
|
||||||
|
if (StringUtils.isNotEmpty(sysModel.getSystemPrompt())) {
|
||||||
|
Message sysMessage = Message.builder().content(sysModel.getSystemPrompt()).role(Message.Role.SYSTEM).build();
|
||||||
|
messages.add(0,sysMessage);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// 计费类型: 1 token扣费 2 次数扣费
|
// 计费类型: 1 token扣费 2 次数扣费
|
||||||
if ("2".equals(sysModel.getModelType())) {
|
if ("2".equals(sysModel.getModelType())) {
|
||||||
|
|||||||
Reference in New Issue
Block a user