Skip to content

Commit 6a3a12e

Browse files
FottasFottas
committed
Resolve conflicts
Signed-off-by: yinh <fottas@163.com>
1 parent 55bbfaa commit 6a3a12e

File tree

14 files changed

+21
-33
lines changed

14 files changed

+21
-33
lines changed

‎auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/main/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicChatAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.ai.model.anthropic.autoconfigure;
1818

1919
import io.micrometer.observation.ObservationRegistry;
20+
2021
import org.springframework.ai.anthropic.AnthropicChatModel;
2122
import org.springframework.ai.anthropic.api.AnthropicApi;
2223
import org.springframework.ai.chat.observation.ChatModelObservationConvention;
@@ -74,8 +75,7 @@ public class AnthropicChatAutoConfiguration {
7475
public AnthropicApi anthropicApi(AnthropicConnectionProperties connectionProperties,
7576
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
7677
ObjectProvider<WebClient.Builder> webClientBuilderProvider,
77-
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
78-
ObjectProvider<SslBundles> sslBundles,
78+
ObjectProvider<ResponseErrorHandler> responseErrorHandler, ObjectProvider<SslBundles> sslBundles,
7979
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
8080
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder,
8181
ObjectProvider<ClientHttpConnectorBuilder<?>> webConnectorBuilderProvider) {

‎auto-configurations/models/spring-ai-autoconfigure-model-elevenlabs/src/main/java/org/springframework/ai/model/elevenlabs/autoconfigure/ElevenLabsAutoConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public class ElevenLabsAutoConfiguration {
6262
public ElevenLabsApi elevenLabsApi(ElevenLabsConnectionProperties connectionProperties,
6363
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
6464
ObjectProvider<WebClient.Builder> webClientBuilderProvider,
65-
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
66-
ObjectProvider<SslBundles> sslBundles,
65+
ObjectProvider<ResponseErrorHandler> responseErrorHandler, ObjectProvider<SslBundles> sslBundles,
6766
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
6867
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder,
6968
ObjectProvider<ClientHttpConnectorBuilder<?>> webConnectorBuilderProvider) {

‎auto-configurations/models/spring-ai-autoconfigure-model-google-genai/src/test/java/org/springframework/ai/model/google/genai/autoconfigure/chat/GoogleGenAiPropertiesTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ void includeThoughtsDefaultBinding() {
157157
@Test
158158
void extendedUsageCustomTimeoutPropertiesBinding() {
159159
this.contextRunner
160-
.withPropertyValues("spring.ai.google.genai.chat.options.include-extended-usage-metadata=true")
161-
.run(context -> {
162-
GoogleGenAiChatProperties chatProperties = context.getBean(GoogleGenAiChatProperties.class);
163-
assertThat(chatProperties.getOptions().getIncludeExtendedUsageMetadata()).isTrue();
164-
});
160+
.withPropertyValues("spring.ai.google.genai.chat.options.include-extended-usage-metadata=true")
161+
.run(context -> {
162+
GoogleGenAiChatProperties chatProperties = context.getBean(GoogleGenAiChatProperties.class);
163+
assertThat(chatProperties.getOptions().getIncludeExtendedUsageMetadata()).isTrue();
164+
});
165165
}
166166

167167
@Configuration

‎auto-configurations/models/spring-ai-autoconfigure-model-minimax/src/main/java/org/springframework/ai/model/minimax/autoconfigure/MiniMaxEmbeddingAutoConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ public MiniMaxEmbeddingModel miniMaxEmbeddingModel(MiniMaxConnectionProperties c
6666
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
6767
ObjectProvider<ObservationRegistry> observationRegistry,
6868
ObjectProvider<EmbeddingModelObservationConvention> observationConvention,
69-
ObjectProvider<SslBundles> sslBundles,
70-
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
69+
ObjectProvider<SslBundles> sslBundles, ObjectProvider<HttpClientSettings> globalHttpClientSettings,
7170
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder) {
7271

7372
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(sslBundles.getIfAvailable(),

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ public MistralAiEmbeddingModel mistralAiEmbeddingModel(MistralAiCommonProperties
7070
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
7171
ObjectProvider<ObservationRegistry> observationRegistry,
7272
ObjectProvider<EmbeddingModelObservationConvention> observationConvention,
73-
ObjectProvider<SslBundles> sslBundles,
74-
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
73+
ObjectProvider<SslBundles> sslBundles, ObjectProvider<HttpClientSettings> globalHttpClientSettings,
7574
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder) {
7675

7776
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(sslBundles.getIfAvailable(),

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public class MistralAiModerationAutoConfiguration {
6262
public MistralAiModerationModel mistralAiModerationModel(MistralAiCommonProperties commonProperties,
6363
MistralAiModerationProperties moderationProperties, ObjectProvider<RetryTemplate> retryTemplate,
6464
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
65-
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
66-
ObjectProvider<SslBundles> sslBundles,
65+
ObjectProvider<ResponseErrorHandler> responseErrorHandler, ObjectProvider<SslBundles> sslBundles,
6766
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
6867
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder) {
6968

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ public class MistralAiOcrAutoConfiguration {
5454
@ConditionalOnMissingBean
5555
public MistralOcrApi mistralOcrApi(MistralAiCommonProperties commonProperties, MistralAiOcrProperties ocrProperties,
5656
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
57-
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
58-
ObjectProvider<SslBundles> sslBundles,
57+
ObjectProvider<ResponseErrorHandler> responseErrorHandler, ObjectProvider<SslBundles> sslBundles,
5958
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
6059
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder) {
6160

@@ -81,7 +80,7 @@ public MistralOcrApi mistralOcrApi(MistralAiCommonProperties commonProperties, M
8180
}
8281

8382
private void applyRestClientSettings(RestClient.Builder builder, HttpClientSettings httpClientSettings,
84-
ClientHttpRequestFactoryBuilder<?> factoryBuilder) {
83+
ClientHttpRequestFactoryBuilder<?> factoryBuilder) {
8584
ClientHttpRequestFactory requestFactory = factoryBuilder.build(httpClientSettings);
8685
builder.requestFactory(requestFactory);
8786
}

‎auto-configurations/models/spring-ai-autoconfigure-model-ollama/src/main/java/org/springframework/ai/model/ollama/autoconfigure/OllamaApiAutoConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ public OllamaApi ollamaApi(OllamaConnectionDetails connectionDetails,
6666
OllamaConnectionProperties connectionProperties,
6767
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
6868
ObjectProvider<WebClient.Builder> webClientBuilderProvider,
69-
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
70-
ObjectProvider<SslBundles> sslBundles,
69+
ObjectProvider<ResponseErrorHandler> responseErrorHandler, ObjectProvider<SslBundles> sslBundles,
7170
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
7271
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder,
7372
ObjectProvider<ClientHttpConnectorBuilder<?>> webConnectorBuilderProvider) {

‎auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiAudioSpeechAutoConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ public OpenAiAudioSpeechModel openAiAudioSpeechModel(OpenAiConnectionProperties
7171
OpenAiAudioSpeechProperties speechProperties, ObjectProvider<RetryTemplate> retryTemplate,
7272
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
7373
ObjectProvider<WebClient.Builder> webClientBuilderProvider,
74-
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
75-
ObjectProvider<SslBundles> sslBundles,
74+
ObjectProvider<ResponseErrorHandler> responseErrorHandler, ObjectProvider<SslBundles> sslBundles,
7675
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
7776
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder,
7877
ObjectProvider<ClientHttpConnectorBuilder<?>> webConnectorBuilderProvider) {

‎auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiAudioTranscriptionAutoConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ public OpenAiAudioTranscriptionModel openAiAudioTranscriptionModel(OpenAiConnect
7171
OpenAiAudioTranscriptionProperties transcriptionProperties, ObjectProvider<RetryTemplate> retryTemplate,
7272
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
7373
ObjectProvider<WebClient.Builder> webClientBuilderProvider,
74-
ObjectProvider<ResponseErrorHandler> responseErrorHandler,
75-
ObjectProvider<SslBundles> sslBundles,
74+
ObjectProvider<ResponseErrorHandler> responseErrorHandler, ObjectProvider<SslBundles> sslBundles,
7675
ObjectProvider<HttpClientSettings> globalHttpClientSettings,
7776
ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder,
7877
ObjectProvider<ClientHttpConnectorBuilder<?>> webConnectorBuilderProvider) {

0 commit comments

Comments
 (0)