Update/remove autoconfiguration enable/disable configurations

 - Since the model autoconfiguration enable/disable flags are no longer used, remove them

   - Currently, the model autoconfigurations can be enabled/disabled via top level Spring AI properties such as spring.ai.model.chat/embedding/image/moderation=<model-provider-name>

   - Update documentation to add note section about this change

- Update note on the autoconfiguration section to point to the configuration changes

- Align the vertex ai text/multimodal keys in line with the other properties

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

Author: ilayaperumalg

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/main/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicChatProperties.java

@@ -33,11 +33,6 @@ public class AnthropicChatProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.anthropic.chat";
 
-	/**
-	 * Enable Anthropic chat model.
-	 */
-	private boolean enabled = true;
-
 	/**
 	 * Client lever Ollama options. Use this property to configure generative temperature,
 	 * topK and topP and alike parameters. The null values are ignored defaulting to the
@@ -54,12 +49,4 @@ public AnthropicChatOptions getOptions() {
 		return this.options;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicPropertiesTests.java

@@ -56,8 +56,6 @@ public void connectionProperties() {
 
 				assertThat(chatProperties.getOptions().getModel()).isEqualTo("MODEL_XYZ");
 				assertThat(chatProperties.getOptions().getTemperature()).isEqualTo(0.55);
-				// enabled is true by default
-				assertThat(chatProperties.isEnabled()).isTrue();
 			});
 	}
 
@@ -111,7 +109,7 @@ public void chatCompletionDisabled() {
 			});
 
 		// Explicitly enable the chat auto-configuration.
-		new ApplicationContextRunner().withPropertyValues("spring.ai.anthropic.chat.enabled=true")
+		new ApplicationContextRunner().withPropertyValues("spring.ai.model.chat=anthropic")
 			.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
 					RestClientAutoConfiguration.class, AnthropicChatAutoConfiguration.class))
 			.run(context -> {

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-azure-openai/src/main/java/org/springframework/ai/model/azure/openai/autoconfigure/AzureOpenAiAudioTranscriptionProperties.java

@@ -30,22 +30,9 @@ public class AzureOpenAiAudioTranscriptionProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.azure.openai.audio.transcription";
 
-	/**
-	 * Enable AzureOpenAI audio transcription model.
-	 */
-	private boolean enabled = true;
-
 	@NestedConfigurationProperty
 	private AzureOpenAiAudioTranscriptionOptions options = AzureOpenAiAudioTranscriptionOptions.builder().build();
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public AzureOpenAiAudioTranscriptionOptions getOptions() {
 		return this.options;
 	}

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-azure-openai/src/main/java/org/springframework/ai/model/azure/openai/autoconfigure/AzureOpenAiChatProperties.java

@@ -29,11 +29,6 @@ public class AzureOpenAiChatProperties {
 
 	private static final Double DEFAULT_TEMPERATURE = 0.7;
 
-	/**
-	 * Enable Azure OpenAI chat model.
-	 */
-	private boolean enabled = true;
-
 	@NestedConfigurationProperty
 	private AzureOpenAiChatOptions options = AzureOpenAiChatOptions.builder()
 		.deploymentName(DEFAULT_DEPLOYMENT_NAME)
@@ -48,12 +43,4 @@ public void setOptions(AzureOpenAiChatOptions options) {
 		this.options = options;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-azure-openai/src/main/java/org/springframework/ai/model/azure/openai/autoconfigure/AzureOpenAiEmbeddingProperties.java

@@ -27,11 +27,6 @@ public class AzureOpenAiEmbeddingProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.azure.openai.embedding";
 
-	/**
-	 * Enable Azure OpenAI embedding model.
-	 */
-	private boolean enabled = true;
-
 	@NestedConfigurationProperty
 	private AzureOpenAiEmbeddingOptions options = AzureOpenAiEmbeddingOptions.builder()
 		.deploymentName("text-embedding-ada-002")
@@ -57,12 +52,4 @@ public void setMetadataMode(MetadataMode metadataMode) {
 		this.metadataMode = metadataMode;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-azure-openai/src/main/java/org/springframework/ai/model/azure/openai/autoconfigure/AzureOpenAiImageOptionsProperties.java

@@ -31,11 +31,6 @@ public class AzureOpenAiImageOptionsProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.azure.openai.image";
 
-	/**
-	 * Enable Azure OpenAI chat client.
-	 */
-	private boolean enabled = true;
-
 	@NestedConfigurationProperty
 	private AzureOpenAiImageOptions options = AzureOpenAiImageOptions.builder().build();
 
@@ -47,12 +42,4 @@ public void setOptions(AzureOpenAiImageOptions options) {
 		this.options = options;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/main/java/org/springframework/ai/model/bedrock/cohere/autoconfigure/BedrockCohereEmbeddingProperties.java

@@ -34,11 +34,6 @@ public class BedrockCohereEmbeddingProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.bedrock.cohere.embedding";
 
-	/**
-	 * Enable Bedrock Cohere Embedding Model. False by default.
-	 */
-	private boolean enabled = false;
-
 	/**
 	 * Bedrock Cohere Embedding generative name. Defaults to
 	 * 'cohere.embed-multilingual-v3'.
@@ -51,14 +46,6 @@ public class BedrockCohereEmbeddingProperties {
 		.truncate(CohereEmbeddingRequest.Truncate.NONE)
 		.build();
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public String getModel() {
 		return this.model;
 	}

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/main/java/org/springframework/ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyChatProperties.java

@@ -32,26 +32,13 @@ public class BedrockConverseProxyChatProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.bedrock.converse.chat";
 
-	/**
-	 * Enable Bedrock Converse chat model.
-	 */
-	private boolean enabled = true;
-
 	@NestedConfigurationProperty
 	private ToolCallingChatOptions options = ToolCallingChatOptions.builder()
 		.temperature(0.7)
 		.maxTokens(300)
 		.topK(10)
 		.build();
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public ToolCallingChatOptions getOptions() {
 		return this.options;
 	}

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/main/java/org/springframework/ai/model/bedrock/titan/autoconfigure/BedrockTitanEmbeddingProperties.java

@@ -31,11 +31,6 @@ public class BedrockTitanEmbeddingProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.bedrock.titan.embedding";
 
-	/**
-	 * Enable Bedrock Titan Embedding Model. False by default.
-	 */
-	private boolean enabled = false;
-
 	/**
 	 * Bedrock Titan Embedding generative name. Defaults to 'amazon.titan-embed-image-v1'.
 	 */
@@ -51,14 +46,6 @@ public static String getConfigPrefix() {
 		return CONFIG_PREFIX;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public String getModel() {
 		return this.model;
 	}

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/test/java/org/springframework/ai/model/bedrock/cohere/autoconfigure/BedrockCohereEmbeddingAutoConfigurationIT.java

@@ -85,7 +85,7 @@ public void batchEmbedding() {
 	public void propertiesTest() {
 
 		BedrockTestUtils.getContextRunnerWithUserConfiguration()
-			.withPropertyValues("spring.ai.bedrock.cohere.embedding.enabled=true",
+			.withPropertyValues("spring.ai.model.embedding=bedrock-cohere",
 					"spring.ai.bedrock.aws.access-key=ACCESS_KEY", "spring.ai.bedrock.aws.secret-key=SECRET_KEY",
 					"spring.ai.bedrock.aws.region=" + Region.US_EAST_1.id(),
 					"spring.ai.bedrock.cohere.embedding.model=MODEL_XYZ",
@@ -96,7 +96,6 @@ public void propertiesTest() {
 				var properties = context.getBean(BedrockCohereEmbeddingProperties.class);
 				var awsProperties = context.getBean(BedrockAwsConnectionProperties.class);
 
-				assertThat(properties.isEnabled()).isTrue();
 				assertThat(awsProperties.getRegion()).isEqualTo(Region.US_EAST_1.id());
 				assertThat(properties.getModel()).isEqualTo("MODEL_XYZ");
 

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/test/java/org/springframework/ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyChatPropertiesTests.java

@@ -51,8 +51,6 @@ public void chatOptionsTest() {
 			.run(context -> {
 				var chatProperties = context.getBean(BedrockConverseProxyChatProperties.class);
 
-				assertThat(chatProperties.isEnabled()).isTrue();
-
 				assertThat(chatProperties.getOptions().getModel()).isEqualTo("MODEL_XYZ");
 				assertThat(chatProperties.getOptions().getMaxTokens()).isEqualTo(123);
 				assertThat(chatProperties.getOptions().getStopSequences()).contains("boza", "koza");

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/test/java/org/springframework/ai/model/bedrock/titan/autoconfigure/BedrockTitanEmbeddingAutoConfigurationIT.java

@@ -44,7 +44,7 @@
 public class BedrockTitanEmbeddingAutoConfigurationIT {
 
 	private final ApplicationContextRunner contextRunner = BedrockTestUtils.getContextRunner()
-		.withPropertyValues("spring.ai.bedrock.titan.embedding.enabled=true",
+		.withPropertyValues("spring.ai.model.embedding=bedrock-titan",
 				"spring.ai.bedrock.aws.access-key=" + System.getenv("AWS_ACCESS_KEY_ID"),
 				"spring.ai.bedrock.aws.secret-key=" + System.getenv("AWS_SECRET_ACCESS_KEY"),
 				"spring.ai.bedrock.aws.region=" + Region.US_EAST_1.id(),
@@ -86,7 +86,7 @@ public void singleImageEmbedding() {
 	public void propertiesTest() {
 
 		BedrockTestUtils.getContextRunnerWithUserConfiguration()
-			.withPropertyValues("spring.ai.bedrock.titan.embedding.enabled=true",
+			.withPropertyValues("spring.ai.model.embedding=bedrock-titan",
 					"spring.ai.bedrock.aws.access-key=ACCESS_KEY", "spring.ai.bedrock.aws.secret-key=SECRET_KEY",
 					"spring.ai.bedrock.aws.region=" + Region.US_EAST_1.id(),
 					"spring.ai.bedrock.titan.embedding.model=MODEL_XYZ",
@@ -96,7 +96,6 @@ public void propertiesTest() {
 				var properties = context.getBean(BedrockTitanEmbeddingProperties.class);
 				var awsProperties = context.getBean(BedrockAwsConnectionProperties.class);
 
-				assertThat(properties.isEnabled()).isTrue();
 				assertThat(awsProperties.getRegion()).isEqualTo(Region.US_EAST_1.id());
 				assertThat(properties.getModel()).isEqualTo("MODEL_XYZ");
 

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-huggingface/src/main/java/org/springframework/ai/model/huggingface/autoconfigure/HuggingfaceChatProperties.java

@@ -41,11 +41,6 @@ public class HuggingfaceChatProperties {
 	 */
 	private String url;
 
-	/**
-	 * Enable Hugging Face chat model.
-	 */
-	private boolean enabled = true;
-
 	public String getApiKey() {
 		return this.apiKey;
 	}
@@ -62,12 +57,4 @@ public void setUrl(String url) {
 		this.url = url;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-minimax/src/main/java/org/springframework/ai/model/minimax/autoconfigure/MiniMaxChatProperties.java

@@ -35,11 +35,6 @@ public class MiniMaxChatProperties extends MiniMaxParentProperties {
 
 	private static final Double DEFAULT_TEMPERATURE = 0.7;
 
-	/**
-	 * Enable MiniMax chat model.
-	 */
-	private boolean enabled = true;
-
 	@NestedConfigurationProperty
 	private MiniMaxChatOptions options = MiniMaxChatOptions.builder()
 		.model(DEFAULT_CHAT_MODEL)
@@ -54,12 +49,4 @@ public void setOptions(MiniMaxChatOptions options) {
 		this.options = options;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-minimax/src/main/java/org/springframework/ai/model/minimax/autoconfigure/MiniMaxEmbeddingProperties.java

@@ -34,11 +34,6 @@ public class MiniMaxEmbeddingProperties extends MiniMaxParentProperties {
 
 	public static final String DEFAULT_EMBEDDING_MODEL = MiniMaxApi.EmbeddingModel.Embo_01.value;
 
-	/**
-	 * Enable MiniMax embedding model.
-	 */
-	private boolean enabled = true;
-
 	private MetadataMode metadataMode = MetadataMode.EMBED;
 
 	@NestedConfigurationProperty
@@ -60,12 +55,4 @@ public void setMetadataMode(MetadataMode metadataMode) {
 		this.metadataMode = metadataMode;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-minimax/src/test/java/org/springframework/ai/model/minimax/autoconfigure/MiniMaxPropertiesTests.java

@@ -281,7 +281,7 @@ void embeddingActivation() {
 
 		new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.minimax.api-key=API_KEY", "spring.ai.minimax.base-url=TEST_BASE_URL",
-					"spring.ai.minimax.embedding.enabled=true")
+					"spring.ai.model.embedding=minimax")
 			.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
 					RestClientAutoConfiguration.class, MiniMaxEmbeddingAutoConfiguration.class))
 			.run(context -> {

Diff for: auto-configurations/models/spring-ai-autoconfigure-model-mistral-ai/src/main/java/org/springframework/ai/model/mistralai/autoconfigure/MistralAiChatProperties.java

@@ -43,11 +43,6 @@ public class MistralAiChatProperties extends MistralAiParentProperties {
 
 	private static final Boolean IS_ENABLED = false;
 
-	/**
-	 * Enable OpenAI chat model.
-	 */
-	private boolean enabled = true;
-
 	@NestedConfigurationProperty
 	private MistralAiChatOptions options = MistralAiChatOptions.builder()
 		.model(DEFAULT_CHAT_MODEL)
@@ -68,12 +63,4 @@ public void setOptions(MistralAiChatOptions options) {
 		this.options = options;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 }