【优化】AI：调整 ai starter 的包封装

YunaiV
1 parent eb8cd3d7
Showing 154 changed files with 366 additions and 359 deletions
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/config/AiChatClientFactory.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiImageConvert.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/chat/AiChatMessageDO.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/model/AiApiKeyDO.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/model/AiChatModelDO.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/vo/AiChatModalConfigVO.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/vo/AiChatModalDallConfigVO.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatServiceImpl.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiImageServiceImpl.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/midjourneyHandler/YuDaoMidjourneyMessageHandler.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelServiceImpl.java
yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiAutoConfiguration.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiImageProperties.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiProperties.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/package-info.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/package-info.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/org/springframework/ai/package-info.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/chat/QianWenChatClientTests.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/chat/XingHuoChatClientMainTests.java
 package cn.iocoder.yudao.module.ai.config;
  
-import cn.iocoder.yudao.framework.ai.AiPlatformEnum;
-import cn.iocoder.yudao.framework.ai.chat.ChatClient;
-import cn.iocoder.yudao.framework.ai.chat.StreamingChatClient;
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenChatClient;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatClient;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatClient;
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
+import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.StreamingChatClient;
+import org.springframework.ai.models.tongyi.QianWenChatClient;
+import org.springframework.ai.models.xinghuo.XingHuoChatClient;
+import org.springframework.ai.models.yiyan.YiYanChatClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 package cn.iocoder.yudao.module.ai.convert;
  
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyMessage;
+import org.springframework.ai.models.midjourney.MidjourneyMessage;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageDallDrawingRespVO;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageListRespVO;
 package cn.iocoder.yudao.module.ai.dal.dataobject.chat;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.MessageType;
+import org.springframework.ai.chat.messages.MessageType;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModelDO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatRoleDO;
 package cn.iocoder.yudao.module.ai.dal.dataobject.model;
  
-import cn.iocoder.yudao.framework.ai.AiPlatformEnum;
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 package cn.iocoder.yudao.module.ai.dal.dataobject.model;
  
-import cn.iocoder.yudao.framework.ai.AiPlatformEnum;
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 package cn.iocoder.yudao.module.ai.dal.vo;
  
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.ai.models.xinghuo.XingHuoChatModel;
+import org.springframework.ai.models.yiyan.YiYanChatModel;
  
 /**
  * modal config
@@ -16,13 +19,13 @@ public class AiChatModalConfigVO {
  
     /**
      * 模型平台 (冗余，方便类型转换)
-     * 参考：{@link cn.iocoder.yudao.framework.ai.AiPlatformEnum}
+     * 参考：{@link AiPlatformEnum}
      */
     private String platform;
     /**
      * 模型类型(冗余，方便类型转换)
-     * {@link cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatModel}
-     * {@link cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatModel}
+     * {@link YiYanChatModel}
+     * {@link XingHuoChatModel}
      */
     private String type;
 }
 package cn.iocoder.yudao.module.ai.dal.vo;
  
-import cn.iocoder.yudao.framework.ai.imageopenai.enums.OpenAiImageStyleEnum;
+import org.springframework.ai.models.openai.enums.OpenAiImageStyleEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
  
 package cn.iocoder.yudao.module.ai.service.impl;
  
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.iocoder.yudao.framework.ai.AiPlatformEnum;
-import cn.iocoder.yudao.framework.ai.chat.ChatClient;
-import cn.iocoder.yudao.framework.ai.chat.ChatResponse;
-import cn.iocoder.yudao.framework.ai.chat.StreamingChatClient;
-import cn.iocoder.yudao.framework.ai.chat.messages.MessageType;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
+import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.ChatResponse;
+import org.springframework.ai.chat.StreamingChatClient;
+import org.springframework.ai.chat.messages.MessageType;
+import org.springframework.ai.chat.prompt.Prompt;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.ai.ErrorCodeConstants;
@@ -2,18 +2,18 @@ package cn.iocoder.yudao.module.ai.service.impl;
  
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.ai.exception.AiException;
-import cn.iocoder.yudao.framework.ai.image.ImageGeneration;
-import cn.iocoder.yudao.framework.ai.image.ImagePrompt;
-import cn.iocoder.yudao.framework.ai.image.ImageResponse;
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageClient;
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageOptions;
-import cn.iocoder.yudao.framework.ai.imageopenai.enums.OpenAiImageModelEnum;
-import cn.iocoder.yudao.framework.ai.imageopenai.enums.OpenAiImageStyleEnum;
-import cn.iocoder.yudao.framework.ai.midjourney.api.MidjourneyInteractionsApi;
-import cn.iocoder.yudao.framework.ai.midjourney.api.req.ReRollReq;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.MidjourneyWebSocketStarter;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.WssNotify;
+import cn.iocoder.yudao.framework.ai.core.exception.AiException;
+import org.springframework.ai.image.ImageGeneration;
+import org.springframework.ai.image.ImagePrompt;
+import org.springframework.ai.image.ImageResponse;
+import org.springframework.ai.models.openai.OpenAiImageClient;
+import org.springframework.ai.models.openai.OpenAiImageOptions;
+import org.springframework.ai.models.openai.enums.OpenAiImageModelEnum;
+import org.springframework.ai.models.openai.enums.OpenAiImageStyleEnum;
+import org.springframework.ai.models.midjourney.api.MidjourneyInteractionsApi;
+import org.springframework.ai.models.midjourney.api.req.ReRollReq;
+import org.springframework.ai.models.midjourney.webSocket.MidjourneyWebSocketStarter;
+import org.springframework.ai.models.midjourney.webSocket.WssNotify;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
@@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.ai.service.midjourneyHandler;
  
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyMessage;
-import cn.iocoder.yudao.framework.ai.midjourney.constants.MidjourneyGennerateStatusEnum;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.MidjourneyMessageHandler;
+import org.springframework.ai.models.midjourney.MidjourneyMessage;
+import org.springframework.ai.models.midjourney.constants.MidjourneyGennerateStatusEnum;
+import org.springframework.ai.models.midjourney.webSocket.MidjourneyMessageHandler;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageMidjourneyOperationsVO;
 import cn.iocoder.yudao.module.ai.convert.AiImageConvert;
 package cn.iocoder.yudao.module.ai.service.model;
  
-import cn.iocoder.yudao.framework.ai.AiPlatformEnum;
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
 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;
@@ -14,7 +14,6 @@ import org.springframework.validation.annotation.Validated;
  
 import java.util.List;
  
-import java.util.List;
 import java.util.Set;
  
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -10,6 +10,7 @@
     </parent>
  
     <artifactId>yudao-spring-boot-starter-ai</artifactId>
+    <!-- TODO 芋艿：这里需要进一步减少 -->
  
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -17,6 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
+        <!-- TODO fan：这里包，要进一步减少 -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
 package cn.iocoder.yudao.framework.ai.config;
  
 import cn.hutool.core.io.IoUtil;
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenChatClient;
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenChatModal;
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenOptions;
-import cn.iocoder.yudao.framework.ai.chatqianwen.api.QianWenApi;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatClient;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoOptions;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoApi;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatClient;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanOptions;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanApi;
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageApi;
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageClient;
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageOptions;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyMessage;
-import cn.iocoder.yudao.framework.ai.midjourney.api.MidjourneyInteractionsApi;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.MidjourneyMessageHandler;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.MidjourneyWebSocketStarter;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.listener.MidjourneyMessageListener;
+import org.springframework.ai.models.tongyi.QianWenChatClient;
+import org.springframework.ai.models.tongyi.QianWenChatModal;
+import org.springframework.ai.models.tongyi.QianWenOptions;
+import org.springframework.ai.models.tongyi.api.QianWenApi;
+import org.springframework.ai.models.xinghuo.XingHuoChatClient;
+import org.springframework.ai.models.xinghuo.XingHuoOptions;
+import org.springframework.ai.models.xinghuo.api.XingHuoApi;
+import org.springframework.ai.models.yiyan.YiYanChatClient;
+import org.springframework.ai.models.yiyan.YiYanOptions;
+import org.springframework.ai.models.yiyan.api.YiYanApi;
+import org.springframework.ai.models.openai.OpenAiImageApi;
+import org.springframework.ai.models.openai.OpenAiImageClient;
+import org.springframework.ai.models.openai.OpenAiImageOptions;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.MidjourneyMessage;
+import org.springframework.ai.models.midjourney.api.MidjourneyInteractionsApi;
+import org.springframework.ai.models.midjourney.webSocket.MidjourneyMessageHandler;
+import org.springframework.ai.models.midjourney.webSocket.MidjourneyWebSocketStarter;
+import org.springframework.ai.models.midjourney.webSocket.listener.MidjourneyMessageListener;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 package cn.iocoder.yudao.framework.ai.config;
  
-import cn.iocoder.yudao.framework.ai.AiPlatformEnum;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatModel;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoOptions;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatModel;
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
+import org.springframework.ai.models.xinghuo.XingHuoChatModel;
+import org.springframework.ai.models.xinghuo.XingHuoOptions;
+import org.springframework.ai.models.yiyan.YiYanChatModel;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.springframework.boot.context.properties.ConfigurationProperties;
  
 import java.util.LinkedHashMap;
 import java.util.Map;
 package cn.iocoder.yudao.framework.ai.config;
  
-import cn.iocoder.yudao.framework.ai.AiPlatformEnum;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatModel;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatModel;
-import cn.iocoder.yudao.framework.ai.imageopenai.enums.OpenAiImageModelEnum;
-import cn.iocoder.yudao.framework.ai.imageopenai.enums.OpenAiImageStyleEnum;
+import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
+import org.springframework.ai.models.xinghuo.XingHuoChatModel;
+import org.springframework.ai.models.yiyan.YiYanChatModel;
+import org.springframework.ai.models.openai.enums.OpenAiImageModelEnum;
+import org.springframework.ai.models.openai.enums.OpenAiImageStyleEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-package cn.iocoder.yudao.framework.ai;
+package cn.iocoder.yudao.framework.ai.core.enums;
  
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
-package cn.iocoder.yudao.framework.ai.exception;
+package cn.iocoder.yudao.framework.ai.core.exception;
  
+// TODO @fan：这个有办法干掉么？
 /**
  * ai 异常
  *
+/**
+ * 芋道 AI Starter，整体参考 spring-ai 拓展
+ */
+package cn.iocoder.yudao.framework.ai.core;
 \ No newline at end of file
-/**
- * author: fansili
- * time: 2024/3/12 20:29
- *
- * TODO @fansili：包的想法，需要重点看看
- *
- * 1. org.springframework.ai：包括 chat、image、model、parser、util 部分
- *
- * 2. yudao.framework.models
- *                      \qianwen 通义千问
- *                      \yiyan 文心一言
- *                      \xinghuo 星火
- *                      \midjourney
- */
-package cn.iocoder.yudao.framework.ai;
 \ No newline at end of file
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat;
+package org.springframework.ai.chat;
  
  
-import cn.iocoder.yudao.framework.ai.chat.messages.UserMessage;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.model.ModelClient;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.model.ModelClient;
  
 @FunctionalInterface
 public interface ChatClient extends ModelClient<Prompt, ChatResponse> {
-package cn.iocoder.yudao.framework.ai.chat;
+package org.springframework.ai.chat;
  
 /**
  * 聊天异常
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.iocoder.yudao.framework.ai.chat;
+package org.springframework.ai.chat;
  
-import cn.iocoder.yudao.framework.ai.chat.metadata.ChatResponseMetadata;
-import cn.iocoder.yudao.framework.ai.model.ModelResponse;
+import org.springframework.ai.chat.metadata.ChatResponseMetadata;
+import org.springframework.ai.model.ModelResponse;
 import org.springframework.util.CollectionUtils;
  
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat;
+package org.springframework.ai.chat;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.AssistantMessage;
-import cn.iocoder.yudao.framework.ai.chat.metadata.ChatGenerationMetadata;
-import cn.iocoder.yudao.framework.ai.model.ModelResult;
+import org.springframework.ai.chat.messages.AssistantMessage;
+import org.springframework.ai.chat.metadata.ChatGenerationMetadata;
+import org.springframework.ai.model.ModelResult;
 import org.springframework.lang.Nullable;
  
 import java.util.Map;
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat;
+package org.springframework.ai.chat;
  
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.model.StreamingModelClient;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.model.StreamingModelClient;
 import reactor.core.publisher.Flux;
  
 @FunctionalInterface
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import java.util.Map;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import java.util.Map;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import java.util.Map;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import org.springframework.util.Assert;
 import org.springframework.util.MimeType;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import java.util.List;
 import java.util.Map;
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 public enum MessageType {
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import org.springframework.core.io.Resource;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.messages;
+package org.springframework.ai.chat.messages;
  
 import org.springframework.core.io.Resource;
  
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.metadata;
+package org.springframework.ai.chat.metadata;
  
-import cn.iocoder.yudao.framework.ai.model.ResultMetadata;
+import org.springframework.ai.model.ResultMetadata;
 import org.springframework.lang.Nullable;
  
 /**
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.metadata;
+package org.springframework.ai.chat.metadata;
  
  
-import cn.iocoder.yudao.framework.ai.model.ResponseMetadata;
+import org.springframework.ai.model.ResponseMetadata;
  
 /**
  * Abstract Data Type (ADT) modeling common AI provider metadata returned in an AI
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.metadata;
+package org.springframework.ai.chat.metadata;
  
 import java.time.Duration;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.metadata;
+package org.springframework.ai.chat.metadata;
  
 /**
  * A EmpytUsage implementation that returns zero for all property getters
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.iocoder.yudao.framework.ai.chat.metadata;
+package org.springframework.ai.chat.metadata;
  
 import org.springframework.util.Assert;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.metadata;
+package org.springframework.ai.chat.metadata;
  
 import java.time.Duration;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.metadata;
+package org.springframework.ai.chat.metadata;
  
 /**
  * 抽象数据类型（ADT）封装关于人工智能提供商API使用的元数据根据AI请求。
@@ -11,4 +11,4 @@
  * This bounded context is designed to encapsulate all aspects of chat-based AI
  * functionalities, maintaining a clear boundary from other contexts within the AI domain.
  */
-package cn.iocoder.yudao.framework.ai.chat;
 \ No newline at end of file
+package org.springframework.ai.chat;
 \ No newline at end of file
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.AssistantMessage;
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.AssistantMessage;
+import org.springframework.ai.chat.messages.Message;
 import org.springframework.core.io.Resource;
  
 import java.util.Map;
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.model.ModelOptions;
+import org.springframework.ai.model.ModelOptions;
  
 /**
  * 聊天选项代表了常见的选项，可在不同的聊天模式中移植。
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
 public class ChatOptionsBuilder {
  
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.Message;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
 public class FunctionPromptTemplate extends PromptTemplate {
  
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.chat.ChatResponse;
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
-import cn.iocoder.yudao.framework.ai.chat.messages.UserMessage;
-import cn.iocoder.yudao.framework.ai.model.ModelOptions;
-import cn.iocoder.yudao.framework.ai.model.ModelRequest;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.model.ModelOptions;
+import org.springframework.ai.model.ModelRequest;
  
 import java.util.Collections;
 import java.util.List;
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
-import cn.iocoder.yudao.framework.ai.chat.messages.UserMessage;
-import cn.iocoder.yudao.framework.ai.parser.OutputParser;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.parser.OutputParser;
 import org.antlr.runtime.Token;
 import org.antlr.runtime.TokenStream;
 import org.springframework.core.io.Resource;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
 import java.util.Map;
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.Message;
  
 import java.util.List;
 import java.util.Map;
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.Message;
  
 import java.util.Map;
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
 import java.util.Map;
  
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
-import cn.iocoder.yudao.framework.ai.chat.messages.SystemMessage;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.core.io.Resource;
  
 import java.util.Map;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.chat.prompt;
+package org.springframework.ai.chat.prompt;
  
 public enum TemplateFormat {
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
 import java.util.Objects;
  
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
  
-import cn.iocoder.yudao.framework.ai.model.ModelClient;
+import org.springframework.ai.model.ModelClient;
  
 public interface ImageClient extends ModelClient<ImagePrompt, ImageResponse> {
  
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
  
-import cn.iocoder.yudao.framework.ai.model.ModelResult;
+import org.springframework.ai.model.ModelResult;
  
 public class ImageGeneration implements ModelResult<Image> {
  
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
-import cn.iocoder.yudao.framework.ai.model.ResultMetadata;
+import org.springframework.ai.model.ResultMetadata;
  
 public interface ImageGenerationMetadata extends ResultMetadata {
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
 import java.util.Objects;
  
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
-import cn.iocoder.yudao.framework.ai.model.ModelOptions;
+import org.springframework.ai.model.ModelOptions;
  
 /**
  * ImageOptions represent the common options, portable across different image generation
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
 public class ImageOptionsBuilder {
  
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
-import cn.iocoder.yudao.framework.ai.model.ModelRequest;
+import org.springframework.ai.model.ModelRequest;
  
 import java.util.Collections;
 import java.util.List;
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
-import cn.iocoder.yudao.framework.ai.model.ModelResponse;
+import org.springframework.ai.model.ModelResponse;
  
 import java.util.List;
 import java.util.Objects;
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.image;
+package org.springframework.ai.image;
  
  
-import cn.iocoder.yudao.framework.ai.model.ResponseMetadata;
+import org.springframework.ai.model.ResponseMetadata;
  
 public interface ImageResponseMetadata extends ResponseMetadata {
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 /**
  * The ModelClient interface provides a generic API for invoking AI models. It is designed
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 /**
  * Interface representing the customizable options for AI model interactions. This marker
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 /**
  * 表示对AI模型的请求的接口。此接口封装了 与人工智能模型交互所需的必要信息，包括指令或 输入（通用类型T）和附加模型选项。它提供了一种标准化的方式
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 import java.util.List;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 /**
  * This interface provides methods to access the main output of the AI model and the
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 /**
  * 表示与AI模型的响应相关联的元数据的接口。此接口 旨在提供有关人工智能生成反应的附加信息 模型，包括处理细节和模型特定数据。它是一种价值
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 /**
  * Interface representing metadata associated with the results of an AI model. This
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model;
+package org.springframework.ai.model;
  
 import reactor.core.publisher.Flux;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
 import org.springframework.util.CollectionUtils;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
 /**
  *
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
 import com.fasterxml.jackson.annotation.JsonClassDescription;
 import org.springframework.beans.BeansException;
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
-import cn.iocoder.yudao.framework.ai.model.ModelOptionsUtils;
+import org.springframework.ai.model.ModelOptionsUtils;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.util.Assert;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
 import java.util.List;
 import java.util.Set;
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
-import cn.iocoder.yudao.framework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.util.Assert;
  
 import java.util.ArrayList;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.model.function;
+package org.springframework.ai.model.function;
  
 import net.jodah.typetools.TypeResolver;
  
@@ -8,4 +8,4 @@
  * ensuring a broad applicability across diverse AI scenarios.
  *
  */
-package cn.iocoder.yudao.framework.ai.model;
 \ No newline at end of file
+package org.springframework.ai.model;
 \ No newline at end of file
-package cn.iocoder.yudao.framework.ai.midjourney;
+package org.springframework.ai.models.midjourney;
  
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.midjourney;
+package org.springframework.ai.models.midjourney;
  
-import cn.iocoder.yudao.framework.ai.midjourney.constants.MidjourneyGennerateStatusEnum;
+import org.springframework.ai.models.midjourney.constants.MidjourneyGennerateStatusEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
  
-package cn.iocoder.yudao.framework.ai.midjourney.api;
+package org.springframework.ai.models.midjourney.api;
  
 import cn.hutool.core.util.IdUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
-import cn.iocoder.yudao.framework.ai.midjourney.constants.MidjourneyConstants;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.constants.MidjourneyConstants;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
-package cn.iocoder.yudao.framework.ai.midjourney.api;
+package org.springframework.ai.models.midjourney.api;
  
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
-import cn.iocoder.yudao.framework.ai.midjourney.api.req.AttachmentsReq;
-import cn.iocoder.yudao.framework.ai.midjourney.api.req.DescribeReq;
-import cn.iocoder.yudao.framework.ai.midjourney.api.req.ReRollReq;
-import cn.iocoder.yudao.framework.ai.midjourney.api.res.UploadAttachmentsRes;
-import cn.iocoder.yudao.framework.ai.midjourney.util.MidjourneyUtil;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.api.req.AttachmentsReq;
+import org.springframework.ai.models.midjourney.api.req.DescribeReq;
+import org.springframework.ai.models.midjourney.api.req.ReRollReq;
+import org.springframework.ai.models.midjourney.api.res.UploadAttachmentsRes;
+import org.springframework.ai.models.midjourney.util.MidjourneyUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.Lists;
-package cn.iocoder.yudao.framework.ai.midjourney.api.req;
+package org.springframework.ai.models.midjourney.api.req;
  
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.midjourney.api.req;
+package org.springframework.ai.models.midjourney.api.req;
  
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.midjourney.api.req;
+package org.springframework.ai.models.midjourney.api.req;
  
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.midjourney.api.res;
+package org.springframework.ai.models.midjourney.api.res;
  
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.midjourney.constants;
+package org.springframework.ai.models.midjourney.constants;
  
 public final class MidjourneyConstants {
  
-package cn.iocoder.yudao.framework.ai.midjourney.constants;
+package org.springframework.ai.models.midjourney.constants;
  
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-package cn.iocoder.yudao.framework.ai.midjourney.constants;
+package org.springframework.ai.models.midjourney.constants;
  
 import lombok.Getter;
  
-package cn.iocoder.yudao.framework.ai.midjourney.constants;
+package org.springframework.ai.models.midjourney.constants;
  
  
 public enum MidjourneyMessageTypeEnum {
-package cn.iocoder.yudao.framework.ai.midjourney.constants;
+package org.springframework.ai.models.midjourney.constants;
  
 import lombok.experimental.UtilityClass;
  
-package cn.iocoder.yudao.framework.ai.midjourney.util;
+package org.springframework.ai.models.midjourney.util;
  
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyMessage;
+import org.springframework.ai.models.midjourney.MidjourneyMessage;
  
 import java.util.Map;
 import java.util.regex.Matcher;
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket;
+package org.springframework.ai.models.midjourney.webSocket;
  
  
 public interface FailureCallback {
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket;
+package org.springframework.ai.models.midjourney.webSocket;
  
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyMessage;
+import org.springframework.ai.models.midjourney.MidjourneyMessage;
  
 /**
  * message handler
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket;
+package org.springframework.ai.models.midjourney.webSocket;
  
  
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.thread.ThreadUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
-import cn.iocoder.yudao.framework.ai.midjourney.constants.MidjourneyNotifyCode;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.handler.MidjourneyWebSocketHandler;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.listener.MidjourneyMessageListener;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.constants.MidjourneyNotifyCode;
+import org.springframework.ai.models.midjourney.webSocket.handler.MidjourneyWebSocketHandler;
+import org.springframework.ai.models.midjourney.webSocket.listener.MidjourneyMessageListener;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.websocket.Constants;
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket;
+package org.springframework.ai.models.midjourney.webSocket;
  
  
 public interface SuccessCallback {
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket;
+package org.springframework.ai.models.midjourney.webSocket;
  
  
 public interface WebSocketStarter {
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket;
+package org.springframework.ai.models.midjourney.webSocket;
  
 /**
  * 通知信息
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket.handler;
+package org.springframework.ai.models.midjourney.webSocket.handler;
  
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.FailureCallback;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.SuccessCallback;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.listener.MidjourneyMessageListener;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.webSocket.FailureCallback;
+import org.springframework.ai.models.midjourney.webSocket.SuccessCallback;
+import org.springframework.ai.models.midjourney.webSocket.listener.MidjourneyMessageListener;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.utils.data.DataArray;
-package cn.iocoder.yudao.framework.ai.midjourney.webSocket.listener;
+package org.springframework.ai.models.midjourney.webSocket.listener;
  
  
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
-import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyMessage;
-import cn.iocoder.yudao.framework.ai.midjourney.constants.MidjourneyConstants;
-import cn.iocoder.yudao.framework.ai.midjourney.constants.MidjourneyGennerateStatusEnum;
-import cn.iocoder.yudao.framework.ai.midjourney.constants.MidjourneyMessageTypeEnum;
-import cn.iocoder.yudao.framework.ai.midjourney.util.MidjourneyUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.MidjourneyMessageHandler;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.MidjourneyMessage;
+import org.springframework.ai.models.midjourney.constants.MidjourneyConstants;
+import org.springframework.ai.models.midjourney.constants.MidjourneyGennerateStatusEnum;
+import org.springframework.ai.models.midjourney.constants.MidjourneyMessageTypeEnum;
+import org.springframework.ai.models.midjourney.util.MidjourneyUtil;
+import org.springframework.ai.models.midjourney.webSocket.MidjourneyMessageHandler;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.utils.data.DataObject;
-package cn.iocoder.yudao.framework.ai.imageopenai;
+package org.springframework.ai.models.openai;
  
 import cn.hutool.json.JSONUtil;
-import cn.iocoder.yudao.framework.ai.imageopenai.api.OpenAiImageRequest;
-import cn.iocoder.yudao.framework.ai.imageopenai.api.OpenAiImageResponse;
+import org.springframework.ai.models.openai.api.OpenAiImageRequest;
+import org.springframework.ai.models.openai.api.OpenAiImageResponse;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import io.netty.channel.ChannelOption;
 import lombok.extern.slf4j.Slf4j;
-package cn.iocoder.yudao.framework.ai.imageopenai;
+package org.springframework.ai.models.openai;
  
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
-import cn.iocoder.yudao.framework.ai.chat.ChatException;
-import cn.iocoder.yudao.framework.ai.chatyiyan.exception.YiYanApiException;
-import cn.iocoder.yudao.framework.ai.exception.AiException;
-import cn.iocoder.yudao.framework.ai.image.*;
-import cn.iocoder.yudao.framework.ai.imageopenai.api.OpenAiImageRequest;
-import cn.iocoder.yudao.framework.ai.imageopenai.api.OpenAiImageResponse;
+import org.springframework.ai.chat.ChatException;
+import org.springframework.ai.models.yiyan.exception.YiYanApiException;
+import cn.iocoder.yudao.framework.ai.core.exception.AiException;
+import org.springframework.ai.models.openai.api.OpenAiImageRequest;
+import org.springframework.ai.models.openai.api.OpenAiImageResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.ai.image.*;
 import org.springframework.retry.RetryCallback;
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryListener;
-package cn.iocoder.yudao.framework.ai.imageopenai;
+package org.springframework.ai.models.openai;
  
-import cn.iocoder.yudao.framework.ai.image.ImageOptions;
-import cn.iocoder.yudao.framework.ai.imageopenai.enums.OpenAiImageModelEnum;
-import cn.iocoder.yudao.framework.ai.imageopenai.enums.OpenAiImageStyleEnum;
+import org.springframework.ai.image.ImageOptions;
+import org.springframework.ai.models.openai.enums.OpenAiImageModelEnum;
+import org.springframework.ai.models.openai.enums.OpenAiImageStyleEnum;
 import lombok.Data;
 import lombok.Getter;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.imageopenai.api;
+package org.springframework.ai.models.openai.api;
  
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
-package cn.iocoder.yudao.framework.ai.imageopenai.api;
+package org.springframework.ai.models.openai.api;
  
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.imageopenai.enums;
+package org.springframework.ai.models.openai.enums;
  
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-package cn.iocoder.yudao.framework.ai.imageopenai.enums;
+package org.springframework.ai.models.openai.enums;
  
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-package cn.iocoder.yudao.framework.ai.chatqianwen;
+package org.springframework.ai.models.tongyi;
  
 import cn.iocoder.yudao.framework.ai.chat.*;
-import cn.iocoder.yudao.framework.ai.chat.prompt.ChatOptions;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.chatqianwen.api.QianWenApi;
-import cn.iocoder.yudao.framework.ai.chatyiyan.exception.YiYanApiException;
+import org.springframework.ai.chat.*;
+import org.springframework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.models.tongyi.api.QianWenApi;
+import org.springframework.ai.models.yiyan.exception.YiYanApiException;
 import com.alibaba.dashscope.aigc.generation.GenerationResult;
 import com.alibaba.dashscope.aigc.generation.models.QwenParam;
 import com.alibaba.dashscope.common.Message;
-package cn.iocoder.yudao.framework.ai.chatqianwen;
+package org.springframework.ai.models.tongyi;
  
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-package cn.iocoder.yudao.framework.ai.chatqianwen;
+package org.springframework.ai.models.tongyi;
  
-import cn.iocoder.yudao.framework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import lombok.Data;
 import lombok.experimental.Accessors;
  
-package cn.iocoder.yudao.framework.ai.chatqianwen.api;
+package org.springframework.ai.models.tongyi.api;
  
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenChatModal;
-import cn.iocoder.yudao.framework.ai.exception.AiException;
+import org.springframework.ai.models.tongyi.QianWenChatModal;
+import cn.iocoder.yudao.framework.ai.core.exception.AiException;
 import com.alibaba.dashscope.aigc.generation.Generation;
 import com.alibaba.dashscope.aigc.generation.GenerationResult;
 import com.alibaba.dashscope.aigc.generation.models.QwenParam;
-import com.alibaba.dashscope.common.Message;
-import com.alibaba.dashscope.common.Role;
 import com.alibaba.dashscope.exception.InputRequiredException;
 import com.alibaba.dashscope.exception.NoApiKeyException;
 import io.reactivex.Flowable;
-package cn.iocoder.yudao.framework.ai.chatqianwen.api;
+package org.springframework.ai.models.tongyi.api;
  
  
 /**
-package cn.iocoder.yudao.framework.ai.chatqianwen.api;
+package org.springframework.ai.models.tongyi.api;
  
 /**
  * author: fansili
-package cn.iocoder.yudao.framework.ai.chatqianwen.api;
+package org.springframework.ai.models.tongyi.api;
  
 import com.alibaba.dashscope.aigc.generation.models.QwenParam;
  
@@ -8,4 +8,4 @@
  * author: fansili
  * time: 2024/3/13 21:05
  */
-package cn.iocoder.yudao.framework.ai.chatqianwen;
 \ No newline at end of file
+package org.springframework.ai.models.tongyi;
 \ No newline at end of file
-package cn.iocoder.yudao.framework.ai.chatxinghuo;
+package org.springframework.ai.models.xinghuo;
  
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.iocoder.yudao.framework.ai.chat.*;
-import cn.iocoder.yudao.framework.ai.chat.prompt.ChatOptions;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoApi;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletion;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletionRequest;
+import org.springframework.ai.chat.*;
+import org.springframework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.models.xinghuo.api.XingHuoApi;
+import org.springframework.ai.models.xinghuo.api.XingHuoChatCompletion;
+import org.springframework.ai.models.xinghuo.api.XingHuoChatCompletionRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.retry.RetryCallback;
-package cn.iocoder.yudao.framework.ai.chatxinghuo;
+package org.springframework.ai.models.xinghuo;
  
 import lombok.Getter;
  
-package cn.iocoder.yudao.framework.ai.chatxinghuo;
+package org.springframework.ai.models.xinghuo;
  
-import cn.iocoder.yudao.framework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import lombok.Data;
 import lombok.experimental.Accessors;
  
-package cn.iocoder.yudao.framework.ai.chatxinghuo.api;
+package org.springframework.ai.models.xinghuo.api;
  
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatModel;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletion;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletionRequest;
+import org.springframework.ai.models.xinghuo.XingHuoChatModel;
 import lombok.Data;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
-package cn.iocoder.yudao.framework.ai.chatxinghuo.api;
+package org.springframework.ai.models.xinghuo.api;
  
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.framework.ai.chatxinghuo.api;
+package org.springframework.ai.models.xinghuo.api;
  
 /**
  * author: fansili
-package cn.iocoder.yudao.framework.ai.chatxinghuo.api;
+package org.springframework.ai.models.xinghuo.api;
  
 import lombok.Data;
 import lombok.Getter;
-package cn.iocoder.yudao.framework.ai.chatyiyan;
+package org.springframework.ai.models.yiyan;
  
 import cn.hutool.core.bean.BeanUtil;
 import cn.iocoder.yudao.framework.ai.chat.*;
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
-import cn.iocoder.yudao.framework.ai.chat.messages.MessageType;
-import cn.iocoder.yudao.framework.ai.chat.prompt.ChatOptions;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanApi;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanChatCompletion;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanChatCompletionRequest;
-import cn.iocoder.yudao.framework.ai.chatyiyan.exception.YiYanApiException;
+import org.springframework.ai.chat.*;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.MessageType;
+import org.springframework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.models.yiyan.api.YiYanApi;
+import org.springframework.ai.models.yiyan.api.YiYanChatCompletion;
+import org.springframework.ai.models.yiyan.api.YiYanChatCompletionRequest;
+import org.springframework.ai.models.yiyan.exception.YiYanApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.http.ResponseEntity;
-package cn.iocoder.yudao.framework.ai.chatyiyan;
+package org.springframework.ai.models.yiyan;
  
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-package cn.iocoder.yudao.framework.ai.chatyiyan;
+package org.springframework.ai.models.yiyan;
  
-import cn.iocoder.yudao.framework.ai.chat.prompt.ChatOptions;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanChatCompletionRequest;
+import org.springframework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.models.yiyan.api.YiYanChatCompletionRequest;
 import lombok.Data;
 import lombok.experimental.Accessors;
  
-package cn.iocoder.yudao.framework.ai.chatyiyan.api;
+package org.springframework.ai.models.yiyan.api;
  
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatModel;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanAuthRes;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanChatCompletion;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanChatCompletionRequest;
-import cn.iocoder.yudao.framework.ai.chatyiyan.exception.YiYanApiException;
+import org.springframework.ai.models.yiyan.YiYanChatModel;
+import org.springframework.ai.models.yiyan.exception.YiYanApiException;
 import lombok.Data;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
-package cn.iocoder.yudao.framework.ai.chatyiyan.api;
+package org.springframework.ai.models.yiyan.api;
  
 import lombok.Data;
  
-package cn.iocoder.yudao.framework.ai.chatyiyan.api;
+package org.springframework.ai.models.yiyan.api;
  
 import lombok.Data;
  
-package cn.iocoder.yudao.framework.ai.chatyiyan.api;
+package org.springframework.ai.models.yiyan.api;
  
 /**
  * author: fansili
-package cn.iocoder.yudao.framework.ai.chatyiyan.api;
+package org.springframework.ai.models.yiyan.api;
  
 import lombok.Data;
  
-package cn.iocoder.yudao.framework.ai.chatyiyan.exception;
+package org.springframework.ai.models.yiyan.exception;
  
 /**
  * 一言 api 调用异常
+/**
+ * 从 https://github.com/spring-projects/spring-ai 拷贝。
+ *
+ * 最大目的：适配 JDK8 兼容性
+ *
+ * 包路径：
+ * 1. chat、parser、model、parser 包：https://github.com/spring-projects/spring-ai/tree/main/spring-ai-core 拷贝
+ * 2. models 包：对标 https://github.com/spring-projects/spring-ai/tree/main/models 拷贝
+ *  2.1 tongyi 包：【阿里】通义千问，对标 spring-cloud-alibaba 提供的 ai 包
+ *  2.2 yiyan 包：【百度】文心一言，自己实现
+ *  2.3 xinghuo 包：【讯飞】星火，自己实现
+ *  2.4 openai 包：【OpenAI】ChatGPT，拷贝 spring-ai 提供的 models/openai 包
+ *  2.5 midjourney 包：Midjourney，参考 https://github.com/novicezk/midjourney-proxy 实现
+ */
+package org.springframework.ai;
 \ No newline at end of file
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 import org.springframework.core.convert.support.DefaultConversionService;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 import org.springframework.messaging.converter.MessageConverter;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 /**
  * Implementations of this interface provides instructions for how the output of a
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 import org.springframework.core.convert.support.DefaultConversionService;
  
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 import org.springframework.messaging.Message;
 import org.springframework.messaging.converter.MappingJackson2MessageConverter;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 /**
  * Converts the (raw) LLM output into a structured responses of type. The
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package cn.iocoder.yudao.framework.ai.parser;
+package org.springframework.ai.parser;
  
 @FunctionalInterface
 public interface Parser<T> {
 package cn.iocoder.yudao.framework.ai.chat;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.SystemMessage;
-import cn.iocoder.yudao.framework.ai.chat.messages.UserMessage;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenChatClient;
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenChatModal;
-import cn.iocoder.yudao.framework.ai.chatqianwen.QianWenOptions;
-import cn.iocoder.yudao.framework.ai.chatqianwen.api.QianWenApi;
+import org.springframework.ai.chat.ChatResponse;
+import org.springframework.ai.chat.messages.SystemMessage;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.models.tongyi.QianWenChatClient;
+import org.springframework.ai.models.tongyi.QianWenChatModal;
+import org.springframework.ai.models.tongyi.QianWenOptions;
+import org.springframework.ai.models.tongyi.api.QianWenApi;
 import com.alibaba.dashscope.aigc.generation.GenerationResult;
 import com.alibaba.dashscope.aigc.generation.models.QwenParam;
 import com.alibaba.dashscope.common.Message;
@@ -46,7 +47,7 @@ public class QianWenChatClientTests {
  
     @Test
     public void callTest() {
-        List<cn.iocoder.yudao.framework.ai.chat.messages.Message> messages = new ArrayList<>();
+        List<org.springframework.ai.chat.messages.Message> messages = new ArrayList<>();
         messages.add(new SystemMessage("你是一个优质的小红书文艺作者，抒写着各城市的美好文化和风景。"));
         messages.add(new UserMessage("长沙怎么样？"));
  
@@ -56,7 +57,7 @@ public class QianWenChatClientTests {
  
     @Test
     public void streamTest() {
-        List<cn.iocoder.yudao.framework.ai.chat.messages.Message> messages = new ArrayList<>();
+        List<org.springframework.ai.chat.messages.Message> messages = new ArrayList<>();
         messages.add(new SystemMessage("你是一个优质的文言文作者，用文言文描述着各城市的人文风景。"));
         messages.add(new UserMessage("长沙怎么样？"));
  
@@ -2,8 +2,8 @@ package cn.iocoder.yudao.framework.ai.chat;
  
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletion;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletionRequest;
+import org.springframework.ai.models.xinghuo.api.XingHuoChatCompletion;
+import org.springframework.ai.models.xinghuo.api.XingHuoChatCompletionRequest;
 import org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClient;
 import org.springframework.web.reactive.socket.client.WebSocketClient;
 import reactor.core.publisher.Flux;
 package cn.iocoder.yudao.framework.ai.chat;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
-import cn.iocoder.yudao.framework.ai.chat.messages.SystemMessage;
-import cn.iocoder.yudao.framework.ai.chat.messages.UserMessage;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatClient;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatModel;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoOptions;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoApi;
+import org.springframework.ai.chat.ChatResponse;
+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.prompt.Prompt;
+import org.springframework.ai.models.xinghuo.XingHuoChatClient;
+import org.springframework.ai.models.xinghuo.XingHuoChatModel;
+import org.springframework.ai.models.xinghuo.XingHuoOptions;
+import org.springframework.ai.models.xinghuo.api.XingHuoApi;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
@@ -2,9 +2,9 @@ package cn.iocoder.yudao.framework.ai.chat;
  
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatClient;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletion;
-import cn.iocoder.yudao.framework.ai.chatxinghuo.api.XingHuoChatCompletionRequest;
+import org.springframework.ai.models.xinghuo.XingHuoChatClient;
+import org.springframework.ai.models.xinghuo.api.XingHuoChatCompletion;
+import org.springframework.ai.models.xinghuo.api.XingHuoChatCompletionRequest;
 import okhttp3.*;
 import org.jetbrains.annotations.NotNull;
  
 package cn.iocoder.yudao.framework.ai.chat;
  
-import cn.iocoder.yudao.framework.ai.chat.messages.Message;
-import cn.iocoder.yudao.framework.ai.chat.messages.SystemMessage;
-import cn.iocoder.yudao.framework.ai.chat.messages.UserMessage;
-import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatClient;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanChatModel;
-import cn.iocoder.yudao.framework.ai.chatyiyan.YiYanOptions;
-import cn.iocoder.yudao.framework.ai.chatyiyan.api.YiYanApi;
+import org.springframework.ai.chat.ChatResponse;
+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.prompt.Prompt;
+import org.springframework.ai.models.yiyan.YiYanChatClient;
+import org.springframework.ai.models.yiyan.YiYanChatModel;
+import org.springframework.ai.models.yiyan.YiYanOptions;
+import org.springframework.ai.models.yiyan.api.YiYanApi;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
@@ -2,11 +2,12 @@ package cn.iocoder.yudao.framework.ai.midjourney;
  
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.api.MidjourneyInteractionsApi;
-import cn.iocoder.yudao.framework.ai.midjourney.api.req.AttachmentsReq;
-import cn.iocoder.yudao.framework.ai.midjourney.api.req.DescribeReq;
-import cn.iocoder.yudao.framework.ai.midjourney.api.req.ReRollReq;
-import cn.iocoder.yudao.framework.ai.midjourney.api.res.UploadAttachmentsRes;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.api.MidjourneyInteractionsApi;
+import org.springframework.ai.models.midjourney.api.req.AttachmentsReq;
+import org.springframework.ai.models.midjourney.api.req.DescribeReq;
+import org.springframework.ai.models.midjourney.api.req.ReRollReq;
+import org.springframework.ai.models.midjourney.api.res.UploadAttachmentsRes;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import org.junit.Before;
 import org.junit.Test;
 package cn.iocoder.yudao.framework.ai.midjourney;
  
-import cn.iocoder.yudao.framework.ai.midjourney.util.MidjourneyUtil;
+import org.springframework.ai.models.midjourney.util.MidjourneyUtil;
 import org.junit.Test;
  
 /**
 package cn.iocoder.yudao.framework.ai.midjourney;
  
 import cn.hutool.core.io.FileUtil;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.WssNotify;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.listener.MidjourneyMessageListener;
-import cn.iocoder.yudao.framework.ai.midjourney.webSocket.MidjourneyWebSocketStarter;
+import org.springframework.ai.models.midjourney.MidjourneyConfig;
+import org.springframework.ai.models.midjourney.webSocket.WssNotify;
+import org.springframework.ai.models.midjourney.webSocket.listener.MidjourneyMessageListener;
+import org.springframework.ai.models.midjourney.webSocket.MidjourneyWebSocketStarter;
 import org.junit.Before;
 import org.junit.Test;
  
 package cn.iocoder.yudao.framework.ai.openAiImage;
  
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageApi;
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageClient;
-import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageOptions;
-import cn.iocoder.yudao.framework.ai.image.ImagePrompt;
-import cn.iocoder.yudao.framework.ai.image.ImageResponse;
+import org.springframework.ai.models.openai.OpenAiImageApi;
+import org.springframework.ai.models.openai.OpenAiImageClient;
+import org.springframework.ai.models.openai.OpenAiImageOptions;
+import org.springframework.ai.image.ImagePrompt;
+import org.springframework.ai.image.ImageResponse;
 import org.junit.Before;
 import org.junit.Test;