Merge pull request #68 from wstever/main

yuluo-yx · web-flow · commit 450fb39133ba · 2025-03-06T20:46:29.000+08:00
fix:SpringAI M5 modify the ChatOptions params
diff --git a/spring-ai-alibaba-chat-example/moonshot-chat/moonshot-chat-client/src/main/java/com/alibaba/cloud/ai/example/chat/moonshot/controller/MoonshotClientController.java b/spring-ai-alibaba-chat-example/moonshot-chat/moonshot-chat-client/src/main/java/com/alibaba/cloud/ai/example/chat/moonshot/controller/MoonshotClientController.java
@@ -49,8 +49,8 @@ public MoonshotClientController(ChatClient.Builder chatClientBuilder) {
                 // 设置Options
                 .defaultOptions(
                         MoonshotChatOptions.builder()
-                                .withTopP(0.8)
-                                .withTemperature(0.8)
+                                .topP(0.8)
+                                .temperature(0.8)
                                 .build()
                 )
                 .build();
diff --git a/spring-ai-alibaba-chat-example/moonshot-chat/moonshot-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/moonshot/controller/MoonshotModelController.java b/spring-ai-alibaba-chat-example/moonshot-chat/moonshot-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/moonshot/controller/MoonshotModelController.java
@@ -78,9 +78,9 @@ public Flux<String> streamChat(HttpServletResponse response) {
     @GetMapping("/custom/chat")
     public String customChat() {
         MoonshotChatOptions moonshotChatOptions = MoonshotChatOptions.builder()
-                .withModel("moonshot-v1-32k")
-                .withTopP(0.8)
-                .withTemperature(0.8)
+                .model("moonshot-v1-32k")
+                .topP(0.8)
+                .temperature(0.8)
                 .build();
 
         return moonshotChatModel.call(new Prompt(DEFAULT_PROMPT, moonshotChatOptions)).getResult().getOutput().getContent();
diff --git a/spring-ai-alibaba-chat-example/ollama-chat/ollama-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/ollama/controller/OllamaChatModelController.java b/spring-ai-alibaba-chat-example/ollama-chat/ollama-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/ollama/controller/OllamaChatModelController.java
@@ -79,9 +79,9 @@ public Flux<String> streamChat(HttpServletResponse response) {
     public String customChat() {
 
         OllamaOptions customOptions = OllamaOptions.builder()
-                .withTopP(0.7)
-                .withModel("llama3")
-                .withTemperature(0.8)
+                .topP(0.7)
+                .model("llama3")
+                .temperature(0.8)
                 .build();
 
         return ollamaChatModel.call(new Prompt(DEFAULT_PROMPT, customOptions)).getResult().getOutput().getContent();
diff --git a/spring-ai-alibaba-chat-example/openai-chat/openai-chat-client/src/main/java/com/alibaba/cloud/ai/example/chat/openai/controller/OpenAiClientController.java b/spring-ai-alibaba-chat-example/openai-chat/openai-chat-client/src/main/java/com/alibaba/cloud/ai/example/chat/openai/controller/OpenAiClientController.java
@@ -51,7 +51,7 @@ public OpenAiClientController(ChatModel chatModel) {
 				// 设置 ChatClient 中 ChatModel 的 Options 参数
 				.defaultOptions(
 						OpenAiChatOptions.builder()
-								.withTopP(0.7)
+								.topP(0.7)
 								.build()
 				)
 				.build();
diff --git a/spring-ai-alibaba-chat-example/openai-chat/openai-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/openai/controller/OpenAiChatModelController.java b/spring-ai-alibaba-chat-example/openai-chat/openai-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/openai/controller/OpenAiChatModelController.java
@@ -22,7 +22,6 @@
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.openai.OpenAiChatOptions;
-import org.springframework.ai.openai.api.OpenAiApi;
 import org.springframework.ai.openai.api.ResponseFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -81,10 +80,10 @@ public Flux<String> streamChat(HttpServletResponse response) {
     public String customChat() {
 
         OpenAiChatOptions customOptions = OpenAiChatOptions.builder()
-                .withTopP(0.7)
-                .withModel("gpt-4o")
-                .withMaxTokens(1000)
-                .withTemperature(0.8)
+                .topP(0.7)
+                .model("gpt-4o")
+                .maxTokens(1000)
+                .temperature(0.8)
                 .build();
 
         return openAiChatModel.call(new Prompt(DEFAULT_PROMPT, customOptions)).getResult().getOutput().getContent();
@@ -122,11 +121,11 @@ public String jsonChat() {
                 """;
 
         OpenAiChatOptions customOptions = OpenAiChatOptions.builder()
-                .withTopP(0.7)
-                .withModel("gpt-4o")
-                .withTemperature(0.4)
-                .withMaxTokens(4096)
-                .withResponseFormat(new ResponseFormat(ResponseFormat.Type.JSON_SCHEMA, jsonSchema))
+                .topP(0.7)
+                .model("gpt-4o")
+                .temperature(0.4)
+                .maxTokens(4096)
+                .responseFormat(new ResponseFormat(ResponseFormat.Type.JSON_SCHEMA, jsonSchema))
                 .build();
 
         return openAiChatModel.call(new Prompt(JSON_OUTPUT_PROMPT, customOptions)).getResult().getOutput().getContent();
diff --git a/spring-ai-alibaba-chat-example/zhipuai-chat/zhipuai-chat-client/src/main/java/com/alibaba/cloud/ai/example/chat/zhipuai/controller/ZhiPuAiClientController.java b/spring-ai-alibaba-chat-example/zhipuai-chat/zhipuai-chat-client/src/main/java/com/alibaba/cloud/ai/example/chat/zhipuai/controller/ZhiPuAiClientController.java
@@ -48,7 +48,7 @@ public ZhiPuAiClientController(ChatModel chatModel) {
 				// 设置 ChatClient 中 ChatModel 的 Options 参数
 				.defaultOptions(
 						ZhiPuAiChatOptions.builder()
-								.withTopP(0.7)
+								.topP(0.7)
 								.build()
 				)
 				.build();
diff --git a/spring-ai-alibaba-chat-example/zhipuai-chat/zhipuai-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/zhipuai/controller/ZhiPuAiChatModelController.java b/spring-ai-alibaba-chat-example/zhipuai-chat/zhipuai-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/zhipuai/controller/ZhiPuAiChatModelController.java
@@ -80,10 +80,10 @@ public Flux<String> streamChat(HttpServletResponse response) {
     public String customChat() {
 
         ZhiPuAiChatOptions customOptions = ZhiPuAiChatOptions.builder()
-                .withTopP(0.7)
-                .withModel("glm-4-flash")
-                .withMaxTokens(1000)
-                .withTemperature(0.8)
+                .topP(0.7)
+                .model("glm-4-flash")
+                .maxTokens(1000)
+                .temperature(0.8)
                 .build();
 
         return zhipuAiChatModel.call(new Prompt(DEFAULT_PROMPT, customOptions)).getResult().getOutput().getContent();
diff --git a/spring-ai-alibaba-multi-model-example/ark-multi-model/src/main/java/com/alibaba/cloud/ai/example/controller/MultiModelController.java b/spring-ai-alibaba-multi-model-example/ark-multi-model/src/main/java/com/alibaba/cloud/ai/example/controller/MultiModelController.java
@@ -42,7 +42,7 @@
 /**
  * ark Multi-Model REST Controller
  * 提供聊天、图片生成、文本向量等多个模型能力的API接口
- * 
+ *
  * @author brian xiadong
  */
 @RestController
@@ -78,7 +78,7 @@ public MultiModelController(ChatModel chatModel) {
                 // 设置 ChatClient 中 ChatModel 的 Options 参数
                 .defaultOptions(
                         OpenAiChatOptions.builder()
-                                .withTopP(0.7)
+                                .topP(0.7)
                                 .build()
                 )
                 .build();

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public OpenAiClientController(ChatModel chatModel) {`
`51`	`51`	`// 设置 ChatClient 中 ChatModel 的 Options 参数`
`52`	`52`	`.defaultOptions(`
`53`	`53`	`OpenAiChatOptions.builder()`
`54`		`- .withTopP(0.7)`
	`54`	`+ .topP(0.7)`
`55`	`55`	`.build()`
`56`	`56`	`)`
`57`	`57`	`.build();`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public ZhiPuAiClientController(ChatModel chatModel) {`
`48`	`48`	`// 设置 ChatClient 中 ChatModel 的 Options 参数`
`49`	`49`	`.defaultOptions(`
`50`	`50`	`ZhiPuAiChatOptions.builder()`
`51`		`- .withTopP(0.7)`
	`51`	`+ .topP(0.7)`
`52`	`52`	`.build()`
`53`	`53`	`)`
`54`	`54`	`.build();`