Skip to content

Commit 6cba78c

Browse files
linarkoulinarkou
authored
Merge branch 'spring-projects:main' into main
2 parents cb82be7 + 07a2643 commit 6cba78c

File tree

61 files changed

+2704
-594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2704
-594
lines changed

‎auto-configurations/models/spring-ai-autoconfigure-model-mistral-ai/src/main/java/org/springframework/ai/model/mistralai/autoconfigure/MistralAiChatAutoConfiguration.java

+1-25
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import org.springframework.ai.chat.observation.ChatModelObservationConvention;
2222
import org.springframework.ai.mistralai.MistralAiChatModel;
2323
import org.springframework.ai.mistralai.api.MistralAiApi;
24-
import org.springframework.ai.mistralai.api.MistralAiModerationApi;
25-
import org.springframework.ai.mistralai.moderation.MistralAiModerationModel;
2624
import org.springframework.ai.model.SpringAIModelProperties;
2725
import org.springframework.ai.model.SpringAIModels;
2826
import org.springframework.ai.model.function.DefaultFunctionCallbackResolver;
@@ -59,8 +57,7 @@
5957
*/
6058
@AutoConfiguration(after = { RestClientAutoConfiguration.class, SpringAiRetryAutoConfiguration.class,
6159
ToolCallingAutoConfiguration.class })
62-
@EnableConfigurationProperties({ MistralAiCommonProperties.class, MistralAiChatProperties.class,
63-
MistralAiModerationProperties.class })
60+
@EnableConfigurationProperties({ MistralAiCommonProperties.class, MistralAiChatProperties.class })
6461
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.MISTRAL,
6562
matchIfMissing = true)
6663
@ConditionalOnClass(MistralAiApi.class)
@@ -96,27 +93,6 @@ public MistralAiChatModel mistralAiChatModel(MistralAiCommonProperties commonPro
9693
return chatModel;
9794
}
9895

99-
@Bean
100-
@ConditionalOnMissingBean
101-
public MistralAiModerationModel mistralAiModerationModel(MistralAiCommonProperties commonProperties,
102-
MistralAiModerationProperties moderationProperties, RetryTemplate retryTemplate,
103-
ObjectProvider<RestClient.Builder> restClientBuilderProvider, ResponseErrorHandler responseErrorHandler) {
104-
105-
var apiKey = moderationProperties.getApiKey();
106-
var baseUrl = moderationProperties.getBaseUrl();
107-
108-
var resolvedApiKey = StringUtils.hasText(apiKey) ? apiKey : commonProperties.getApiKey();
109-
var resoledBaseUrl = StringUtils.hasText(baseUrl) ? baseUrl : commonProperties.getBaseUrl();
110-
111-
Assert.hasText(resolvedApiKey, "Mistral API key must be set");
112-
Assert.hasText(resoledBaseUrl, "Mistral base URL must be set");
113-
114-
var mistralAiModerationAi = new MistralAiModerationApi(resoledBaseUrl, resolvedApiKey,
115-
restClientBuilderProvider.getIfAvailable(RestClient::builder), responseErrorHandler);
116-
117-
return new MistralAiModerationModel(mistralAiModerationAi, retryTemplate, moderationProperties.getOptions());
118-
}
119-
12096
private MistralAiApi mistralAiApi(String apiKey, String commonApiKey, String baseUrl, String commonBaseUrl,
12197
RestClient.Builder restClientBuilder, ResponseErrorHandler responseErrorHandler) {
12298

‎auto-configurations/models/spring-ai-autoconfigure-model-mistral-ai/src/main/java/org/springframework/ai/model/mistralai/autoconfigure/MistralAiModerationAutoConfiguration.java

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/*
2+
* Copyright 2023-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.ai.model.mistralai.autoconfigure;
18+
19+
import org.springframework.ai.mistralai.api.MistralAiApi;
20+
import org.springframework.ai.mistralai.api.MistralAiModerationApi;
21+
import org.springframework.ai.mistralai.moderation.MistralAiModerationModel;
22+
import org.springframework.ai.model.SpringAIModelProperties;
23+
import org.springframework.ai.model.SpringAIModels;
24+
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
25+
import org.springframework.beans.factory.ObjectProvider;
26+
import org.springframework.boot.autoconfigure.AutoConfiguration;
27+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
28+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
29+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
30+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
31+
import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
32+
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
33+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
34+
import org.springframework.context.annotation.Bean;
35+
import org.springframework.retry.support.RetryTemplate;
36+
import org.springframework.util.Assert;
37+
import org.springframework.util.StringUtils;
38+
import org.springframework.web.client.ResponseErrorHandler;
39+
import org.springframework.web.client.RestClient;
40+
41+
/**
42+
* Moderation {@link AutoConfiguration Auto-configuration} for Mistral AI.
43+
*
44+
* @author Ricken Bazolo
45+
*/
46+
@AutoConfiguration(after = { RestClientAutoConfiguration.class, SpringAiRetryAutoConfiguration.class,
47+
WebClientAutoConfiguration.class })
48+
@EnableConfigurationProperties({ MistralAiCommonProperties.class, MistralAiModerationProperties.class })
49+
@ConditionalOnProperty(name = SpringAIModelProperties.MODERATION_MODEL, havingValue = SpringAIModels.MISTRAL,
50+
matchIfMissing = true)
51+
@ConditionalOnClass(MistralAiApi.class)
52+
@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
53+
WebClientAutoConfiguration.class })
54+
public class MistralAiModerationAutoConfiguration {
55+
56+
@Bean
57+
@ConditionalOnMissingBean
58+
public MistralAiModerationModel mistralAiModerationModel(MistralAiCommonProperties commonProperties,
59+
MistralAiModerationProperties moderationProperties, RetryTemplate retryTemplate,
60+
ObjectProvider<RestClient.Builder> restClientBuilderProvider, ResponseErrorHandler responseErrorHandler) {
61+
62+
var apiKey = moderationProperties.getApiKey();
63+
var baseUrl = moderationProperties.getBaseUrl();
64+
65+
var resolvedApiKey = StringUtils.hasText(apiKey) ? apiKey : commonProperties.getApiKey();
66+
var resoledBaseUrl = StringUtils.hasText(baseUrl) ? baseUrl : commonProperties.getBaseUrl();
67+
68+
Assert.hasText(resolvedApiKey, "Mistral API key must be set");
69+
Assert.hasText(resoledBaseUrl, "Mistral base URL must be set");
70+
71+
var mistralAiModerationAi = new MistralAiModerationApi(resoledBaseUrl, resolvedApiKey,
72+
restClientBuilderProvider.getIfAvailable(RestClient::builder), responseErrorHandler);
73+
74+
return new MistralAiModerationModel(mistralAiModerationAi, retryTemplate, moderationProperties.getOptions());
75+
}
76+
77+
}

‎auto-configurations/models/spring-ai-autoconfigure-model-mistral-ai/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
#
1616
org.springframework.ai.model.mistralai.autoconfigure.MistralAiChatAutoConfiguration
1717
org.springframework.ai.model.mistralai.autoconfigure.MistralAiEmbeddingAutoConfiguration
18+
org.springframework.ai.model.mistralai.autoconfigure.MistralAiModerationAutoConfiguration

‎auto-configurations/models/spring-ai-autoconfigure-model-mistral-ai/src/test/java/org/springframework/ai/model/mistralai/autoconfigure/MistralAiPropertiesTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void moderationOptionsTest() {
151151
.withPropertyValues("spring.ai.mistralai.base-url=TEST_BASE_URL", "spring.ai.mistralai.api-key=abc123",
152152
"spring.ai.mistralai.moderation.options.model=MODERATION_MODEL")
153153
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
154-
RestClientAutoConfiguration.class, MistralAiChatAutoConfiguration.class))
154+
RestClientAutoConfiguration.class, MistralAiModerationAutoConfiguration.class))
155155
.run(context -> {
156156
var moderationProperties = context.getBean(MistralAiModerationProperties.class);
157157
assertThat(moderationProperties.getOptions().getModel()).isEqualTo("MODERATION_MODEL");

‎auto-configurations/models/spring-ai-autoconfigure-model-mistral-ai/src/test/java/org/springframework/ai/model/mistralai/autoconfigure/MistralModelConfigurationTests.java

+44
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.springframework.ai.mistralai.MistralAiChatModel;
2222
import org.springframework.ai.mistralai.MistralAiEmbeddingModel;
23+
import org.springframework.ai.mistralai.moderation.MistralAiModerationModel;
2324
import org.springframework.boot.autoconfigure.AutoConfigurations;
2425
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2526

@@ -29,6 +30,7 @@
2930
* Unit Tests for Mistral AI auto-configurations conditional enabling of models.
3031
*
3132
* @author Ilayaperumal Gopinathan
33+
* @author Ricken Bazolo
3234
*/
3335
public class MistralModelConfigurationTests {
3436

@@ -43,6 +45,8 @@ void chatModelActivation() {
4345
assertThat(context.getBeansOfType(MistralAiChatModel.class)).isNotEmpty();
4446
assertThat(context.getBeansOfType(MistralAiEmbeddingProperties.class)).isEmpty();
4547
assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
48+
assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isEmpty();
49+
assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isEmpty();
4650
});
4751

4852
this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiChatAutoConfiguration.class))
@@ -61,6 +65,8 @@ void chatModelActivation() {
6165
assertThat(context.getBeansOfType(MistralAiChatModel.class)).isNotEmpty();
6266
assertThat(context.getBeansOfType(MistralAiEmbeddingProperties.class)).isEmpty();
6367
assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
68+
assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isEmpty();
69+
assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isEmpty();
6470
});
6571
}
6672

@@ -84,4 +90,42 @@ void embeddingModelActivation() {
8490
});
8591
}
8692

93+
@Test
94+
void moderationModelActivation() {
95+
this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiModerationAutoConfiguration.class))
96+
.run(context -> {
97+
assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isNotEmpty();
98+
assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isNotEmpty();
99+
assertThat(context.getBeansOfType(MistralAiChatModel.class)).isEmpty();
100+
assertThat(context.getBeansOfType(MistralAiChatProperties.class)).isEmpty();
101+
assertThat(context.getBeansOfType(MistralAiEmbeddingProperties.class)).isEmpty();
102+
assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
103+
});
104+
105+
this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiModerationAutoConfiguration.class))
106+
.withPropertyValues("spring.ai.model.moderation=none")
107+
.run(context -> {
108+
assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isEmpty();
109+
assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isEmpty();
110+
});
111+
112+
this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiModerationAutoConfiguration.class))
113+
.withPropertyValues("spring.ai.model.moderation=mistral")
114+
.run(context -> {
115+
assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isNotEmpty();
116+
assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isNotEmpty();
117+
});
118+
119+
this.contextRunner
120+
.withConfiguration(AutoConfigurations.of(MistralAiChatAutoConfiguration.class,
121+
MistralAiEmbeddingAutoConfiguration.class, MistralAiModerationAutoConfiguration.class))
122+
.withPropertyValues("spring.ai.model.chat=none", "spring.ai.model.embedding=none",
123+
"spring.ai.model.moderation=mistral")
124+
.run(context -> {
125+
assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isNotEmpty();
126+
assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
127+
assertThat(context.getBeansOfType(MistralAiChatModel.class)).isEmpty();
128+
});
129+
}
130+
87131
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.springframework.ai.chat.model.ChatResponse;
4343
import org.springframework.ai.converter.BeanOutputConverter;
4444
import org.springframework.ai.converter.ListOutputConverter;
45+
import org.springframework.ai.test.CurlyBracketEscaper;
4546
import org.springframework.ai.tool.function.FunctionToolCallback;
4647
import org.springframework.beans.factory.annotation.Autowired;
4748
import org.springframework.beans.factory.annotation.Value;
@@ -189,7 +190,7 @@ void beanStreamOutputConverterRecords() {
189190
.user(u -> u
190191
.text("Generate the filmography of 5 movies for Tom Hanks. " + System.lineSeparator()
191192
+ "{format}")
192-
.param("format", outputConverter.getFormat()))
193+
.param("format", CurlyBracketEscaper.escapeCurlyBrackets(outputConverter.getFormat())))
193194
.stream()
194195
.content();
195196

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor;
3232
import org.springframework.ai.chat.model.ChatResponse;
3333
import org.springframework.ai.converter.BeanOutputConverter;
34+
import org.springframework.ai.test.CurlyBracketEscaper;
3435
import org.springframework.beans.factory.annotation.Autowired;
3536
import org.springframework.beans.factory.annotation.Value;
3637
import org.springframework.boot.SpringBootConfiguration;
@@ -83,7 +84,7 @@ void beanStreamOutputConverterRecords() {
8384
.user(u -> u
8485
.text("Generate the filmography of 5 movies for Tom Hanks. " + System.lineSeparator()
8586
+ "{format}")
86-
.param("format", outputConverter.getFormat()))
87+
.param("format", CurlyBracketEscaper.escapeCurlyBrackets(outputConverter.getFormat())))
8788
.stream()
8889
.chatResponse();
8990

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.springframework.ai.converter.BeanOutputConverter;
3838
import org.springframework.ai.converter.ListOutputConverter;
3939
import org.springframework.ai.model.tool.ToolCallingChatOptions;
40+
import org.springframework.ai.test.CurlyBracketEscaper;
4041
import org.springframework.ai.tool.function.FunctionToolCallback;
4142
import org.springframework.beans.factory.annotation.Autowired;
4243
import org.springframework.beans.factory.annotation.Value;
@@ -182,7 +183,7 @@ void beanStreamOutputConverterRecords() {
182183
.user(u -> u
183184
.text("Generate the filmography of 5 movies for Tom Hanks. " + System.lineSeparator()
184185
+ "{format}")
185-
.param("format", outputConverter.getFormat()))
186+
.param("format", CurlyBracketEscaper.escapeCurlyBrackets(outputConverter.getFormat())))
186187
.stream()
187188
.chatResponse();
188189

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
import reactor.core.publisher.Flux;
2929

3030
import org.springframework.ai.chat.client.ChatClient;
31+
import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor;
3132
import org.springframework.ai.chat.messages.UserMessage;
3233
import org.springframework.ai.chat.model.ChatResponse;
3334
import org.springframework.ai.converter.BeanOutputConverter;
3435
import org.springframework.ai.converter.ListOutputConverter;
3536
import org.springframework.ai.mistralai.api.MistralAiApi;
3637
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionRequest.ToolChoice;
38+
import org.springframework.ai.test.CurlyBracketEscaper;
3739
import org.springframework.ai.tool.function.FunctionToolCallback;
3840
import org.springframework.beans.factory.annotation.Autowired;
3941
import org.springframework.beans.factory.annotation.Value;
@@ -198,10 +200,11 @@ void beanStreamOutputConverterRecords() {
198200
// @formatter:off
199201
Flux<String> chatResponse = ChatClient.create(this.chatModel)
200202
.prompt()
203+
.advisors(new SimpleLoggerAdvisor())
201204
.user(u -> u
202205
.text("Generate the filmography of 5 movies for Tom Hanks. " + System.lineSeparator()
203206
+ "{format}")
204-
.param("format", outputConverter.getFormat()))
207+
.param("format", CurlyBracketEscaper.escapeCurlyBrackets(outputConverter.getFormat())))
205208
.stream()
206209
.content();
207210

0 commit comments

Comments
 (0)