【解决todo】AI Music: 结构优化，task状态同步使用统一标准Job

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

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.framework.ai.config;
 import cn.hutool.core.io.IoUtil;
 import cn.iocoder.yudao.framework.ai.core.factory.AiClientFactory;
 import cn.iocoder.yudao.framework.ai.core.factory.AiClientFactoryImpl;
-import cn.iocoder.yudao.framework.ai.core.model.suno.SunoConfig;
 import cn.iocoder.yudao.framework.ai.core.model.suno.api.SunoApi;
 import cn.iocoder.yudao.framework.ai.core.model.tongyi.QianWenChatClient;
 import cn.iocoder.yudao.framework.ai.core.model.tongyi.QianWenChatModal;
@@ -151,7 +150,7 @@ public class YudaoAiAutoConfiguration {
     @Bean
     @ConditionalOnProperty(value = "yudao.ai.suno.enable", havingValue = "true")
     public SunoApi sunoApi(YudaoAiProperties yudaoAiProperties) {
-        return new SunoApi(new SunoConfig(yudaoAiProperties.getSuno().getBaseUrl()));
+        return new SunoApi(yudaoAiProperties.getSuno().getBaseUrl());
     }
 
     private static @NotNull MidjourneyConfig getMidjourneyConfig(ApplicationContext applicationContext,

yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/enums/AiPlatformEnum.java

@@ -22,6 +22,7 @@ public enum AiPlatformEnum {
 
     STABLE_DIFFUSION("StableDiffusion", "StableDiffusion"), // Stability AI
     MIDJOURNEY("midjourney", "midjourney"), // TODO MJ 提供的绘图，接入中
+    SUNO("Suno", "Suno"), // Suno AI
     ;
 
     /**

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

@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.framework.ai.core.model.suno;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-// TODO @xin：不需要这个类哈，直接 SunoApi 传入 baseUrl 参数即可
-/**
- * Suno 配置类
- *
- * @author  xiaoxin
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SunoConfig {
-
-    /**
-     * suno-api服务的基本路径
-     */
-    private String baseUrl;
-
-}

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

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.framework.ai.core.model.suno.api;
 
-import cn.iocoder.yudao.framework.ai.core.model.suno.SunoConfig;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.StrPool;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.ClientResponse;
@@ -17,11 +19,10 @@ import java.util.function.Predicate;
 
 /**
  * Suno API
- * <br>
+ * <b>
  * 文档地址：https://github.com/status2xx/suno-api/blob/main/README_CN.md
  *
- * @Author xiaoxin
- * @Date 2024/6/3
+ * @author xiaoxin
  */
 @Slf4j
 public class SunoApi {
@@ -29,86 +30,88 @@ public class SunoApi {
     private final WebClient webClient;
 
     private final Predicate<HttpStatusCode> STATUS_PREDICATE = status -> !status.is2xxSuccessful();
-    private final Function<ClientResponse, Mono<? extends Throwable>> EXCEPTION_FUNCTION = response -> response.bodyToMono(String.class)
+
+    private final Function<Object, Function<ClientResponse, Mono<? extends Throwable>>> EXCEPTION_FUNCTION = reqParam -> response -> response.bodyToMono(String.class)
             .handle((respBody, sink) -> {
-                // TODO @xin：最好是 request、response 都有哈
-                log.error("【suno-api】调用失败！resp: 【{}】", respBody);
-                sink.error(new IllegalStateException("【suno-api】调用失败！"));
+                HttpRequest request = response.request();
+                log.error("[suno-api] 调用失败！请求方式:[{}], 请求地址:[{}], 请求参数:[{}], 响应数据: [{}]", request.getMethod(), request.getURI(), reqParam, respBody);
+                sink.error(new IllegalStateException("[suno-api] 调用失败！"));
             });
 
-    public SunoApi(SunoConfig config) {
+
+    public SunoApi(String baseUrl) {
         this.webClient = WebClient.builder()
-                .baseUrl(config.getBaseUrl())
+                .baseUrl(baseUrl)
                 .defaultHeaders((headers) -> headers.setContentType(MediaType.APPLICATION_JSON))
                 .build();
     }
 
-    public List<MusicData> generate(SunoRequest request) {
+    public List<MusicData> generate(MusicGenerateRequest request) {
         return this.webClient.post()
                 .uri("/api/generate")
-                .body(Mono.just(request), SunoRequest.class)
+                .body(Mono.just(request), MusicGenerateRequest.class)
                 .retrieve()
-                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION)
-                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() { })
+                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
+                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() {
+                })
                 .block();
     }
 
-    public List<MusicData> customGenerate(SunoRequest request) {
+    public List<MusicData> customGenerate(MusicGenerateRequest request) {
         return this.webClient.post()
                 .uri("/api/custom_generate")
-                .body(Mono.just(request), SunoRequest.class)
+                .body(Mono.just(request), MusicGenerateRequest.class)
                 .retrieve()
-                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION)
-                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() { })
+                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
+                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() {
+                })
                 .block();
     }
 
-    // TODO @xin: 是不是叫 chatCompletion
-    public List<MusicData> doChatCompletion(String prompt) {
+    public List<MusicData> chatCompletion(String prompt) {
         return this.webClient.post()
                 .uri("/v1/chat/completions")
-                .body(Mono.just(new SunoRequest(prompt)), SunoRequest.class)
+                .body(Mono.just(new MusicGenerateRequest(prompt)), MusicGenerateRequest.class)
                 .retrieve()
-                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION)
-                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() { })
+                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(prompt))
+                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() {
+                })
                 .block();
     }
 
     public LyricsData generateLyrics(String prompt) {
         return this.webClient.post()
                 .uri("/api/generate_lyrics")
-                .body(Mono.just(new SunoRequest(prompt)), SunoRequest.class)
+                .body(Mono.just(new MusicGenerateRequest(prompt)), MusicGenerateRequest.class)
                 .retrieve()
-                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION)
+                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(prompt))
                 .bodyToMono(LyricsData.class)
                 .block();
     }
 
-    // TODO @xin:应该传入 List<String> ids
-    // TODO @xin:方法名，建议使用 getMusicList
-    public List<MusicData> selectById(String ids) {
+    public List<MusicData> getMusicList(List<String> ids) {
         return this.webClient.get()
                 .uri(uriBuilder -> uriBuilder
                         .path("/api/get")
-                        .queryParam("ids", ids)
+                        .queryParam("ids", CollUtil.join(ids, StrPool.COMMA))
                         .build())
                 .retrieve()
-                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION)
-                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() { })
+                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(ids))
+                .bodyToMono(new ParameterizedTypeReference<List<MusicData>>() {
+                })
                 .block();
     }
 
-    // TODO @xin:方法名，建议使用 getLimitUsage
-    public LimitData selectLimit() {
+    public LimitUsageData getLimitUsage() {
         return this.webClient.get()
                 .uri("/api/get_limit")
                 .retrieve()
-                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION)
-                .bodyToMono(LimitData.class)
+                .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(null))
+                .bodyToMono(LimitUsageData.class)
                 .block();
     }
 
-    // TODO @xin：可以改成 MusicGenerateRequest
+
     /**
      * 根据提示生成音频
      *
@@ -121,7 +124,7 @@ public class SunoApi {
      * @param makeInstrumental 指示音乐音频是否为定制，如果为 true，则从歌词生成，否则从提示生成
      */
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
-    public record SunoRequest(
+    public record MusicGenerateRequest(
             String prompt,
             String tags,
             String title,
@@ -130,15 +133,15 @@ public class SunoApi {
             @JsonProperty("make_instrumental") boolean makeInstrumental
     ) {
 
-        public SunoRequest(String prompt) {
+        public MusicGenerateRequest(String prompt) {
             this(prompt, null, null, null, false, false);
         }
 
-        public SunoRequest(String prompt, String mv, boolean makeInstrumental) {
+        public MusicGenerateRequest(String prompt, String mv, boolean makeInstrumental) {
             this(prompt, null, null, mv, false, makeInstrumental);
         }
 
-        public SunoRequest(String prompt, String mv, String tags, String title) {
+        public MusicGenerateRequest(String prompt, String mv, String tags, String title) {
             this(prompt, tags, title, mv, false, false);
         }
 
@@ -154,12 +157,12 @@ public class SunoApi {
      * @param audioUrl             音乐音频的 URL
      * @param videoUrl             音乐视频的 URL
      * @param createdAt            音乐音频的创建时间
-     * @param modelName
+     * @param modelName            模型名称
      * @param status               submitted、queued、streaming、complete
-     * @param gptDescriptionPrompt
+     * @param gptDescriptionPrompt 描述词
      * @param prompt               生成音乐音频的提示
-     * @param type
-     * @param tags
+     * @param type                 操作类型
+     * @param tags                 音乐类型标签
      */
     public record MusicData(
             String id,
@@ -195,7 +198,7 @@ public class SunoApi {
     /**
      * Suno API 响应的限额数据，目前每日免费50
      */
-    public record LimitData(
+    public record LimitUsageData(
             @JsonProperty("credits_left") Long creditsLeft,
             String period,
             @JsonProperty("monthly_limit") Long monthlyLimit,