perf(oci-genai): support HTTP client timeout configuration

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

Author: Fottas

auto-configurations/models/spring-ai-autoconfigure-model-oci-genai/src/main/java/org/springframework/ai/model/oci/genai/autoconfigure/OCIConnectionProperties.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.model.oci.genai.autoconfigure;
 
 import java.nio.file.Paths;
+import java.time.Duration;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.StringUtils;
@@ -53,6 +54,12 @@ public class OCIConnectionProperties {
 
 	private String endpoint;
 
+	private Duration connectTimeout;
+
+	private Duration readTimeout;
+
+	private Integer maxAsyncThreads;
+
 	public String getRegion() {
 		return this.region;
 	}
@@ -133,6 +140,30 @@ public void setEndpoint(String endpoint) {
 		this.endpoint = endpoint;
 	}
 
+	public Duration getConnectTimeout() {
+		return this.connectTimeout;
+	}
+
+	public void setConnectTimeout(Duration connectTimeout) {
+		this.connectTimeout = connectTimeout;
+	}
+
+	public Duration getReadTimeout() {
+		return this.readTimeout;
+	}
+
+	public void setReadTimeout(Duration readTimeout) {
+		this.readTimeout = readTimeout;
+	}
+
+	public Integer getMaxAsyncThreads() {
+		return this.maxAsyncThreads;
+	}
+
+	public void setMaxAsyncThreads(Integer maxAsyncThreads) {
+		this.maxAsyncThreads = maxAsyncThreads;
+	}
+
 	public enum AuthenticationType {
 
 		FILE("file"), INSTANCE_PRINCIPAL("instance-principal"), WORKLOAD_IDENTITY("workload-identity"),

auto-configurations/models/spring-ai-autoconfigure-model-oci-genai/src/main/java/org/springframework/ai/model/oci/genai/autoconfigure/OCIGenAiInferenceClientAutoConfiguration.java

@@ -52,9 +52,20 @@ public class OCIGenAiInferenceClientAutoConfiguration {
 	@ConditionalOnMissingBean
 	public GenerativeAiInferenceClient generativeAiInferenceClient(OCIConnectionProperties properties)
 			throws IOException {
-		ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-			.retryConfiguration(RetryConfiguration.SDK_DEFAULT_RETRY_CONFIGURATION)
-			.build();
+		ClientConfiguration.ClientConfigurationBuilder clientConfigurationBuilder = ClientConfiguration.builder()
+			.retryConfiguration(RetryConfiguration.SDK_DEFAULT_RETRY_CONFIGURATION);
+
+		if (properties.getConnectTimeout() != null) {
+			clientConfigurationBuilder.connectionTimeoutMillis(properties.getConnectTimeout().toMillisPart());
+		}
+		if (properties.getReadTimeout() != null) {
+			clientConfigurationBuilder.readTimeoutMillis(properties.getReadTimeout().toMillisPart());
+		}
+		if (properties.getMaxAsyncThreads() != null) {
+			clientConfigurationBuilder.maxAsyncThreads(properties.getMaxAsyncThreads());
+		}
+		ClientConfiguration clientConfiguration = clientConfigurationBuilder.build();
+
 		GenerativeAiInferenceClient.Builder builder = GenerativeAiInferenceClient.builder()
 			.configuration(clientConfiguration);
 		if (StringUtils.hasText(properties.getRegion())) {

auto-configurations/models/spring-ai-autoconfigure-model-oci-genai/src/test/java/org/springframework/ai/model/oci/genai/autoconfigure/OCIGenAIAutoConfigurationTest.java

@@ -20,6 +20,7 @@
 import java.nio.file.Path;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
+import java.time.Duration;
 
 import com.oracle.bmc.http.client.pki.Pem;
 import org.junit.jupiter.api.Test;
@@ -54,7 +55,11 @@ void setProperties(@TempDir Path tempDir) throws Exception {
 				"spring.ai.oci.genai.cohere.chat.options.topP=0.8",
 				"spring.ai.oci.genai.cohere.chat.options.maxTokens=1000",
 				"spring.ai.oci.genai.cohere.chat.options.frequencyPenalty=0.1",
-				"spring.ai.oci.genai.cohere.chat.options.presencePenalty=0.2"
+				"spring.ai.oci.genai.cohere.chat.options.presencePenalty=0.2",
+
+				"spring.ai.oci.genai.connect-timeout:1s",
+				"spring.ai.oci.genai.read-timeout:1s",
+				"spring.ai.oci.genai.max-async-threads:30"
 				// @formatter:on
 		).withConfiguration(SpringAiTestAutoConfigurations.of(OCIGenAiChatAutoConfiguration.class));
 
@@ -79,6 +84,10 @@ void setProperties(@TempDir Path tempDir) throws Exception {
 			assertThat(props.getPrivateKey()).isEqualTo(tmp.toAbsolutePath().toString());
 			assertThat(props.getRegion()).isEqualTo("us-ashburn-1");
 
+			assertThat(props.getConnectTimeout()).isEqualTo(Duration.ofSeconds(1));
+			assertThat(props.getReadTimeout()).isEqualTo(Duration.ofSeconds(1));
+			assertThat(props.getMaxAsyncThreads()).isEqualTo(30);
+
 		});
 	}
 

auto-configurations/models/spring-ai-autoconfigure-model-oci-genai/src/test/java/org/springframework/ai/model/oci/genai/autoconfigure/OCIGenAiAutoConfigurationIT.java

@@ -50,7 +50,9 @@ public class OCIGenAiAutoConfigurationIT {
 				"spring.ai.oci.genai.file=" + this.CONFIG_FILE,
 				"spring.ai.oci.genai.embedding.compartment=" + this.COMPARTMENT_ID,
 				"spring.ai.oci.genai.embedding.servingMode=on-demand",
-				"spring.ai.oci.genai.embedding.model=cohere.embed-english-light-v2.0"
+				"spring.ai.oci.genai.embedding.model=cohere.embed-english-light-v2.0",
+				"spring.ai.oci.genai.connect-timeout:1ms",
+				"spring.ai.oci.genai.read-timeout:1ms"
 				// @formatter:on
 	).withConfiguration(SpringAiTestAutoConfigurations.of(OCIGenAiEmbeddingAutoConfiguration.class));
 
@@ -60,7 +62,9 @@ public class OCIGenAiAutoConfigurationIT {
 			"spring.ai.oci.genai.file=" + this.CONFIG_FILE,
 			"spring.ai.oci.genai.cohere.chat.options.compartment=" + this.COMPARTMENT_ID,
 			"spring.ai.oci.genai.cohere.chat.options.servingMode=on-demand",
-			"spring.ai.oci.genai.cohere.chat.options.model=" + this.CHAT_MODEL_ID
+			"spring.ai.oci.genai.cohere.chat.options.model=" + this.CHAT_MODEL_ID,
+			"spring.ai.oci.genai.connect-timeout:1ms",
+			"spring.ai.oci.genai.read-timeout:1ms"
 			// @formatter:on
 	).withConfiguration(SpringAiTestAutoConfigurations.of(OCIGenAiChatAutoConfiguration.class));