Skip to content

Commit 722c77e

Browse files
ilayaperumalgilayaperumalg
committed
Remove deprecated PromptTemplate constructors
 - Remove the deprecated constructors from PromptTemplate and replace the references using the builder methods Signed-off-by: Ilayaperumal Gopinathan <[email protected]>
1 parent 46be898 commit 722c77e

File tree

23 files changed

+326
-175
lines changed

23 files changed

+326
-175
lines changed

‎advisors/spring-ai-advisors-vector-store/src/test/java/org/springframework/ai/chat/client/advisor/vectorstore/QuestionAnswerAdvisorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public void qaAdvisorTakesUserParameterizedUserMessagesIntoAccountForSimilarityS
218218
var qaAdvisor = new QuestionAnswerAdvisor(this.vectorStore, SearchRequest.builder().build());
219219

220220
var userTextTemplate = "Please answer my question {question}";
221-
var userPromptTemplate = new PromptTemplate(userTextTemplate, Map.of("question", "XYZ"));
221+
var userPromptTemplate = PromptTemplate.builder().template(userTextTemplate).variables(Map.of("question", "XYZ")).build();
222222
var userMessage = userPromptTemplate.createMessage();
223223
// @formatter:off
224224
chatClient.prompt(new Prompt(userMessage))

‎models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,10 @@ void listOutputConverter() {
154154
List five {subject}
155155
{format}
156156
""";
157-
PromptTemplate promptTemplate = new PromptTemplate(template,
158-
Map.of("subject", "ice cream flavors", "format", format));
157+
PromptTemplate promptTemplate = PromptTemplate.builder()
158+
.template(template)
159+
.variables(Map.of("subject", "ice cream flavors", "format", format))
160+
.build();
159161
Prompt prompt = new Prompt(promptTemplate.createMessage());
160162
Generation generation = this.chatModel.call(prompt).getResult();
161163

@@ -172,8 +174,11 @@ void mapOutputConverter() {
172174
Provide me a List of {subject}
173175
{format}
174176
""";
175-
PromptTemplate promptTemplate = new PromptTemplate(template,
176-
Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format", format));
177+
PromptTemplate promptTemplate = PromptTemplate.builder()
178+
.template(template)
179+
.variables(Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format",
180+
format))
181+
.build();
177182
Prompt prompt = new Prompt(promptTemplate.createMessage());
178183
Generation generation = this.chatModel.call(prompt).getResult();
179184

@@ -192,7 +197,10 @@ void beanOutputConverterRecords() {
192197
Generate the filmography of 5 movies for Tom Hanks.
193198
{format}
194199
""";
195-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
200+
PromptTemplate promptTemplate = PromptTemplate.builder()
201+
.template(template)
202+
.variables(Map.of("format", format))
203+
.build();
196204
Prompt prompt = new Prompt(promptTemplate.createMessage());
197205
Generation generation = this.chatModel.call(prompt).getResult();
198206

@@ -212,7 +220,10 @@ void beanStreamOutputConverterRecords() {
212220
Generate the filmography of 5 movies for Tom Hanks.
213221
{format}
214222
""";
215-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
223+
PromptTemplate promptTemplate = PromptTemplate.builder()
224+
.template(template)
225+
.variables(Map.of("format", format))
226+
.build();
216227
Prompt prompt = new Prompt(promptTemplate.createMessage());
217228

218229
String generationTextFromStream = this.streamingChatModel.stream(prompt)

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatModelIT.java

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ void listOutputConverter() {
137137
List five {subject}
138138
{format}
139139
""";
140-
PromptTemplate promptTemplate = new PromptTemplate(template,
141-
Map.of("subject", "ice cream flavors", "format", format));
140+
PromptTemplate promptTemplate = PromptTemplate.builder()
141+
.template(template)
142+
.variables(Map.of("subject", "ice cream flavors", "format", format))
143+
.build();
142144
Prompt prompt = new Prompt(promptTemplate.createMessage());
143145
Generation generation = this.chatModel.call(prompt).getResult();
144146

@@ -156,8 +158,11 @@ void mapOutputConverter() {
156158
Provide me a List of {subject}
157159
{format}
158160
""";
159-
PromptTemplate promptTemplate = new PromptTemplate(template,
160-
Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format", format));
161+
PromptTemplate promptTemplate = PromptTemplate.builder()
162+
.template(template)
163+
.variables(Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format",
164+
format))
165+
.build();
161166
Prompt prompt = new Prompt(promptTemplate.createMessage());
162167
Generation generation = this.chatModel.call(prompt).getResult();
163168

@@ -176,7 +181,10 @@ void beanOutputConverter() {
176181
Generate the filmography for a random actor.
177182
{format}
178183
""";
179-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
184+
PromptTemplate promptTemplate = PromptTemplate.builder()
185+
.template(template)
186+
.variables(Map.of("format", format))
187+
.build();
180188
Prompt prompt = new Prompt(promptTemplate.createMessage());
181189
Generation generation = this.chatModel.call(prompt).getResult();
182190

@@ -194,7 +202,10 @@ void beanOutputConverterRecords() {
194202
Generate the filmography of 5 movies for Tom Hanks.
195203
{format}
196204
""";
197-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
205+
PromptTemplate promptTemplate = PromptTemplate.builder()
206+
.template(template)
207+
.variables(Map.of("format", format))
208+
.build();
198209
Prompt prompt = new Prompt(promptTemplate.createMessage());
199210
Generation generation = this.chatModel.call(prompt).getResult();
200211

@@ -214,7 +225,10 @@ void beanStreamOutputConverterRecords() {
214225
Generate the filmography of 5 movies for Tom Hanks.
215226
{format}
216227
""";
217-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
228+
PromptTemplate promptTemplate = PromptTemplate.builder()
229+
.template(template)
230+
.variables(Map.of("format", format))
231+
.build();
218232
Prompt prompt = new Prompt(promptTemplate.createMessage());
219233

220234
String generationTextFromStream = this.chatModel.stream(prompt)

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelIT.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,10 @@ void listOutputConverter() {
152152
List five {subject}
153153
{format}
154154
""";
155-
PromptTemplate promptTemplate = new PromptTemplate(template,
156-
Map.of("subject", "ice cream flavors", "format", format));
155+
PromptTemplate promptTemplate = PromptTemplate.builder()
156+
.template(template)
157+
.variables(Map.of("subject", "ice cream flavors", "format", format))
158+
.build();
157159
Prompt prompt = new Prompt(promptTemplate.createMessage());
158160
Generation generation = this.chatModel.call(prompt).getResult();
159161

@@ -170,8 +172,11 @@ void mapOutputConverter() {
170172
Provide me a List of {subject}
171173
{format}
172174
""";
173-
PromptTemplate promptTemplate = new PromptTemplate(template,
174-
Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format", format));
175+
PromptTemplate promptTemplate = PromptTemplate.builder()
176+
.template(template)
177+
.variables(Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format",
178+
format))
179+
.build();
175180
Prompt prompt = new Prompt(promptTemplate.createMessage());
176181
Generation generation = this.chatModel.call(prompt).getResult();
177182

@@ -190,7 +195,10 @@ void beanOutputConverterRecords() {
190195
Generate the filmography of 5 movies for Tom Hanks.
191196
{format}
192197
""";
193-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
198+
PromptTemplate promptTemplate = PromptTemplate.builder()
199+
.template(template)
200+
.variables(Map.of("format", format))
201+
.build();
194202
Prompt prompt = new Prompt(promptTemplate.createMessage());
195203
Generation generation = this.chatModel.call(prompt).getResult();
196204

@@ -210,7 +218,10 @@ void beanStreamOutputConverterRecords() {
210218
Generate the filmography of 5 movies for Tom Hanks.
211219
{format}
212220
""";
213-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
221+
PromptTemplate promptTemplate = PromptTemplate.builder()
222+
.template(template)
223+
.variables(Map.of("format", format))
224+
.build();
214225
Prompt prompt = new Prompt(promptTemplate.createMessage());
215226

216227
String generationTextFromStream = this.streamingChatModel.stream(prompt)

‎models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatModelIT.java

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ void listOutputConverter() {
127127
List five {subject}
128128
{format}
129129
""";
130-
PromptTemplate promptTemplate = new PromptTemplate(template,
131-
Map.of("subject", "ice cream flavors", "format", format));
130+
PromptTemplate promptTemplate = PromptTemplate.builder()
131+
.template(template)
132+
.variables(Map.of("subject", "ice cream flavors", "format", format))
133+
.build();
132134
Prompt prompt = new Prompt(promptTemplate.createMessage());
133135
Generation generation = this.chatModel.call(prompt).getResult();
134136

@@ -145,8 +147,11 @@ void mapOutputConverter() {
145147
Provide me a List of {subject}
146148
{format}
147149
""";
148-
PromptTemplate promptTemplate = new PromptTemplate(template,
149-
Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format", format));
150+
PromptTemplate promptTemplate = PromptTemplate.builder()
151+
.template(template)
152+
.variables(Map.of("subject", "an array of numbers from 1 to 9 under they key name 'numbers'", "format",
153+
format))
154+
.build();
150155
Prompt prompt = new Prompt(promptTemplate.createMessage());
151156
Generation generation = this.chatModel.call(prompt).getResult();
152157

@@ -165,7 +170,10 @@ void beanOutputConverterRecords() {
165170
Generate the filmography of 5 movies for Tom Hanks.
166171
{format}
167172
""";
168-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
173+
PromptTemplate promptTemplate = PromptTemplate.builder()
174+
.template(template)
175+
.variables(Map.of("format", format))
176+
.build();
169177
Prompt prompt = new Prompt(promptTemplate.createMessage());
170178
Generation generation = this.chatModel.call(prompt).getResult();
171179

@@ -185,7 +193,10 @@ void beanStreamOutputConverterRecords() {
185193
Generate the filmography of 5 movies for Tom Hanks.
186194
{format}
187195
""";
188-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
196+
PromptTemplate promptTemplate = PromptTemplate.builder()
197+
.template(template)
198+
.variables(Map.of("format", format))
199+
.build();
189200
Prompt prompt = new Prompt(promptTemplate.createMessage());
190201

191202
String generationTextFromStream = this.streamingChatModel.stream(prompt)

‎models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelIT.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ void listOutputConverter() {
163163
List five {subject}
164164
{format}
165165
""";
166-
PromptTemplate promptTemplate = new PromptTemplate(template,
167-
Map.of("subject", "ice cream flavors.", "format", format));
166+
PromptTemplate promptTemplate = PromptTemplate.builder()
167+
.template(template)
168+
.variables(Map.of("subject", "ice cream flavors.", "format", format))
169+
.build();
168170
Prompt prompt = new Prompt(promptTemplate.createMessage());
169171
Generation generation = this.chatModel.call(prompt).getResult();
170172

@@ -182,7 +184,10 @@ void mapOutputConvert() {
182184
Example: R -> Red.
183185
{format}
184186
""";
185-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
187+
PromptTemplate promptTemplate = PromptTemplate.builder()
188+
.template(template)
189+
.variables(Map.of("format", format))
190+
.build();
186191
Prompt prompt = new Prompt(promptTemplate.createMessage());
187192

188193
Generation generation = this.chatModel.call(prompt).getResult();
@@ -203,7 +208,10 @@ void beanOutputConverterRecords() {
203208
Consider the filmography of Tom Hanks and tell me 5 of his movies.
204209
{format}
205210
""";
206-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
211+
PromptTemplate promptTemplate = PromptTemplate.builder()
212+
.template(template)
213+
.variables(Map.of("format", format))
214+
.build();
207215
Prompt prompt = new Prompt(promptTemplate.createMessage());
208216
Generation generation = this.chatModel.call(prompt).getResult();
209217

@@ -221,7 +229,10 @@ void beanStreamOutputConverterRecords() {
221229
Consider the filmography of Tom Hanks and tell me 5 of his movies.
222230
{format}
223231
""";
224-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
232+
PromptTemplate promptTemplate = PromptTemplate.builder()
233+
.template(template)
234+
.variables(Map.of("format", format))
235+
.build();
225236
Prompt prompt = new Prompt(promptTemplate.createMessage());
226237

227238
String generationTextFromStream = this.chatModel.stream(prompt)

‎models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelIT.java

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,10 @@ void listOutputConverter() {
246246
List five {subject}
247247
{format}
248248
""";
249-
PromptTemplate promptTemplate = new PromptTemplate(template,
250-
Map.of("subject", "ice cream flavors", "format", format));
249+
PromptTemplate promptTemplate = PromptTemplate.builder()
250+
.template(template)
251+
.variables(Map.of("subject", "ice cream flavors", "format", format))
252+
.build();
251253
Prompt prompt = new Prompt(promptTemplate.createMessage());
252254
Generation generation = this.chatModel.call(prompt).getResult();
253255

@@ -265,8 +267,10 @@ void mapOutputConverter() {
265267
Provide me a List of {subject}
266268
{format}
267269
""";
268-
PromptTemplate promptTemplate = new PromptTemplate(template,
269-
Map.of("subject", "numbers from 1 to 9 under they key name 'numbers'", "format", format));
270+
PromptTemplate promptTemplate = PromptTemplate.builder()
271+
.template(template)
272+
.variables(Map.of("subject", "numbers from 1 to 9 under they key name 'numbers'", "format", format))
273+
.build();
270274
Prompt prompt = new Prompt(promptTemplate.createMessage());
271275
Generation generation = this.chatModel.call(prompt).getResult();
272276

@@ -285,7 +289,10 @@ void beanOutputConverter() {
285289
Generate the filmography for a random actor.
286290
{format}
287291
""";
288-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
292+
PromptTemplate promptTemplate = PromptTemplate.builder()
293+
.template(template)
294+
.variables(Map.of("format", format))
295+
.build();
289296
Prompt prompt = new Prompt(promptTemplate.createMessage());
290297
Generation generation = this.chatModel.call(prompt).getResult();
291298

@@ -302,7 +309,10 @@ void beanOutputConverterRecords() {
302309
Generate the filmography of 5 movies for Tom Hanks.
303310
{format}
304311
""";
305-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
312+
PromptTemplate promptTemplate = PromptTemplate.builder()
313+
.template(template)
314+
.variables(Map.of("format", format))
315+
.build();
306316
Prompt prompt = new Prompt(promptTemplate.createMessage());
307317
Generation generation = this.chatModel.call(prompt).getResult();
308318

@@ -322,7 +332,10 @@ void beanStreamOutputConverterRecords() {
322332
Generate the filmography of 5 movies for Tom Hanks.
323333
{format}
324334
""";
325-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
335+
PromptTemplate promptTemplate = PromptTemplate.builder()
336+
.template(template)
337+
.variables(Map.of("format", format))
338+
.build();
326339
Prompt prompt = new Prompt(promptTemplate.createMessage());
327340

328341
String generationTextFromStream = this.streamingChatModel.stream(prompt)

‎models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelTypeReferenceBeanOutputConverterIT.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ void typeRefOutputConverterRecords() {
5858
Generate the filmography of 5 movies for Tom Hanks and Bill Murray.
5959
{format}
6060
""";
61-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
61+
PromptTemplate promptTemplate = PromptTemplate.builder()
62+
.template(template)
63+
.variables(Map.of("format", format))
64+
.build();
6265
Prompt prompt = new Prompt(promptTemplate.createMessage());
6366
Generation generation = this.chatModel.call(prompt).getResult();
6467

@@ -84,7 +87,10 @@ void typeRefStreamOutputConverterRecords() {
8487
Generate the filmography of 5 movies for Tom Hanks and Bill Murray.
8588
{format}
8689
""";
87-
PromptTemplate promptTemplate = new PromptTemplate(template, Map.of("format", format));
90+
PromptTemplate promptTemplate = PromptTemplate.builder()
91+
.template(template)
92+
.variables(Map.of("format", format))
93+
.build();
8894
Prompt prompt = new Prompt(promptTemplate.createMessage());
8995

9096
String generationTextFromStream = this.streamingChatModel.stream(prompt)

0 commit comments

Comments
 (0)