Skip to content

Commit 9330187

Browse files
committed
Improve auto-confg condigiton on class to prevent undesired activation
1 parent c453529 commit 9330187

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/azure/openai/AzureOpenAiAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.springframework.util.CollectionUtils;
3838

3939
@AutoConfiguration
40-
@ConditionalOnClass(OpenAIClientBuilder.class)
40+
@ConditionalOnClass({ OpenAIClientBuilder.class, AzureOpenAiChatClient.class })
4141
@EnableConfigurationProperties({ AzureOpenAiChatProperties.class, AzureOpenAiEmbeddingProperties.class,
4242
AzureOpenAiConnectionProperties.class })
4343
public class AzureOpenAiAutoConfiguration {

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.List;
1919

2020
import org.springframework.ai.autoconfigure.retry.SpringAiRetryAutoConfiguration;
21-
import org.springframework.ai.embedding.EmbeddingClient;
2221
import org.springframework.ai.model.function.FunctionCallback;
2322
import org.springframework.ai.model.function.FunctionCallbackContext;
2423
import org.springframework.ai.openai.OpenAiAudioTranscriptionClient;

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import ai.djl.huggingface.tokenizers.HuggingFaceTokenizer;
1919
import ai.onnxruntime.OrtSession;
2020

21-
import org.springframework.ai.embedding.EmbeddingClient;
2221
import org.springframework.ai.transformers.TransformersEmbeddingClient;
2322
import org.springframework.boot.autoconfigure.AutoConfiguration;
2423
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -32,7 +31,7 @@
3231
*/
3332
@AutoConfiguration
3433
@EnableConfigurationProperties({ TransformersEmbeddingClientProperties.class })
35-
@ConditionalOnClass({ OrtSession.class, HuggingFaceTokenizer.class })
34+
@ConditionalOnClass({ OrtSession.class, HuggingFaceTokenizer.class, TransformersEmbeddingClient.class })
3635
public class TransformersEmbeddingClientAutoConfiguration {
3736

3837
@Bean

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/azure/AzureVectorStoreAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Christian Tzolov
3333
*/
3434
@AutoConfiguration
35-
@ConditionalOnClass({ EmbeddingClient.class, SearchIndexClient.class })
35+
@ConditionalOnClass({ EmbeddingClient.class, SearchIndexClient.class, AzureVectorStore.class })
3636
@EnableConfigurationProperties({ AzureVectorStoreProperties.class })
3737
@ConditionalOnProperty(prefix = "spring.ai.vectorstore.azure", value = { "url", "api-key", "index-name" })
3838
public class AzureVectorStoreAutoConfiguration {

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vertexai/gemini/VertexAiGeminiAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* @author Christian Tzolov
4040
* @since 0.8.0
4141
*/
42-
@ConditionalOnClass(VertexAI.class)
42+
@ConditionalOnClass({ VertexAI.class, VertexAiGeminiChatClient.class })
4343
@EnableConfigurationProperties({ VertexAiGeminiChatProperties.class, VertexAiGeminiConnectionProperties.class })
4444
public class VertexAiGeminiAutoConfiguration {
4545

0 commit comments

Comments
 (0)