fix:【ai 大模型】混元支持 thinking 返回
This commit is contained in:
@@ -14,6 +14,9 @@ import cn.iocoder.yudao.module.ai.framework.ai.core.model.siliconflow.SiliconFlo
|
|||||||
import cn.iocoder.yudao.module.ai.framework.ai.core.model.suno.api.SunoApi;
|
import cn.iocoder.yudao.module.ai.framework.ai.core.model.suno.api.SunoApi;
|
||||||
import cn.iocoder.yudao.module.ai.framework.ai.core.model.xinghuo.XingHuoChatModel;
|
import cn.iocoder.yudao.module.ai.framework.ai.core.model.xinghuo.XingHuoChatModel;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.ai.deepseek.DeepSeekChatModel;
|
||||||
|
import org.springframework.ai.deepseek.DeepSeekChatOptions;
|
||||||
|
import org.springframework.ai.deepseek.api.DeepSeekApi;
|
||||||
import org.springframework.ai.embedding.BatchingStrategy;
|
import org.springframework.ai.embedding.BatchingStrategy;
|
||||||
import org.springframework.ai.embedding.TokenCountBatchingStrategy;
|
import org.springframework.ai.embedding.TokenCountBatchingStrategy;
|
||||||
import org.springframework.ai.model.tool.ToolCallingManager;
|
import org.springframework.ai.model.tool.ToolCallingManager;
|
||||||
@@ -152,13 +155,14 @@ public class AiAutoConfiguration {
|
|||||||
StrUtil.startWithIgnoreCase(properties.getModel(), "deepseek") ? HunYuanChatModel.DEEP_SEEK_BASE_URL
|
StrUtil.startWithIgnoreCase(properties.getModel(), "deepseek") ? HunYuanChatModel.DEEP_SEEK_BASE_URL
|
||||||
: HunYuanChatModel.BASE_URL);
|
: HunYuanChatModel.BASE_URL);
|
||||||
}
|
}
|
||||||
// 创建 OpenAiChatModel、HunYuanChatModel 对象
|
// 创建 DeepSeekChatModel、HunYuanChatModel 对象
|
||||||
OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
|
DeepSeekChatModel openAiChatModel = DeepSeekChatModel.builder()
|
||||||
.openAiApi(OpenAiApi.builder()
|
.deepSeekApi(DeepSeekApi.builder()
|
||||||
.baseUrl(properties.getBaseUrl())
|
.baseUrl(properties.getBaseUrl())
|
||||||
|
.completionsPath(HunYuanChatModel.COMPLETE_PATH)
|
||||||
.apiKey(properties.getApiKey())
|
.apiKey(properties.getApiKey())
|
||||||
.build())
|
.build())
|
||||||
.defaultOptions(OpenAiChatOptions.builder()
|
.defaultOptions(DeepSeekChatOptions.builder()
|
||||||
.model(properties.getModel())
|
.model(properties.getModel())
|
||||||
.temperature(properties.getTemperature())
|
.temperature(properties.getTemperature())
|
||||||
.maxTokens(properties.getMaxTokens())
|
.maxTokens(properties.getMaxTokens())
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import org.springframework.ai.chat.model.ChatModel;
|
|||||||
import org.springframework.ai.chat.model.ChatResponse;
|
import org.springframework.ai.chat.model.ChatResponse;
|
||||||
import org.springframework.ai.chat.prompt.ChatOptions;
|
import org.springframework.ai.chat.prompt.ChatOptions;
|
||||||
import org.springframework.ai.chat.prompt.Prompt;
|
import org.springframework.ai.chat.prompt.Prompt;
|
||||||
import org.springframework.ai.openai.OpenAiChatModel;
|
|
||||||
import reactor.core.publisher.Flux;
|
import reactor.core.publisher.Flux;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -22,6 +21,7 @@ import reactor.core.publisher.Flux;
|
|||||||
public class HunYuanChatModel implements ChatModel {
|
public class HunYuanChatModel implements ChatModel {
|
||||||
|
|
||||||
public static final String BASE_URL = "https://api.hunyuan.cloud.tencent.com";
|
public static final String BASE_URL = "https://api.hunyuan.cloud.tencent.com";
|
||||||
|
public static final String COMPLETE_PATH = "/v1/chat/completions";
|
||||||
|
|
||||||
public static final String MODEL_DEFAULT = "hunyuan-turbo";
|
public static final String MODEL_DEFAULT = "hunyuan-turbo";
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ public class HunYuanChatModel implements ChatModel {
|
|||||||
/**
|
/**
|
||||||
* 兼容 OpenAI 接口,进行复用
|
* 兼容 OpenAI 接口,进行复用
|
||||||
*/
|
*/
|
||||||
private final OpenAiChatModel openAiChatModel;
|
private final ChatModel openAiChatModel;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ChatResponse call(Prompt prompt) {
|
public ChatResponse call(Prompt prompt) {
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class AiUtils {
|
|||||||
case DOU_BAO: // 复用 DeepSeek 客户端
|
case DOU_BAO: // 复用 DeepSeek 客户端
|
||||||
return DeepSeekChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
|
return DeepSeekChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
|
||||||
.toolNames(toolNames).toolContext(toolContext).build();
|
.toolNames(toolNames).toolContext(toolContext).build();
|
||||||
|
case HUN_YUAN: // 复用 DeepSeek 客户端
|
||||||
case ZHI_PU:
|
case ZHI_PU:
|
||||||
return ZhiPuAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
|
return ZhiPuAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
|
||||||
.toolNames(toolNames).toolContext(toolContext).build();
|
.toolNames(toolNames).toolContext(toolContext).build();
|
||||||
@@ -63,7 +64,6 @@ public class AiUtils {
|
|||||||
.toolNames(toolNames).toolContext(toolContext).build();
|
.toolNames(toolNames).toolContext(toolContext).build();
|
||||||
case OPENAI:
|
case OPENAI:
|
||||||
case GEMINI: // 复用 OpenAI 客户端
|
case GEMINI: // 复用 OpenAI 客户端
|
||||||
case HUN_YUAN: // 复用 OpenAI 客户端
|
|
||||||
case XING_HUO: // 复用 OpenAI 客户端
|
case XING_HUO: // 复用 OpenAI 客户端
|
||||||
case SILICON_FLOW: // 复用 OpenAI 客户端
|
case SILICON_FLOW: // 复用 OpenAI 客户端
|
||||||
case BAI_CHUAN: // 复用 OpenAI 客户端
|
case BAI_CHUAN: // 复用 OpenAI 客户端
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ import org.springframework.ai.chat.messages.SystemMessage;
|
|||||||
import org.springframework.ai.chat.messages.UserMessage;
|
import org.springframework.ai.chat.messages.UserMessage;
|
||||||
import org.springframework.ai.chat.model.ChatResponse;
|
import org.springframework.ai.chat.model.ChatResponse;
|
||||||
import org.springframework.ai.chat.prompt.Prompt;
|
import org.springframework.ai.chat.prompt.Prompt;
|
||||||
import org.springframework.ai.openai.OpenAiChatModel;
|
import org.springframework.ai.deepseek.DeepSeekChatModel;
|
||||||
import org.springframework.ai.openai.OpenAiChatOptions;
|
import org.springframework.ai.deepseek.DeepSeekChatOptions;
|
||||||
import org.springframework.ai.openai.api.OpenAiApi;
|
import org.springframework.ai.deepseek.api.DeepSeekApi;
|
||||||
import reactor.core.publisher.Flux;
|
import reactor.core.publisher.Flux;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -23,12 +23,13 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
public class HunYuanChatModelTests {
|
public class HunYuanChatModelTests {
|
||||||
|
|
||||||
private final OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
|
private final DeepSeekChatModel openAiChatModel = DeepSeekChatModel.builder()
|
||||||
.openAiApi(OpenAiApi.builder()
|
.deepSeekApi(DeepSeekApi.builder()
|
||||||
.baseUrl(HunYuanChatModel.BASE_URL)
|
.baseUrl(HunYuanChatModel.BASE_URL)
|
||||||
.apiKey("sk-bcd") // apiKey
|
.completionsPath(HunYuanChatModel.COMPLETE_PATH)
|
||||||
|
.apiKey("sk-abc") // apiKey
|
||||||
.build())
|
.build())
|
||||||
.defaultOptions(OpenAiChatOptions.builder()
|
.defaultOptions(DeepSeekChatOptions.builder()
|
||||||
.model(HunYuanChatModel.MODEL_DEFAULT) // 模型
|
.model(HunYuanChatModel.MODEL_DEFAULT) // 模型
|
||||||
.temperature(0.7)
|
.temperature(0.7)
|
||||||
.build())
|
.build())
|
||||||
@@ -64,12 +65,33 @@ public class HunYuanChatModelTests {
|
|||||||
flux.doOnNext(System.out::println).then().block();
|
flux.doOnNext(System.out::println).then().block();
|
||||||
}
|
}
|
||||||
|
|
||||||
private final OpenAiChatModel deepSeekOpenAiChatModel = OpenAiChatModel.builder()
|
@Test
|
||||||
.openAiApi(OpenAiApi.builder()
|
@Disabled
|
||||||
|
public void testStream_thinking() {
|
||||||
|
// 准备参数
|
||||||
|
List<Message> messages = new ArrayList<>();
|
||||||
|
messages.add(new UserMessage("详细分析下,如何设计一个电商系统?"));
|
||||||
|
DeepSeekChatOptions options = DeepSeekChatOptions.builder()
|
||||||
|
.model("hunyuan-a13b")
|
||||||
|
// .model("hunyuan-turbos-latest")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
Flux<ChatResponse> flux = chatModel.stream(new Prompt(messages, options));
|
||||||
|
// 打印结果
|
||||||
|
flux.doOnNext(response -> {
|
||||||
|
// System.out.println(response);
|
||||||
|
System.out.println(response.getResult().getOutput());
|
||||||
|
}).then().block();
|
||||||
|
}
|
||||||
|
|
||||||
|
private final DeepSeekChatModel deepSeekOpenAiChatModel = DeepSeekChatModel.builder()
|
||||||
|
.deepSeekApi(DeepSeekApi.builder()
|
||||||
.baseUrl(HunYuanChatModel.DEEP_SEEK_BASE_URL)
|
.baseUrl(HunYuanChatModel.DEEP_SEEK_BASE_URL)
|
||||||
|
.completionsPath(HunYuanChatModel.COMPLETE_PATH)
|
||||||
.apiKey("sk-abc") // apiKey
|
.apiKey("sk-abc") // apiKey
|
||||||
.build())
|
.build())
|
||||||
.defaultOptions(OpenAiChatOptions.builder()
|
.defaultOptions(DeepSeekChatOptions.builder()
|
||||||
// .model(HunYuanChatModel.DEEP_SEEK_MODEL_DEFAULT) // 模型("deepseek-v3")
|
// .model(HunYuanChatModel.DEEP_SEEK_MODEL_DEFAULT) // 模型("deepseek-v3")
|
||||||
.model("deepseek-r1") // 模型("deepseek-r1")
|
.model("deepseek-r1") // 模型("deepseek-r1")
|
||||||
.temperature(0.7)
|
.temperature(0.7)
|
||||||
@@ -94,7 +116,7 @@ public class HunYuanChatModelTests {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Disabled
|
@Disabled
|
||||||
public void testStream_deekseek() {
|
public void testStream_deepseek() {
|
||||||
// 准备参数
|
// 准备参数
|
||||||
List<Message> messages = new ArrayList<>();
|
List<Message> messages = new ArrayList<>();
|
||||||
messages.add(new SystemMessage("你是一个优质的文言文作者,用文言文描述着各城市的人文风景。"));
|
messages.add(new SystemMessage("你是一个优质的文言文作者,用文言文描述着各城市的人文风景。"));
|
||||||
@@ -106,5 +128,23 @@ public class HunYuanChatModelTests {
|
|||||||
flux.doOnNext(System.out::println).then().block();
|
flux.doOnNext(System.out::println).then().block();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Disabled
|
||||||
|
public void testStream_deepseek_thinking() {
|
||||||
|
// 准备参数
|
||||||
|
List<Message> messages = new ArrayList<>();
|
||||||
|
messages.add(new UserMessage("详细分析下,如何设计一个电商系统?"));
|
||||||
|
DeepSeekChatOptions options = DeepSeekChatOptions.builder()
|
||||||
|
.model("deepseek-r1")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
Flux<ChatResponse> flux = deepSeekChatModel.stream(new Prompt(messages, options));
|
||||||
|
// 打印结果
|
||||||
|
flux.doOnNext(response -> {
|
||||||
|
// System.out.println(response);
|
||||||
|
System.out.println(response.getResult().getOutput());
|
||||||
|
}).then().block();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user