Skip to content

GH-1679 Disable BedrockConverseProxyChatAutoConfiguration by default #1698

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-1679 Disable BedrockConverseProxyChatAutoConfiguration by default #1698

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
2 changes: 1 addition & 1 deletion spring-ai-docs/src/main/antora/modules/ROOT/pages/api/bedrock-converse.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ The prefix `spring.ai.bedrock.converse.chat` is the property prefix that configu
|====
| Property | Description | Default

| spring.ai.bedrock.converse.chat.enabled | Enable Bedrock Converse chat model. | true
| spring.ai.bedrock.converse.chat.enabled | Enable Bedrock Converse chat model. | false
| spring.ai.bedrock.converse.chat.options.model | The model ID to use. You can use the https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html[Supported models and model features] | anthropic.claude-3-sonnet-20240229-v1:0
| spring.ai.bedrock.converse.chat.options.temperature | Controls the randomness of the output. Values can range over [0.0,1.0] | 0.8
| spring.ai.bedrock.converse.chat.options.top-p | The maximum cumulative probability of tokens to consider when sampling. | AWS Bedrock default
Expand Down
2 changes: 1 addition & 1 deletion ...ramework/ai/autoconfigure/bedrock/converse/BedrockConverseProxyChatAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
@EnableConfigurationProperties({ BedrockConverseProxyChatProperties.class, BedrockAwsConnectionConfiguration.class })
@ConditionalOnClass({ BedrockRuntimeClient.class, BedrockRuntimeAsyncClient.class })
@ConditionalOnProperty(prefix = BedrockConverseProxyChatProperties.CONFIG_PREFIX, name = "enabled",
havingValue = "true", matchIfMissing = true)
havingValue = "true")
@Import(BedrockAwsConnectionConfiguration.class)
public class BedrockConverseProxyChatAutoConfiguration {

Expand Down
2 changes: 1 addition & 1 deletion ...springframework/ai/autoconfigure/bedrock/converse/BedrockConverseProxyChatProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class BedrockConverseProxyChatProperties {
/**
* Enable Bedrock Converse chat model.
*/
private boolean enabled = true;
private boolean enabled = false;

@NestedConfigurationProperty
private PortableFunctionCallingOptions options = PortableFunctionCallingOptions.builder()
Expand Down
2 changes: 1 addition & 1 deletion ...mework/ai/autoconfigure/bedrock/converse/BedrockConverseProxyChatAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class BedrockConverseProxyChatAutoConfigurationIT {
private static final Log logger = LogFactory.getLog(BedrockConverseProxyChatAutoConfigurationIT.class);

private final ApplicationContextRunner contextRunner = BedrockTestUtils.getContextRunner()
.withPropertyValues(
.withPropertyValues("spring.ai.bedrock.converse.chat.enabled=true",
"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));
Expand Down
5 changes: 3 additions & 2 deletions ...gframework/ai/autoconfigure/bedrock/converse/BedrockConverseProxyChatPropertiesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public void chatOptionsTest() {

new ApplicationContextRunner().withPropertyValues(
// @formatter:off
"spring.ai.bedrock.converse.chat.enabled=true",
"spring.ai.bedrock.converse.chat.options.model=MODEL_XYZ",

"spring.ai.bedrock.converse.chat.options.max-tokens=123",
Expand Down Expand Up @@ -65,10 +66,10 @@ public void chatOptionsTest() {
@Test
public void chatCompletionDisabled() {

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

// Explicitly enable the chat auto-configuration.
new ApplicationContextRunner().withPropertyValues("spring.ai.bedrock.converse.chat.enabled=true")
Expand Down
4 changes: 2 additions & 2 deletions ...pringframework/ai/autoconfigure/bedrock/converse/tool/FunctionCallWithFunctionBeanIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class FunctionCallWithFunctionBeanIT {
void functionCallTest() {

this.contextRunner
.withPropertyValues(
.withPropertyValues("spring.ai.bedrock.converse.chat.enabled=true",
"spring.ai.bedrock.converse.chat.options.model=" + "anthropic.claude-3-5-sonnet-20240620-v1:0")
.run(context -> {

Expand Down Expand Up @@ -84,7 +84,7 @@ void functionCallTest() {
void functionStreamTest() {

this.contextRunner
.withPropertyValues(
.withPropertyValues("spring.ai.bedrock.converse.chat.enabled=true",
"spring.ai.bedrock.converse.chat.options.model=" + "anthropic.claude-3-5-sonnet-20240620-v1:0")
.run(context -> {

Expand Down