perf(elevenLabs): support HTTP client timeout configuration

Signed-off-by: yinh <fottas@163.com>

Author: Fottas

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

@@ -27,10 +27,17 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
+import org.springframework.boot.http.client.HttpClientSettings;
+import org.springframework.boot.http.client.autoconfigure.HttpClientSettingsPropertyMapper;
+import org.springframework.boot.http.client.reactive.ClientHttpConnectorBuilder;
 import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
+import org.springframework.boot.ssl.SslBundles;
 import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.retry.RetryTemplate;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.reactive.ClientHttpConnector;
 import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -52,13 +59,28 @@ public class ElevenLabsAutoConfiguration {
 	@ConditionalOnMissingBean
 	public ElevenLabsApi elevenLabsApi(ElevenLabsConnectionProperties connectionProperties,
 			ObjectProvider<RestClient.Builder> restClientBuilderProvider,
-			ObjectProvider<WebClient.Builder> webClientBuilderProvider, ResponseErrorHandler responseErrorHandler) {
+			ObjectProvider<WebClient.Builder> webClientBuilderProvider, ResponseErrorHandler responseErrorHandler,
+			ObjectProvider<SslBundles> sslBundles, ObjectProvider<HttpClientSettings> globalHttpClientSettings,
+			ObjectProvider<ClientHttpRequestFactoryBuilder<?>> factoryBuilder,
+			ObjectProvider<ClientHttpConnectorBuilder<?>> webConnectorBuilderProvider) {
+
+		HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(sslBundles.getIfAvailable(),
+				globalHttpClientSettings.getIfAvailable());
+		HttpClientSettings httpClientSettings = mapper.map(connectionProperties);
+
+		RestClient.Builder restClientBuilder = restClientBuilderProvider.getIfAvailable(RestClient::builder);
+		applyRestClientSettings(restClientBuilder, httpClientSettings,
+				factoryBuilder.getIfAvailable(ClientHttpRequestFactoryBuilder::detect));
+
+		WebClient.Builder webClientBuilder = webClientBuilderProvider.getIfAvailable(WebClient::builder);
+		applyWebClientSettings(webClientBuilder, httpClientSettings,
+				webConnectorBuilderProvider.getIfAvailable(ClientHttpConnectorBuilder::detect));
 
 		return ElevenLabsApi.builder()
 			.baseUrl(connectionProperties.getBaseUrl())
 			.apiKey(connectionProperties.getApiKey())
-			.restClientBuilder(restClientBuilderProvider.getIfAvailable(RestClient::builder))
-			.webClientBuilder(webClientBuilderProvider.getIfAvailable(WebClient::builder))
+			.restClientBuilder(restClientBuilder)
+			.webClientBuilder(webClientBuilder)
 			.responseErrorHandler(responseErrorHandler)
 			.build();
 	}
@@ -75,4 +97,16 @@ public ElevenLabsTextToSpeechModel elevenLabsSpeechModel(ElevenLabsApi elevenLab
 			.build();
 	}
 
+	private void applyRestClientSettings(RestClient.Builder builder, HttpClientSettings httpClientSettings,
+			ClientHttpRequestFactoryBuilder<?> factoryBuilder) {
+		ClientHttpRequestFactory requestFactory = factoryBuilder.build(httpClientSettings);
+		builder.requestFactory(requestFactory);
+	}
+
+	private void applyWebClientSettings(WebClient.Builder builder, HttpClientSettings httpClientSettings,
+			ClientHttpConnectorBuilder<?> connectorBuilder) {
+		ClientHttpConnector connector = connectorBuilder.build(httpClientSettings);
+		builder.clientConnector(connector);
+	}
+
 }

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

@@ -18,14 +18,15 @@
 
 import org.springframework.ai.elevenlabs.api.ElevenLabsApi;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.http.client.autoconfigure.HttpClientSettingsProperties;
 
 /**
  * Configuration properties for the ElevenLabs API connection.
  *
  * @author Alexandros Pappas
  */
 @ConfigurationProperties(ElevenLabsConnectionProperties.CONFIG_PREFIX)
-public class ElevenLabsConnectionProperties {
+public class ElevenLabsConnectionProperties extends HttpClientSettingsProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.elevenlabs";
 

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

@@ -16,6 +16,7 @@
 
 package org.springframework.ai.model.elevenlabs.autoconfigure;
 
+import java.time.Duration;
 import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
@@ -73,6 +74,23 @@ void speechStream() {
 		});
 	}
 
+	@Test
+	void speechWithCustomTimeout() {
+		this.contextRunner.withConfiguration(SpringAiTestAutoConfigurations.of(ElevenLabsAutoConfiguration.class))
+			.withPropertyValues("spring.ai.elevenlabs.connect-timeout=1ms", "spring.ai.elevenlabs.read-timeout=1ms")
+			.run(context -> {
+				ElevenLabsTextToSpeechModel speechModel = context.getBean(ElevenLabsTextToSpeechModel.class);
+				var connectionProperties = context.getBean(ElevenLabsConnectionProperties.class);
+				assertThat(connectionProperties.getConnectTimeout()).isEqualTo(Duration.ofMillis(1));
+				assertThat(connectionProperties.getReadTimeout()).isEqualTo(Duration.ofMillis(1));
+
+				byte[] response = speechModel.call("H");
+				assertThat(response).isNotNull();
+
+				logger.info("Response with custom timeout: " + Arrays.toString(response));
+			});
+	}
+
 	public boolean verifyMp3FrameHeader(byte[] audioResponse) {
 		if (audioResponse == null || audioResponse.length < 3) {
 			return false;

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

@@ -16,6 +16,8 @@
 
 package org.springframework.ai.model.elevenlabs.autoconfigure;
 
+import java.time.Duration;
+
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ai.elevenlabs.ElevenLabsTextToSpeechModel;
@@ -46,7 +48,10 @@ public void connectionProperties() {
 				"spring.ai.elevenlabs.tts.options.voice-settings.similarity-boost=0.8",
 				"spring.ai.elevenlabs.tts.options.voice-settings.style=0.2",
 				"spring.ai.elevenlabs.tts.options.voice-settings.use-speaker-boost=false",
-				"spring.ai.elevenlabs.tts.options.voice-settings.speed=1.5"
+				"spring.ai.elevenlabs.tts.options.voice-settings.speed=1.5",
+
+				"spring.ai.elevenlabs.connect-timeout=1s",
+				"spring.ai.elevenlabs.read-timeout=1s"
 				// @formatter:on
 		).withConfiguration(SpringAiTestAutoConfigurations.of(ElevenLabsAutoConfiguration.class)).run(context -> {
 			var speechProperties = context.getBean(ElevenLabsSpeechProperties.class);
@@ -62,6 +67,9 @@ public void connectionProperties() {
 			assertThat(speechProperties.getOptions().getVoiceSettings().style()).isEqualTo(0.2);
 			assertThat(speechProperties.getOptions().getVoiceSettings().useSpeakerBoost()).isFalse();
 			assertThat(speechProperties.getOptions().getSpeed()).isEqualTo(1.5f);
+
+			assertThat(connectionProperties.getConnectTimeout()).isEqualTo(Duration.ofSeconds(1));
+			assertThat(connectionProperties.getReadTimeout()).isEqualTo(Duration.ofSeconds(1));
 		});
 	}