ady/ruoyi-vue-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【功能新增】AI：新增 function call 示例。会继续完善！

Browse Source
This commit is contained in:
YunaiV
2025-03-13 12:51:50 +08:00
parent f7ab30c50a
commit 25a0fe908a
6 changed files with 226 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiAutoConfiguration.java
View File

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean;
* @author fansili
*/
@AutoConfiguration
@EnableConfigurationProperties({YudaoAiProperties.class,
@EnableConfigurationProperties({ YudaoAiProperties.class,
QdrantVectorStoreProperties.class, // 解析 Qdrant 配置
RedisVectorStoreProperties.class, // 解析 Redis 配置
MilvusVectorStoreProperties.class, MilvusServiceClientProperties.class // 解析 Milvus 配置
@@ -139,15 +139,16 @@ public class YudaoAiAutoConfiguration {
}
// 特殊：由于混元大模型不提供 deepseek，而是通过知识引擎，所以需要区分下 URL
if (StrUtil.isEmpty(properties.getBaseUrl())) {
properties.setBaseUrl(StrUtil.startWithIgnoreCase(properties.getModel(), "deepseek") ?
HunYuanChatModel.DEEP_SEEK_BASE_URL : HunYuanChatModel.BASE_URL);
properties.setBaseUrl(
StrUtil.startWithIgnoreCase(properties.getModel(), "deepseek") ? HunYuanChatModel.DEEP_SEEK_BASE_URL
: HunYuanChatModel.BASE_URL);
}
// 创建 OpenAiChatModel、HunYuanChatModel 对象
OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
.openAiApi(OpenAiApi.builder()
.baseUrl(properties.getBaseUrl())
.apiKey(properties.getApiKey())
.build())
.baseUrl(properties.getBaseUrl())
.apiKey(properties.getApiKey())
.build())
.defaultOptions(OpenAiChatOptions.builder()
.model(properties.getModel())
.temperature(properties.getTemperature())

9
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/factory/AiModelFactoryImpl.java
View File

@@ -61,6 +61,7 @@ import org.springframework.ai.minimax.MiniMaxChatModel;
import org.springframework.ai.minimax.MiniMaxEmbeddingModel;
import org.springframework.ai.minimax.MiniMaxEmbeddingOptions;
import org.springframework.ai.minimax.api.MiniMaxApi;
import org.springframework.ai.model.tool.ToolCallingManager;
import org.springframework.ai.moonshot.MoonshotChatModel;
import org.springframework.ai.moonshot.api.MoonshotApi;
import org.springframework.ai.ollama.OllamaChatModel;
@@ -431,7 +432,7 @@ public class AiModelFactoryImpl implements AiModelFactory {
private static OpenAiChatModel buildOpenAiChatModel(String openAiToken, String url) {
url = StrUtil.blankToDefault(url, OpenAiApiConstants.DEFAULT_BASE_URL);
OpenAiApi openAiApi = OpenAiApi.builder().baseUrl(url).apiKey(openAiToken).build();
return OpenAiChatModel.builder().openAiApi(openAiApi).build();
return OpenAiChatModel.builder().openAiApi(openAiApi).toolCallingManager(getToolCallingManager()).build();
}
// TODO @芋艿：手头暂时没密钥，使用建议再测试下
@@ -465,7 +466,7 @@ public class AiModelFactoryImpl implements AiModelFactory {
*/
private static OllamaChatModel buildOllamaChatModel(String url) {
OllamaApi ollamaApi = new OllamaApi(url);
return OllamaChatModel.builder().ollamaApi(ollamaApi).build();
return OllamaChatModel.builder().ollamaApi(ollamaApi).toolCallingManager(getToolCallingManager()).build();
}
private StabilityAiImageModel buildStabilityAiImageModel(String apiKey, String url) {
@@ -699,4 +700,8 @@ public class AiModelFactoryImpl implements AiModelFactory {
return SpringUtil.getBean(BatchingStrategy.class);
}
private static ToolCallingManager getToolCallingManager() {
return SpringUtil.getBean(ToolCallingManager.class);
}
}

14
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java
View File

@@ -24,14 +24,18 @@ public class AiUtils {
// noinspection EnhancedSwitchMigration
switch (platform) {
case TONG_YI:
// TODO functions
return DashScopeChatOptions.builder().withModel(model).withTemperature(temperature).withMaxToken(maxTokens).build();
case YI_YAN:
return QianFanChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build();
case ZHI_PU:
// TODO functions
return ZhiPuAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build();
case MINI_MAX:
// TODO functions
return MiniMaxChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build();
case MOONSHOT:
// TODO functions
return MoonshotChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build();
case OPENAI:
case DEEP_SEEK: // 复用 OpenAI 客户端
@@ -39,12 +43,18 @@ public class AiUtils {
case HUN_YUAN: // 复用 OpenAI 客户端
case XING_HUO: // 复用 OpenAI 客户端
case SILICON_FLOW: // 复用 OpenAI 客户端
return OpenAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build();
return OpenAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
// .toolNames() TODO
.toolNames("listDir")
.build();
case AZURE_OPENAI:
// TODO 芋艿：貌似没 model 字段？？？！
// TODO 芋艿：.toolNames() TODO
return AzureOpenAiChatOptions.builder().deploymentName(model).temperature(temperature).maxTokens(maxTokens).build();
case OLLAMA:
return OllamaOptions.builder().model(model).temperature(temperature).numPredict(maxTokens).build();
// TODO 芋艿：.toolNames() TODO
return OllamaOptions.builder().model(model).temperature(temperature).numPredict(maxTokens)
.toolNames("listDir").build();
default:
throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform));
}

7
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/package-info.java
View File

@@ -4,7 +4,10 @@
* models 包路径：
* 1. xinghuo 包：【讯飞】星火，自己实现
* 2. deepseek 包：【深度求索】DeepSeek，自己实现
* 3. midjourney 包：Midjourney API，对接 https://github.com/novicezk/midjourney-proxy 实现
* 4. suno 包：Suno API，对接 https://github.com/gcui-art/suno-api 实现
* 3. doubao 包：【字节豆包】DouBao，自己实现
* 4. hunyuan 包：【腾讯混元】HunYuan，自己实现
* 5. siliconflow 包：【硅基硅流】SiliconFlow，自己实现
* 6. midjourney 包：Midjourney API，对接 https://github.com/novicezk/midjourney-proxy 实现
* 7. suno 包：Suno API，对接 https://github.com/gcui-art/suno-api 实现
*/
package cn.iocoder.yudao.framework.ai;