Skip to content

Commit abb9e31

Browse files
committed
fix M6 compilation
1 parent 560d3aa commit abb9e31

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

spring-ai-alibaba-chat-example/deepseek-chat/deepseek-chat-model/src/main/java/com/alibaba/cloud/ai/example/chat/deepseek/controller/DeepSeekChatModelController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public DeepSeekChatModelController (ChatModel chatModel) {
4646
*/
4747
@GetMapping("/simple/chat")
4848
public String simpleChat () {
49-
return DeepSeekChatModel.call(new Prompt(DEFAULT_PROMPT)).getResult().getOutput().getContent();
49+
return DeepSeekChatModel.call(new Prompt(DEFAULT_PROMPT)).getResult().getOutput().getText();
5050
}
5151

5252
/**
@@ -69,6 +69,6 @@ public Flux<String> streamChat (HttpServletResponse response) {
6969
@GetMapping("/custom/chat")
7070
public String customChat () {
7171
OpenAiChatOptions customOptions = OpenAiChatOptions.builder().temperature(0.8d).build();
72-
return DeepSeekChatModel.call(new Prompt(DEFAULT_PROMPT, customOptions)).getResult().getOutput().getContent();
72+
return DeepSeekChatModel.call(new Prompt(DEFAULT_PROMPT, customOptions)).getResult().getOutput().getText();
7373
}
7474
}

spring-ai-alibaba-more-platform-and-model-example/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public class MoreModelCallController {
143143
new Prompt(prompt, runtimeOptions))
144144
.getResult();
145145

146-
return gen.getOutput().getContent();
146+
return gen.getOutput().getText();
147147
}
148148

149149
}

spring-ai-alibaba-more-platform-and-model-example/src/main/java/com/alibaba/ai/examples/controller/model/MoreModelCallController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public String modelChat(
7676
new Prompt(prompt, runtimeOptions))
7777
.getResult();
7878

79-
return gen.getOutput().getContent();
79+
return gen.getOutput().getText();
8080
}
8181

8282
}

spring-ai-alibaba-more-platform-and-model-example/src/main/java/com/alibaba/ai/examples/controller/model/MorePlatformController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ public String chat(
6767

6868
if ("dashscope".equals(model)) {
6969
return dashScopeChatModel.call(new Prompt(prompt))
70-
.getResult().getOutput().getContent();
70+
.getResult().getOutput().getText();
7171
}
7272

7373
if ("ollama".equals(model)) {
7474
return ollamaChatModel.call(new Prompt(prompt))
75-
.getResult().getOutput().getContent();
75+
.getResult().getOutput().getText();
7676
}
7777

7878
if ("openAI".equals(model)) {
7979
return openAIChatModel.call(new Prompt(prompt))
80-
.getResult().getOutput().getContent();
80+
.getResult().getOutput().getText();
8181
}
8282
return "Error ...";
8383
}

spring-ai-alibaba-multi-model-example/ark-multi-model/src/main/java/com/alibaba/cloud/ai/example/controller/MultiModelController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public String image(
105105
)
106106
).call().chatResponse();
107107

108-
return response.getResult().getOutput().getContent();
108+
return response.getResult().getOutput().getText();
109109
}
110110

111111
@GetMapping("/stream/image")
@@ -130,7 +130,7 @@ public String streamImage(
130130
StringBuilder result = new StringBuilder();
131131
if (response != null) {
132132
for (ChatResponse chatResponse : response) {
133-
String outputContent = chatResponse.getResult().getOutput().getContent();
133+
String outputContent = chatResponse.getResult().getOutput().getText();
134134
result.append(outputContent);
135135
}
136136
}
@@ -154,7 +154,7 @@ public String video(
154154
)
155155
).call().chatResponse();
156156

157-
return response.getResult().getOutput().getContent();
157+
return response.getResult().getOutput().getText();
158158
}
159159
}
160160

spring-ai-alibaba-multi-model-example/dashscope-multi-model/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public String image(
7070
)
7171
).call().chatResponse();
7272

73-
return response.getResult().getOutput().getContent();
73+
return response.getResult().getOutput().getText();
7474
}
7575
```
7676

@@ -212,7 +212,7 @@ public String video(
212212
)
213213
).call().chatResponse();
214214

215-
return response.getResult().getOutput().getContent();
215+
return response.getResult().getOutput().getText();
216216
}
217217
```
218218

spring-ai-alibaba-multi-model-example/dashscope-multi-model/src/main/java/com/alibaba/cloud/ai/example/multi/controller/MultiModelController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public String image(
8989
)
9090
).call().chatResponse();
9191

92-
return response.getResult().getOutput().getContent();
92+
return response.getResult().getOutput().getText();
9393
}
9494

9595
@GetMapping("/video")
@@ -113,7 +113,7 @@ public String video(
113113
)
114114
).call().chatResponse();
115115

116-
return response.getResult().getOutput().getContent();
116+
return response.getResult().getOutput().getText();
117117
}
118118

119119
@GetMapping("/image/bin")
@@ -140,7 +140,7 @@ public String imagesBinary(
140140
)
141141
).call().chatResponse();
142142

143-
return response.getResult().getOutput().getContent();
143+
return response.getResult().getOutput().getText();
144144
}
145145

146146
@GetMapping("/stream/image")
@@ -170,7 +170,7 @@ public String streamImage(
170170
StringBuilder result = new StringBuilder();
171171
if (response != null) {
172172
for (ChatResponse chatResponse : response) {
173-
String outputContent = chatResponse.getResult().getOutput().getContent();
173+
String outputContent = chatResponse.getResult().getOutput().getText();
174174
result.append(outputContent);
175175
}
176176
}

spring-ai-alibaba-observability-example/observationhandler-example/src/main/java/com/alibaba/cloud/ai/observationhandlerexample/controller/ChatModelController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public String add(String message) {
3939
registry.observationConfig().observationHandler(new CustomerObservationHandler());
4040
OllamaChatModel ollamaChatModel = new OllamaChatModel(
4141
new OllamaApi(),
42-
new OllamaOptions().withModel("qwen2.5"),
42+
OllamaOptions.builder().model("qwen2.5").build(),
4343
null,
4444
null,
4545
registry,

spring-ai-alibaba-rag-example/bailian-agent/src/main/java/com/alibaba/cloud/ai/example/rag/agent/BailianAgentRagController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public String call(@RequestParam(value = "message",
6262
}
6363

6464
AssistantMessage app_output = response.getResult().getOutput();
65-
String content = app_output.getContent();
65+
String content = app_output.getText();
6666

6767
DashScopeAgentApi.DashScopeAgentResponse.DashScopeAgentResponseOutput output = (DashScopeAgentApi.DashScopeAgentResponse.DashScopeAgentResponseOutput) app_output.getMetadata().get("output");
6868
List<DashScopeAgentApi.DashScopeAgentResponse.DashScopeAgentResponseOutput.DashScopeAgentResponseOutputDocReference> docReferences = output.docReferences();

spring-ai-alibaba-rag-example/bailian-agent/src/main/java/com/alibaba/cloud/ai/example/rag/agent/BailianAgentRagStreamController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public Flux<String> stream(@RequestParam(value = "message",
7575
}
7676

7777
AssistantMessage app_output = response.getResult().getOutput();
78-
String content = app_output.getContent();
78+
String content = app_output.getText();
7979

8080
DashScopeAgentApi.DashScopeAgentResponse.DashScopeAgentResponseOutput output = (DashScopeAgentApi.DashScopeAgentResponse.DashScopeAgentResponseOutput) app_output.getMetadata().get("output");
8181
List<DashScopeAgentApi.DashScopeAgentResponse.DashScopeAgentResponseOutput.DashScopeAgentResponseOutputDocReference> docReferences = output.docReferences();

0 commit comments

Comments
 (0)