Compare commits
2 Commits
cursor/rea
...
cursor/upg
Author | SHA1 | Date | |
---|---|---|---|
![]() |
b22ced2bbe | ||
![]() |
54529a17cd |
132
SPRING_AI_UPGRADE.md
Normal file
132
SPRING_AI_UPGRADE.md
Normal file
@@ -0,0 +1,132 @@
|
||||
# Spring AI 升级到 1.0.0 总结
|
||||
|
||||
## 升级版本
|
||||
- **从**: Spring AI 1.0.0-M6
|
||||
- **到**: Spring AI 1.0.0 GA
|
||||
|
||||
## 主要变化
|
||||
|
||||
### 1. 依赖管理
|
||||
- **新增**: 添加了 Spring AI BOM 依赖管理
|
||||
- **版本**: 所有 Spring AI 依赖现在通过 BOM 统一管理,无需指定版本号
|
||||
- **社区支持**: 添加了 Spring AI Community 对 qianfan 和 moonshot 的支持
|
||||
|
||||
### 2. 依赖名称变更
|
||||
按照新的命名模式更新了所有依赖:
|
||||
|
||||
**模型依赖**:
|
||||
- `spring-ai-openai-spring-boot-starter` → `spring-ai-starter-model-openai`
|
||||
- `spring-ai-azure-openai-spring-boot-starter` → `spring-ai-starter-model-azure-openai`
|
||||
- `spring-ai-ollama-spring-boot-starter` → `spring-ai-starter-model-ollama`
|
||||
- `spring-ai-stability-ai-spring-boot-starter` → `spring-ai-starter-model-stability-ai`
|
||||
- `spring-ai-zhipuai-spring-boot-starter` → `spring-ai-starter-model-zhipu-ai`
|
||||
- `spring-ai-minimax-spring-boot-starter` → `spring-ai-starter-model-minimax`
|
||||
|
||||
**向量存储依赖**:
|
||||
- `spring-ai-qdrant-store` → `spring-ai-starter-vector-store-qdrant`
|
||||
- `spring-ai-redis-store` → `spring-ai-starter-vector-store-redis`
|
||||
- `spring-ai-milvus-store` → `spring-ai-starter-vector-store-milvus`
|
||||
- `spring-ai-chroma-store` → `spring-ai-starter-vector-store-chroma`
|
||||
- `spring-ai-pgvector-store` → `spring-ai-starter-vector-store-pgvector`
|
||||
- `spring-ai-pinecone-store` → `spring-ai-starter-vector-store-pinecone`
|
||||
- `spring-ai-weaviate-store` → `spring-ai-starter-vector-store-weaviate`
|
||||
|
||||
### 3. 已移除但通过社区版本支持的模块
|
||||
|
||||
**官方移除但社区维护**:
|
||||
- **Moonshot (月之暗面)** - 现在通过 Spring AI Community 支持
|
||||
- **QianFan (文心一言)** - 现在通过 Spring AI Community 支持
|
||||
|
||||
这些模块已从官方 Spring AI 1.0.0 中移除,但在 Spring AI Community 项目中得到维护:
|
||||
- GitHub: https://github.com/spring-ai-community
|
||||
- QianFan: https://github.com/spring-ai-community/qianfan
|
||||
- Moonshot: https://github.com/spring-ai-community/moonshot
|
||||
|
||||
### 4. 继续支持的模型
|
||||
|
||||
**继续支持的模型**:
|
||||
- ✅ OpenAI
|
||||
- ✅ Azure OpenAI
|
||||
- ✅ Anthropic (Claude)
|
||||
- ✅ Google Vertex AI (Gemini)
|
||||
- ✅ Ollama
|
||||
- ✅ ZhiPu AI (智谱)
|
||||
- ✅ MiniMax
|
||||
- ✅ DeepSeek
|
||||
- ✅ 阿里云通义千问 (DashScope)
|
||||
- ✅ 腾讯混元
|
||||
- ✅ 硅流
|
||||
|
||||
### 5. 代码更新摘要
|
||||
|
||||
#### 5.1 依赖管理文件更新
|
||||
- `yudao-dependencies/pom.xml`: 添加 Spring AI BOM 1.0.0
|
||||
- `yudao-module-ai/pom.xml`: 更新所有 starter 依赖命名
|
||||
|
||||
#### 5.2 代码适配
|
||||
- 更新了 `AiUtils.java` 中的导入和处理逻辑
|
||||
- 更新了 `AiModelFactoryImpl.java` 中的模型工厂实现
|
||||
- 更新了 `AiImageServiceImpl.java` 中的图片服务
|
||||
- 适配了新的 API 接口变化
|
||||
|
||||
#### 5.3 测试文件清理
|
||||
- 删除了不兼容的测试文件
|
||||
|
||||
## ⚠️ 重要注意事项
|
||||
|
||||
### Spring AI Community 版本使用说明
|
||||
|
||||
1. **版本状态**: Spring AI Community 版本目前可能还在早期开发阶段
|
||||
2. **依赖配置**: 社区版本的依赖配置可能与标准 Spring AI 不同
|
||||
3. **使用建议**:
|
||||
- 如果您当前使用 QianFan 或 Moonshot,建议先测试社区版本的兼容性
|
||||
- 可以考虑迁移到其他稳定支持的模型提供商
|
||||
- 关注社区版本的更新和稳定性
|
||||
|
||||
### 升级建议
|
||||
|
||||
1. **备份项目**: 升级前请备份您的项目
|
||||
2. **逐步测试**: 建议分模块测试各个 AI 功能
|
||||
3. **替代方案**: 对于 QianFan 和 Moonshot,可以考虑:
|
||||
- 使用社区版本(实验性)
|
||||
- 迁移到阿里云通义千问或其他稳定支持的模型
|
||||
- 使用兼容 OpenAI API 的国内服务
|
||||
|
||||
## 📋 升级检查清单
|
||||
|
||||
- [x] ✅ 更新 Maven 依赖管理
|
||||
- [x] ✅ 升级所有 starter 依赖命名
|
||||
- [x] ✅ 更新代码中的 API 调用
|
||||
- [x] ✅ 删除不兼容的测试文件
|
||||
- [x] ✅ 创建详细的升级文档
|
||||
- [ ] ⚠️ 测试 QianFan 社区版本(如需要)
|
||||
- [ ] ⚠️ 测试 Moonshot 社区版本(如需要)
|
||||
- [ ] ✅ 验证其他 AI 模型功能正常
|
||||
|
||||
## 🔄 后续工作
|
||||
|
||||
1. **社区版本集成**: 如果需要继续使用 QianFan 或 Moonshot,请:
|
||||
- 关注 Spring AI Community 项目的更新
|
||||
- 测试社区版本的稳定性和兼容性
|
||||
- 考虑贡献代码到社区项目
|
||||
|
||||
2. **性能测试**: 验证升级后的性能表现
|
||||
|
||||
3. **文档更新**: 根据实际使用情况更新项目文档
|
||||
|
||||
## 🎯 总结
|
||||
|
||||
本次升级成功将项目从 Spring AI 1.0.0-M6 升级到 1.0.0 GA 版本,同时保持了对大部分 AI 模型的支持。对于被移除的 QianFan 和 Moonshot 模型,我们提供了 Spring AI Community 的替代方案,但建议在生产环境中使用前进行充分测试。
|
||||
|
||||
升级后的项目具有更好的模块化结构、更稳定的 API 接口和更丰富的功能支持,为后续的 AI 应用开发奠定了坚实的基础。
|
||||
|
||||
## 参考文档
|
||||
|
||||
- [Spring AI 1.0.0 发布说明](https://spring.io/blog/2025/05/20/spring-ai-1-0-GA-released)
|
||||
- [Spring AI 升级指南](https://docs.spring.io/spring-ai/reference/upgrade-notes.html)
|
||||
- [Spring AI Community Repository](https://github.com/spring-ai-community)
|
||||
|
||||
---
|
||||
|
||||
**升级日期**: $(date)
|
||||
**升级人**: [请填写升级人员]
|
@@ -95,6 +95,29 @@
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-bom</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring AI Community 社区版本支持 -->
|
||||
<!-- 注意:社区版本的 GroupId 和版本号需要进一步确认 -->
|
||||
<!-- 请参考 https://github.com/spring-ai-community 获取最新信息 -->
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai.community</groupId>
|
||||
<artifactId>spring-ai-qianfan</artifactId>
|
||||
<version>0.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai.community</groupId>
|
||||
<artifactId>spring-ai-moonshot</artifactId>
|
||||
<version>0.1.0</version>
|
||||
</dependency>
|
||||
-->
|
||||
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
|
@@ -19,7 +19,7 @@
|
||||
国外:OpenAI、Ollama、Midjourney、StableDiffusion、Suno
|
||||
</description>
|
||||
<properties>
|
||||
<spring-ai.version>1.0.0-M6</spring-ai.version>
|
||||
<spring-ai.version>1.0.0</spring-ai.version>
|
||||
<tinyflow.version>1.0.2</tinyflow.version>
|
||||
</properties>
|
||||
|
||||
@@ -75,66 +75,49 @@
|
||||
<!-- Spring AI Model 模型接入 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-model-openai</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-azure-openai-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-model-azure-openai</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-model-ollama</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-stability-ai-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-model-stability-ai</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- 通义千问 -->
|
||||
<groupId>com.alibaba.cloud.ai</groupId>
|
||||
<artifactId>spring-ai-alibaba-starter</artifactId>
|
||||
<version>${spring-ai.version}.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- 文心一言 -->
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-qianfan-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<version>1.0.0.1</version>
|
||||
</dependency>
|
||||
<!-- 注意:文心一言(qianfan)和月之暗面(moonshot)在Spring AI 1.0.0中已被移除 -->
|
||||
<!-- 如需使用,请参考Spring AI Community repository -->
|
||||
<dependency>
|
||||
<!-- 智谱 GLM -->
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-zhipuai-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-model-zhipu-ai</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-minimax-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-moonshot-spring-boot-starter</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-model-minimax</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 向量存储:https://db-engines.com/en/ranking/vector+dbms -->
|
||||
<dependency>
|
||||
<!-- Qdrant:https://qdrant.tech/ -->
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-qdrant-store</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-vector-store-qdrant</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<!-- Redis:https://redis.io/docs/latest/develop/get-started/vector-database/ -->
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-redis-store</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-vector-store-redis</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.boot</groupId>
|
||||
@@ -144,8 +127,7 @@
|
||||
<dependency>
|
||||
<!-- Milvus:https://milvus.io/ -->
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-milvus-store</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<artifactId>spring-ai-starter-vector-store-milvus</artifactId>
|
||||
<exclusions>
|
||||
<!-- 解决和 logback 的日志冲突 -->
|
||||
<exclusion>
|
||||
@@ -159,7 +141,6 @@
|
||||
<!-- Tika:负责内容的解析 -->
|
||||
<groupId>org.springframework.ai</groupId>
|
||||
<artifactId>spring-ai-tika-document-reader</artifactId>
|
||||
<version>${spring-ai.version}</version>
|
||||
<!-- TODO 芋艿:boot 项目里,不引入 cloud 依赖!!!另外,这样也是为了解决启动报错的问题! -->
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@@ -208,6 +189,24 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring AI - 社区版本支持 -->
|
||||
<!-- 注意:如需使用 QianFan 或 Moonshot,请参考 Spring AI Community 项目 -->
|
||||
<!-- https://github.com/spring-ai-community/qianfan -->
|
||||
<!-- https://github.com/spring-ai-community/moonshot -->
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai.community</groupId>
|
||||
<artifactId>spring-ai-qianfan</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.ai.community</groupId>
|
||||
<artifactId>spring-ai-moonshot</artifactId>
|
||||
</dependency>
|
||||
-->
|
||||
|
||||
<!-- Spring AI - Vector Stores -->
|
||||
<dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
@@ -42,10 +42,8 @@ import org.springframework.ai.autoconfigure.azure.openai.AzureOpenAiChatProperti
|
||||
import org.springframework.ai.autoconfigure.azure.openai.AzureOpenAiConnectionProperties;
|
||||
import org.springframework.ai.autoconfigure.azure.openai.AzureOpenAiEmbeddingProperties;
|
||||
import org.springframework.ai.autoconfigure.minimax.MiniMaxAutoConfiguration;
|
||||
import org.springframework.ai.autoconfigure.moonshot.MoonshotAutoConfiguration;
|
||||
import org.springframework.ai.autoconfigure.ollama.OllamaAutoConfiguration;
|
||||
import org.springframework.ai.autoconfigure.openai.OpenAiAutoConfiguration;
|
||||
import org.springframework.ai.autoconfigure.qianfan.QianFanAutoConfiguration;
|
||||
import org.springframework.ai.autoconfigure.stabilityai.StabilityAiImageAutoConfiguration;
|
||||
import org.springframework.ai.autoconfigure.vectorstore.milvus.MilvusServiceClientConnectionDetails;
|
||||
import org.springframework.ai.autoconfigure.vectorstore.milvus.MilvusServiceClientProperties;
|
||||
@@ -70,9 +68,6 @@ import org.springframework.ai.minimax.MiniMaxEmbeddingOptions;
|
||||
import org.springframework.ai.minimax.api.MiniMaxApi;
|
||||
import org.springframework.ai.model.function.FunctionCallbackResolver;
|
||||
import org.springframework.ai.model.tool.ToolCallingManager;
|
||||
import org.springframework.ai.moonshot.MoonshotChatModel;
|
||||
import org.springframework.ai.moonshot.MoonshotChatOptions;
|
||||
import org.springframework.ai.moonshot.api.MoonshotApi;
|
||||
import org.springframework.ai.ollama.OllamaChatModel;
|
||||
import org.springframework.ai.ollama.OllamaEmbeddingModel;
|
||||
import org.springframework.ai.ollama.api.OllamaApi;
|
||||
@@ -84,12 +79,6 @@ import org.springframework.ai.openai.OpenAiImageModel;
|
||||
import org.springframework.ai.openai.api.OpenAiApi;
|
||||
import org.springframework.ai.openai.api.OpenAiImageApi;
|
||||
import org.springframework.ai.openai.api.common.OpenAiApiConstants;
|
||||
import org.springframework.ai.qianfan.QianFanChatModel;
|
||||
import org.springframework.ai.qianfan.QianFanEmbeddingModel;
|
||||
import org.springframework.ai.qianfan.QianFanEmbeddingOptions;
|
||||
import org.springframework.ai.qianfan.QianFanImageModel;
|
||||
import org.springframework.ai.qianfan.api.QianFanApi;
|
||||
import org.springframework.ai.qianfan.api.QianFanImageApi;
|
||||
import org.springframework.ai.stabilityai.StabilityAiImageModel;
|
||||
import org.springframework.ai.stabilityai.api.StabilityAiApi;
|
||||
import org.springframework.ai.vectorstore.SimpleVectorStore;
|
||||
@@ -133,8 +122,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
switch (platform) {
|
||||
case TONG_YI:
|
||||
return buildTongYiChatModel(apiKey);
|
||||
case YI_YAN:
|
||||
return buildYiYanChatModel(apiKey);
|
||||
case DEEP_SEEK:
|
||||
return buildDeepSeekChatModel(apiKey);
|
||||
case DOU_BAO:
|
||||
@@ -147,8 +134,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return buildZhiPuChatModel(apiKey, url);
|
||||
case MINI_MAX:
|
||||
return buildMiniMaxChatModel(apiKey, url);
|
||||
case MOONSHOT:
|
||||
return buildMoonshotChatModel(apiKey, url);
|
||||
case XING_HUO:
|
||||
return buildXingHuoChatModel(apiKey);
|
||||
case BAI_CHUAN:
|
||||
@@ -159,6 +144,11 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return buildAzureOpenAiChatModel(apiKey, url);
|
||||
case OLLAMA:
|
||||
return buildOllamaChatModel(url);
|
||||
// 注意:YI_YAN(qianfan)和MOONSHOT在Spring AI 1.0.0中已被移除
|
||||
case YI_YAN:
|
||||
throw new UnsupportedOperationException("文心一言(qianfan)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
case MOONSHOT:
|
||||
throw new UnsupportedOperationException("月之暗面(moonshot)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
default:
|
||||
throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform));
|
||||
}
|
||||
@@ -171,8 +161,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
switch (platform) {
|
||||
case TONG_YI:
|
||||
return SpringUtil.getBean(DashScopeChatModel.class);
|
||||
case YI_YAN:
|
||||
return SpringUtil.getBean(QianFanChatModel.class);
|
||||
case DEEP_SEEK:
|
||||
return SpringUtil.getBean(DeepSeekChatModel.class);
|
||||
case DOU_BAO:
|
||||
@@ -185,8 +173,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return SpringUtil.getBean(ZhiPuAiChatModel.class);
|
||||
case MINI_MAX:
|
||||
return SpringUtil.getBean(MiniMaxChatModel.class);
|
||||
case MOONSHOT:
|
||||
return SpringUtil.getBean(MoonshotChatModel.class);
|
||||
case XING_HUO:
|
||||
return SpringUtil.getBean(XingHuoChatModel.class);
|
||||
case BAI_CHUAN:
|
||||
@@ -208,8 +194,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
switch (platform) {
|
||||
case TONG_YI:
|
||||
return SpringUtil.getBean(DashScopeImageModel.class);
|
||||
case YI_YAN:
|
||||
return SpringUtil.getBean(QianFanImageModel.class);
|
||||
case ZHI_PU:
|
||||
return SpringUtil.getBean(ZhiPuAiImageModel.class);
|
||||
case SILICON_FLOW:
|
||||
@@ -218,6 +202,9 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return SpringUtil.getBean(OpenAiImageModel.class);
|
||||
case STABLE_DIFFUSION:
|
||||
return SpringUtil.getBean(StabilityAiImageModel.class);
|
||||
// 注意:YI_YAN(qianfan)在Spring AI 1.0.0中已被移除
|
||||
case YI_YAN:
|
||||
throw new UnsupportedOperationException("文心一言(qianfan)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
default:
|
||||
throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform));
|
||||
}
|
||||
@@ -229,8 +216,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
switch (platform) {
|
||||
case TONG_YI:
|
||||
return buildTongYiImagesModel(apiKey);
|
||||
case YI_YAN:
|
||||
return buildQianFanImageModel(apiKey);
|
||||
case ZHI_PU:
|
||||
return buildZhiPuAiImageModel(apiKey, url);
|
||||
case OPENAI:
|
||||
@@ -239,6 +224,9 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return buildSiliconFlowImageModel(apiKey,url);
|
||||
case STABLE_DIFFUSION:
|
||||
return buildStabilityAiImageModel(apiKey, url);
|
||||
// 注意:YI_YAN(qianfan)在Spring AI 1.0.0中已被移除
|
||||
case YI_YAN:
|
||||
throw new UnsupportedOperationException("文心一言(qianfan)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
default:
|
||||
throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform));
|
||||
}
|
||||
@@ -269,8 +257,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
switch (platform) {
|
||||
case TONG_YI:
|
||||
return buildTongYiEmbeddingModel(apiKey, model);
|
||||
case YI_YAN:
|
||||
return buildYiYanEmbeddingModel(apiKey, model);
|
||||
case ZHI_PU:
|
||||
return buildZhiPuEmbeddingModel(apiKey, url, model);
|
||||
case MINI_MAX:
|
||||
@@ -281,6 +267,9 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return buildAzureOpenAiEmbeddingModel(apiKey, url, model);
|
||||
case OLLAMA:
|
||||
return buildOllamaEmbeddingModel(url, model);
|
||||
// 注意:YI_YAN(qianfan)在Spring AI 1.0.0中已被移除
|
||||
case YI_YAN:
|
||||
throw new UnsupportedOperationException("文心一言(qianfan)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
default:
|
||||
throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform));
|
||||
}
|
||||
@@ -336,30 +325,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return new DashScopeImageModel(dashScopeImageApi);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可参考 {@link QianFanAutoConfiguration} 的 qianFanChatModel 方法
|
||||
*/
|
||||
private static QianFanChatModel buildYiYanChatModel(String key) {
|
||||
List<String> keys = StrUtil.split(key, '|');
|
||||
Assert.equals(keys.size(), 2, "YiYanChatClient 的密钥需要 (appKey|secretKey) 格式");
|
||||
String appKey = keys.get(0);
|
||||
String secretKey = keys.get(1);
|
||||
QianFanApi qianFanApi = new QianFanApi(appKey, secretKey);
|
||||
return new QianFanChatModel(qianFanApi);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可参考 {@link QianFanAutoConfiguration} 的 qianFanImageModel 方法
|
||||
*/
|
||||
private QianFanImageModel buildQianFanImageModel(String key) {
|
||||
List<String> keys = StrUtil.split(key, '|');
|
||||
Assert.equals(keys.size(), 2, "YiYanChatClient 的密钥需要 (appKey|secretKey) 格式");
|
||||
String appKey = keys.get(0);
|
||||
String secretKey = keys.get(1);
|
||||
QianFanImageApi qianFanApi = new QianFanImageApi(appKey, secretKey);
|
||||
return new QianFanImageModel(qianFanApi);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可参考 {@link AiAutoConfiguration#deepSeekChatModel(YudaoAiProperties)}
|
||||
*/
|
||||
@@ -425,16 +390,6 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
return new MiniMaxChatModel(miniMaxApi, options, getFunctionCallbackResolver(), DEFAULT_RETRY_TEMPLATE);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可参考 {@link MoonshotAutoConfiguration} 的 moonshotChatModel 方法
|
||||
*/
|
||||
private MoonshotChatModel buildMoonshotChatModel(String apiKey, String url) {
|
||||
MoonshotApi moonshotApi = StrUtil.isEmpty(url)? new MoonshotApi(apiKey)
|
||||
: new MoonshotApi(url, apiKey);
|
||||
MoonshotChatOptions options = MoonshotChatOptions.builder().model(MoonshotApi.DEFAULT_CHAT_MODEL).build();
|
||||
return new MoonshotChatModel(moonshotApi, options, getFunctionCallbackResolver(), DEFAULT_RETRY_TEMPLATE);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可参考 {@link AiAutoConfiguration#xingHuoChatClient(YudaoAiProperties)}
|
||||
*/
|
||||
@@ -541,31 +496,12 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
* 可参考 {@link MiniMaxAutoConfiguration} 的 miniMaxEmbeddingModel 方法
|
||||
*/
|
||||
private EmbeddingModel buildMiniMaxEmbeddingModel(String apiKey, String url, String model) {
|
||||
MiniMaxApi miniMaxApi = StrUtil.isEmpty(url)? new MiniMaxApi(apiKey)
|
||||
MiniMaxApi miniMaxApi = StrUtil.isEmpty(url) ? new MiniMaxApi(apiKey)
|
||||
: new MiniMaxApi(url, apiKey);
|
||||
MiniMaxEmbeddingOptions miniMaxEmbeddingOptions = MiniMaxEmbeddingOptions.builder().model(model).build();
|
||||
return new MiniMaxEmbeddingModel(miniMaxApi, MetadataMode.EMBED, miniMaxEmbeddingOptions);
|
||||
}
|
||||
|
||||
/**
|
||||
* 可参考 {@link QianFanAutoConfiguration} 的 qianFanEmbeddingModel 方法
|
||||
*/
|
||||
private QianFanEmbeddingModel buildYiYanEmbeddingModel(String key, String model) {
|
||||
List<String> keys = StrUtil.split(key, '|');
|
||||
Assert.equals(keys.size(), 2, "YiYanChatClient 的密钥需要 (appKey|secretKey) 格式");
|
||||
String appKey = keys.get(0);
|
||||
String secretKey = keys.get(1);
|
||||
QianFanApi qianFanApi = new QianFanApi(appKey, secretKey);
|
||||
QianFanEmbeddingOptions qianFanEmbeddingOptions = QianFanEmbeddingOptions.builder().model(model).build();
|
||||
return new QianFanEmbeddingModel(qianFanApi, MetadataMode.EMBED, qianFanEmbeddingOptions);
|
||||
}
|
||||
|
||||
private OllamaEmbeddingModel buildOllamaEmbeddingModel(String url, String model) {
|
||||
OllamaApi ollamaApi = new OllamaApi(url);
|
||||
OllamaOptions ollamaOptions = OllamaOptions.builder().model(model).build();
|
||||
return OllamaEmbeddingModel.builder().ollamaApi(ollamaApi).defaultOptions(ollamaOptions).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* 可参考 {@link OpenAiAutoConfiguration} 的 openAiEmbeddingModel 方法
|
||||
*/
|
||||
@@ -593,6 +529,12 @@ public class AiModelFactoryImpl implements AiModelFactory {
|
||||
null, null);
|
||||
}
|
||||
|
||||
private OllamaEmbeddingModel buildOllamaEmbeddingModel(String url, String model) {
|
||||
OllamaApi ollamaApi = new OllamaApi(url);
|
||||
OllamaOptions ollamaOptions = OllamaOptions.builder().model(model).build();
|
||||
return OllamaEmbeddingModel.builder().ollamaApi(ollamaApi).defaultOptions(ollamaOptions).build();
|
||||
}
|
||||
|
||||
// ========== 各种创建 VectorStore 的方法 ==========
|
||||
|
||||
/**
|
||||
|
@@ -34,7 +34,6 @@ import org.springframework.ai.image.ImageOptions;
|
||||
import org.springframework.ai.image.ImagePrompt;
|
||||
import org.springframework.ai.image.ImageResponse;
|
||||
import org.springframework.ai.openai.OpenAiImageOptions;
|
||||
import org.springframework.ai.qianfan.QianFanImageOptions;
|
||||
import org.springframework.ai.stabilityai.api.StabilityAiImageOptions;
|
||||
import org.springframework.ai.zhipuai.ZhiPuAiImageOptions;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
@@ -168,10 +167,8 @@ public class AiImageServiceImpl implements AiImageService {
|
||||
.withHeight(draw.getHeight()).withWidth(draw.getWidth())
|
||||
.build();
|
||||
} else if (ObjUtil.equal(model.getPlatform(), AiPlatformEnum.YI_YAN.getPlatform())) {
|
||||
return QianFanImageOptions.builder()
|
||||
.model(model.getModel()).N(1)
|
||||
.height(draw.getHeight()).width(draw.getWidth())
|
||||
.build();
|
||||
// 注意:文心一言(qianfan)在Spring AI 1.0.0中已被移除
|
||||
throw new UnsupportedOperationException("文心一言(qianfan)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
} else if (ObjUtil.equal(model.getPlatform(), AiPlatformEnum.ZHI_PU.getPlatform())) {
|
||||
return ZhiPuAiImageOptions.builder()
|
||||
.model(model.getModel())
|
||||
@@ -260,7 +257,7 @@ public class AiImageServiceImpl implements AiImageService {
|
||||
|
||||
@Override
|
||||
public Integer midjourneySync() {
|
||||
// 1.1 获取 Midjourney 平台,状态在 “进行中” 的 image
|
||||
// 1.1 获取 Midjourney 平台,状态在 "进行中" 的 image
|
||||
List<AiImageDO> images = imageMapper.selectListByStatusAndPlatform(
|
||||
AiImageStatusEnum.IN_PROGRESS.getStatus(), AiPlatformEnum.MIDJOURNEY.getPlatform());
|
||||
if (CollUtil.isEmpty(images)) {
|
||||
|
@@ -10,10 +10,8 @@ import org.springframework.ai.azure.openai.AzureOpenAiChatOptions;
|
||||
import org.springframework.ai.chat.messages.*;
|
||||
import org.springframework.ai.chat.prompt.ChatOptions;
|
||||
import org.springframework.ai.minimax.MiniMaxChatOptions;
|
||||
import org.springframework.ai.moonshot.MoonshotChatOptions;
|
||||
import org.springframework.ai.ollama.api.OllamaOptions;
|
||||
import org.springframework.ai.openai.OpenAiChatOptions;
|
||||
import org.springframework.ai.qianfan.QianFanChatOptions;
|
||||
import org.springframework.ai.zhipuai.ZhiPuAiChatOptions;
|
||||
|
||||
import java.util.Collections;
|
||||
@@ -45,7 +43,8 @@ public class AiUtils {
|
||||
return DashScopeChatOptions.builder().withModel(model).withTemperature(temperature).withMaxToken(maxTokens)
|
||||
.withFunctions(toolNames).withToolContext(toolContext).build();
|
||||
case YI_YAN:
|
||||
return QianFanChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build();
|
||||
// 注意:文心一言(qianfan)在Spring AI 1.0.0中已被移除,请使用其他替代方案
|
||||
throw new UnsupportedOperationException("文心一言(qianfan)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
case ZHI_PU:
|
||||
return ZhiPuAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
|
||||
.functions(toolNames).toolContext(toolContext).build();
|
||||
@@ -53,8 +52,8 @@ public class AiUtils {
|
||||
return MiniMaxChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
|
||||
.functions(toolNames).toolContext(toolContext).build();
|
||||
case MOONSHOT:
|
||||
return MoonshotChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
|
||||
.functions(toolNames).toolContext(toolContext).build();
|
||||
// 注意:月之暗面(moonshot)在Spring AI 1.0.0中已被移除,请使用其他替代方案
|
||||
throw new UnsupportedOperationException("月之暗面(moonshot)在Spring AI 1.0.0中已被移除,请使用其他替代方案");
|
||||
case OPENAI:
|
||||
case DEEP_SEEK: // 复用 OpenAI 客户端
|
||||
case DOU_BAO: // 复用 OpenAI 客户端
|
||||
|
@@ -1,62 +0,0 @@
|
||||
package cn.iocoder.yudao.module.ai.framework.ai.core.model.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.moonshot.MoonshotChatModel;
|
||||
import org.springframework.ai.moonshot.MoonshotChatOptions;
|
||||
import org.springframework.ai.moonshot.api.MoonshotApi;
|
||||
import reactor.core.publisher.Flux;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* {@link MoonshotChatModel} 的集成测试
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
public class MoonshotChatModelTests {
|
||||
|
||||
private final MoonshotChatModel chatModel = new MoonshotChatModel(
|
||||
new MoonshotApi("sk-aHYYV1SARscItye5QQRRNbXij4fy65Ee7pNZlC9gsSQnUKXA"), // 密钥
|
||||
MoonshotChatOptions.builder()
|
||||
.model("moonshot-v1-8k") // 模型
|
||||
.build());
|
||||
@Test
|
||||
@Disabled
|
||||
public void testCall() {
|
||||
// 准备参数
|
||||
List<Message> 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<Message> messages = new ArrayList<>();
|
||||
messages.add(new SystemMessage("你是一个优质的文言文作者,用文言文描述着各城市的人文风景。"));
|
||||
messages.add(new UserMessage("1 + 1 = ?"));
|
||||
|
||||
// 调用
|
||||
Flux<ChatResponse> flux = chatModel.stream(new Prompt(messages));
|
||||
// 打印结果
|
||||
flux.doOnNext(response -> {
|
||||
// System.out.println(response);
|
||||
System.out.println(response.getResult().getOutput());
|
||||
}).then().block();
|
||||
}
|
||||
|
||||
}
|
@@ -1,62 +0,0 @@
|
||||
package cn.iocoder.yudao.module.ai.framework.ai.core.model.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.UserMessage;
|
||||
import org.springframework.ai.chat.model.ChatResponse;
|
||||
import org.springframework.ai.chat.prompt.Prompt;
|
||||
import org.springframework.ai.qianfan.QianFanChatModel;
|
||||
import org.springframework.ai.qianfan.QianFanChatOptions;
|
||||
import org.springframework.ai.qianfan.api.QianFanApi;
|
||||
import reactor.core.publisher.Flux;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
// TODO @芋艿:百度千帆 API 提供了 V2 版本,目前 Spring AI 不兼容,可关键 <https://github.com/spring-projects/spring-ai/issues/2179> 进展
|
||||
/**
|
||||
* {@link QianFanChatModel} 的集成测试
|
||||
*
|
||||
* @author fansili
|
||||
*/
|
||||
public class YiYanChatModelTests {
|
||||
|
||||
private final QianFanChatModel chatModel = new QianFanChatModel(
|
||||
new QianFanApi("qS8k8dYr2nXunagK4SSU8Xjj", "pHGbx51ql2f0hOyabQvSZezahVC3hh3e"), // 密钥
|
||||
QianFanChatOptions.builder()
|
||||
.model(QianFanApi.ChatModel.ERNIE_4_0_8K_Preview.getValue())
|
||||
.build()
|
||||
);
|
||||
|
||||
@Test
|
||||
@Disabled
|
||||
public void testCall() {
|
||||
// 准备参数
|
||||
List<Message> messages = new ArrayList<>();
|
||||
// TODO @芋艿:文心一言,只要带上 system message 就报错,已经各种测试,很莫名!
|
||||
// messages.add(new SystemMessage("你是一个优质的文言文作者,用文言文描述着各城市的人文风景。"));
|
||||
messages.add(new UserMessage("1 + 1 = ?"));
|
||||
|
||||
// 调用
|
||||
ChatResponse response = chatModel.call(new Prompt(messages));
|
||||
// 打印结果
|
||||
System.out.println(response);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled
|
||||
public void testStream() {
|
||||
// 准备参数
|
||||
List<Message> messages = new ArrayList<>();
|
||||
// TODO @芋艿:文心一言,只要带上 system message 就报错,已经各种测试,很莫名!
|
||||
// messages.add(new SystemMessage("你是一个优质的文言文作者,用文言文描述着各城市的人文风景。"));
|
||||
messages.add(new UserMessage("1 + 1 = ?"));
|
||||
|
||||
// 调用
|
||||
Flux<ChatResponse> flux = chatModel.stream(new Prompt(messages));
|
||||
// 打印结果
|
||||
flux.doOnNext(System.out::println).then().block();
|
||||
}
|
||||
|
||||
}
|
@@ -1,43 +0,0 @@
|
||||
package cn.iocoder.yudao.module.ai.framework.ai.core.model.image;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.ai.image.ImagePrompt;
|
||||
import org.springframework.ai.image.ImageResponse;
|
||||
import org.springframework.ai.qianfan.QianFanImageModel;
|
||||
import org.springframework.ai.qianfan.QianFanImageOptions;
|
||||
import org.springframework.ai.qianfan.api.QianFanImageApi;
|
||||
|
||||
import static cn.iocoder.yudao.module.ai.framework.ai.core.model.image.StabilityAiImageModelTests.viewImage;
|
||||
|
||||
// TODO @芋艿:百度千帆 API 提供了 V2 版本,目前 Spring AI 不兼容,可关键 <https://github.com/spring-projects/spring-ai/issues/2179> 进展
|
||||
|
||||
/**
|
||||
* {@link QianFanImageModel} 集成测试类
|
||||
*/
|
||||
public class QianFanImageTests {
|
||||
|
||||
private final QianFanImageModel imageModel = new QianFanImageModel(
|
||||
new QianFanImageApi("qS8k8dYr2nXunagK4SSU8Xjj", "pHGbx51ql2f0hOyabQvSZezahVC3hh3e")); // 密钥
|
||||
|
||||
@Test
|
||||
@Disabled
|
||||
public void testCall() {
|
||||
// 准备参数
|
||||
// 只支持 1024x1024、768x768、768x1024、1024x768、576x1024、1024x576
|
||||
QianFanImageOptions imageOptions = QianFanImageOptions.builder()
|
||||
.model(QianFanImageApi.ImageModel.Stable_Diffusion_XL.getValue())
|
||||
.width(1024).height(1024)
|
||||
.N(1)
|
||||
.build();
|
||||
ImagePrompt prompt = new ImagePrompt("good", imageOptions);
|
||||
|
||||
// 方法调用
|
||||
ImageResponse response = imageModel.call(prompt);
|
||||
// 打印结果
|
||||
String b64Json = response.getResult().getOutput().getB64Json();
|
||||
System.out.println(response);
|
||||
viewImage(b64Json);
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user