perf(ollama): support HTTP client timeout configuration

Signed-off-by: yinh <[email protected]>

Author: Fottas

auto-configurations/models/spring-ai-autoconfigure-model-ollama/src/main/java/org/springframework/ai/model/ollama/autoconfigure/OllamaApiAutoConfiguration.java

@@ -23,9 +23,16 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 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.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;
@@ -37,6 +44,7 @@
  * @author Eddú Meléndez
  * @author Thomas Vitale
  * @author Ilayaperumal Gopinathan
+ * @author yinh
  * @since 0.8.0
  */
 @AutoConfiguration(after = { RestClientAutoConfiguration.class, WebClientAutoConfiguration.class,
@@ -54,12 +62,29 @@ PropertiesOllamaConnectionDetails ollamaConnectionDetails(OllamaConnectionProper
 	@Bean
 	@ConditionalOnMissingBean
 	public OllamaApi ollamaApi(OllamaConnectionDetails connectionDetails,
+			OllamaConnectionProperties 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 OllamaApi.builder()
 			.baseUrl(connectionDetails.getBaseUrl())
-			.restClientBuilder(restClientBuilderProvider.getIfAvailable(RestClient::builder))
-			.webClientBuilder(webClientBuilderProvider.getIfAvailable(WebClient::builder))
+			.restClientBuilder(restClientBuilder)
+			.webClientBuilder(webClientBuilder)
 			.responseErrorHandler(responseErrorHandler)
 			.build();
 	}
@@ -79,4 +104,16 @@ public String getBaseUrl() {
 
 	}
 
+	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-ollama/src/main/java/org/springframework/ai/model/ollama/autoconfigure/OllamaConnectionProperties.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.model.ollama.autoconfigure;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.http.client.autoconfigure.HttpClientSettingsProperties;
 
 /**
  * Ollama connection autoconfiguration properties.
@@ -25,7 +26,7 @@
  * @since 0.8.0
  */
 @ConfigurationProperties(OllamaConnectionProperties.CONFIG_PREFIX)
-public class OllamaConnectionProperties {
+public class OllamaConnectionProperties extends HttpClientSettingsProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.ollama";
 

auto-configurations/models/spring-ai-autoconfigure-model-ollama/src/test/java/org/springframework/ai/model/ollama/autoconfigure/OllamaChatAutoConfigurationIT.java

@@ -129,4 +129,15 @@ void chatActivation() {
 		});
 	}
 
+	@Test
+	void chatCompletionWithCustomTimeout() {
+		this.contextRunner.withPropertyValues("spring.ai.ollama.read-timeout=1ms")
+			.withPropertyValues("spring.ai.ollama.connect-timeout=1ms")
+			.run(context -> {
+				OllamaChatModel chatModel = context.getBean(OllamaChatModel.class);
+				ChatResponse response = chatModel.call(new Prompt(this.userMessage));
+				assertThat(response.getResult().getOutput().getText()).contains("Copenhagen");
+			});
+	}
+
 }