Add/update MistralModelConfigurationTests

Author: ricken07

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

@@ -57,8 +57,7 @@
  */
 @AutoConfiguration(after = { RestClientAutoConfiguration.class, SpringAiRetryAutoConfiguration.class,
 		ToolCallingAutoConfiguration.class })
-@EnableConfigurationProperties({ MistralAiCommonProperties.class, MistralAiChatProperties.class,
-		MistralAiModerationProperties.class })
+@EnableConfigurationProperties({ MistralAiCommonProperties.class, MistralAiChatProperties.class })
 @ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.MISTRAL,
 		matchIfMissing = true)
 @ConditionalOnClass(MistralAiApi.class)

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

@@ -20,6 +20,7 @@
 
 import org.springframework.ai.mistralai.MistralAiChatModel;
 import org.springframework.ai.mistralai.MistralAiEmbeddingModel;
+import org.springframework.ai.mistralai.moderation.MistralAiModerationModel;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
@@ -29,6 +30,7 @@
  * Unit Tests for Mistral AI auto-configurations conditional enabling of models.
  *
  * @author Ilayaperumal Gopinathan
+ * @author Ricken Bazolo
  */
 public class MistralModelConfigurationTests {
 
@@ -43,6 +45,8 @@ void chatModelActivation() {
 				assertThat(context.getBeansOfType(MistralAiChatModel.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(MistralAiEmbeddingProperties.class)).isEmpty();
 				assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isEmpty();
 			});
 
 		this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiChatAutoConfiguration.class))
@@ -61,6 +65,8 @@ void chatModelActivation() {
 				assertThat(context.getBeansOfType(MistralAiChatModel.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(MistralAiEmbeddingProperties.class)).isEmpty();
 				assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isEmpty();
 			});
 	}
 
@@ -84,4 +90,42 @@ void embeddingModelActivation() {
 			});
 	}
 
+	@Test
+	void moderationModelActivation() {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiModerationAutoConfiguration.class))
+			.run(context -> {
+				assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isNotEmpty();
+				assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isNotEmpty();
+				assertThat(context.getBeansOfType(MistralAiChatModel.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiChatProperties.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiEmbeddingProperties.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
+			});
+
+		this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiModerationAutoConfiguration.class))
+			.withPropertyValues("spring.ai.model.moderation=none")
+			.run(context -> {
+				assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isEmpty();
+			});
+
+		this.contextRunner.withConfiguration(AutoConfigurations.of(MistralAiModerationAutoConfiguration.class))
+			.withPropertyValues("spring.ai.model.moderation=mistral")
+			.run(context -> {
+				assertThat(context.getBeansOfType(MistralAiModerationProperties.class)).isNotEmpty();
+				assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isNotEmpty();
+			});
+
+		this.contextRunner
+			.withConfiguration(AutoConfigurations.of(MistralAiChatAutoConfiguration.class,
+					MistralAiEmbeddingAutoConfiguration.class, MistralAiModerationAutoConfiguration.class))
+			.withPropertyValues("spring.ai.model.chat=none", "spring.ai.model.embedding=none",
+					"spring.ai.model.moderation=mistral")
+			.run(context -> {
+				assertThat(context.getBeansOfType(MistralAiModerationModel.class)).isNotEmpty();
+				assertThat(context.getBeansOfType(MistralAiEmbeddingModel.class)).isEmpty();
+				assertThat(context.getBeansOfType(MistralAiChatModel.class)).isEmpty();
+			});
+	}
+
 }