fix：【ai 大模型】豆包支持 thinking 返回

YunaiV
1 parent 9d149f41
Showing 4 changed files with 16 additions and 11 deletions
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/doubao/DouBaoChatModel.java
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java
yudao-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/DouBaoChatModelTests.java
@@ -94,6 +94,7 @@ public class AiAutoConfiguration {
         OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
                 .openAiApi(OpenAiApi.builder()
                         .baseUrl(DouBaoChatModel.BASE_URL)
+                        .completionsPath(DouBaoChatModel.COMPLETE_PATH)
                         .apiKey(properties.getApiKey())
                         .build())
                 .defaultOptions(OpenAiChatOptions.builder()
@@ -6,7 +6,6 @@ import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
-import org.springframework.ai.openai.OpenAiChatModel;
 import reactor.core.publisher.Flux;
 /**
@@ -19,13 +18,14 @@ import reactor.core.publisher.Flux;
 public class DouBaoChatModel implements ChatModel {
     public static final String BASE_URL = "https://ark.cn-beijing.volces.com/api";
+    public static final String COMPLETE_PATH = "/v3/chat/completions";
     public static final String MODEL_DEFAULT = "doubao-1-5-lite-32k-250115";
     /**
      * 兼容 OpenAI 接口，进行复用
      */
-    private final OpenAiChatModel openAiChatModel;
+    private final ChatModel openAiChatModel;
     @Override
     public ChatResponse call(Prompt prompt) {
@@ -49,6 +49,7 @@ public class AiUtils {
             case YI_YAN:
                 return QianFanChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens).build();
             case DEEP_SEEK:
+            case DOU_BAO: // 复用 DeepSeek 客户端
                 return DeepSeekChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
                         .toolNames(toolNames).toolContext(toolContext).build();
             case ZHI_PU:
@@ -62,7 +63,6 @@ public class AiUtils {
                         .toolNames(toolNames).toolContext(toolContext).build();
             case OPENAI:
             case GEMINI: // 复用 OpenAI 客户端
-            case DOU_BAO: // 复用 OpenAI 客户端
             case HUN_YUAN: // 复用 OpenAI 客户端
             case XING_HUO: // 复用 OpenAI 客户端
             case SILICON_FLOW: // 复用 OpenAI 客户端
@@ -8,9 +8,9 @@ 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.openai.OpenAiChatModel;
-import org.springframework.ai.openai.OpenAiChatOptions;
-import org.springframework.ai.openai.api.OpenAiApi;
+import org.springframework.ai.deepseek.DeepSeekChatModel;
+import org.springframework.ai.deepseek.DeepSeekChatOptions;
+import org.springframework.ai.deepseek.api.DeepSeekApi;
 import reactor.core.publisher.Flux;
 import java.util.ArrayList;
@@ -23,13 +23,18 @@ import java.util.List;
  */
 public class DouBaoChatModelTests {
-    private final OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
-            .openAiApi(OpenAiApi.builder()
+    /**
+     * 相比 OpenAIChatModel 来说，DeepSeekChatModel 可以兼容豆包的 thinking 能力！
+     */
+    private final DeepSeekChatModel openAiChatModel = DeepSeekChatModel.builder()
+            .deepSeekApi(DeepSeekApi.builder()
                     .baseUrl(DouBaoChatModel.BASE_URL)
+                    .completionsPath(DouBaoChatModel.COMPLETE_PATH)
                     .apiKey("5c1b5747-26d2-4ebd-a4e0-dd0e8d8b4272") // apiKey
                     .build())
-            .defaultOptions(OpenAiChatOptions.builder()
+            .defaultOptions(DeepSeekChatOptions.builder()
                     .model("doubao-1-5-lite-32k-250115") // 模型（doubao）
+//                    .model("doubao-seed-1-6-thinking-250715") // 模型（doubao）
 //                    .model("deepseek-r1-250120") // 模型（deepseek）
                     .temperature(0.7)
                     .build())
@@ -51,14 +56,13 @@ public class DouBaoChatModelTests {
         System.out.println(response);
     }
-    // TODO @芋艿：因为使用的是 v1 api，导致 deepseek-r1-250120 不返回 think 过程，后续需要优化
     @Test
     @Disabled
     public void testStream() {
         // 准备参数
         List<Message> messages = new ArrayList<>();
         messages.add(new SystemMessage("你是一个优质的文言文作者，用文言文描述着各城市的人文风景。"));
-        messages.add(new UserMessage("1 + 1 = ？"));
+        messages.add(new UserMessage("详细推理下，帮我设计一个用户中心！"));
         // 调用
         Flux<ChatResponse> flux = chatModel.stream(new Prompt(messages));