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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ageerle
2025-04-08 11:11:10 +08:00
parent 65d479458e 57e17e0dda
commit 00f362acf1
16 changed files with 132 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-modules/ruoyi-knowledge/src/main/java/org/ruoyi/knowledge/chain/vectorizer/OpenAiVectorization.java
View File

@@ -11,6 +11,8 @@ import org.ruoyi.common.chat.entity.embeddings.EmbeddingResponse;
import org.ruoyi.common.chat.openai.OpenAiStreamClient;
import org.ruoyi.knowledge.domain.vo.KnowledgeInfoVo;
import org.ruoyi.knowledge.service.IKnowledgeInfoService;
import org.ruoyi.system.domain.SysModel;
import org.ruoyi.system.service.ISysModelService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
@@ -31,6 +33,9 @@ public class OpenAiVectorization implements Vectorization {
@Lazy
@Resource
private LocalModelsVectorization localModelsVectorization;
@Lazy
@Resource
private ISysModelService sysModelService;
@Getter
private OpenAiStreamClient openAiStreamClient;
@@ -40,9 +45,18 @@ public class OpenAiVectorization implements Vectorization {
@Override
public List<List<Double>> batchVectorization(List<String> chunkList, String kid) {
List<List<Double>> vectorList;
openAiStreamClient = chatConfig.getOpenAiStreamClient();
// 获取知识库信息
KnowledgeInfoVo knowledgeInfoVo = knowledgeInfoService.queryById(Long.valueOf(kid));
if(knowledgeInfoVo == null){
log.warn("知识库不存在:请查检ID {}",kid);
vectorList=new ArrayList<>();
vectorList.add(new ArrayList<>());
return vectorList;
}
SysModel sysModel = sysModelService.selectModelByName(knowledgeInfoVo.getVectorModel());
String apiHost= sysModel.getApiHost();
String apiKey= sysModel.getApiKey();
openAiStreamClient = chatConfig.createOpenAiStreamClient(apiHost,apiKey);
Embedding embedding = buildEmbedding(chunkList, knowledgeInfoVo);
EmbeddingResponse embeddings = openAiStreamClient.embeddings(embedding);

18
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatConfigController.java
View File

@@ -63,6 +63,24 @@ public class ChatConfigController extends BaseController {
return R.ok(configService.getConfigValue("sys",configKey));
}
/**
* 查询版权信息
*
*/
@GetMapping(value = "/configKey/copyright")
public R<String> getConfigKeyCopyright() {
return R.ok(configService.getConfigValue("sys","copyright"));
}
/**
* 查询logoImage
*
*/
@GetMapping(value = "/configKey/logoImage")
public R<String> getConfigKeyLogoImage() {
return R.ok(configService.getConfigValue("sys","logoImage"));
}
/**
* 查询系统参数
*

1
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeController.java
View File

@@ -31,7 +31,6 @@ public class SysNoticeController extends BaseController {
/**
* 获取公告列表
*/
@SaCheckPermission("system:notice:list")
@GetMapping("/list")
public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
//公告类型（1通知 2公告）

10
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java
View File

@@ -97,5 +97,15 @@ public class ChatGpts extends BaseEntity {
*/
private String updateIp;
/**
* 模型名称
*/
private String modelName;
/**
* 模型system
*/
private String systemPrompt;
}

10
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/ChatGptsBo.java
View File

@@ -84,4 +84,14 @@ public class ChatGptsBo extends BaseEntity {
*/
private String updateIp;
/**
* 模型名称
*/
private String modelName;
/**
* 模型system
*/
private String systemPrompt;
}

11
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatGptsVo.java
View File

@@ -96,5 +96,16 @@ public class ChatGptsVo implements Serializable {
@ExcelProperty(value = "更新IP")
private String updateIp;
/**
* 模型名称
*/
@ExcelProperty(value = "模型名称")
private String modelName;
/**
* 模型system
*/
private String systemPrompt;
}

3
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/listener/SSEEventSourceListener.java
View File

@@ -106,7 +106,8 @@ public class SSEEventSourceListener extends EventSourceListener {
}
Object content = completionResponse.getChoices().get(0).getDelta().getContent();
if(content == null){
return;
content = completionResponse.getChoices().get(0).getDelta().getReasoningContent();
if(content == null) return;
}
if(StringUtils.isEmpty(modelName)){
modelName = completionResponse.getModel();

4
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
View File

@@ -228,7 +228,9 @@ public class SysLoginService {
TenantHelper.clearDynamic();
}
StpUtil.logout();
recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
if (loginUser !=null) {
recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
}
} catch (NotLoginException ignored) {
}
}

21
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SseServiceImpl.java
View File

@@ -44,6 +44,7 @@ import org.ruoyi.common.satoken.utils.LoginHelper;
import org.ruoyi.system.domain.SysModel;
import org.ruoyi.system.domain.bo.ChatMessageBo;
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.service.*;
import org.springframework.core.io.InputStreamResource;
@@ -88,6 +89,8 @@ public class SseServiceImpl implements ISseService {
private final ConfigService configService;
private final IChatGptsService chatGptsService;
static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
private static final String requestIdTemplate = "mycompany-%d";
@@ -132,20 +135,22 @@ public class SseServiceImpl implements ISseService {
chatMessageBo.setContent(chatString);
String model = chatRequest.getModel();
// 如果是gpts系列模型
if (chatRequest.getModel().startsWith("gpt-4-gizmo")) {
model = "gpt-4-gizmo";
}
SysModel sysModel = sysModelService.selectModelByName(model);
if (sysModel == null) {
// 如果模型不存在默认使用token扣费方式
processByToken(chatRequest.getModel(), chatString, chatMessageBo);
} else {
openAiStreamClient = chatConfig.createOpenAiStreamClient(sysModel.getApiHost(), sysModel.getApiKey());
// 模型设置默认提示词
if (StringUtils.isNotEmpty(sysModel.getSystemPrompt())) {
Message sysMessage = Message.builder().content(sysModel.getSystemPrompt()).role(Message.Role.SYSTEM).build();
messages.add(sysMessage);
if (StringUtils.isNotEmpty(chatRequest.getAppId())) { // 设置应用的系统角色为描述
ChatGptsVo chatGptsVo = chatGptsService.queryById(Long.valueOf(chatRequest.getAppId()));
Message sysMessage = Message.builder().content(chatGptsVo.getSystemPrompt()).role(Message.Role.SYSTEM).build();
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 次数扣费
if ("2".equals(sysModel.getModelType())) {

1
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SysModelServiceImpl.java
View File

@@ -63,6 +63,7 @@ public class SysModelServiceImpl implements ISysModelService {
lqw.like(StringUtils.isNotBlank(bo.getModelShow()), SysModel::getModelShow, bo.getModelShow());
lqw.eq(StringUtils.isNotBlank(bo.getModelDescribe()), SysModel::getModelDescribe, bo.getModelDescribe());
lqw.eq(StringUtils.isNotBlank(bo.getModelType()), SysModel::getModelType, bo.getModelType());
lqw.eq(StringUtils.isNotBlank(bo.getCategory()), SysModel::getCategory, bo.getCategory());
return lqw;
}