【增加】MidjourneyApi 自动配置

yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiImageProperties.java

@@ -1,98 +0,0 @@
-package cn.iocoder.yudao.framework.ai.config;
-
-import cn.iocoder.yudao.framework.ai.core.enums.AiPlatformEnum;
-import cn.iocoder.yudao.framework.ai.core.model.xinghuo.XingHuoChatModel;
-import cn.iocoder.yudao.framework.ai.core.model.xinghuo.XingHuoOptions;
-import cn.iocoder.yudao.framework.ai.core.model.yiyan.api.YiYanChatModel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * ai 自动配置
- *
- * @author fansili
- * @time 2024/4/12 16:29
- * @since 1.0
- */
-
-@Data
-@Accessors(chain = true)
-public class YudaoAiImageProperties extends LinkedHashMap<String, Map<String, Object>> {
-
-    private String initType;
-    private QianWenProperties qianwen;
-    private XingHuoOptions xinghuo;
-    private YiYanProperties yiyan;
-
-    @Data
-    @Accessors(chain = true)
-    public static class QianWenProperties extends ChatProperties {
-        /**
-         * 阿里云：服务器接入点
-         */
-        private String endpoint = "bailian.cn-beijing.aliyuncs.com";
-        /**
-         * 阿里云：权限 accessKeyId
-         */
-        private String accessKeyId;
-        /**
-         * 阿里云：权限 accessKeySecret
-         */
-        private String accessKeySecret;
-        /**
-         * 阿里云：agentKey
-         */
-        private String agentKey;
-        /**
-         * 阿里云：agentKey(相当于应用id)
-         */
-        private String appId;
-
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class XingHuoProperties extends ChatProperties {
-        private String appId;
-        private String appKey;
-        private String secretKey;
-        private XingHuoChatModel chatModel;
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class YiYanProperties extends ChatProperties {
-        /**
-         * appKey
-         */
-        private String appKey;
-        /**
-         * secretKey
-         */
-        private String secretKey;
-        /**
-         * 模型
-         */
-        private YiYanChatModel chatModel = YiYanChatModel.ERNIE4_3_5_8K;
-        /**
-         * token 刷新时间(默认 86400 = 24小时)
-         */
-        private int refreshTokenSecondTime = 86400;
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class ChatProperties {
-
-        private AiPlatformEnum aiPlatform;
-
-        private Float temperature;
-
-        private Float topP;
-
-        private Integer topK;
-    }
-}

yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoMidjourneyConfiguration.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.framework.ai.config;
+
+import cn.iocoder.yudao.framework.ai.core.model.midjourney.MidjourneyConfig;
+import cn.iocoder.yudao.framework.ai.core.model.midjourney.api.MidjourneyApi;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 配置
+ *
+ * @author fansili
+ * @time 2024/6/13 09:50
+ */
+@Configuration
+public class YudaoMidjourneyConfiguration {
+
+    @Bean
+    @ConditionalOnProperty(value = "ai.midjourney-proxy.enable", havingValue = "true")
+    public MidjourneyApi midjourneyApi(YudaoMidjourneyProperties midjourneyProperties) {
+        return new MidjourneyApi(BeanUtils.toBean(midjourneyProperties, MidjourneyConfig.class));
+    }
+}

yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoMidjourneyProperties.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.ai.config;
+package cn.iocoder.yudao.framework.ai.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -14,9 +14,9 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ConfigurationProperties(prefix = "ai.midjourney-proxy")
 @Data
-public class MidjourneyProperties {
+public class YudaoMidjourneyProperties {
 
+    private String enable;
     private String key;
     private String url;
-    private String notifyUrl;
 }

yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyConfig.java

@@ -20,8 +20,4 @@ public class MidjourneyConfig {
      * 请求地址
      */
     private String url;
-    /**
-     * 通知回调地址
-     */
-    private String notifyUrl;
 }

yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/api/MidjourneyApi.java

@@ -46,11 +46,11 @@ public class MidjourneyApi {
      * @param imagineReqVO
      * @return
      */
-    public MidjourneySubmitResponse imagine(MidjourneyImagineRequest imagineReqVO) {
+    public SubmitResponse imagine(ImagineRequest imagineReqVO) {
         // 1、发送 post 请求
         String res = post(URI_IMAGINE, imagineReqVO);
         // 2、转换 resp
-        return JsonUtils.parseObject(res, MidjourneySubmitResponse.class);
+        return JsonUtils.parseObject(res, SubmitResponse.class);
     }
 
     /**
@@ -58,11 +58,11 @@ public class MidjourneyApi {
      *
      * @param actionReqVO
      */
-    public MidjourneySubmitResponse action(MidjourneyActionRequest actionReqVO) {
+    public SubmitResponse action(ActionRequest actionReqVO) {
         // 1、发送 post 请求
         String res = post(URI_ACTON, actionReqVO);
         // 2、转换 resp
-        return JsonUtils.parseObject(res, MidjourneySubmitResponse.class);
+        return JsonUtils.parseObject(res, SubmitResponse.class);
     }
 
     /**
@@ -104,7 +104,7 @@ public class MidjourneyApi {
      * @param prompt 提示词
      * @param state 自定义参数
      */
-    public record MidjourneyImagineRequest(List<String> base64Array,
+    public record ImagineRequest(List<String> base64Array,
                                  String notifyHook,
                                  String prompt,
                                  String state) {
@@ -116,12 +116,11 @@ public class MidjourneyApi {
      * @param customId   操作按钮id
      * @param taskId     操作按钮id
      * @param notifyHook 通知地址
-     * @param state 自定义参数
      */
-    public record MidjourneyActionRequest(String customId,
+    public record ActionRequest(String customId,
                                 String taskId,
-                                          String notifyHook,
+                                String notifyHook
-                                          String state) {
+    ) {
     }
 
     /**
@@ -132,7 +131,7 @@ public class MidjourneyApi {
      * @param properties 扩展字段
      * @param result 任务ID
      */
-    public record MidjourneySubmitResponse(String code,
+    public record SubmitResponse(String code,
                                  String description,
                                  Map<String, Object> properties,
                                  String result) {