Skip to content

Commit b7f7020

Browse files
committed
fix: Temporarily remove the builder() method from DeepSeekAssistantMessage and modify related references to use new instead.
Signed-off-by: Sun Yuhan <[email protected]>
1 parent 23591ae commit b7f7020

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekAssistantMessage.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,35 +119,35 @@ public String toString() {
119119
+ this.prefix + ", metadata=" + this.metadata + "]";
120120
}
121121

122-
public static Builder builder() {
123-
return new Builder();
124-
}
122+
public static final class Builder {
123+
124+
private String content;
125+
126+
private Map<String, Object> properties = Map.of();
127+
128+
private List<ToolCall> toolCalls = List.of();
125129

126-
public static final class Builder extends AssistantMessage.Builder {
130+
private List<Media> media = List.of();
127131

128132
private Boolean prefix;
129133

130134
private String reasoningContent;
131135

132-
@Override
133136
public Builder content(String content) {
134137
this.content = content;
135138
return this;
136139
}
137140

138-
@Override
139141
public Builder properties(Map<String, Object> properties) {
140142
this.properties = properties;
141143
return this;
142144
}
143145

144-
@Override
145146
public Builder toolCalls(List<ToolCall> toolCalls) {
146147
this.toolCalls = toolCalls;
147148
return this;
148149
}
149150

150-
@Override
151151
public Builder media(List<Media> media) {
152152
this.media = media;
153153
return this;

models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,8 @@ private Generation buildGeneration(Choice choice, Map<String, Object> metadata)
340340
String textContent = choice.message().content();
341341
String reasoningContent = choice.message().reasoningContent();
342342

343-
DeepSeekAssistantMessage assistantMessage = DeepSeekAssistantMessage.builder()
344-
.content(textContent)
343+
DeepSeekAssistantMessage.Builder builder = new DeepSeekAssistantMessage.Builder();
344+
DeepSeekAssistantMessage assistantMessage = builder.content(textContent)
345345
.reasoningContent(reasoningContent)
346346
.properties(metadata)
347347
.toolCalls(toolCalls)

models/spring-ai-deepseek/src/test/java/org/springframework/ai/deepseek/DeepSeekAssistantMessageTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ public void testBuilderComplete() {
170170
List<ToolCall> toolCalls = List.of(new ToolCall("1", "function", "testFunction", "{}"));
171171
List<Media> media = List.of();
172172

173-
DeepSeekAssistantMessage message = DeepSeekAssistantMessage.builder()
174-
.content("content")
173+
DeepSeekAssistantMessage.Builder builder = new DeepSeekAssistantMessage.Builder();
174+
DeepSeekAssistantMessage message = builder.content("content")
175175
.reasoningContent("reasoning")
176176
.prefix(true)
177177
.properties(properties)

spring-ai-model/src/main/java/org/springframework/ai/chat/messages/AssistantMessage.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,17 @@ public record ToolCall(String id, String type, String name, String arguments) {
121121

122122
}
123123

124-
public static class Builder {
124+
public static final class Builder {
125125

126-
protected String content;
126+
private String content;
127127

128-
protected Map<String, Object> properties = Map.of();
128+
private Map<String, Object> properties = Map.of();
129129

130-
protected List<ToolCall> toolCalls = List.of();
130+
private List<ToolCall> toolCalls = List.of();
131131

132-
protected List<Media> media = List.of();
132+
private List<Media> media = List.of();
133133

134-
protected Builder() {
134+
private Builder() {
135135
}
136136

137137
public Builder content(String content) {

0 commit comments

Comments
 (0)