Skip to content

Commit ad69fd7

Browse files
SuganthiThomasilayaperumalg
authored andcommitted
Fix MistralAi Auto-configuration
- Remove ImportAutoConfiguration usage and verify the ordering of autoconfiguration Signed-off-by: Suganthi Thomas <sugan.mercy@gmail.com>
1 parent e55711b commit ad69fd7

File tree

4 files changed

+0
-10
lines changed

4 files changed

+0
-10
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
3131
import org.springframework.beans.factory.ObjectProvider;
3232
import org.springframework.boot.autoconfigure.AutoConfiguration;
33-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3433
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3534
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3635
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -60,8 +59,6 @@
6059
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.MISTRAL,
6160
matchIfMissing = true)
6261
@ConditionalOnClass(MistralAiApi.class)
63-
@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
64-
WebClientAutoConfiguration.class, ToolCallingAutoConfiguration.class })
6562
public class MistralAiChatAutoConfiguration {
6663

6764
@Bean

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
2727
import org.springframework.beans.factory.ObjectProvider;
2828
import org.springframework.boot.autoconfigure.AutoConfiguration;
29-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3231
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -53,7 +52,6 @@
5352
@ConditionalOnClass(MistralAiApi.class)
5453
@ConditionalOnProperty(name = SpringAIModelProperties.EMBEDDING_MODEL, havingValue = SpringAIModels.MISTRAL,
5554
matchIfMissing = true)
56-
@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class })
5755
public class MistralAiEmbeddingAutoConfiguration {
5856

5957
@Bean

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
2525
import org.springframework.beans.factory.ObjectProvider;
2626
import org.springframework.boot.autoconfigure.AutoConfiguration;
27-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2928
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -49,8 +48,6 @@
4948
@ConditionalOnProperty(name = SpringAIModelProperties.MODERATION_MODEL, havingValue = SpringAIModels.MISTRAL,
5049
matchIfMissing = true)
5150
@ConditionalOnClass(MistralAiApi.class)
52-
@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
53-
WebClientAutoConfiguration.class })
5451
public class MistralAiModerationAutoConfiguration {
5552

5653
@Bean

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
2222
import org.springframework.beans.factory.ObjectProvider;
2323
import org.springframework.boot.autoconfigure.AutoConfiguration;
24-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2524
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2726
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -43,7 +42,6 @@
4342
@ConditionalOnClass(MistralOcrApi.class)
4443
@ConditionalOnProperty(name = "spring.ai.model.ocr", havingValue = SpringAIModels.MISTRAL, matchIfMissing = true)
4544
@EnableConfigurationProperties({ MistralAiCommonProperties.class, MistralAiOcrProperties.class })
46-
@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class })
4745
public class MistralAiOcrAutoConfiguration {
4846

4947
@Bean

0 commit comments

Comments
 (0)