Add support of Bedrock API timeout

 Configure the amount of time to allow the client to complete the execution of an API call.
 This timeout covers the entire client execution except for marshalling. This includes request handler execution,
 all HTTP requests including retries, unmarshalling, etc. This value should always be positive, if present.

  - Add timeout filed to the AbstractBedrockApi, used to initialize the BedrockRuntimeClient and the
    BedrockStreamingRuntimeClient. Update all classes that extend the AbstractBedrockApi.
  - Keep the previous constructors for backward compatibility using timeout value of 5 min.
  - Add a common AWS connection timeout auto-config property and update the documentation.
    Defaults to 5 min.

 Additional changes:
  - Fix Anthropic 3 straming response - add bedrock metrics field.
  - Increate the default timeout to 5 min. Update the docs.
  - Increase the ITs.

Author: impactCn

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/anthropic/api/AnthropicChatBedrockApi.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.ai.bedrock.anthropic.api;
 
+import java.time.Duration;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -54,6 +55,16 @@ public AnthropicChatBedrockApi(String modelId, String region) {
 		super(modelId, region);
 	}
 
+	/**
+	 * Create a new AnthropicChatBedrockApi instance using the default credentials provider chain, the default object.
+	 * @param modelId The model id to use. See the {@link AnthropicChatModel} for the supported models.
+	 * @param region The AWS region to use.
+	 * @param timeout The timeout to use.
+	 */
+	public AnthropicChatBedrockApi(String modelId, String region, Duration timeout) {
+		super(modelId, region, timeout);
+	}
+
 	/**
 	 * Create a new AnthropicChatBedrockApi instance using the provided credentials provider, region and object mapper.
 	 *
@@ -67,6 +78,20 @@ public AnthropicChatBedrockApi(String modelId, AwsCredentialsProvider credential
 		super(modelId, credentialsProvider, region, objectMapper);
 	}
 
+	/**
+	 * Create a new AnthropicChatBedrockApi instance using the provided credentials provider, region and object mapper.
+	 *
+	 * @param modelId The model id to use. See the {@link AnthropicChatModel} for the supported models.
+	 * @param credentialsProvider The credentials provider to connect to AWS.
+	 * @param region The AWS region to use.
+	 * @param objectMapper The object mapper to use for JSON serialization and deserialization.
+	 * @param timeout The timeout to use.
+	 */
+	public AnthropicChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
+			ObjectMapper objectMapper, Duration timeout) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout);
+	}
+
 	// https://github.com/build-on-aws/amazon-bedrock-java-examples/blob/main/example_code/bedrock-runtime/src/main/java/aws/community/examples/InvokeBedrockStreamingAsync.java
 
 	// https://docs.anthropic.com/claude/reference/complete_post

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/anthropic3/api/Anthropic3ChatBedrockApi.java

@@ -27,6 +27,7 @@
 import reactor.core.publisher.Flux;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 
+import java.time.Duration;
 import java.util.List;
 
 /**
@@ -58,6 +59,16 @@ public Anthropic3ChatBedrockApi(String modelId, String region) {
 		super(modelId, region);
 	}
 
+	/**
+	 * Create a new AnthropicChatBedrockApi instance using the default credentials provider chain, the default object.
+	 * @param modelId The model id to use. See the {@link AnthropicChatModel} for the supported models.
+	 * @param region The AWS region to use.
+	 * @param timeout The timeout to use.
+	 */
+	public Anthropic3ChatBedrockApi(String modelId, String region, Duration timeout) {
+		super(modelId, region, timeout);
+	}
+
 	/**
 	 * Create a new AnthropicChatBedrockApi instance using the provided credentials provider, region and object mapper.
 	 *
@@ -71,6 +82,20 @@ public Anthropic3ChatBedrockApi(String modelId, AwsCredentialsProvider credentia
 		super(modelId, credentialsProvider, region, objectMapper);
 	}
 
+	/**
+	 * Create a new AnthropicChatBedrockApi instance using the provided credentials provider, region and object mapper.
+	 *
+	 * @param modelId The model id to use. See the {@link AnthropicChatModel} for the supported models.
+	 * @param credentialsProvider The credentials provider to connect to AWS.
+	 * @param region The AWS region to use.
+	 * @param objectMapper The object mapper to use for JSON serialization and deserialization.
+	 * @param timeout The timeout to use.
+	 */
+	public Anthropic3ChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
+			ObjectMapper objectMapper, Duration timeout) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout);
+	}
+
 	// https://github.com/build-on-aws/amazon-bedrock-java-examples/blob/main/example_code/bedrock-runtime/src/main/java/aws/community/examples/InvokeBedrockStreamingAsync.java
 
 	// https://docs.anthropic.com/claude/reference/complete_post
@@ -307,10 +332,12 @@ public record AnthropicUsage(@JsonProperty("input_tokens") Integer inputTokens,
 	 * @param usage Metrics about the model invocation.
 	 */
 	@JsonInclude(Include.NON_NULL)
-	public record AnthropicChatResponse(@JsonProperty("id") String id, @JsonProperty("model") String model,
-			@JsonProperty("type") String type, @JsonProperty("role") String role,
-			@JsonProperty("content") List<MediaContent> content, @JsonProperty("stop_reason") String stopReason,
-			@JsonProperty("stop_sequence") String stopSequence, @JsonProperty("usage") AnthropicUsage usage) {
+	public record AnthropicChatResponse(// formatter:off
+			@JsonProperty("id") String id, @JsonProperty("model") String model, @JsonProperty("type") String type,
+			@JsonProperty("role") String role, @JsonProperty("content") List<MediaContent> content,
+			@JsonProperty("stop_reason") String stopReason, @JsonProperty("stop_sequence") String stopSequence,
+			@JsonProperty("usage") AnthropicUsage usage,
+			@JsonProperty("amazon-bedrock-invocationMetrics") AmazonBedrockInvocationMetrics amazonBedrockInvocationMetrics) { // formatter:on
 	}
 
 	/**
@@ -326,10 +353,11 @@ public record AnthropicChatResponse(@JsonProperty("id") String id, @JsonProperty
 	 * @param usage The usage data.
 	 */
 	@JsonInclude(Include.NON_NULL)
-	public record AnthropicChatStreamingResponse(@JsonProperty("type") StreamingType type,
-			@JsonProperty("message") AnthropicChatResponse message, @JsonProperty("index") Integer index,
-			@JsonProperty("content_block") MediaContent contentBlock, @JsonProperty("delta") Delta delta,
-			@JsonProperty("usage") AnthropicUsage usage) {
+	public record AnthropicChatStreamingResponse(// formatter:off
+			@JsonProperty("type") StreamingType type, @JsonProperty("message") AnthropicChatResponse message,
+			@JsonProperty("index") Integer index, @JsonProperty("content_block") MediaContent contentBlock,
+			@JsonProperty("delta") Delta delta, @JsonProperty("usage") AnthropicUsage usage,
+			@JsonProperty("amazon-bedrock-invocationMetrics") AmazonBedrockInvocationMetrics amazonBedrockInvocationMetrics) { // formatter:on
 
 		/**
 		 * The streaming type of this message.

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/api/AbstractBedrockApi.java

@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +43,9 @@
 import software.amazon.awssdk.services.bedrockruntime.model.InvokeModelWithResponseStreamResponseHandler;
 import software.amazon.awssdk.services.bedrockruntime.model.ResponseStream;
 
+import org.springframework.ai.model.ModelOptionsUtils;
+import org.springframework.util.Assert;
+
 /**
  * Abstract class for the Bedrock API. It provides the basic functionality to invoke the chat completion model and
  * receive the response for streaming and non-streaming requests.
@@ -67,7 +69,6 @@ public abstract class AbstractBedrockApi<I, O, SO> {
 
 	private final String modelId;
 	private final ObjectMapper objectMapper;
-	private final AwsCredentialsProvider credentialsProvider;
 	private final String region;
 	private final BedrockRuntimeClient client;
 	private final BedrockRuntimeAsyncClient clientStreaming;
@@ -79,48 +80,81 @@ public abstract class AbstractBedrockApi<I, O, SO> {
 	 * @param region The AWS region to use.
 	 */
 	public AbstractBedrockApi(String modelId, String region) {
-		this(modelId, ProfileCredentialsProvider.builder().build(), region, new ObjectMapper());
+		this(modelId, ProfileCredentialsProvider.builder().build(), region, ModelOptionsUtils.OBJECT_MAPPER, Duration.ofMinutes(5));
+	}
+	/**
+	 * Create a new AbstractBedrockApi instance using default credentials provider and object mapper.
+	 *
+	 * @param modelId The model id to use.
+	 * @param region The AWS region to use.
+	 * @param timeout The timeout to use.
+	 */
+	public AbstractBedrockApi(String modelId, String region, Duration timeout) {
+		this(modelId, ProfileCredentialsProvider.builder().build(), region, ModelOptionsUtils.OBJECT_MAPPER, timeout);
 	}
 
+		/**
+	 * Create a new AbstractBedrockApi instance using the provided credentials provider, region and object mapper.
+	 *
+	 * @param modelId The model id to use.
+	 * @param credentialsProvider The credentials provider to connect to AWS.
+	 * @param region The AWS region to use.
+	 * @param objectMapper The object mapper to use for JSON serialization and deserialization.
+	 */
+	public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
+			 ObjectMapper objectMapper) {
+		this(modelId, credentialsProvider, region, objectMapper, Duration.ofMinutes(5));
+	}
 	/**
 	 * Create a new AbstractBedrockApi instance using the provided credentials provider, region and object mapper.
 	 *
 	 * @param modelId The model id to use.
 	 * @param credentialsProvider The credentials provider to connect to AWS.
 	 * @param region The AWS region to use.
 	 * @param objectMapper The object mapper to use for JSON serialization and deserialization.
+	 * @param timeout Configure the amount of time to allow the client to complete the execution of an API call.
+	 * This timeout covers the entire client execution except for marshalling. This includes request handler execution,
+	 * all HTTP requests including retries, unmarshalling, etc. This value should always be positive, if present.
 	 */
 	public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
-			ObjectMapper objectMapper) {
+			ObjectMapper objectMapper, Duration timeout) {
+
+		Assert.hasText(modelId, "Model id must not be empty");
+		Assert.notNull(credentialsProvider, "Credentials provider must not be null");
+		Assert.hasText(region, "Region must not be empty");
+		Assert.notNull(objectMapper, "Object mapper must not be null");
+		Assert.notNull(timeout, "Timeout must not be null");
 
 		this.modelId = modelId;
-		this.objectMapper = objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-		this.credentialsProvider = credentialsProvider;
+		this.objectMapper = objectMapper;
 		this.region = region;
 
+
 		this.client = BedrockRuntimeClient.builder()
 				.region(Region.of(this.region))
-				.credentialsProvider(this.credentialsProvider)
+				.credentialsProvider(credentialsProvider)
+				.overrideConfiguration(c -> c.apiCallTimeout(timeout))
 				.build();
 
 		this.clientStreaming = BedrockRuntimeAsyncClient.builder()
 				.region(Region.of(this.region))
-				.credentialsProvider(this.credentialsProvider)
+				.credentialsProvider(credentialsProvider)
+				.overrideConfiguration(c -> c.apiCallTimeout(timeout))
 				.build();
 	}
 
 	/**
 	 * @return The model id.
 	 */
 	public String getModelId() {
-		return modelId;
+		return this.modelId;
 	}
 
 	/**
 	 * @return The AWS region.
 	 */
 	public String getRegion() {
-		return region;
+		return this.region;
 	}
 
 	/**

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/cohere/api/CohereChatBedrockApi.java

@@ -16,6 +16,7 @@
 // @formatter:off
 package org.springframework.ai.bedrock.cohere.api;
 
+import java.time.Duration;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -64,6 +65,32 @@ public CohereChatBedrockApi(String modelId, AwsCredentialsProvider credentialsPr
 		super(modelId, credentialsProvider, region, objectMapper);
 	}
 
+	/**
+	 * Create a new CohereChatBedrockApi instance using the default credentials provider chain, the default object
+	 * mapper, default temperature and topP values.
+	 *
+	 * @param modelId The model id to use. See the {@link CohereChatModel} for the supported models.
+	 * @param region The AWS region to use.
+	 * @param timeout The timeout to use.
+	 */
+	public CohereChatBedrockApi(String modelId, String region, Duration timeout) {
+		super(modelId, region, timeout);
+	}
+
+	/**
+	 * Create a new CohereChatBedrockApi instance using the provided credentials provider, region and object mapper.
+	 *
+	 * @param modelId The model id to use. See the {@link CohereChatModel} for the supported models.
+	 * @param credentialsProvider The credentials provider to connect to AWS.
+	 * @param region The AWS region to use.
+	 * @param objectMapper The object mapper to use for JSON serialization and deserialization.
+	 * @param timeout The timeout to use.
+	 */
+	public CohereChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
+			ObjectMapper objectMapper, Duration timeout) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout);
+	}
+
 	/**
 	 * CohereChatRequest encapsulates the request parameters for the Cohere command model.
 	 *

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/cohere/api/CohereEmbeddingBedrockApi.java

@@ -16,6 +16,7 @@
 // @formatter:off
 package org.springframework.ai.bedrock.cohere.api;
 
+import java.time.Duration;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -63,6 +64,33 @@ public CohereEmbeddingBedrockApi(String modelId, AwsCredentialsProvider credenti
 		super(modelId, credentialsProvider, region, objectMapper);
 	}
 
+	/**
+	 * Create a new CohereEmbeddingBedrockApi instance using the default credentials provider chain, the default object
+	 * mapper, default temperature and topP values.
+	 *
+	 * @param modelId The model id to use. See the {@link CohereEmbeddingModel} for the supported models.
+	 * @param region The AWS region to use.
+	 * @param timeout The timeout to use.
+	 */
+	public CohereEmbeddingBedrockApi(String modelId, String region, Duration timeout) {
+		super(modelId, region, timeout);
+	}
+
+	/**
+	 * Create a new CohereEmbeddingBedrockApi instance using the provided credentials provider, region and object
+	 * mapper.
+	 *
+	 * @param modelId The model id to use. See the {@link CohereEmbeddingModel} for the supported models.
+	 * @param credentialsProvider The credentials provider to connect to AWS.
+	 * @param region The AWS region to use.
+	 * @param objectMapper The object mapper to use for JSON serialization and deserialization.
+	 * @param timeout The timeout to use.
+	 */
+	public CohereEmbeddingBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
+			ObjectMapper objectMapper, Duration timeout) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout);
+	}
+
 	/**
 	 * The Cohere Embed model request.
 	 *
@@ -140,6 +168,7 @@ public record CohereEmbeddingResponse(
 			@JsonProperty("id") String id,
 			@JsonProperty("embeddings") List<List<Double>> embeddings,
 			@JsonProperty("texts") List<String> texts,
+			@JsonProperty("response_type") String responseType,
 			// For future use: Currently bedrock doesn't return invocationMetrics for the cohere embedding model.
 			@JsonProperty("amazon-bedrock-invocationMetrics") AmazonBedrockInvocationMetrics amazonBedrockInvocationMetrics) {
 	}

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/jurassic2/api/Ai21Jurassic2ChatBedrockApi.java

@@ -16,6 +16,7 @@
 // @formatter:off
 package org.springframework.ai.bedrock.jurassic2.api;
 
+import java.time.Duration;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -64,6 +65,32 @@ public Ai21Jurassic2ChatBedrockApi(String modelId, AwsCredentialsProvider creden
 		super(modelId, credentialsProvider, region, objectMapper);
 	}
 
+	/**
+	 * Create a new Ai21Jurassic2ChatBedrockApi instance using the default credentials provider chain, the default
+	 * object mapper, default temperature and topP values.
+	 *
+	 * @param modelId The model id to use. See the {@link Ai21Jurassic2ChatModel} for the supported models.
+	 * @param region The AWS region to use.
+	 * @param timeout The timeout to use.
+	 */
+	public Ai21Jurassic2ChatBedrockApi(String modelId, String region, Duration timeout) {
+		super(modelId, region, timeout);
+	}
+
+
+	/**
+	 * Create a new Ai21Jurassic2ChatBedrockApi instance.
+	 *
+	 * @param modelId The model id to use. See the {@link Ai21Jurassic2ChatBedrockApi.Ai21Jurassic2ChatModel} for the supported models.
+	 * @param credentialsProvider The credentials provider to connect to AWS.
+	 * @param region The AWS region to use.
+	 * @param objectMapper The object mapper to use for JSON serialization and deserialization.
+	 * @param timeout The timeout to use.
+	 */
+	public Ai21Jurassic2ChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
+									ObjectMapper objectMapper, Duration timeout) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout);
+	}
 
 	/**
 	 * AI21 Jurassic2 chat request parameters.