BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f8ca6341599bd5d07b8b8d708ebeb70b498682c5

Authored by YunaiV
1 parent 9d149f41

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

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