diff --git a/README.md b/README.md index 8ee93ba..58e3553 100644 --- a/README.md +++ b/README.md @@ -70,25 +70,39 @@ vue3+typescript+pnpm openai的secretKey ```plaintext -update adi_sys_config set value = '{"secret_key":"my_openai_secret_key","models":["gpt-3.5-turbo"]}' where name = 'openai_setting'; +update adi_sys_config set value = '{"secret_key":"my_openai_secret_key"}' where name = 'openai_setting'; ``` 灵积大模型平台的apiKey ```plaintext -update adi_sys_config set value = '{"api_key":"my_dashcope_api_key","models":["my model name,eg:qwen-max"]}' where name = 'dashscope_setting'; +update adi_sys_config set value = '{"api_key":"my_dashcope_api_key"}' where name = 'dashscope_setting'; ``` 千帆大模型平台的配置 ```plaintext -update adi_sys_config set value = '{"api_key":"my_qianfan_api_key","secret_key":"my_qianfan_secret_key","models":["my model name,eg:ERNIE-Bot"]}' where name = 'qianfan_setting'; +update adi_sys_config set value = '{"api_key":"my_qianfan_api_key","secret_key":"my_qianfan_secret_key"}' where name = 'qianfan_setting'; ``` ollama的配置 ``` -update adi_sys_config set value = '{"base_url":"my_ollama_base_url","models":["my model name,eg:tinydolphin"]}' where name = 'ollama_setting'; +update adi_sys_config set value = '{"base_url":"my_ollama_base_url"}' where name = 'ollama_setting'; +``` + +* 启用模型或新增模型 + +``` +-- Enable model +update adi_ai_model set is_enable = true where name = 'gpt-3.5-turbo'; +update adi_ai_model set is_enable = true where name = 'dall-e-2'; +update adi_ai_model set is_enable = true where name = 'qwen-turbo'; +update adi_ai_model set is_enable = true where name = 'ernie-3.5-8k-0205'; +update adi_ai_model set is_enable = true where name = 'tinydolphin'; + +-- Add new model +INSERT INTO adi_ai_model (name, type, platform, is_enable) VALUES ('vicuna', 'text', 'ollama', true); ``` * 填充搜索引擎的配置 diff --git a/adi-chat/src/main/java/com/moyz/adi/chat/controller/KnowledgeBaseQAController.java b/adi-chat/src/main/java/com/moyz/adi/chat/controller/KnowledgeBaseQAController.java index 40ad4c4..0e700f6 100644 --- a/adi-chat/src/main/java/com/moyz/adi/chat/controller/KnowledgeBaseQAController.java +++ b/adi-chat/src/main/java/com/moyz/adi/chat/controller/KnowledgeBaseQAController.java @@ -1,6 +1,7 @@ package com.moyz.adi.chat.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.moyz.adi.common.dto.KbQaRecordDto; import com.moyz.adi.common.dto.QAReq; import com.moyz.adi.common.entity.KnowledgeBaseQaRecord; import com.moyz.adi.common.service.KnowledgeBaseQaRecordService; @@ -38,7 +39,7 @@ public class KnowledgeBaseQAController { } @GetMapping("/record/search") - public Page list(String kbUuid, String keyword, @NotNull @Min(1) Integer currentPage, @NotNull @Min(10) Integer pageSize) { + public Page list(String kbUuid, String keyword, @NotNull @Min(1) Integer currentPage, @NotNull @Min(10) Integer pageSize) { return knowledgeBaseQaRecordService.search(kbUuid, keyword, currentPage, pageSize); } diff --git a/adi-common/src/main/java/com/moyz/adi/common/cosntant/AdiConstant.java b/adi-common/src/main/java/com/moyz/adi/common/cosntant/AdiConstant.java index 79d2b71..dad10fe 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/cosntant/AdiConstant.java +++ b/adi-common/src/main/java/com/moyz/adi/common/cosntant/AdiConstant.java @@ -102,6 +102,21 @@ public class AdiConstant { public static final String[] POI_DOC_TYPES = {"doc", "docx", "ppt", "pptx", "xls", "xlsx"}; + + public static class ModelPlatform { + public static final String OPENAI = "openai"; + public static final String DASHSCOPE = "dashscope"; + public static final String QIANFAN = "qianfan"; + public static final String OLLAMA = "ollama"; + } + + public static class ModelType { + public static final String TEXT = "text"; + public static final String IMAGE = "image"; + public static final String EMBEDDING = "embedding"; + public static final String RERANK = "rerank"; + } + public static class SearchEngineName { public static final String GOOGLE = "google"; public static final String BING = "bing"; diff --git a/adi-common/src/main/java/com/moyz/adi/common/dto/ConvMsgDto.java b/adi-common/src/main/java/com/moyz/adi/common/dto/ConvMsgDto.java new file mode 100644 index 0000000..2daa4ac --- /dev/null +++ b/adi-common/src/main/java/com/moyz/adi/common/dto/ConvMsgDto.java @@ -0,0 +1,44 @@ +package com.moyz.adi.common.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class ConvMsgDto { + + @JsonIgnore + private Long id; + + @Schema(title = "消息的uuid") + private String uuid; + + @Schema(title = "父级消息id") + private Long parentMessageId; + + @Schema(title = "对话的消息") + @TableField("remark") + private String remark; + + @Schema(title = "产生该消息的角色：1: 用户,2:系统,3:助手") + private Integer messageRole; + + @Schema(title = "消耗的token数量") + private Integer tokens; + + @Schema(title = "创建时间") + private LocalDateTime createTime; + + @Schema(title = "model id") + private Long aiModelId; + + @Schema(title = "model platform name") + private String aiModelPlatform; + + @Schema(title = "子级消息（一般指的是AI的响应）") + private List children; +} diff --git a/adi-common/src/main/java/com/moyz/adi/common/dto/ConvMsgListResp.java b/adi-common/src/main/java/com/moyz/adi/common/dto/ConvMsgListResp.java index 864a99f..5620521 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/dto/ConvMsgListResp.java +++ b/adi-common/src/main/java/com/moyz/adi/common/dto/ConvMsgListResp.java @@ -11,5 +11,5 @@ public class ConvMsgListResp { private String minMsgUuid; - private List msgList; + private List msgList; } diff --git a/adi-common/src/main/java/com/moyz/adi/common/dto/KbQaRecordDto.java b/adi-common/src/main/java/com/moyz/adi/common/dto/KbQaRecordDto.java new file mode 100644 index 0000000..f17f113 --- /dev/null +++ b/adi-common/src/main/java/com/moyz/adi/common/dto/KbQaRecordDto.java @@ -0,0 +1,39 @@ +package com.moyz.adi.common.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class KbQaRecordDto { + @Schema(title = "uuid") + private String uuid; + + @Schema(title = "知识库uuid") + private String kbUuid; + + @Schema(title = "来源文档id,以逗号隔开") + private String sourceFileIds; + + @Schema(title = "问题") + private String question; + + @Schema(title = "最终提供给LLM的提示词") + @TableField("prompt") + private String prompt; + + @Schema(title = "提供给LLM的提示词所消耗的token数量") + private Integer promptTokens; + + @Schema(title = "答案") + private String answer; + + @Schema(title = "答案消耗的token") + private Integer answerTokens; + + @Schema(title = "ai model id") + private Long aiModelId; + + @Schema(title = "ai model platform") + private String aiModelPlatform; +} diff --git a/adi-common/src/main/java/com/moyz/adi/common/entity/AiModel.java b/adi-common/src/main/java/com/moyz/adi/common/entity/AiModel.java index 4fd4301..dcba595 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/entity/AiModel.java +++ b/adi-common/src/main/java/com/moyz/adi/common/entity/AiModel.java @@ -1,6 +1,5 @@ package com.moyz.adi.common.entity; -import com.moyz.adi.common.enums.AiModelStatus; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -11,15 +10,23 @@ import lombok.Data; @Schema(title = "AiModel对象", description = "AI模型表") public class AiModel extends BaseEntity { + @Schema(title = "模型类型:text,image,embedding,rerank") + @TableField("type") + private String type; + @Schema(title = "模型名称") @TableField("name") private String name; + @Schema(title = "模型所属平台") + @TableField("platform") + private String platform; + @Schema(title = "说明") @TableField("remark") private String remark; - @Schema(title = "状态(1:正常使用,2:不可用)") - @TableField("model_status") - private AiModelStatus modelStatus; + @Schema(title = "状态(1:正常使用,0:不可用)") + @TableField("is_enable") + private Boolean isEnable; } diff --git a/adi-common/src/main/java/com/moyz/adi/common/entity/ConversationMessage.java b/adi-common/src/main/java/com/moyz/adi/common/entity/ConversationMessage.java index 5cca22b..e44e31a 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/entity/ConversationMessage.java +++ b/adi-common/src/main/java/com/moyz/adi/common/entity/ConversationMessage.java @@ -58,7 +58,7 @@ public class ConversationMessage extends BaseEntity { @TableField("understand_context_msg_pair_num") private Integer understandContextMsgPairNum; - @Schema(name = "LLM name") - @TableField("language_model_name") - private String languageModelName; + @Schema(name = "adi_ai_model id") + @TableField("ai_model_id") + private Long aiModelId; } diff --git a/adi-common/src/main/java/com/moyz/adi/common/entity/KnowledgeBaseQaRecord.java b/adi-common/src/main/java/com/moyz/adi/common/entity/KnowledgeBaseQaRecord.java index c27f3ac..7a5d25f 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/entity/KnowledgeBaseQaRecord.java +++ b/adi-common/src/main/java/com/moyz/adi/common/entity/KnowledgeBaseQaRecord.java @@ -51,4 +51,7 @@ public class KnowledgeBaseQaRecord extends BaseEntity { @TableField("user_id") private Long userId; + @Schema(title = "adi_ai_model id") + @TableField("ai_model_id") + private Long aiModelId; } diff --git a/adi-common/src/main/java/com/moyz/adi/common/helper/ImageModelContext.java b/adi-common/src/main/java/com/moyz/adi/common/helper/ImageModelContext.java index 9352819..d4c3108 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/helper/ImageModelContext.java +++ b/adi-common/src/main/java/com/moyz/adi/common/helper/ImageModelContext.java @@ -1,5 +1,6 @@ package com.moyz.adi.common.helper; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.interfaces.AbstractImageModelService; import com.moyz.adi.common.vo.ImageModelInfo; import lombok.extern.slf4j.Slf4j; @@ -35,12 +36,12 @@ public class ImageModelContext { } } - public static void addImageModelService(String modelServiceKey, AbstractImageModelService modelService) { + public static void addImageModelService(AbstractImageModelService modelService) { ImageModelInfo imageModelInfo = new ImageModelInfo(); imageModelInfo.setModelService(modelService); - imageModelInfo.setModelName(modelServiceKey); + imageModelInfo.setModelName(modelService.getAiModel().getName()); imageModelInfo.setEnable(modelService.isEnabled()); - NAME_TO_MODEL.put(modelServiceKey, imageModelInfo); + NAME_TO_MODEL.put(modelService.getAiModel().getName(), imageModelInfo); } public AbstractImageModelService getModelService() { diff --git a/adi-common/src/main/java/com/moyz/adi/common/helper/LLMContext.java b/adi-common/src/main/java/com/moyz/adi/common/helper/LLMContext.java index 0bc8d24..f0168d7 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/helper/LLMContext.java +++ b/adi-common/src/main/java/com/moyz/adi/common/helper/LLMContext.java @@ -1,5 +1,6 @@ package com.moyz.adi.common.helper; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.interfaces.AbstractLLMService; import com.moyz.adi.common.util.JsonUtil; import com.moyz.adi.common.util.LocalCache; @@ -34,12 +35,12 @@ public class LLMContext { } } - public static void addLLMService(String llmServiceKey, AbstractLLMService llmService) { + public static void addLLMService(AbstractLLMService llmService) { LLMModelInfo llmModelInfo = new LLMModelInfo(); - llmModelInfo.setModelName(llmServiceKey); + llmModelInfo.setModelName(llmService.getAiModel().getName()); llmModelInfo.setEnable(llmService.isEnabled()); llmModelInfo.setLlmService(llmService); - NAME_TO_MODEL.put(llmServiceKey, llmModelInfo); + NAME_TO_MODEL.put(llmService.getAiModel().getName(), llmModelInfo); } public AbstractLLMService getLLMService() { diff --git a/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractImageModelService.java b/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractImageModelService.java index 3465a18..cfb07c0 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractImageModelService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractImageModelService.java @@ -1,6 +1,7 @@ package com.moyz.adi.common.interfaces; import com.moyz.adi.common.entity.AiImage; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.entity.User; import com.moyz.adi.common.enums.ErrorEnum; import com.moyz.adi.common.exception.BaseException; @@ -24,7 +25,7 @@ public abstract class AbstractImageModelService { protected Proxy proxy; - protected String modelName; + protected AiModel aiModel; protected T setting; @@ -39,8 +40,8 @@ public abstract class AbstractImageModelService { protected ImageModel imageModel; - public AbstractImageModelService(String modelName, String settingName, Class clazz) { - this.modelName = modelName; + public AbstractImageModelService(AiModel aiModel, String settingName, Class clazz) { + this.aiModel = aiModel; String st = LocalCache.CONFIGS.get(settingName); setting = JsonUtil.fromJson(st, clazz); } @@ -88,4 +89,8 @@ public abstract class AbstractImageModelService { public abstract List editImage(User user, AiImage aiImage); public abstract List createImageVariation(User user, AiImage aiImage); + + public AiModel getAiModel() { + return aiModel; + } } diff --git a/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractLLMService.java b/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractLLMService.java index 852c1ea..f382d18 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractLLMService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/interfaces/AbstractLLMService.java @@ -1,5 +1,6 @@ package com.moyz.adi.common.interfaces; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.exception.BaseException; import com.moyz.adi.common.service.RAGService; import com.moyz.adi.common.util.JsonUtil; @@ -37,9 +38,9 @@ public abstract class AbstractLLMService { protected Proxy proxy; - protected String modelName; + protected AiModel aiModel; - protected T setting; + protected T modelPlatformSetting; protected StreamingChatLanguageModel streamingChatLanguageModel; protected ChatLanguageModel chatLanguageModel; @@ -50,10 +51,10 @@ public abstract class AbstractLLMService { private RAGService queryCompressingRagService; - public AbstractLLMService(String modelName, String settingName, Class clazz) { - this.modelName = modelName; + public AbstractLLMService(AiModel aiModel, String settingName, Class clazz) { + this.aiModel = aiModel; String st = LocalCache.CONFIGS.get(settingName); - setting = JsonUtil.fromJson(st, clazz); + modelPlatformSetting = JsonUtil.fromJson(st, clazz); } public AbstractLLMService setProxy(Proxy proxy) { @@ -61,7 +62,7 @@ public abstract class AbstractLLMService { return this; } - public AbstractLLMService setQueryCompressingRAGService(RAGService ragService){ + public AbstractLLMService setQueryCompressingRAGService(RAGService ragService) { queryCompressingRagService = ragService; return this; } @@ -201,4 +202,8 @@ public abstract class AbstractLLMService { return chatAssistant.chat(messageId, userMessage); } } + + public AiModel getAiModel() { + return aiModel; + } } diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/AiModelService.java b/adi-common/src/main/java/com/moyz/adi/common/service/AiModelService.java new file mode 100644 index 0000000..ab37486 --- /dev/null +++ b/adi-common/src/main/java/com/moyz/adi/common/service/AiModelService.java @@ -0,0 +1,51 @@ +package com.moyz.adi.common.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; +import com.moyz.adi.common.entity.AiModel; +import com.moyz.adi.common.mapper.AiModelMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +import java.util.List; + +import static com.moyz.adi.common.util.LocalCache.MODEL_ID_TO_OBJ; +import static com.moyz.adi.common.util.LocalCache.MODEL_NAME_TO_OBJ; + +@Slf4j +@Service +public class AiModelService extends ServiceImpl { + + @Scheduled(fixedDelay = 5 * 60 * 1000) + public void initAll() { + List all = ChainWrappers.lambdaQueryChain(baseMapper) + .eq(AiModel::getIsDeleted, false) + .list(); + for (AiModel model : all) { + MODEL_NAME_TO_OBJ.put(model.getName(), model); + MODEL_ID_TO_OBJ.put(model.getId(), model); + } + } + + public List listBy(String platform, String type) { + return ChainWrappers.lambdaQueryChain(baseMapper) + .eq(AiModel::getPlatform, platform) + .eq(AiModel::getType, type) + .eq(AiModel::getIsDeleted, false) + .list(); + } + + public AiModel getByName(String modelName) { + return ChainWrappers.lambdaQueryChain(baseMapper) + .eq(AiModel::getName, modelName) + .eq(AiModel::getIsDeleted, false) + .one(); + } + + public Long getIdByName(String modelName) { + AiModel aiModel = this.getByName(modelName); + return null == aiModel ? 0l : aiModel.getId(); + } + +} diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/ConversationMessageService.java b/adi-common/src/main/java/com/moyz/adi/common/service/ConversationMessageService.java index 278777a..2fc5911 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/ConversationMessageService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/ConversationMessageService.java @@ -61,6 +61,9 @@ public class ConversationMessageService extends ServiceImpl historyMsgList = this.lambdaQuery() -// .eq(ConversationMessage::getUserId, user.getId()) -// .eq(ConversationMessage::getConversationUuid, askReq.getConversationUuid()) -// .orderByDesc(ConversationMessage::getId) -// .last("limit " + user.getUnderstandContextMsgPairNum() * 2) -// .list(); -// if (!historyMsgList.isEmpty()) { -// ChatMemory chatMemory = TokenWindowChatMemory.withMaxTokens(1000, new OpenAiTokenizer(GPT_3_5_TURBO)); -// historyMsgList.sort(Comparator.comparing(ConversationMessage::getId)); -// for (ConversationMessage historyMsg : historyMsgList) { -// if (ChatMessageRoleEnum.USER.getValue().equals(historyMsg.getMessageRole())) { -// UserMessage userMessage = UserMessage.from(historyMsg.getRemark()); -// chatMemory.add(userMessage); -// } else if (ChatMessageRoleEnum.SYSTEM.getValue().equals(historyMsg.getMessageRole())) { -// SystemMessage systemMessage = SystemMessage.from(historyMsg.getRemark()); -// chatMemory.add(systemMessage); -// }else if (ChatMessageRoleEnum.ASSISTANT.getValue().equals(historyMsg.getMessageRole())) { -// AiMessage aiMessage = AiMessage.from(historyMsg.getRemark()); -// chatMemory.add(aiMessage); -// } -// } -// sseAskParams.setChatMemory(chatMemory); -// } -// } } sseEmitterHelper.processAndPushToModel(user, sseAskParams, (response, questionMeta, answerMeta) -> { _this.saveAfterAiResponse(user, askReq, response, questionMeta, answerMeta); @@ -228,7 +207,7 @@ public class ConversationMessageService extends ServiceImpl listByUser() { List list = this.lambdaQuery() .eq(Conversation::getUserId, ThreadContext.getCurrentUserId()) @@ -81,7 +88,7 @@ public class ConversationService extends ServiceImpl userMessages = MPPageUtil.convertToList(questions, ConvMsgResp.class); + List userMessages = MPPageUtil.convertToList(questions, ConvMsgDto.class); ConvMsgListResp result = new ConvMsgListResp(minUuid, userMessages); //Wrap answer content @@ -95,9 +102,14 @@ public class ConversationService extends ServiceImpl { - List children = MPPageUtil.convertToList(idToMessages.get(item.getId()), ConvMsgResp.class); + List children = MPPageUtil.convertToList(idToMessages.get(item.getId()), ConvMsgDto.class); if (children.size() > 1) { - children = children.stream().sorted(Comparator.comparing(ConvMsgResp::getCreateTime).reversed()).collect(Collectors.toList()); + children = children.stream().sorted(Comparator.comparing(ConvMsgDto::getCreateTime).reversed()).collect(Collectors.toList()); + } + + for (ConvMsgDto convMsgDto : children) { + AiModel aiModel = MODEL_ID_TO_OBJ.get(convMsgDto.getAiModelId()); + convMsgDto.setAiModelPlatform(null == aiModel ? "" : aiModel.getPlatform()); } item.setChildren(children); }); diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/DashScopeLLMService.java b/adi-common/src/main/java/com/moyz/adi/common/service/DashScopeLLMService.java index 1702e5d..36eb0d6 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/DashScopeLLMService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/DashScopeLLMService.java @@ -1,6 +1,7 @@ package com.moyz.adi.common.service; import com.moyz.adi.common.cosntant.AdiConstant; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.exception.BaseException; import com.moyz.adi.common.interfaces.AbstractLLMService; import com.moyz.adi.common.vo.DashScopeSetting; @@ -11,8 +12,6 @@ import dev.langchain4j.model.dashscope.QwenStreamingChatModel; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import java.net.Proxy; - import static com.moyz.adi.common.enums.ErrorEnum.B_LLM_SECRET_KEY_NOT_SET; /** @@ -21,23 +20,23 @@ import static com.moyz.adi.common.enums.ErrorEnum.B_LLM_SECRET_KEY_NOT_SET; @Slf4j public class DashScopeLLMService extends AbstractLLMService { - public DashScopeLLMService(String modelName) { - super(modelName, AdiConstant.SysConfigKey.DASHSCOPE_SETTING, DashScopeSetting.class); + public DashScopeLLMService(AiModel aiModel) { + super(aiModel, AdiConstant.SysConfigKey.DASHSCOPE_SETTING, DashScopeSetting.class); } @Override public boolean isEnabled() { - return StringUtils.isNotBlank(setting.getApiKey()); + return StringUtils.isNotBlank(modelPlatformSetting.getApiKey()) && aiModel.getIsEnable(); } @Override protected StreamingChatLanguageModel buildStreamingChatLLM() { - if (StringUtils.isBlank(setting.getApiKey())) { + if (StringUtils.isBlank(modelPlatformSetting.getApiKey())) { throw new BaseException(B_LLM_SECRET_KEY_NOT_SET); } return QwenStreamingChatModel.builder() - .apiKey(setting.getApiKey()) - .modelName(modelName) + .apiKey(modelPlatformSetting.getApiKey()) + .modelName(aiModel.getName()) .build(); } @@ -48,12 +47,12 @@ public class DashScopeLLMService extends AbstractLLMService { @Override protected ChatLanguageModel buildChatLLM() { - if (StringUtils.isBlank(setting.getApiKey())) { + if (StringUtils.isBlank(modelPlatformSetting.getApiKey())) { throw new BaseException(B_LLM_SECRET_KEY_NOT_SET); } return QwenChatModel.builder() - .apiKey(setting.getApiKey()) - .modelName(modelName) + .apiKey(modelPlatformSetting.getApiKey()) + .modelName(aiModel.getName()) .build(); } diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/Initializer.java b/adi-common/src/main/java/com/moyz/adi/common/service/Initializer.java index 2005041..9bc073d 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/Initializer.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/Initializer.java @@ -1,19 +1,24 @@ package com.moyz.adi.common.service; import com.moyz.adi.common.cosntant.AdiConstant; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.helper.ImageModelContext; import com.moyz.adi.common.helper.LLMContext; +import com.moyz.adi.common.interfaces.AbstractImageModelService; +import com.moyz.adi.common.interfaces.AbstractLLMService; import com.moyz.adi.common.searchengine.GoogleSearchEngine; import com.moyz.adi.common.searchengine.SearchEngineContext; -import dev.langchain4j.model.openai.OpenAiModelName; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.net.InetSocketAddress; import java.net.Proxy; +import java.util.List; +import java.util.function.Function; @Slf4j @Service @@ -28,6 +33,9 @@ public class Initializer { @Value("${adi.proxy.http-port:0}") protected int proxyHttpPort; + @Resource + private AiModelService aiModelService; + @Resource private SysConfigService sysConfigService; @@ -37,52 +45,53 @@ public class Initializer { @PostConstruct public void init() { sysConfigService.reload(); + aiModelService.initAll(); - Proxy proxy = null; + Proxy proxy; if (proxyEnable) { proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyHttpPort)); + } else { + proxy = null; } //openai - String[] openaiModels = LLMContext.getSupportModels(AdiConstant.SysConfigKey.OPENAI_SETTING); - if (openaiModels.length == 0) { - log.warn("openai service is disabled"); - } - for (String model : openaiModels) { - LLMContext.addLLMService(model, new OpenAiLLMService(model).setProxy(proxy).setQueryCompressingRAGService(queryCompressingRagService)); - } + initLLMService(AdiConstant.ModelPlatform.OPENAI, (model) -> new OpenAiLLMService(model).setProxy(proxy).setQueryCompressingRAGService(queryCompressingRagService)); //dashscope - String[] dashscopeModels = LLMContext.getSupportModels(AdiConstant.SysConfigKey.DASHSCOPE_SETTING); - if (dashscopeModels.length == 0) { - log.warn("dashscope service is disabled"); - } - for (String model : dashscopeModels) { - LLMContext.addLLMService(model, new DashScopeLLMService(model).setQueryCompressingRAGService(queryCompressingRagService)); - } + initLLMService(AdiConstant.ModelPlatform.DASHSCOPE, (model) -> new DashScopeLLMService(model).setQueryCompressingRAGService(queryCompressingRagService)); //qianfan - String[] qianfanModels = LLMContext.getSupportModels(AdiConstant.SysConfigKey.QIANFAN_SETTING); - if (qianfanModels.length == 0) { - log.warn("qianfan service is disabled"); - } - for (String model : qianfanModels) { - LLMContext.addLLMService(model, new QianFanLLMService(model).setQueryCompressingRAGService(queryCompressingRagService)); - } + initLLMService(AdiConstant.ModelPlatform.QIANFAN, (model) -> new QianFanLLMService(model).setQueryCompressingRAGService(queryCompressingRagService)); //ollama - String[] ollamaModels = LLMContext.getSupportModels(AdiConstant.SysConfigKey.OLLAMA_SETTING); - if (ollamaModels.length == 0) { - log.warn("ollama service is disabled"); - } - for (String model : ollamaModels) { - LLMContext.addLLMService("ollama:" + model, new OllamaLLMService(model).setQueryCompressingRAGService(queryCompressingRagService)); - } + initLLMService(AdiConstant.ModelPlatform.OLLAMA, (model) -> new OllamaLLMService(model).setQueryCompressingRAGService(queryCompressingRagService)); - ImageModelContext.addImageModelService(OpenAiModelName.DALL_E_2, new OpenAiImageModelService(OpenAiModelName.DALL_E_2).setProxy(proxy)); + //openai image model + initImageModelService(AdiConstant.ModelPlatform.OPENAI, (model) -> new OpenAiImageModelService(model).setProxy(proxy)); //search engine SearchEngineContext.addEngine(AdiConstant.SearchEngineName.GOOGLE, new GoogleSearchEngine().setProxy(proxy)); } + + private void initLLMService(String platform, Function function) { + List models = aiModelService.listBy(platform, AdiConstant.ModelType.TEXT); + if (CollectionUtils.isEmpty(models)) { + log.warn("{} service is disabled", platform); + } + for (AiModel model : models) { + LLMContext.addLLMService(function.apply(model)); + } + } + + private void initImageModelService(String platform, Function function) { + List models = aiModelService.listBy(platform, AdiConstant.ModelType.IMAGE); + if (CollectionUtils.isEmpty(models)) { + log.warn("{} service is disabled", platform); + } + for (AiModel model : models) { + ImageModelContext.addImageModelService(function.apply(model)); + } + + } } diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseQaRecordService.java b/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseQaRecordService.java index 93e8f9e..8446dcd 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseQaRecordService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseQaRecordService.java @@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; import com.moyz.adi.common.base.ThreadContext; +import com.moyz.adi.common.dto.KbQaRecordDto; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.entity.KnowledgeBase; import com.moyz.adi.common.entity.KnowledgeBaseQaRecord; import com.moyz.adi.common.entity.User; import com.moyz.adi.common.exception.BaseException; import com.moyz.adi.common.mapper.KnowledgeBaseQaRecordMapper; +import com.moyz.adi.common.util.MPPageUtil; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -17,12 +21,16 @@ import org.springframework.stereotype.Service; import java.util.UUID; import static com.moyz.adi.common.enums.ErrorEnum.A_DATA_NOT_FOUND; +import static com.moyz.adi.common.util.LocalCache.MODEL_ID_TO_OBJ; @Slf4j @Service public class KnowledgeBaseQaRecordService extends ServiceImpl { - public Page search(String kbUuid, String keyword, Integer currentPage, Integer pageSize) { + @Resource + private AiModelService aiModelService; + + public Page search(String kbUuid, String keyword, Integer currentPage, Integer pageSize) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(KnowledgeBaseQaRecord::getKbUuid, kbUuid); wrapper.eq(KnowledgeBaseQaRecord::getIsDeleted, false); @@ -33,7 +41,15 @@ public class KnowledgeBaseQaRecordService extends ServiceImpl(currentPage, pageSize), wrapper); + Page page = baseMapper.selectPage(new Page<>(currentPage, pageSize), wrapper); + + Page result = new Page<>(); + MPPageUtil.convertToPage(page, result, KbQaRecordDto.class, (t1, t2) -> { + AiModel aiModel = MODEL_ID_TO_OBJ.get(t1.getAiModelId()); + t2.setAiModelPlatform(null == aiModel ? "" : aiModel.getPlatform()); + return t2; + }); + return result; } /** @@ -45,9 +61,10 @@ public class KnowledgeBaseQaRecordService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseService.java b/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseService.java index 0f9c44b..87d727b 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/KnowledgeBaseService.java @@ -244,7 +244,7 @@ public class KnowledgeBaseService extends ServiceImpl { - knowledgeBaseQaRecordService.createNewRecord(user, knowledgeBase, req.getQuestion(), promptText, promptMeta.getTokens(), response, answerMeta.getTokens()); + knowledgeBaseQaRecordService.createNewRecord(user, knowledgeBase, req.getQuestion(), promptText, promptMeta.getTokens(), response, answerMeta.getTokens(), req.getModelName()); userDayCostService.appendCostToUser(user, promptMeta.getTokens() + answerMeta.getTokens()); }); } diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/OllamaLLMService.java b/adi-common/src/main/java/com/moyz/adi/common/service/OllamaLLMService.java index 73ec58d..60be47b 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/OllamaLLMService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/OllamaLLMService.java @@ -1,5 +1,6 @@ package com.moyz.adi.common.service; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.interfaces.AbstractLLMService; import com.moyz.adi.common.vo.OllamaSetting; import dev.langchain4j.model.chat.ChatLanguageModel; @@ -12,20 +13,20 @@ import static com.moyz.adi.common.cosntant.AdiConstant.SysConfigKey.OLLAMA_SETTI public class OllamaLLMService extends AbstractLLMService { - public OllamaLLMService(String modelName) { - super(modelName, OLLAMA_SETTING, OllamaSetting.class); + public OllamaLLMService(AiModel aiModel) { + super(aiModel, OLLAMA_SETTING, OllamaSetting.class); } @Override public boolean isEnabled() { - return StringUtils.isNotBlank(setting.getBaseUrl()); + return StringUtils.isNotBlank(modelPlatformSetting.getBaseUrl()) && aiModel.getIsEnable(); } @Override protected ChatLanguageModel buildChatLLM() { return OllamaChatModel.builder() - .baseUrl(setting.getBaseUrl()) - .modelName(modelName) + .baseUrl(modelPlatformSetting.getBaseUrl()) + .modelName(aiModel.getName()) .temperature(0.0) .build(); } @@ -33,8 +34,8 @@ public class OllamaLLMService extends AbstractLLMService { @Override protected StreamingChatLanguageModel buildStreamingChatLLM() { return OllamaStreamingChatModel.builder() - .baseUrl(setting.getBaseUrl()) - .modelName(modelName) + .baseUrl(modelPlatformSetting.getBaseUrl()) + .modelName(aiModel.getName()) .build(); } diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/OpenAiImageModelService.java b/adi-common/src/main/java/com/moyz/adi/common/service/OpenAiImageModelService.java index 8f97e53..857b2c7 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/OpenAiImageModelService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/OpenAiImageModelService.java @@ -3,6 +3,7 @@ package com.moyz.adi.common.service; import com.fasterxml.jackson.databind.ObjectMapper; import com.moyz.adi.common.cosntant.AdiConstant; import com.moyz.adi.common.entity.AiImage; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.entity.User; import com.moyz.adi.common.enums.ErrorEnum; import com.moyz.adi.common.exception.BaseException; @@ -45,13 +46,13 @@ public class OpenAiImageModelService extends AbstractImageModelService { - public OpenAiLLMService(String modelName) { - super(modelName, AdiConstant.SysConfigKey.OPENAI_SETTING, OpenAiSetting.class); + public OpenAiLLMService(AiModel model) { + super(model, AdiConstant.SysConfigKey.OPENAI_SETTING, OpenAiSetting.class); } @Override public boolean isEnabled() { - return StringUtils.isNotBlank(setting.getSecretKey()); + return StringUtils.isNotBlank(modelPlatformSetting.getSecretKey()) && aiModel.getIsEnable(); } @Override protected StreamingChatLanguageModel buildStreamingChatLLM() { - if (StringUtils.isBlank(setting.getSecretKey())) { + if (StringUtils.isBlank(modelPlatformSetting.getSecretKey())) { throw new BaseException(ErrorEnum.B_LLM_SECRET_KEY_NOT_SET); } OpenAiStreamingChatModel.OpenAiStreamingChatModelBuilder builder = OpenAiStreamingChatModel .builder() - .modelName(modelName) - .apiKey(setting.getSecretKey()) + .modelName(aiModel.getName()) + .apiKey(modelPlatformSetting.getSecretKey()) .timeout(Duration.of(60, ChronoUnit.SECONDS)); if (null != proxy) { builder.proxy(proxy); @@ -54,8 +55,8 @@ public class OpenAiLLMService extends AbstractLLMService { @Override protected String parseError(Object error) { - if(error instanceof OpenAiHttpException){ - OpenAiHttpException openAiHttpException = (OpenAiHttpException)error; + if (error instanceof OpenAiHttpException) { + OpenAiHttpException openAiHttpException = (OpenAiHttpException) error; OpenAiError openAiError = JsonUtil.fromJson(openAiHttpException.getMessage(), OpenAiError.class); return openAiError.getError().getMessage(); } @@ -64,10 +65,10 @@ public class OpenAiLLMService extends AbstractLLMService { @Override protected ChatLanguageModel buildChatLLM() { - if (StringUtils.isBlank(setting.getSecretKey())) { + if (StringUtils.isBlank(modelPlatformSetting.getSecretKey())) { throw new BaseException(ErrorEnum.B_LLM_SECRET_KEY_NOT_SET); } - OpenAiChatModel.OpenAiChatModelBuilder builder = OpenAiChatModel.builder().apiKey(setting.getSecretKey()); + OpenAiChatModel.OpenAiChatModelBuilder builder = OpenAiChatModel.builder().apiKey(modelPlatformSetting.getSecretKey()); if (null != proxy) { builder.proxy(proxy); } diff --git a/adi-common/src/main/java/com/moyz/adi/common/service/QianFanLLMService.java b/adi-common/src/main/java/com/moyz/adi/common/service/QianFanLLMService.java index a8c0f0d..b2d2186 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/service/QianFanLLMService.java +++ b/adi-common/src/main/java/com/moyz/adi/common/service/QianFanLLMService.java @@ -1,6 +1,7 @@ package com.moyz.adi.common.service; import com.moyz.adi.common.cosntant.AdiConstant; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.interfaces.AbstractLLMService; import com.moyz.adi.common.vo.QianFanSetting; import dev.langchain4j.model.chat.ChatLanguageModel; @@ -18,35 +19,35 @@ import org.apache.commons.lang3.StringUtils; @Accessors(chain = true) public class QianFanLLMService extends AbstractLLMService { - public QianFanLLMService(String modelName) { - super(modelName, AdiConstant.SysConfigKey.QIANFAN_SETTING, QianFanSetting.class); + public QianFanLLMService(AiModel aiModel) { + super(aiModel, AdiConstant.SysConfigKey.QIANFAN_SETTING, QianFanSetting.class); } @Override public boolean isEnabled() { - return StringUtils.isNoneBlank(setting.getApiKey(), setting.getSecretKey()); + return StringUtils.isNoneBlank(modelPlatformSetting.getApiKey(), modelPlatformSetting.getSecretKey()) && aiModel.getIsEnable(); } @Override protected ChatLanguageModel buildChatLLM() { return QianfanChatModel.builder() - .modelName(modelName) + .modelName(aiModel.getName()) .temperature(0.7) .topP(1.0) .maxRetries(1) - .apiKey(setting.getApiKey()) - .secretKey(setting.getSecretKey()) + .apiKey(modelPlatformSetting.getApiKey()) + .secretKey(modelPlatformSetting.getSecretKey()) .build(); } @Override protected StreamingChatLanguageModel buildStreamingChatLLM() { return QianfanStreamingChatModel.builder() - .modelName(modelName) + .modelName(aiModel.getName()) .temperature(0.7) .topP(1.0) - .apiKey(setting.getApiKey()) - .secretKey(setting.getSecretKey()) + .apiKey(modelPlatformSetting.getApiKey()) + .secretKey(modelPlatformSetting.getSecretKey()) .build(); } diff --git a/adi-common/src/main/java/com/moyz/adi/common/util/LocalCache.java b/adi-common/src/main/java/com/moyz/adi/common/util/LocalCache.java index 23c77a6..f8b615d 100644 --- a/adi-common/src/main/java/com/moyz/adi/common/util/LocalCache.java +++ b/adi-common/src/main/java/com/moyz/adi/common/util/LocalCache.java @@ -1,14 +1,19 @@ package com.moyz.adi.common.util; +import com.moyz.adi.common.entity.AiModel; import com.moyz.adi.common.vo.RequestRateLimit; -import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; public class LocalCache { - public static final Map CONFIGS = new HashMap<>(); + public static final Map CONFIGS = new ConcurrentHashMap<>(); public static RequestRateLimit TEXT_RATE_LIMIT_CONFIG; public static RequestRateLimit IMAGE_RATE_LIMIT_CONFIG; + + public static Map MODEL_NAME_TO_OBJ = new ConcurrentHashMap<>(); + + public static Map MODEL_ID_TO_OBJ = new ConcurrentHashMap<>(); } diff --git a/docs/create.sql b/docs/create.sql index bc3c47c..32451a1 100644 --- a/docs/create.sql +++ b/docs/create.sql @@ -49,26 +49,39 @@ COMMENT ON COLUMN public.adi_ai_image.is_deleted IS 'Flag indicating whether the CREATE TABLE public.adi_ai_model ( - id bigserial primary key, - name character varying(45) DEFAULT ''::character varying NOT NULL, - remark character varying(1000), - model_status smallint DEFAULT '1'::smallint NOT NULL, - create_time timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_time timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL, - is_deleted boolean DEFAULT false NOT NULL, - CONSTRAINT adi_ai_model_model_status_check CHECK ((model_status = ANY (ARRAY [1, 2]))) + id bigserial primary key, + name varchar(45) default '' not null, + type varchar(45) default 'llm' not null, + remark varchar(1000) default '', + platform varchar(45) default '' not null, + max_tokens int default 0 not null, + is_enable boolean default false NOT NULL, + create_time timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL, + update_time timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL, + is_deleted boolean DEFAULT false NOT NULL ); COMMENT ON TABLE public.adi_ai_model IS 'ai模型'; - +COMMENT ON COLUMN public.adi_ai_model.type IS 'The type of the AI model,eg: text,image,embedding,rerank'; COMMENT ON COLUMN public.adi_ai_model.name IS 'The name of the AI model'; COMMENT ON COLUMN public.adi_ai_model.remark IS 'Additional remarks about the AI model'; -COMMENT ON COLUMN public.adi_ai_model.model_status IS '1: Normal usage, 2: Not available'; - +COMMENT ON COLUMN public.adi_ai_model.platform IS 'eg: openai,dashscope,qianfan,ollama'; +COMMENT ON COLUMN public.adi_ai_model.max_tokens IS 'The maximum number of tokens that can be generated'; +COMMENT ON COLUMN public.adi_ai_model.is_enable IS '1: Normal usage, 0: Not available'; COMMENT ON COLUMN public.adi_ai_model.create_time IS 'Timestamp of record creation'; - COMMENT ON COLUMN public.adi_ai_model.update_time IS 'Timestamp of record last update, automatically updated on each update'; +INSERT INTO adi_ai_model (name, type, platform, max_tokens, is_enable) +VALUES ('gpt-3.5-turbo', 'text', 'openai', 2048, false); +INSERT INTO adi_ai_model (name, type, platform, is_enable) +VALUES ('dall-e-2', 'image', 'openai', false); +INSERT INTO adi_ai_model (name, type, platform, is_enable) +VALUES ('qwen-turbo', 'text', 'dashscope', false); +INSERT INTO adi_ai_model (name, type, platform, is_enable) +VALUES ('ernie-3.5-8k-0205', 'text', 'qianfan', false); +INSERT INTO adi_ai_model (name, type, platform, is_enable) +VALUES ('tinydolphin', 'text', 'ollama', false); + CREATE TABLE public.adi_conversation ( id bigserial primary key, @@ -103,8 +116,8 @@ CREATE TABLE public.adi_conversation_message uuid character varying(32) DEFAULT ''::character varying NOT NULL, message_role integer DEFAULT 1 NOT NULL, tokens integer DEFAULT 0 NOT NULL, - language_model_name character varying(32) DEFAULT ''::character varying NOT NULL, user_id bigint DEFAULT '0'::bigint NOT NULL, + ai_model_id bigint default 0 not null, secret_key_type integer DEFAULT 1 NOT NULL, understand_context_msg_pair_num integer DEFAULT 0 NOT NULL, create_time timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL, @@ -131,6 +144,8 @@ COMMENT ON COLUMN public.adi_conversation_message.language_model_name IS 'LLM na COMMENT ON COLUMN public.adi_conversation_message.user_id IS '用户ID'; +COMMENT ON COLUMN public.adi_conversation_message.ai_model_id IS 'adi_ai_model id'; + COMMENT ON COLUMN public.adi_conversation_message.secret_key_type IS '加密密钥类型'; COMMENT ON COLUMN public.adi_conversation_message.understand_context_msg_pair_num IS '上下文消息对数量'; @@ -381,6 +396,12 @@ CREATE TRIGGER trigger_user_day_cost_update_time FOR EACH ROW EXECUTE PROCEDURE update_modified_column(); +create trigger trigger_ai_model + before update + on adi_ai_model + for each row +execute procedure update_modified_column(); + INSERT INTO adi_sys_config (name, value) VALUES ('openai_setting', '{"secret_key":"","models":[]}'); INSERT INTO adi_sys_config (name, value) @@ -549,6 +570,7 @@ create table adi_knowledge_base_qa_record answer_tokens integer DEFAULT 0 NOT NULL, source_file_ids varchar(500) default ''::character varying not null, user_id bigint default '0' NOT NULL, + ai_model_id bigint default 0 not null, create_time timestamp default CURRENT_TIMESTAMP not null, update_time timestamp default CURRENT_TIMESTAMP not null, is_deleted boolean default false not null