Skip to content

Commit 3b3ee5f

Browse files
emopti-jruferemopti-jrufer
committed
Switch tests to use cross-region inference for model access reliability.
Signed-off-by: Jared Rufer <[email protected]>
1 parent f773fb9 commit 3b3ee5f

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockConverseChatClientIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ void singularStreamFunctionCallTest() {
363363
}
364364

365365
@ParameterizedTest(name = "{0} : {displayName} ")
366-
@ValueSource(strings = { "anthropic.claude-3-5-sonnet-20240620-v1:0" })
366+
@ValueSource(strings = { "us.anthropic.claude-3-5-sonnet-20240620-v1:0" })
367367
void multiModalityEmbeddedImage(String modelName) throws IOException {
368368

369369
// @formatter:off
@@ -380,7 +380,7 @@ void multiModalityEmbeddedImage(String modelName) throws IOException {
380380
}
381381

382382
@ParameterizedTest(name = "{0} : {displayName} ")
383-
@ValueSource(strings = { "anthropic.claude-3-5-sonnet-20240620-v1:0" })
383+
@ValueSource(strings = { "us.anthropic.claude-3-5-sonnet-20240620-v1:0" })
384384
void multiModalityImageUrl2(String modelName) throws IOException {
385385

386386
// TODO: add url method that wraps the checked exception.
@@ -400,7 +400,7 @@ void multiModalityImageUrl2(String modelName) throws IOException {
400400
}
401401

402402
@ParameterizedTest(name = "{0} : {displayName} ")
403-
@ValueSource(strings = { "anthropic.claude-3-5-sonnet-20240620-v1:0" })
403+
@ValueSource(strings = { "us.anthropic.claude-3-5-sonnet-20240620-v1:0" })
404404
void multiModalityImageUrl(String modelName) throws IOException {
405405

406406
// TODO: add url method that wraps the checked exception.

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockConverseTestConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public BedrockProxyChatModel bedrockConverseChatModel() {
3434
// String modelId = "anthropic.claude-3-5-sonnet-20241022-v2:0";
3535
// String modelId = "meta.llama3-8b-instruct-v1:0";
3636
// String modelId = "ai21.jamba-1-5-large-v1:0";
37-
String modelId = "anthropic.claude-3-5-sonnet-20240620-v1:0";
37+
String modelId = "us.anthropic.claude-3-5-sonnet-20240620-v1:0";
3838

3939
return BedrockProxyChatModel.builder()
4040
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelIT.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ private static void validateChatResponseMetadata(ChatResponse response, String m
8383
}
8484

8585
@ParameterizedTest(name = "{0} : {displayName} ")
86-
@ValueSource(strings = { "anthropic.claude-3-haiku-20240307-v1:0", "anthropic.claude-3-sonnet-20240229-v1:0",
87-
"anthropic.claude-3-5-sonnet-20240620-v1:0" })
86+
@ValueSource(strings = { "us.anthropic.claude-3-haiku-20240307-v1:0", "anthropic.claude-3-sonnet-20240229-v1:0",
87+
"us.anthropic.claude-3-5-sonnet-20240620-v1:0" })
8888
void roleTest(String modelName) {
8989
UserMessage userMessage = new UserMessage(
9090
"Tell me about 3 famous pirates from the Golden Age of Piracy and why they did.");
@@ -315,7 +315,7 @@ void streamFunctionCallTest() {
315315
List<Message> messages = new ArrayList<>(List.of(userMessage));
316316

317317
var promptOptions = BedrockChatOptions.builder()
318-
.model("anthropic.claude-3-5-sonnet-20240620-v1:0")
318+
.model("us.anthropic.claude-3-5-sonnet-20240620-v1:0")
319319
.toolCallbacks(List.of(FunctionToolCallback.builder("getCurrentWeather", new MockWeatherService())
320320
.description(
321321
"Get the weather in location. Return temperature in 36°F or 36°C format. Use multi-turn if needed.")
@@ -349,7 +349,7 @@ void streamFunctionCallTestWithMaxTokens(int maxTokens) {
349349

350350
var promptOptions = BedrockChatOptions.builder()
351351
.maxTokens(maxTokens)
352-
.model("anthropic.claude-3-5-sonnet-20240620-v1:0")
352+
.model("us.anthropic.claude-3-5-sonnet-20240620-v1:0")
353353
.toolCallbacks(List.of(FunctionToolCallback.builder("getCurrentWeather", new MockWeatherService())
354354
.description(
355355
"Get the weather in location. Return temperature in 36°F or 36°C format. Use multi-turn if needed.")
@@ -367,7 +367,7 @@ void streamFunctionCallTestWithMaxTokens(int maxTokens) {
367367

368368
@Test
369369
void validateCallResponseMetadata() {
370-
String model = "anthropic.claude-3-5-sonnet-20240620-v1:0";
370+
String model = "us.anthropic.claude-3-5-sonnet-20240620-v1:0";
371371
// @formatter:off
372372
ChatResponse response = ChatClient.create(this.chatModel).prompt()
373373
.options(BedrockChatOptions.builder().model(model).build())
@@ -382,7 +382,7 @@ void validateCallResponseMetadata() {
382382

383383
@Test
384384
void validateStreamCallResponseMetadata() {
385-
String model = "anthropic.claude-3-5-sonnet-20240620-v1:0";
385+
String model = "us.anthropic.claude-3-5-sonnet-20240620-v1:0";
386386
// @formatter:off
387387
ChatResponse response = ChatClient.create(this.chatModel).prompt()
388388
.options(BedrockChatOptions.builder().model(model).build())

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelObservationIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void beforeEach() {
6767
@Test
6868
void observationForChatOperation() {
6969
var options = BedrockChatOptions.builder()
70-
.model("anthropic.claude-3-5-sonnet-20240620-v1:0")
70+
.model("us.anthropic.claude-3-5-sonnet-20240620-v1:0")
7171
.maxTokens(2048)
7272
.stopSequences(List.of("this-is-the-end"))
7373
.temperature(0.7)
@@ -89,7 +89,7 @@ void observationForChatOperation() {
8989
@Test
9090
void observationForStreamingChatOperation() {
9191
var options = BedrockChatOptions.builder()
92-
.model("anthropic.claude-3-5-sonnet-20240620-v1:0")
92+
.model("us.anthropic.claude-3-5-sonnet-20240620-v1:0")
9393
.maxTokens(2048)
9494
.stopSequences(List.of("this-is-the-end"))
9595
.temperature(0.7)
@@ -124,13 +124,13 @@ private void validate(ChatResponseMetadata responseMetadata, String finishReason
124124
.doesNotHaveAnyRemainingCurrentObservation()
125125
.hasObservationWithNameEqualTo(DefaultChatModelObservationConvention.DEFAULT_NAME)
126126
.that()
127-
.hasContextualNameEqualTo("chat " + "anthropic.claude-3-5-sonnet-20240620-v1:0")
127+
.hasContextualNameEqualTo("chat " + "us.anthropic.claude-3-5-sonnet-20240620-v1:0")
128128
.hasLowCardinalityKeyValue(LowCardinalityKeyNames.AI_OPERATION_TYPE.asString(),
129129
AiOperationType.CHAT.value())
130130
.hasLowCardinalityKeyValue(LowCardinalityKeyNames.AI_PROVIDER.asString(),
131131
AiProvider.BEDROCK_CONVERSE.value())
132132
.hasLowCardinalityKeyValue(LowCardinalityKeyNames.REQUEST_MODEL.asString(),
133-
"anthropic.claude-3-5-sonnet-20240620-v1:0")
133+
"us.anthropic.claude-3-5-sonnet-20240620-v1:0")
134134
// .hasLowCardinalityKeyValue(LowCardinalityKeyNames.RESPONSE_MODEL.asString(),
135135
// responseMetadata.getModel())
136136
.doesNotHaveHighCardinalityKeyValueWithKey(HighCardinalityKeyNames.REQUEST_FREQUENCY_PENALTY.asString())
@@ -166,7 +166,7 @@ public TestObservationRegistry observationRegistry() {
166166
@Bean
167167
public BedrockProxyChatModel bedrockConverseChatModel(ObservationRegistry observationRegistry) {
168168

169-
String modelId = "anthropic.claude-3-5-sonnet-20240620-v1:0";
169+
String modelId = "us.anthropic.claude-3-5-sonnet-20240620-v1:0";
170170

171171
return BedrockProxyChatModel.builder()
172172
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/client/BedrockNovaChatClientIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void toolAnnotationWeatherForecast() {
191191

192192
// https://github.com/spring-projects/spring-ai/issues/1878
193193
@ParameterizedTest
194-
@ValueSource(strings = { "amazon.nova-pro-v1:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0" })
194+
@ValueSource(strings = { "us.amazon.nova-pro-v1:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0" })
195195
void toolAnnotationWeatherForecastStreaming(String modelName) {
196196

197197
ChatClient chatClient = ChatClient.builder(this.chatModel).build();
@@ -262,7 +262,7 @@ public static class Config {
262262
@Bean
263263
public BedrockProxyChatModel bedrockConverseChatModel() {
264264

265-
String modelId = "amazon.nova-pro-v1:0";
265+
String modelId = "us.amazon.nova-pro-v1:0";
266266
// String modelId = "us.anthropic.claude-3-7-sonnet-20250219-v1:0";
267267

268268
return BedrockProxyChatModel.builder()

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/experiments/BedrockConverseChatModelMain3.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void main(String[] args) {
4040

4141
// String modelId = "anthropic.claude-3-5-sonnet-20240620-v1:0";
4242
// String modelId = "ai21.jamba-1-5-large-v1:0";
43-
String modelId = "anthropic.claude-3-5-sonnet-20240620-v1:0";
43+
String modelId = "us.anthropic.claude-3-5-sonnet-20240620-v1:0";
4444

4545
// var prompt = new Prompt("Tell me a joke?",
4646
// ChatOptions.builder().model(modelId).build();

0 commit comments

Comments
 (0)