Bedrock API: Add option to configure API endpoint (#1018)

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.net.URI;
 import java.time.Duration;
 import java.util.List;
 
@@ -109,6 +110,21 @@ public AnthropicChatBedrockApi(String modelId, AwsCredentialsProvider credential
 		super(modelId, credentialsProvider, region, objectMapper, timeout);
 	}
 
+	/**
+	 * 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public AnthropicChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+								   ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	// 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

@@ -29,6 +29,7 @@
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
 
+import java.net.URI;
 import java.time.Duration;
 import java.util.List;
 
@@ -113,6 +114,21 @@ public Anthropic3ChatBedrockApi(String modelId, AwsCredentialsProvider credentia
 		super(modelId, credentialsProvider, region, objectMapper, timeout);
 	}
 
+	/**
+	 * 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public Anthropic3ChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+									ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	// 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/api/AbstractBedrockApi.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.bedrock.api;
 
 import java.io.UncheckedIOException;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 
@@ -107,6 +108,11 @@ public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProv
 		this(modelId, credentialsProvider, region, objectMapper, Duration.ofMinutes(5));
 	}
 
+	public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+							  ObjectMapper objectMapper, Duration timeout) {
+		this(modelId, credentialsProvider, region, objectMapper, timeout, null);
+	}
+
 	/**
 	 * Create a new AbstractBedrockApi instance using the provided credentials provider, region and object mapper.
 	 *
@@ -120,7 +126,7 @@ public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProv
 	 */
 	public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, String region,
 			ObjectMapper objectMapper, Duration timeout) {
-		this(modelId, credentialsProvider, Region.of(region), objectMapper, timeout);
+		this(modelId, credentialsProvider, Region.of(region), objectMapper, timeout, null);
 	}
 
 	/**
@@ -135,7 +141,7 @@ public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProv
 	 * all HTTP requests including retries, unmarshalling, etc. This value should always be positive, if present.
 	 */
 	public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
-			ObjectMapper objectMapper, Duration timeout) {
+			ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
 
 		Assert.hasText(modelId, "Model id must not be empty");
 		Assert.notNull(credentialsProvider, "Credentials provider must not be null");
@@ -152,12 +158,14 @@ public AbstractBedrockApi(String modelId, AwsCredentialsProvider credentialsProv
 				.region(this.region)
 				.credentialsProvider(credentialsProvider)
 				.overrideConfiguration(c -> c.apiCallTimeout(timeout))
+				.endpointOverride(endpointOverride)
 				.build();
 
 		this.clientStreaming = BedrockRuntimeAsyncClient.builder()
 				.region(this.region)
 				.credentialsProvider(credentialsProvider)
 				.overrideConfiguration(c -> c.apiCallTimeout(timeout))
+				.endpointOverride(endpointOverride)
 				.build();
 	}
 

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.net.URI;
 import java.time.Duration;
 import java.util.List;
 
@@ -108,6 +109,21 @@ public CohereChatBedrockApi(String modelId, AwsCredentialsProvider credentialsPr
 		super(modelId, credentialsProvider, region, objectMapper, 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public CohereChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+								ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	/**
 	 * 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.net.URI;
 import java.time.Duration;
 import java.util.List;
 
@@ -109,6 +110,22 @@ public CohereEmbeddingBedrockApi(String modelId, AwsCredentialsProvider credenti
 		super(modelId, credentialsProvider, region, objectMapper, 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public CohereEmbeddingBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+									 ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	/**
 	 * The Cohere Embed model request.
 	 *

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.net.URI;
 import java.time.Duration;
 import java.util.List;
 
@@ -109,6 +110,21 @@ public Ai21Jurassic2ChatBedrockApi(String modelId, AwsCredentialsProvider creden
 		super(modelId, credentialsProvider, region, objectMapper, 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public Ai21Jurassic2ChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+									   ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	/**
 	 * AI21 Jurassic2 chat request parameters.
 	 *

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

@@ -28,6 +28,7 @@
 import org.springframework.ai.bedrock.llama.api.LlamaChatBedrockApi.LlamaChatResponse;
 import org.springframework.ai.model.ChatModelDescription;
 
+import java.net.URI;
 import java.time.Duration;
 
 // @formatter:off
@@ -106,6 +107,21 @@ public LlamaChatBedrockApi(String modelId, AwsCredentialsProvider credentialsPro
 		super(modelId, credentialsProvider, region, objectMapper, timeout);
 	}
 
+	/**
+	 * Create a new LlamaChatBedrockApi instance using the provided credentials provider, region and object mapper.
+	 *
+	 * @param modelId The model id to use. See the {@link LlamaChatModel} 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public LlamaChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+							   ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	/**
 	 * LlamaChatRequest encapsulates the request parameters for the Meta Llama chat model.
 	 *

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.ai.bedrock.titan.api;
 
+import java.net.URI;
 import java.time.Duration;
 import java.util.List;
 
@@ -109,6 +110,21 @@ public TitanChatBedrockApi(String modelId, AwsCredentialsProvider credentialsPro
 		super(modelId, credentialsProvider, region, objectMapper, timeout);
 	}
 
+	/**
+	 * Create a new TitanEmbeddingBedrockApi instance.
+	 *
+	 * @param modelId The model id to use. See the {@link TitanEmbeddingBedrockApi.TitanEmbeddingModel} 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public TitanChatBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+									ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	/**
 	 * TitanChatRequest encapsulates the request parameters for the Titan chat model.
 	 *

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.ai.bedrock.titan.api;
 
+import java.net.URI;
 import java.time.Duration;
 import java.util.List;
 
@@ -81,6 +82,21 @@ public TitanEmbeddingBedrockApi(String modelId, AwsCredentialsProvider credentia
 		super(modelId, credentialsProvider, region, objectMapper, timeout);
 	}
 
+	/**
+	 * Create a new TitanEmbeddingBedrockApi instance.
+	 *
+	 * @param modelId The model id to use. See the {@link TitanEmbeddingModel} 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.
+	 * @param endpointOverride The endpoint to use.
+	 */
+	public TitanEmbeddingBedrockApi(String modelId, AwsCredentialsProvider credentialsProvider, Region region,
+									ObjectMapper objectMapper, Duration timeout, URI endpointOverride) {
+		super(modelId, credentialsProvider, region, objectMapper, timeout, endpointOverride);
+	}
+
 	/**
 	 * Titan Embedding request parameters.
 	 *