Skip to content

GH-4494: Fix Bedrock Converse proxy auto-configuration #4573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

GH-4494: Fix Bedrock Converse proxy auto-configuration #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...rk/ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyChatAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
Expand All @@ -50,14 +49,14 @@
*
* @author Christian Tzolov
* @author Wei Jiang
* @author Pawel Potaczala
*/
@AutoConfiguration(after = { ToolCallingAutoConfiguration.class })
@EnableConfigurationProperties({ BedrockConverseProxyChatProperties.class, BedrockAwsConnectionConfiguration.class })
@ConditionalOnClass({ BedrockProxyChatModel.class, BedrockRuntimeClient.class, BedrockRuntimeAsyncClient.class })
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.BEDROCK_CONVERSE,
matchIfMissing = true)
@Import(BedrockAwsConnectionConfiguration.class)
@ImportAutoConfiguration({ ToolCallingAutoConfiguration.class })
public class BedrockConverseProxyChatAutoConfiguration {

@Bean
Expand Down
6 changes: 3 additions & 3 deletions ...ework/ai/model/bedrock/converse/autoconfigure/BedrockConverseModelConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.junit.jupiter.api.Test;

import org.springframework.ai.bedrock.converse.BedrockProxyChatModel;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -29,11 +28,12 @@
* of models.
*
* @author Ilayaperumal Gopinathan
* @author Pawel Potaczala
*/
public class BedrockConverseModelConfigurationTests {

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class));
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
BedrockConverseProxyITUtil.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class));

@Test
void chatModelActivation() {
Expand Down
4 changes: 2 additions & 2 deletions .../ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyChatAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.model.bedrock.autoconfigure.BedrockTestUtils;
import org.springframework.ai.model.bedrock.autoconfigure.RequiresAwsCredentials;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -46,7 +45,8 @@ public class BedrockConverseProxyChatAutoConfigurationIT {
.withPropertyValues(
"spring.ai.bedrock.converse.chat.options.model=" + "anthropic.claude-3-5-sonnet-20240620-v1:0",
"spring.ai.bedrock.converse.chat.options.temperature=0.5")
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class));
.withConfiguration(BedrockConverseProxyITUtil
.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class));

@Test
void call() {
Expand Down
14 changes: 9 additions & 5 deletions ...work/ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyChatPropertiesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
import org.junit.jupiter.api.Test;

import org.springframework.ai.bedrock.converse.BedrockProxyChatModel;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

import static org.assertj.core.api.Assertions.assertThat;

/**
* @author Christian Tzolov
* @author Pawel Potaczala
*
* Unit Tests for {@link BedrockConverseProxyChatProperties}.
*/
Expand All @@ -47,7 +47,8 @@ public void chatOptionsTest() {
"spring.ai.bedrock.converse.chat.options.top-k=100"
)
// @formatter:on
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class))
.withConfiguration(BedrockConverseProxyITUtil
.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class))
.run(context -> {
var chatProperties = context.getBean(BedrockConverseProxyChatProperties.class);

Expand All @@ -66,20 +67,23 @@ public void chatCompletionDisabled() {

// It is enabled by default
new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class))
.withConfiguration(BedrockConverseProxyITUtil
.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class))
.run(context -> assertThat(context.getBeansOfType(BedrockConverseProxyChatProperties.class)).isNotEmpty());

// Explicitly enable the chat auto-configuration.
new ApplicationContextRunner().withPropertyValues("spring.ai.model.chat=bedrock-converse")
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class))
.withConfiguration(BedrockConverseProxyITUtil
.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(BedrockConverseProxyChatProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(BedrockProxyChatModel.class)).isNotEmpty();
});

// Explicitly disable the chat auto-configuration.
new ApplicationContextRunner().withPropertyValues("spring.ai.model.chat=none")
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class))
.withConfiguration(BedrockConverseProxyITUtil
.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(BedrockConverseProxyChatProperties.class)).isEmpty();
assertThat(context.getBeansOfType(BedrockProxyChatModel.class)).isEmpty();
Expand Down
42 changes: 42 additions & 0 deletions ...g/springframework/ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyITUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Copyright 2025-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.ai.model.bedrock.converse.autoconfigure;

import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;

/**
* Utility class for Bedrock Converse Proxy integration tests.
*
* @author Pawel Potaczala
*/
public final class BedrockConverseProxyITUtil {

private BedrockConverseProxyITUtil() {
}

public static AutoConfigurations bedrockConverseProxyAutoConfig(Class<?>... additionalAutoConfigurations) {
Class<?>[] dependencies = new Class[] { ToolCallingAutoConfiguration.class };
Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
additionalAutoConfigurations.length);

return AutoConfigurations.of(allAutoConfigurations);
}

}
5 changes: 3 additions & 2 deletions ...ramework/ai/model/bedrock/converse/autoconfigure/tool/FunctionCallWithFunctionBeanIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.springframework.ai.model.bedrock.autoconfigure.BedrockTestUtils;
import org.springframework.ai.model.bedrock.autoconfigure.RequiresAwsCredentials;
import org.springframework.ai.model.bedrock.converse.autoconfigure.BedrockConverseProxyChatAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.ai.model.bedrock.converse.autoconfigure.BedrockConverseProxyITUtil;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -47,7 +47,8 @@ class FunctionCallWithFunctionBeanIT {
private final Logger logger = LoggerFactory.getLogger(FunctionCallWithFunctionBeanIT.class);

private final ApplicationContextRunner contextRunner = BedrockTestUtils.getContextRunner()
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class))
.withConfiguration(BedrockConverseProxyITUtil
.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class))
.withUserConfiguration(Config.class);

@Test
Expand Down
5 changes: 3 additions & 2 deletions ...mework/ai/model/bedrock/converse/autoconfigure/tool/FunctionCallWithPromptFunctionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.springframework.ai.model.bedrock.autoconfigure.BedrockTestUtils;
import org.springframework.ai.model.bedrock.autoconfigure.RequiresAwsCredentials;
import org.springframework.ai.model.bedrock.converse.autoconfigure.BedrockConverseProxyChatAutoConfiguration;
import org.springframework.ai.model.bedrock.converse.autoconfigure.BedrockConverseProxyITUtil;
import org.springframework.ai.tool.function.FunctionToolCallback;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -42,7 +42,8 @@ public class FunctionCallWithPromptFunctionIT {
private final Logger logger = LoggerFactory.getLogger(FunctionCallWithPromptFunctionIT.class);

private final ApplicationContextRunner contextRunner = BedrockTestUtils.getContextRunner()
.withConfiguration(AutoConfigurations.of(BedrockConverseProxyChatAutoConfiguration.class));
.withConfiguration(BedrockConverseProxyITUtil
.bedrockConverseProxyAutoConfig(BedrockConverseProxyChatAutoConfiguration.class));

@Test
void functionCallTest() {
Expand Down