From dda2b56bbffdabff9fc19bdceae6b045a308290e Mon Sep 17 00:00:00 2001 From: Ren Date: Sat, 12 Apr 2025 23:52:24 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat=EF=BC=9AAI=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=96=B0=E5=A2=9EToolContext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/AiChatMessageServiceImpl.java | 16 +++++-- .../model/tool/UserIdQueryToolFunction.java | 43 +++++++++++++++++++ .../framework/ai/core/pojo/AiToolContext.java | 37 ++++++++++++++++ .../yudao/framework/ai/core/util/AiUtils.java | 19 ++++---- 4 files changed, 102 insertions(+), 13 deletions(-) create mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java index f310ba69fd..36dcaa999c 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java @@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum; +import cn.iocoder.yudao.framework.ai.core.pojo.AiToolContext; import cn.iocoder.yudao.framework.ai.core.util.AiUtils; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.message.AiChatMessagePageReqVO; import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.message.AiChatMessageRespVO; @@ -115,7 +117,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { knowledgeSegments); // 3.2 创建 chat 需要的 Prompt - Prompt prompt = buildPrompt(conversation, historyMessages, knowledgeSegments, model, sendReqVO); + Prompt prompt = buildPrompt(chatModel, conversation, historyMessages, knowledgeSegments, model, sendReqVO); ChatResponse chatResponse = chatModel.call(prompt); // 3.3 更新响应内容 @@ -164,7 +166,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { knowledgeSegments); // 4.2 构建 Prompt,并进行调用 - Prompt prompt = buildPrompt(conversation, historyMessages, knowledgeSegments, model, sendReqVO); + Prompt prompt = buildPrompt(chatModel, conversation, historyMessages, knowledgeSegments, model, sendReqVO); Flux streamResponse = chatModel.stream(prompt); // 4.3 流式返回 @@ -220,7 +222,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { return knowledgeSegments; } - private Prompt buildPrompt(AiChatConversationDO conversation, List messages, + private Prompt buildPrompt(StreamingChatModel chatModel, AiChatConversationDO conversation, List messages, List knowledgeSegments, AiModelDO model, AiChatMessageSendReqVO sendReqVO) { List chatMessages = new ArrayList<>(); @@ -247,16 +249,22 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { // 2.1 查询 tool 工具 Set toolNames = null; + Map toolContext = Map.of(); if (conversation.getRoleId() != null) { AiChatRoleDO chatRole = chatRoleService.getChatRole(conversation.getRoleId()); if (chatRole != null && CollUtil.isNotEmpty(chatRole.getToolIds())) { toolNames = convertSet(toolService.getToolList(chatRole.getToolIds()), AiToolDO::getName); + // 2.1.1 构建 Function Calling 的上下文参数 + toolContext = Map.of( + AiToolContext.CONTEXT_KEY, new AiToolContext().setChatModel(chatModel).setUserId(SecurityFrameworkUtils.getLoginUserId()) + .setRoleId(conversation.getRoleId()) + .setConversationId(conversation.getId())); } } // 2.2 构建 ChatOptions 对象 AiPlatformEnum platform = AiPlatformEnum.validatePlatform(model.getPlatform()); ChatOptions chatOptions = AiUtils.buildChatOptions(platform, model.getModel(), - conversation.getTemperature(), conversation.getMaxTokens(), toolNames); + conversation.getTemperature(), conversation.getMaxTokens(), toolNames, toolContext); return new Prompt(chatMessages, chatOptions); } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java new file mode 100644 index 0000000000..380fdba414 --- /dev/null +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java @@ -0,0 +1,43 @@ +package cn.iocoder.yudao.module.ai.service.model.tool; + +import cn.iocoder.yudao.framework.ai.core.pojo.AiToolContext; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.ai.chat.model.ToolContext; +import org.springframework.stereotype.Component; + +import java.util.function.BiFunction; + +/** + * 工具:用户ID查询(上下文参数Demo) + * + * @author Ren + */ +@Component("userid_query") +public class UserIdQueryToolFunction + implements BiFunction { + + @Data + @JsonClassDescription("用户ID查询") + public static class Request { } + + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class Response { + /** + * 用户ID + */ + private Long UserId; + + } + @Override + public UserIdQueryToolFunction.Response apply(UserIdQueryToolFunction.Request request, ToolContext toolContext) { + // 获取当前登录用户 + AiToolContext context = (AiToolContext) toolContext.getContext().get(AiToolContext.CONTEXT_KEY); + + return new Response(context.getUserId()); + } +} diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java new file mode 100644 index 0000000000..a0aa72f466 --- /dev/null +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.framework.ai.core.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.ai.chat.model.ChatModel; +import org.springframework.ai.chat.model.StreamingChatModel; + +/** + * 工具上下文参数 DTO,让AI工具可以处理当前用户的相关信息 + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AiToolContext { + public static final String CONTEXT_KEY = "AI_TOOL_CONTEXT"; + /** + * 用户ID + */ + private Long userId; + + /** + * 聊天模型 + */ + private StreamingChatModel chatModel; + + /** + * 关联的聊天角色Id + */ + private Long roleId; + + /** + * 会话Id + */ + private Long conversationId; +} \ No newline at end of file diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java index 09370c6363..47577356be 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java @@ -15,6 +15,7 @@ import org.springframework.ai.qianfan.QianFanChatOptions; import org.springframework.ai.zhipuai.ZhiPuAiChatOptions; import java.util.Collections; +import java.util.Map; import java.util.Set; /** @@ -25,28 +26,28 @@ import java.util.Set; public class AiUtils { public static ChatOptions buildChatOptions(AiPlatformEnum platform, String model, Double temperature, Integer maxTokens) { - return buildChatOptions(platform, model, temperature, maxTokens, null); + return buildChatOptions(platform, model, temperature, maxTokens, null, Map.of()); } public static ChatOptions buildChatOptions(AiPlatformEnum platform, String model, Double temperature, Integer maxTokens, - Set toolNames) { + Set toolNames, Map toolContext) { toolNames = ObjUtil.defaultIfNull(toolNames, Collections.emptySet()); // noinspection EnhancedSwitchMigration switch (platform) { case TONG_YI: return DashScopeChatOptions.builder().withModel(model).withTemperature(temperature).withMaxToken(maxTokens) - .withFunctions(toolNames).build(); + .withFunctions(toolNames).withToolContext(toolContext).build(); case YI_YAN: return QianFanChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build(); case ZHI_PU: return ZhiPuAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) - .functions(toolNames).build(); + .functions(toolNames).toolContext(toolContext).build(); case MINI_MAX: return MiniMaxChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) - .functions(toolNames).build(); + .functions(toolNames).toolContext(toolContext).build(); case MOONSHOT: return MoonshotChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) - .functions(toolNames).build(); + .functions(toolNames).toolContext(toolContext).build(); case OPENAI: case DEEP_SEEK: // 复用 OpenAI 客户端 case DOU_BAO: // 复用 OpenAI 客户端 @@ -55,14 +56,14 @@ public class AiUtils { case SILICON_FLOW: // 复用 OpenAI 客户端 case BAI_CHUAN: // 复用 OpenAI 客户端 return OpenAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) - .toolNames(toolNames).build(); + .toolNames(toolNames).toolContext(toolContext).build(); case AZURE_OPENAI: // TODO 芋艿:貌似没 model 字段???! return AzureOpenAiChatOptions.builder().deploymentName(model).temperature(temperature).maxTokens(maxTokens) - .toolNames(toolNames).build(); + .toolNames(toolNames).toolContext(toolContext).build(); case OLLAMA: return OllamaOptions.builder().model(model).temperature(temperature).numPredict(maxTokens) - .toolNames(toolNames).build(); + .toolNames(toolNames).toolContext(toolContext).build(); default: throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform)); } From bce63cd04f985b7b3bfb350f2d8b1002ac8e22c5 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Tue, 29 Apr 2025 13:59:33 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84AI=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E8=BF=90=E8=A1=8C=E6=B5=8B=E8=AF=95(?= =?UTF-8?q?=E9=80=9A=E4=B9=89=E5=8D=83=E9=97=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/service/model/AiModelService.java | 9 +++++++ .../ai/service/model/AiModelServiceImpl.java | 19 ++++++++++++++ .../workflow/AiWorkflowServiceImpl.java | 25 +++---------------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java index 127f72cc46..c0802b0fc3 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.ai.controller.admin.model.vo.model.AiModelPageReqVO; import cn.iocoder.yudao.module.ai.controller.admin.model.vo.model.AiModelSaveReqVO; import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiModelDO; +import dev.tinyflow.core.Tinyflow; import jakarta.validation.Valid; import org.springframework.ai.chat.model.ChatModel; import org.springframework.ai.image.ImageModel; @@ -131,4 +132,12 @@ public interface AiModelService { */ VectorStore getOrCreateVectorStore(Long id, Map> metadataFields); + /** + * 获取 Tinyflow 所需 LLm Provider + * + * @param tinyflow tinyflow + * @param modelId AI 模型 ID + */ + void getLLmProvider4Tinyflow(Tinyflow tinyflow, Long modelId); + } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java index b0e9e97172..a3f764c2eb 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java @@ -12,6 +12,9 @@ import cn.iocoder.yudao.module.ai.controller.admin.model.vo.model.AiModelSaveReq import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiApiKeyDO; import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiModelDO; import cn.iocoder.yudao.module.ai.dal.mysql.model.AiChatMapper; +import com.agentsflex.llm.qwen.QwenLlm; +import com.agentsflex.llm.qwen.QwenLlmConfig; +import dev.tinyflow.core.Tinyflow; import jakarta.annotation.Resource; import org.springframework.ai.chat.model.ChatModel; import org.springframework.ai.embedding.EmbeddingModel; @@ -168,4 +171,20 @@ public class AiModelServiceImpl implements AiModelService { // return modelFactory.getOrCreateVectorStore(MilvusVectorStore.class, embeddingModel, metadataFields); } + @Override + public void getLLmProvider4Tinyflow(Tinyflow tinyflow, Long modelId) { + AiModelDO model = validateModel(modelId); + AiApiKeyDO apiKey = apiKeyService.validateApiKey(model.getKeyId()); + AiPlatformEnum platform = AiPlatformEnum.validatePlatform(apiKey.getPlatform()); + switch (platform) { + // TODO @lesan 考虑到未来不需要使用agents-flex 现在仅测试通义千问 + case TONG_YI: + QwenLlmConfig qwenLlmConfig = new QwenLlmConfig(); + qwenLlmConfig.setApiKey(apiKey.getApiKey()); + qwenLlmConfig.setModel(model.getModel()); + tinyflow.setLlmProvider(id -> new QwenLlm(qwenLlmConfig)); + break; + } + } + } \ No newline at end of file diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java index 70d28496c8..a7a477b655 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java @@ -7,10 +7,9 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.ai.controller.admin.workflow.vo.AiWorkflowPageReqVO; import cn.iocoder.yudao.module.ai.controller.admin.workflow.vo.AiWorkflowSaveReqVO; import cn.iocoder.yudao.module.ai.controller.admin.workflow.vo.AiWorkflowTestReqVO; -import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiApiKeyDO; import cn.iocoder.yudao.module.ai.dal.dataobject.workflow.AiWorkflowDO; import cn.iocoder.yudao.module.ai.dal.mysql.workflow.AiWorkflowMapper; -import cn.iocoder.yudao.module.ai.service.model.AiApiKeyService; +import cn.iocoder.yudao.module.ai.service.model.AiModelService; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import dev.tinyflow.core.Tinyflow; @@ -37,7 +36,7 @@ public class AiWorkflowServiceImpl implements AiWorkflowService { private AiWorkflowMapper workflowMapper; @Resource - private AiApiKeyService apiKeyService; + private AiModelService apiModelService; @Override public Long createWorkflow(AiWorkflowSaveReqVO createReqVO) { @@ -118,25 +117,7 @@ public class AiWorkflowServiceImpl implements AiWorkflowService { switch (node.getString("type")) { case "llmNode": JSONObject data = node.getJSONObject("data"); - AiApiKeyDO apiKey = apiKeyService.getApiKey(data.getLong("llmId")); - switch (apiKey.getPlatform()) { - // TODO @lesan 需要讨论一下这里怎么弄 - // TODO @lesan llmId 对应 model 的编号如何?这样的话,就是 apiModelService 提供一个获取 LLM 的方法。然后,创建的方法,也在 AiModelFactory 提供。可以先接个 deepseek 先。deepseek yyds! - case "OpenAI": - break; - case "Ollama": - break; - case "YiYan": - break; - case "XingHuo": - break; - case "TongYi": - break; - case "DeepSeek": - break; - case "ZhiPu": - break; - } + apiModelService.getLLmProvider4Tinyflow(tinyflow, data.getLong("llmId")); break; case "internalNode": break; From 282e87b17e0041d618b2592bb30a534754d05f21 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 16:10:37 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91=E5=86=99=E4=BD=9C=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=81=8A=E5=A4=A9=E6=A8=A1=E5=9E=8B=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/ai/service/write/AiWriteServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/write/AiWriteServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/write/AiWriteServiceImpl.java index 787f8d2046..eab2cd65b1 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/write/AiWriteServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/write/AiWriteServiceImpl.java @@ -76,7 +76,7 @@ public class AiWriteServiceImpl implements AiWriteService { ? writeRole.getSystemMessage() : AiChatRoleEnum.AI_WRITE_ROLE.getSystemMessage(); // 1.3 校验平台 AiPlatformEnum platform = AiPlatformEnum.validatePlatform(model.getPlatform()); - StreamingChatModel chatModel = modalService.getChatModel(model.getKeyId()); + StreamingChatModel chatModel = modalService.getChatModel(model.getId()); // 2. 插入写作信息 AiWriteDO writeDO = BeanUtils.toBean(generateReqVO, AiWriteDO.class, write -> write.setUserId(userId) From e11ee654ef567b87474192cbac00772aa7f2ad9c Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 16:37:50 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91=E5=A2=9E=E5=8A=A0=20AI=20ToolContex?= =?UTF-8?q?t=20=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/AiChatMessageServiceImpl.java | 21 ++---- .../service/knowledge/AiKnowledgeService.java | 7 ++ .../knowledge/AiKnowledgeServiceImpl.java | 7 +- .../model/tool/UserIdQueryToolFunction.java | 43 ----------- .../tool/UserProfileQueryToolFunction.java | 75 +++++++++++++++++++ .../yudao-spring-boot-starter-ai/pom.xml | 12 +++ .../framework/ai/core/pojo/AiToolContext.java | 37 --------- .../yudao/framework/ai/core/util/AiUtils.java | 15 +++- 8 files changed, 120 insertions(+), 97 deletions(-) delete mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java create mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java delete mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java index 36dcaa999c..d11844a4b5 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java @@ -4,12 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum; -import cn.iocoder.yudao.framework.ai.core.pojo.AiToolContext; import cn.iocoder.yudao.framework.ai.core.util.AiUtils; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.message.AiChatMessagePageReqVO; import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.message.AiChatMessageRespVO; @@ -103,8 +101,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { ChatModel chatModel = modalService.getChatModel(model.getId()); // 2. 知识库找回 - List knowledgeSegments = recallKnowledgeSegment(sendReqVO.getContent(), - conversation); + List knowledgeSegments = recallKnowledgeSegment(sendReqVO.getContent(), conversation); // 3. 插入 user 发送消息 AiChatMessageDO userMessage = createChatMessage(conversation.getId(), null, model, @@ -117,7 +114,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { knowledgeSegments); // 3.2 创建 chat 需要的 Prompt - Prompt prompt = buildPrompt(chatModel, conversation, historyMessages, knowledgeSegments, model, sendReqVO); + Prompt prompt = buildPrompt(conversation, historyMessages, knowledgeSegments, model, sendReqVO); ChatResponse chatResponse = chatModel.call(prompt); // 3.3 更新响应内容 @@ -166,7 +163,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { knowledgeSegments); // 4.2 构建 Prompt,并进行调用 - Prompt prompt = buildPrompt(chatModel, conversation, historyMessages, knowledgeSegments, model, sendReqVO); + Prompt prompt = buildPrompt(conversation, historyMessages, knowledgeSegments, model, sendReqVO); Flux streamResponse = chatModel.stream(prompt); // 4.3 流式返回 @@ -222,9 +219,9 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { return knowledgeSegments; } - private Prompt buildPrompt(StreamingChatModel chatModel, AiChatConversationDO conversation, List messages, - List knowledgeSegments, - AiModelDO model, AiChatMessageSendReqVO sendReqVO) { + private Prompt buildPrompt(AiChatConversationDO conversation, List messages, + List knowledgeSegments, + AiModelDO model, AiChatMessageSendReqVO sendReqVO) { List chatMessages = new ArrayList<>(); // 1.1 System Context 角色设定 if (StrUtil.isNotBlank(conversation.getSystemMessage())) { @@ -254,11 +251,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { AiChatRoleDO chatRole = chatRoleService.getChatRole(conversation.getRoleId()); if (chatRole != null && CollUtil.isNotEmpty(chatRole.getToolIds())) { toolNames = convertSet(toolService.getToolList(chatRole.getToolIds()), AiToolDO::getName); - // 2.1.1 构建 Function Calling 的上下文参数 - toolContext = Map.of( - AiToolContext.CONTEXT_KEY, new AiToolContext().setChatModel(chatModel).setUserId(SecurityFrameworkUtils.getLoginUserId()) - .setRoleId(conversation.getRoleId()) - .setConversationId(conversation.getId())); + toolContext = AiUtils.buildCommonToolContext(); } } // 2.2 构建 ChatOptions 对象 diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeService.java index 5336570d27..6c552a40f0 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeService.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeService.java @@ -29,6 +29,13 @@ public interface AiKnowledgeService { */ void updateKnowledge(AiKnowledgeSaveReqVO updateReqVO); + /** + * 删除知识库 + * + * @param id 知识库编号 + */ + void deleteKnowledge(Long id); + /** * 获得知识库 * diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java index 59afd7d7bc..3a4f60cfa7 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.ai.service.knowledge; import cn.hutool.core.util.ObjUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgePageReqVO; import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgeSaveReqVO; import cn.iocoder.yudao.module.ai.dal.dataobject.knowledge.AiKnowledgeDO; -import cn.iocoder.yudao.module.ai.dal.dataobject.knowledge.AiKnowledgeDocumentDO; import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiModelDO; import cn.iocoder.yudao.module.ai.dal.mysql.knowledge.AiKnowledgeMapper; import cn.iocoder.yudao.module.ai.service.model.AiModelService; @@ -67,6 +65,11 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { } } + @Override + public void deleteKnowledge(Long id) { + + } + @Override public AiKnowledgeDO getKnowledge(Long id) { return knowledgeMapper.selectById(id); diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java deleted file mode 100644 index 380fdba414..0000000000 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserIdQueryToolFunction.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.iocoder.yudao.module.ai.service.model.tool; - -import cn.iocoder.yudao.framework.ai.core.pojo.AiToolContext; -import com.fasterxml.jackson.annotation.JsonClassDescription; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.ai.chat.model.ToolContext; -import org.springframework.stereotype.Component; - -import java.util.function.BiFunction; - -/** - * 工具:用户ID查询(上下文参数Demo) - * - * @author Ren - */ -@Component("userid_query") -public class UserIdQueryToolFunction - implements BiFunction { - - @Data - @JsonClassDescription("用户ID查询") - public static class Request { } - - @Data - @AllArgsConstructor - @NoArgsConstructor - public static class Response { - /** - * 用户ID - */ - private Long UserId; - - } - @Override - public UserIdQueryToolFunction.Response apply(UserIdQueryToolFunction.Request request, ToolContext toolContext) { - // 获取当前登录用户 - AiToolContext context = (AiToolContext) toolContext.getContext().get(AiToolContext.CONTEXT_KEY); - - return new Response(context.getUserId()); - } -} diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java new file mode 100644 index 0000000000..d8db05aeb6 --- /dev/null +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/tool/UserProfileQueryToolFunction.java @@ -0,0 +1,75 @@ +package cn.iocoder.yudao.module.ai.service.model.tool; + +import cn.iocoder.yudao.framework.ai.core.util.AiUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.security.core.LoginUser; +import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.fasterxml.jackson.annotation.JsonClassDescription; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.ai.chat.model.ToolContext; +import org.springframework.stereotype.Component; + +import java.util.function.BiFunction; + +/** + * 工具:当前用户信息查询 + * + * 同时,也是展示 ToolContext 上下文的使用 + * + * @author Ren + */ +@Component("user_profile_query") +public class UserProfileQueryToolFunction + implements BiFunction { + + @Resource + private AdminUserApi adminUserApi; + + @Data + @JsonClassDescription("当前用户信息查询") + public static class Request { } + + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class Response { + + /** + * 用户ID + */ + private Long id; + /** + * 用户昵称 + */ + private String nickname; + + /** + * 手机号码 + */ + private String mobile; + /** + * 用户头像 + */ + private String avatar; + + } + + @Override + public UserProfileQueryToolFunction.Response apply(UserProfileQueryToolFunction.Request request, ToolContext toolContext) { + LoginUser loginUser = (LoginUser) toolContext.getContext().get(AiUtils.TOOL_CONTEXT_LOGIN_USER); + Long tenantId = (Long) toolContext.getContext().get(AiUtils.TOOL_CONTEXT_TENANT_ID); + if (loginUser == null | tenantId == null) { + return null; + } + return TenantUtils.execute(tenantId, () -> { + AdminUserRespDTO user = adminUserApi.getUser(loginUser.getId()); + return BeanUtils.toBean(user, Response.class); + }); + } + +} diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml index ba1c923f79..1b04282613 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml @@ -24,6 +24,18 @@ yudao-common + + + cn.iocoder.boot + yudao-spring-boot-starter-biz-tenant + + + + + cn.iocoder.boot + yudao-spring-boot-starter-security + + org.springframework.ai diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java deleted file mode 100644 index a0aa72f466..0000000000 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/pojo/AiToolContext.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.iocoder.yudao.framework.ai.core.pojo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.ai.chat.model.ChatModel; -import org.springframework.ai.chat.model.StreamingChatModel; - -/** - * 工具上下文参数 DTO,让AI工具可以处理当前用户的相关信息 - * - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class AiToolContext { - public static final String CONTEXT_KEY = "AI_TOOL_CONTEXT"; - /** - * 用户ID - */ - private Long userId; - - /** - * 聊天模型 - */ - private StreamingChatModel chatModel; - - /** - * 关联的聊天角色Id - */ - private Long roleId; - - /** - * 会话Id - */ - private Long conversationId; -} \ No newline at end of file diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java index 47577356be..10f15b7b32 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.framework.ai.core.util; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import com.alibaba.cloud.ai.dashscope.chat.DashScopeChatOptions; import org.springframework.ai.azure.openai.AzureOpenAiChatOptions; import org.springframework.ai.chat.messages.*; @@ -15,6 +17,7 @@ import org.springframework.ai.qianfan.QianFanChatOptions; import org.springframework.ai.zhipuai.ZhiPuAiChatOptions; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -25,8 +28,11 @@ import java.util.Set; */ public class AiUtils { + public static final String TOOL_CONTEXT_LOGIN_USER = "LOGIN_USER"; + public static final String TOOL_CONTEXT_TENANT_ID = "TENANT_ID"; + public static ChatOptions buildChatOptions(AiPlatformEnum platform, String model, Double temperature, Integer maxTokens) { - return buildChatOptions(platform, model, temperature, maxTokens, null, Map.of()); + return buildChatOptions(platform, model, temperature, maxTokens, null, null); } public static ChatOptions buildChatOptions(AiPlatformEnum platform, String model, Double temperature, Integer maxTokens, @@ -85,4 +91,11 @@ public class AiUtils { throw new IllegalArgumentException(StrUtil.format("未知消息类型({})", type)); } + public static Map buildCommonToolContext() { + Map context = new HashMap<>(); + context.put(TOOL_CONTEXT_LOGIN_USER, SecurityFrameworkUtils.getLoginUser()); + context.put(TOOL_CONTEXT_TENANT_ID, TenantContextHolder.getTenantId()); + return context; + } + } \ No newline at end of file From 3e8596ee4b0eb0f96cbcb70df333392ca5cb0713 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 16:51:17 +0800 Subject: [PATCH 05/11] =?UTF-8?q?feat=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91=E5=A2=9E=E5=8A=A0=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge/AiKnowledgeController.java | 9 +++++++++ .../knowledge/AiKnowledgeDocumentMapper.java | 4 ++++ .../knowledge/AiKnowledgeDocumentService.java | 15 ++++++++++++++ .../AiKnowledgeDocumentServiceImpl.java | 20 +++++++++++++++++++ .../knowledge/AiKnowledgeServiceImpl.java | 18 ++++++++++++++--- 5 files changed, 63 insertions(+), 3 deletions(-) diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java index c6e31f0e8d..b9daa95135 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/AiKnowledgeController.java @@ -63,6 +63,15 @@ public class AiKnowledgeController { knowledgeService.updateKnowledge(updateReqVO); return success(true); } + + @DeleteMapping("/delete") + @Operation(summary = "删除知识库") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('ai:knowledge:delete')") + public CommonResult deleteKnowledge(@RequestParam("id") Long id) { + knowledgeService.deleteKnowledge(id); + return success(true); + } @GetMapping("/simple-list") @Operation(summary = "获得知识库的精简列表") diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeDocumentMapper.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeDocumentMapper.java index 11a76cc57b..55f04bb328 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeDocumentMapper.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeDocumentMapper.java @@ -36,4 +36,8 @@ public interface AiKnowledgeDocumentMapper extends BaseMapperX selectListByKnowledgeId(Long knowledgeId) { + return selectList(AiKnowledgeDocumentDO::getKnowledgeId, knowledgeId); + } + } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java index 8ff137b331..3ffd47a510 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java @@ -81,6 +81,13 @@ public interface AiKnowledgeDocumentService { */ void deleteKnowledgeDocument(Long id); + /** + * 根据知识库编号,批量删除文档 + * + * @param knowledgeId 知识库编号 + */ + void deleteKnowledgeDocumentByKnowledgeId(Long knowledgeId); + /** * 校验文档是否存在 * @@ -105,6 +112,14 @@ public interface AiKnowledgeDocumentService { */ List getKnowledgeDocumentList(Collection ids); + /** + * 根据知识库编号获取文档列表 + * + * @param knowledgeId 知识库编号 + * @return 文档列表 + */ + List getKnowledgeDocumentListByKnowledgeId(Long knowledgeId); + /** * 获取文档 Map * diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java index 2d78f94f34..c03d35f064 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java @@ -211,4 +211,24 @@ public class AiKnowledgeDocumentServiceImpl implements AiKnowledgeDocumentServic return knowledgeDocumentMapper.selectBatchIds(ids); } + @Override + public List getKnowledgeDocumentListByKnowledgeId(Long knowledgeId) { + return knowledgeDocumentMapper.selectListByKnowledgeId(knowledgeId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteKnowledgeDocumentByKnowledgeId(Long knowledgeId) { + // 1. 获取该知识库下的所有文档 + List documents = knowledgeDocumentMapper.selectListByKnowledgeId(knowledgeId); + if (CollUtil.isEmpty(documents)) { + return; + } + + // 2. 逐个删除文档及其对应的段落 + for (AiKnowledgeDocumentDO document : documents) { + deleteKnowledgeDocument(document.getId()); + } + } + } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java index 3a4f60cfa7..75b9943a8c 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeServiceImpl.java @@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.ai.service.model.AiModelService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,6 +35,8 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { private AiModelService modelService; @Resource private AiKnowledgeSegmentService knowledgeSegmentService; + @Resource + private AiKnowledgeDocumentService knowledgeDocumentService; @Override public Long createKnowledge(AiKnowledgeSaveReqVO createReqVO) { @@ -66,8 +69,17 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { } @Override + @Transactional(rollbackFor = Exception.class) public void deleteKnowledge(Long id) { + // 1. 校验存在 + validateKnowledgeExists(id); + // 2. 删除知识库下的所有文档及段落 + knowledgeDocumentService.deleteKnowledgeDocumentByKnowledgeId(id); + + // 3. 删除知识库 + // 特殊:知识库需要最后删除,不然相关的配置会找不到 + knowledgeMapper.deleteById(id); } @Override @@ -77,11 +89,11 @@ public class AiKnowledgeServiceImpl implements AiKnowledgeService { @Override public AiKnowledgeDO validateKnowledgeExists(Long id) { - AiKnowledgeDO knowledgeBase = knowledgeMapper.selectById(id); - if (knowledgeBase == null) { + AiKnowledgeDO knowledge = knowledgeMapper.selectById(id); + if (knowledge == null) { throw exception(KNOWLEDGE_NOT_EXISTS); } - return knowledgeBase; + return knowledge; } @Override From 04b8aa04222d6fbe516c657221b3532c4146c480 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 18:09:28 +0800 Subject: [PATCH 06/11] =?UTF-8?q?reactor=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=90=8E=EF=BC=8C=E8=AF=BB=E5=8F=96=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=20N=20=E6=AC=A1=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge/AiKnowledgeSegmentMapper.java | 4 ++-- .../chat/AiChatMessageServiceImpl.java | 21 ++++++++++--------- .../knowledge/AiKnowledgeDocumentService.java | 7 ------- .../AiKnowledgeDocumentServiceImpl.java | 8 ------- 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeSegmentMapper.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeSegmentMapper.java index 00bacd9665..1b9ca867f5 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeSegmentMapper.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/mysql/knowledge/AiKnowledgeSegmentMapper.java @@ -30,9 +30,9 @@ public interface AiKnowledgeSegmentMapper extends BaseMapperX selectListByVectorIds(List vectorIdList) { + default List selectListByVectorIds(List vectorIds) { return selectList(new LambdaQueryWrapperX() - .in(AiKnowledgeSegmentDO::getVectorId, vectorIdList) + .in(AiKnowledgeSegmentDO::getVectorId, vectorIds) .orderByDesc(AiKnowledgeSegmentDO::getId)); } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java index d11844a4b5..672a3ae0c9 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java @@ -121,11 +121,11 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { String newContent = chatResponse.getResult().getOutput().getText(); chatMessageMapper.updateById(new AiChatMessageDO().setId(assistantMessage.getId()).setContent(newContent)); // 3.4 响应结果 + Map documentMap = knowledgeDocumentService.getKnowledgeDocumentMap( + convertSet(knowledgeSegments, AiKnowledgeSegmentSearchRespBO::getDocumentId)); List segments = BeanUtils.toBean(knowledgeSegments, - AiChatMessageRespVO.KnowledgeSegment.class, - segment -> { - AiKnowledgeDocumentDO document = knowledgeDocumentService - .getKnowledgeDocument(segment.getDocumentId()); + AiChatMessageRespVO.KnowledgeSegment.class, segment -> { + AiKnowledgeDocumentDO document = documentMap.get(segment.getDocumentId()); segment.setDocumentName(document != null ? document.getName() : null); }); return new AiChatMessageSendRespVO() @@ -172,12 +172,13 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { // 处理知识库的返回,只有首次才有 List segments = null; if (StrUtil.isEmpty(contentBuffer)) { - segments = BeanUtils.toBean(knowledgeSegments, AiChatMessageRespVO.KnowledgeSegment.class, - segment -> TenantUtils.executeIgnore(() -> { - AiKnowledgeDocumentDO document = knowledgeDocumentService - .getKnowledgeDocument(segment.getDocumentId()); - segment.setDocumentName(document != null ? document.getName() : null); - })); + Map documentMap = TenantUtils.executeIgnore(() -> + knowledgeDocumentService.getKnowledgeDocumentMap( + convertSet(knowledgeSegments, AiKnowledgeSegmentSearchRespBO::getDocumentId))); + segments = BeanUtils.toBean(knowledgeSegments, AiChatMessageRespVO.KnowledgeSegment.class, segment -> { + AiKnowledgeDocumentDO document = documentMap.get(segment.getDocumentId()); + segment.setDocumentName(document != null ? document.getName() : null); + }); } // 响应结果 String newContent = chunk.getResult() != null ? chunk.getResult().getOutput().getText() : null; diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java index 3ffd47a510..66155d7727 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentService.java @@ -67,13 +67,6 @@ public interface AiKnowledgeDocumentService { */ void updateKnowledgeDocumentStatus(AiKnowledgeDocumentUpdateStatusReqVO reqVO); - /** - * 更新文档检索次数(增加 +1) - * - * @param ids 文档编号列表 - */ - void updateKnowledgeDocumentRetrievalCountIncr(Collection ids); - /** * 删除文档 * diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java index c03d35f064..7de51ca0f2 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeDocumentServiceImpl.java @@ -161,14 +161,6 @@ public class AiKnowledgeDocumentServiceImpl implements AiKnowledgeDocumentServic knowledgeSegmentService.deleteKnowledgeSegmentByDocumentId(id); } - @Override - public void updateKnowledgeDocumentRetrievalCountIncr(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return; - } - knowledgeDocumentMapper.updateRetrievalCountIncr(ids); - } - @Override public AiKnowledgeDocumentDO validateKnowledgeDocumentExists(Long id) { AiKnowledgeDocumentDO knowledgeDocument = knowledgeDocumentMapper.selectById(id); From 8b958cdc9b77d7b4f2fc67967329491c006951e1 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 19:50:29 +0800 Subject: [PATCH 07/11] =?UTF-8?q?feat=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20OLLAMA=20=E7=9A=84=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/workflow/AiWorkflowController.http | 12 ++++ .../workflow/vo/AiWorkflowTestReqVO.java | 14 +++- .../ai/service/model/AiModelService.java | 2 +- .../ai/service/model/AiModelServiceImpl.java | 11 ++++ .../workflow/AiWorkflowServiceImpl.java | 65 +++++++++++-------- 5 files changed, 74 insertions(+), 30 deletions(-) create mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/AiWorkflowController.http diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/AiWorkflowController.http b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/AiWorkflowController.http new file mode 100644 index 0000000000..8dc1b0c0f7 --- /dev/null +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/AiWorkflowController.http @@ -0,0 +1,12 @@ +### 测试 AI 工作流 +POST {{baseUrl}}/ai/workflow/test +Content-Type: application/json +Authorization: {{token}} +tenant-id: {{adminTenantId}} + +{ + "id": 4, + "params": { + "message": "1 + 1 = ?" + } +} \ No newline at end of file diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/vo/AiWorkflowTestReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/vo/AiWorkflowTestReqVO.java index 4dc509e89d..37b455cc03 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/vo/AiWorkflowTestReqVO.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/workflow/vo/AiWorkflowTestReqVO.java @@ -1,7 +1,8 @@ package cn.iocoder.yudao.module.ai.controller.admin.workflow.vo; +import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.AssertTrue; import lombok.Data; import java.util.Map; @@ -10,11 +11,18 @@ import java.util.Map; @Data public class AiWorkflowTestReqVO { - @Schema(description = "工作流模型", requiredMode = Schema.RequiredMode.REQUIRED, example = "{}") - @NotEmpty(message = "工作流模型不能为空") + @Schema(description = "工作流编号", example = "1024") + private Long id; + + @Schema(description = "工作流模型", example = "{}") private String graph; @Schema(description = "参数", requiredMode = Schema.RequiredMode.REQUIRED, example = "{}") private Map params; + @AssertTrue(message = "工作流或模型,必须传递一个") + public boolean isGraphValid() { + return id != null || StrUtil.isNotEmpty(graph); + } + } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java index c0802b0fc3..1b5aabbc51 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelService.java @@ -133,7 +133,7 @@ public interface AiModelService { VectorStore getOrCreateVectorStore(Long id, Map> metadataFields); /** - * 获取 Tinyflow 所需 LLm Provider + * 获取 TinyFlow 所需 LLm Provider * * @param tinyflow tinyflow * @param modelId AI 模型 ID diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java index a3f764c2eb..3c7c3a952d 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java @@ -12,6 +12,8 @@ import cn.iocoder.yudao.module.ai.controller.admin.model.vo.model.AiModelSaveReq import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiApiKeyDO; import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiModelDO; import cn.iocoder.yudao.module.ai.dal.mysql.model.AiChatMapper; +import com.agentsflex.llm.ollama.OllamaLlm; +import com.agentsflex.llm.ollama.OllamaLlmConfig; import com.agentsflex.llm.qwen.QwenLlm; import com.agentsflex.llm.qwen.QwenLlmConfig; import dev.tinyflow.core.Tinyflow; @@ -171,6 +173,7 @@ public class AiModelServiceImpl implements AiModelService { // return modelFactory.getOrCreateVectorStore(MilvusVectorStore.class, embeddingModel, metadataFields); } + // TODO @lesan:是不是返回 Llm 对象会好点哈? @Override public void getLLmProvider4Tinyflow(Tinyflow tinyflow, Long modelId) { AiModelDO model = validateModel(modelId); @@ -178,12 +181,20 @@ public class AiModelServiceImpl implements AiModelService { AiPlatformEnum platform = AiPlatformEnum.validatePlatform(apiKey.getPlatform()); switch (platform) { // TODO @lesan 考虑到未来不需要使用agents-flex 现在仅测试通义千问 + // TODO @lesan:【重要】是不是可以实现一个 SpringAiLlm,这样的话,内部全部用它就好了。只实现 chat 部分;这样,就把 flex 作为一个 agent 框架,内部调用,还是 spring ai 相关的。成本可能低一点?! case TONG_YI: QwenLlmConfig qwenLlmConfig = new QwenLlmConfig(); qwenLlmConfig.setApiKey(apiKey.getApiKey()); qwenLlmConfig.setModel(model.getModel()); + // TODO @lesan:这个有点奇怪。。。如果一个链式里,有多个模型,咋整呀。。。 tinyflow.setLlmProvider(id -> new QwenLlm(qwenLlmConfig)); break; + case OLLAMA: + OllamaLlmConfig ollamaLlmConfig = new OllamaLlmConfig(); + ollamaLlmConfig.setEndpoint(apiKey.getUrl()); + ollamaLlmConfig.setModel(model.getModel()); + tinyflow.setLlmProvider(id -> new OllamaLlm(ollamaLlmConfig)); + break; } } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java index a7a477b655..ac16e8755e 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java @@ -40,7 +40,10 @@ public class AiWorkflowServiceImpl implements AiWorkflowService { @Override public Long createWorkflow(AiWorkflowSaveReqVO createReqVO) { - validateWorkflowForCreateOrUpdate(null, createReqVO.getCode()); + // 1. 参数校验 + validateCodeUnique(null, createReqVO.getCode()); + + // 2. 插入工作流配置 AiWorkflowDO workflow = BeanUtils.toBean(createReqVO, AiWorkflowDO.class); workflowMapper.insert(workflow); return workflow.getId(); @@ -48,47 +51,33 @@ public class AiWorkflowServiceImpl implements AiWorkflowService { @Override public void updateWorkflow(AiWorkflowSaveReqVO updateReqVO) { - validateWorkflowForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getCode()); + // 1. 参数校验 + validateWorkflowExists(updateReqVO.getId()); + validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 2. 更新工作流配置 AiWorkflowDO workflow = BeanUtils.toBean(updateReqVO, AiWorkflowDO.class); workflowMapper.updateById(workflow); } @Override public void deleteWorkflow(Long id) { + // 1. 校验存在 validateWorkflowExists(id); + + // 2. 删除工作流配置 workflowMapper.deleteById(id); } - @Override - public AiWorkflowDO getWorkflow(Long id) { - return workflowMapper.selectById(id); - } - - @Override - public PageResult getWorkflowPage(AiWorkflowPageReqVO pageReqVO) { - return workflowMapper.selectPage(pageReqVO); - } - - @Override - public Object testWorkflow(AiWorkflowTestReqVO testReqVO) { - Map variables = testReqVO.getParams(); - Tinyflow tinyflow = parseFlowParam(testReqVO.getGraph()); - return tinyflow.toChain().executeForResult(variables); - } - - private void validateWorkflowForCreateOrUpdate(Long id, String code) { - validateWorkflowExists(id); - validateCodeUnique(id, code); - } - - private void validateWorkflowExists(Long id) { + private AiWorkflowDO validateWorkflowExists(Long id) { if (ObjUtil.isNull(id)) { - return; + throw exception(WORKFLOW_NOT_EXISTS); } AiWorkflowDO workflow = workflowMapper.selectById(id); if (ObjUtil.isNull(workflow)) { throw exception(WORKFLOW_NOT_EXISTS); } + return workflow; } private void validateCodeUnique(Long id, String code) { @@ -107,6 +96,30 @@ public class AiWorkflowServiceImpl implements AiWorkflowService { } } + @Override + public AiWorkflowDO getWorkflow(Long id) { + return workflowMapper.selectById(id); + } + + @Override + public PageResult getWorkflowPage(AiWorkflowPageReqVO pageReqVO) { + return workflowMapper.selectPage(pageReqVO); + } + + @Override + public Object testWorkflow(AiWorkflowTestReqVO testReqVO) { + // 加载 graph + String graph = testReqVO.getGraph() != null ? testReqVO.getGraph() + : validateWorkflowExists(testReqVO.getId()).getGraph(); + + // 构建 TinyFlow 执行链 + Tinyflow tinyflow = parseFlowParam(graph); + + // 执行 + Map variables = testReqVO.getParams(); + return tinyflow.toChain().executeForResult(variables); + } + private Tinyflow parseFlowParam(String graph) { // TODO @lesan:可以使用 jackson 哇? JSONObject json = JSONObject.parseObject(graph); From 50f86f1e0a678f3bb335814157575e165e75fc10 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 20:05:20 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91logback=20=E5=92=8C=20slf4j-simple?= =?UTF-8?q?=20=E7=9A=84=E6=97=A5=E5=BF=97=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao-spring-boot-starter-ai/pom.xml | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml index 1b04282613..a3d681fd7c 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml @@ -15,7 +15,7 @@ AI 大模型拓展,接入国内外大模型 1.0.0-M6 - 1.0.0-rc.3 + 1.0.2 @@ -110,6 +110,13 @@ org.springframework.ai spring-ai-milvus-store ${spring-ai.version} + + + + org.slf4j + slf4j-reload4j + + @@ -136,6 +143,10 @@ tinyflow-java-core ${tinyflow.version} + + com.jfinal + enjoy + com.agentsflex @@ -146,6 +157,19 @@ org.codehaus.groovy groovy-all + + + org.slf4j + slf4j-simple + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.slf4j + slf4j-reload4j + From b66a75322660daa54e3b3552b6ea574c4126332a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 21:56:31 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feat=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91=E6=96=B0=E5=A2=9E=20Coze=20?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E4=BD=93=E7=9A=84=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/ai/chat/CozeChatModelTests.java | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/chat/CozeChatModelTests.java diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/chat/CozeChatModelTests.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/chat/CozeChatModelTests.java new file mode 100644 index 0000000000..11f7dd60e7 --- /dev/null +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/chat/CozeChatModelTests.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.framework.ai.chat; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.ai.chat.messages.Message; +import org.springframework.ai.chat.messages.SystemMessage; +import org.springframework.ai.chat.messages.UserMessage; +import org.springframework.ai.chat.model.ChatResponse; +import org.springframework.ai.chat.prompt.Prompt; +import org.springframework.ai.openai.OpenAiChatModel; +import org.springframework.ai.openai.api.OpenAiApi; +import reactor.core.publisher.Flux; + +import java.util.ArrayList; +import java.util.List; + +/** + * 基于 {@link OpenAiChatModel} 集成 Coze 测试 + * + * @author 芋道源码 + */ +public class CozeChatModelTests { + + private final OpenAiChatModel chatModel = OpenAiChatModel.builder() + .openAiApi(OpenAiApi.builder() + .baseUrl("http://127.0.0.1:3000") + .apiKey("app-4hy2d7fJauSbrKbzTKX1afuP") // apiKey + .build()) + .build(); + + @Test + @Disabled + public void testCall() { + // 准备参数 + List messages = new ArrayList<>(); + messages.add(new SystemMessage("你是一个优质的文言文作者,用文言文描述着各城市的人文风景。")); + messages.add(new UserMessage("1 + 1 = ?")); + + // 调用 + ChatResponse response = chatModel.call(new Prompt(messages)); + // 打印结果 + System.out.println(response); + System.out.println(response.getResult().getOutput()); + } + + @Test + @Disabled + public void testStream() { + // 准备参数 + List messages = new ArrayList<>(); + messages.add(new SystemMessage("你是一个优质的文言文作者,用文言文描述着各城市的人文风景。")); + messages.add(new UserMessage("1 + 1 = ?")); + + // 调用 + Flux flux = chatModel.stream(new Prompt(messages)); + // 打印结果 + flux.doOnNext(response -> { +// System.out.println(response); + System.out.println(response.getResult().getOutput()); + }).then().block(); + } + +} From d695dc3cd9a8fd8d3126f44d08ed1509558bee04 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 3 May 2025 22:11:31 +0800 Subject: [PATCH 10/11] =?UTF-8?q?update=EF=BC=9AAI=20=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .image/common/ai-feature.png | Bin 25498 -> 33087 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.image/common/ai-feature.png b/.image/common/ai-feature.png index 552ed59b424610bf8438003a1c839e197bda7eed..7f8c92f8cdca66cfd6bba53af2bfdf483698685f 100644 GIT binary patch literal 33087 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 Z!>4Z+lZ{pJ@TmVa$jhimBc%+3{vR@)I86Wm literal 25498 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 ArvLx| From 163839926a78dd85df46c0ced2bc44654376667a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 4 May 2025 09:53:34 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix=EF=BC=9Ajustauth-spring-boot-starter?= =?UTF-8?q?=20=E5=BC=95=E5=85=A5=E7=9A=84=20hutool-core=20=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-dependencies/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index b40005ab74..118b7ae0e2 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -562,6 +562,13 @@ com.xkcoding.justauth justauth-spring-boot-starter ${justauth-starter.version} + + + + cn.hutool + hutool-core + +