From d3f2a8fb15bf3138ee7b13f4b9aed0ff5f780d3c Mon Sep 17 00:00:00 2001 From: wmz7year Date: Fri, 19 Apr 2024 08:51:45 +0800 Subject: [PATCH] Fix bean name conflicts when using BedrockAnthropic and BedrockAnthropic3 at the same time. --- .../anthropic3/BedrockAnthropic3ChatAutoConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/bedrock/anthropic3/BedrockAnthropic3ChatAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/bedrock/anthropic3/BedrockAnthropic3ChatAutoConfiguration.java index 31f18597c..7d04798d0 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/bedrock/anthropic3/BedrockAnthropic3ChatAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/bedrock/anthropic3/BedrockAnthropic3ChatAutoConfiguration.java @@ -35,6 +35,7 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; * Leverages the Spring Cloud AWS to resolve the {@link AwsCredentialsProvider}. * * @author Christian Tzolov + * @author Wei Jiang * @since 0.8.0 */ @AutoConfiguration @@ -46,14 +47,14 @@ public class BedrockAnthropic3ChatAutoConfiguration { @Bean @ConditionalOnMissingBean - public Anthropic3ChatBedrockApi anthropicApi(AwsCredentialsProvider credentialsProvider, + public Anthropic3ChatBedrockApi anthropic3Api(AwsCredentialsProvider credentialsProvider, BedrockAnthropic3ChatProperties properties, BedrockAwsConnectionProperties awsProperties) { return new Anthropic3ChatBedrockApi(properties.getModel(), credentialsProvider, awsProperties.getRegion(), new ObjectMapper(), awsProperties.getTimeout()); } @Bean - public BedrockAnthropic3ChatClient anthropicChatClient(Anthropic3ChatBedrockApi anthropicApi, + public BedrockAnthropic3ChatClient anthropic3ChatClient(Anthropic3ChatBedrockApi anthropicApi, BedrockAnthropic3ChatProperties properties) { return new BedrockAnthropic3ChatClient(anthropicApi, properties.getOptions()); }