Commit 21b6e9f996100f1f22203f54f0804f13af75e0cb

Authored by cherishsince
1 parent 0c42d617

重命名测试包

yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/image/MjTests.java renamed to yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/mj/MjInteractionsTests.java
1 -package cn.iocoder.yudao.framework.ai.image; 1 +package cn.iocoder.yudao.framework.ai.mj;
2 2
3 import cn.hutool.core.io.FileUtil; 3 import cn.hutool.core.io.FileUtil;
4 import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig; 4 import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
5 -import cn.iocoder.yudao.framework.ai.midjourney.interactions.MjImagineInteractions; 5 +import cn.iocoder.yudao.framework.ai.midjourney.interactions.MjInteractions;
  6 +import cn.iocoder.yudao.framework.ai.midjourney.vo.ReRoll;
6 import org.junit.Before; 7 import org.junit.Before;
7 import org.junit.Test; 8 import org.junit.Test;
8 9
@@ -17,23 +18,32 @@ import java.util.Map; @@ -17,23 +18,32 @@ import java.util.Map;
17 * author: fansili 18 * author: fansili
18 * time: 2024/4/4 18:59 19 * time: 2024/4/4 18:59
19 */ 20 */
20 -public class MjTests { 21 +public class MjInteractionsTests {
21 22
22 private MidjourneyConfig midjourneyConfig; 23 private MidjourneyConfig midjourneyConfig;
23 @Before 24 @Before
24 public void setup() { 25 public void setup() {
25 - String token = "OTcwNDc3NzQxMjUyMTY5NzI4.GJcVxa.VrzMii8dsHOJAPZn4Mw8GuEo7_nIUJij9JIHD4"; 26 + String token = "OTcyNzIxMzA0ODkxNDUzNDUw.G_vMOz.BO_Q0sXAD80u5ZKIHPNYDTRX_FgeKL3cKFc53I";
26 Map<String, String> requestTemplates = new HashMap<>(); 27 Map<String, String> requestTemplates = new HashMap<>();
27 List<File> files = FileUtil.loopFiles("/Users/fansili/projects/github/ruoyi-vue-pro/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/resources/http-body"); 28 List<File> files = FileUtil.loopFiles("/Users/fansili/projects/github/ruoyi-vue-pro/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/resources/http-body");
28 for (File file : files) { 29 for (File file : files) {
29 requestTemplates.put(file.getName().replace(".json", ""), FileUtil.readUtf8String(file)); 30 requestTemplates.put(file.getName().replace(".json", ""), FileUtil.readUtf8String(file));
30 } 31 }
31 - this.midjourneyConfig = new MidjourneyConfig(token, "1225414986084388926", "1225414986587832385", requestTemplates); 32 + this.midjourneyConfig = new MidjourneyConfig(token, "1225608134878302329", "1225608134878302332", requestTemplates);
32 } 33 }
33 34
34 @Test 35 @Test
35 - public void mjImage() {  
36 - MjImagineInteractions mjImagineInteractions = new MjImagineInteractions(midjourneyConfig);  
37 - mjImagineInteractions.execute("童话里应该是什么样子?"); 36 + public void mjImageTest() {
  37 + MjInteractions mjImagineInteractions = new MjInteractions(midjourneyConfig);
  38 + mjImagineInteractions.imagine("童话里应该是什么样子?");
  39 + }
  40 +
  41 +
  42 + @Test
  43 + public void reRollTest() {
  44 + MjInteractions mjImagineInteractions = new MjInteractions(midjourneyConfig);
  45 + mjImagineInteractions.reRoll(new ReRoll()
  46 + .setMessageId("1226165117448753243")
  47 + .setCustomId("MJ::JOB::upsample::3::2aeefbef-43e2-4057-bcf1-43b5f39ab6f7"));
38 } 48 }
39 } 49 }
yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/image/MjWebSocketTests.java renamed to yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/mj/MjWebSocketTests.java
1 -package cn.iocoder.yudao.framework.ai.image; 1 +package cn.iocoder.yudao.framework.ai.mj;
2 2
3 import cn.hutool.core.io.FileUtil; 3 import cn.hutool.core.io.FileUtil;
4 import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig; 4 import cn.iocoder.yudao.framework.ai.midjourney.MidjourneyConfig;
yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/image/OpenAiImageClientTests.java renamed to yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/openAiImage/OpenAiImageClientTests.java
1 -package cn.iocoder.yudao.framework.ai.image; 1 +package cn.iocoder.yudao.framework.ai.openAiImage;
2 2
3 import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageApi; 3 import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageApi;
4 import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageClient; 4 import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageClient;
5 import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageOptions; 5 import cn.iocoder.yudao.framework.ai.imageopenai.OpenAiImageOptions;
  6 +import cn.iocoder.yudao.framework.ai.mj.ImagePrompt;
  7 +import cn.iocoder.yudao.framework.ai.mj.ImageResponse;
6 import org.junit.Before; 8 import org.junit.Before;
7 import org.junit.Test; 9 import org.junit.Test;
8 10