Fix ElevenLabs auto-configuration

Signed-off-by: Pawel Potaczala <[email protected]>

Author: centrumek

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

@@ -45,8 +45,6 @@
 @EnableConfigurationProperties({ ElevenLabsSpeechProperties.class, ElevenLabsConnectionProperties.class })
 @ConditionalOnProperty(prefix = ElevenLabsSpeechProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
 		matchIfMissing = true)
-@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
-		WebClientAutoConfiguration.class })
 public class ElevenLabsAutoConfiguration {
 
 	@Bean

auto-configurations/models/spring-ai-autoconfigure-model-elevenlabs/src/test/java/org/springframework/ai/model/elevenlabs/autoconfigure/ElevenLabsAutoConfigurationIT.java

@@ -40,7 +40,7 @@ public class ElevenLabsAutoConfigurationIT {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withPropertyValues("spring.ai.elevenlabs.api-key=" + System.getenv("ELEVEN_LABS_API_KEY"))
-		.withConfiguration(AutoConfigurations.of(ElevenLabsAutoConfiguration.class));
+		.withConfiguration(ElevenLabsITUtil.elevenLabsAutoConfig(ElevenLabsAutoConfiguration.class));
 
 	@Test
 	void speech() {

auto-configurations/models/spring-ai-autoconfigure-model-elevenlabs/src/test/java/org/springframework/ai/model/elevenlabs/autoconfigure/ElevenLabsITUtil.java

@@ -0,0 +1,28 @@
+package org.springframework.ai.model.elevenlabs.autoconfigure;
+
+import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
+
+/**
+ * Utility class for VertexAI integration tests.
+ *
+ * @author Pawel Potaczala
+ */
+public final class ElevenLabsITUtil {
+
+	private ElevenLabsITUtil() {
+	}
+
+	public static AutoConfigurations elevenLabsAutoConfig(Class<?>... additionalAutoConfigurations) {
+		Class<?>[] dependencies = new Class[] { SpringAiRetryAutoConfiguration.class,
+				RestClientAutoConfiguration.class, WebClientAutoConfiguration.class };
+		Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
+		System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
+		System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
+				additionalAutoConfigurations.length);
+
+		return AutoConfigurations.of(allAutoConfigurations);
+	}
+}

auto-configurations/models/spring-ai-autoconfigure-model-elevenlabs/src/test/java/org/springframework/ai/model/elevenlabs/autoconfigure/ElevenLabsPropertiesTests.java

@@ -20,7 +20,6 @@
 
 import org.springframework.ai.elevenlabs.ElevenLabsTextToSpeechModel;
 import org.springframework.ai.elevenlabs.api.ElevenLabsApi;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +46,7 @@ public void connectionProperties() {
 				"spring.ai.elevenlabs.tts.options.voice-settings.use-speaker-boost=false",
 				"spring.ai.elevenlabs.tts.options.voice-settings.speed=1.5"
 				// @formatter:on
-		).withConfiguration(AutoConfigurations.of(ElevenLabsAutoConfiguration.class)).run(context -> {
+		).withConfiguration(ElevenLabsITUtil.elevenLabsAutoConfig(ElevenLabsAutoConfiguration.class)).run(context -> {
 			var speechProperties = context.getBean(ElevenLabsSpeechProperties.class);
 			var connectionProperties = context.getBean(ElevenLabsConnectionProperties.class);
 
@@ -87,7 +86,7 @@ public void speechOptionsTest() {
 				"spring.ai.elevenlabs.tts.options.apply-text-normalization=ON",
 				"spring.ai.elevenlabs.tts.options.apply-language-text-normalization=true"
 				// @formatter:on
-		).withConfiguration(AutoConfigurations.of(ElevenLabsAutoConfiguration.class)).run(context -> {
+		).withConfiguration(ElevenLabsITUtil.elevenLabsAutoConfig(ElevenLabsAutoConfiguration.class)).run(context -> {
 			var speechProperties = context.getBean(ElevenLabsSpeechProperties.class);
 
 			assertThat(speechProperties.getOptions().getModelId()).isEqualTo("custom-model");
@@ -114,7 +113,7 @@ public void speechActivation() {
 
 		// It is enabled by default
 		new ApplicationContextRunner().withPropertyValues("spring.ai.elevenlabs.api-key=YOUR_API_KEY")
-			.withConfiguration(AutoConfigurations.of(ElevenLabsAutoConfiguration.class))
+			.withConfiguration(ElevenLabsITUtil.elevenLabsAutoConfig(ElevenLabsAutoConfiguration.class))
 			.run(context -> {
 				assertThat(context.getBeansOfType(ElevenLabsSpeechProperties.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(ElevenLabsTextToSpeechModel.class)).isNotEmpty();
@@ -123,7 +122,7 @@ public void speechActivation() {
 		// Explicitly enable the text-to-speech autoconfiguration.
 		new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.elevenlabs.api-key=YOUR_API_KEY", "spring.ai.elevenlabs.tts.enabled=true")
-			.withConfiguration(AutoConfigurations.of(ElevenLabsAutoConfiguration.class))
+			.withConfiguration(ElevenLabsITUtil.elevenLabsAutoConfig(ElevenLabsAutoConfiguration.class))
 			.run(context -> {
 				assertThat(context.getBeansOfType(ElevenLabsSpeechProperties.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(ElevenLabsTextToSpeechModel.class)).isNotEmpty();
@@ -132,7 +131,7 @@ public void speechActivation() {
 		// Explicitly disable the text-to-speech autoconfiguration.
 		new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.elevenlabs.api-key=YOUR_API_KEY", "spring.ai.elevenlabs.tts.enabled=false")
-			.withConfiguration(AutoConfigurations.of(ElevenLabsAutoConfiguration.class))
+			.withConfiguration(ElevenLabsITUtil.elevenLabsAutoConfig(ElevenLabsAutoConfiguration.class))
 			.run(context -> {
 				assertThat(context.getBeansOfType(ElevenLabsSpeechProperties.class)).isEmpty();
 				assertThat(context.getBeansOfType(ElevenLabsTextToSpeechModel.class)).isEmpty();