From 80a4c213f72f517a029e598a145f32225904d4ae Mon Sep 17 00:00:00 2001
From: Thomas Vitale <ThomasVitale@users.noreply.github.com>
Date: Fri, 3 Jan 2025 14:15:37 +0100
Subject: [PATCH] Do not autoconfigure ChatClient.Builder if a bean exists
 already

* Fix the ChatClient.Builder auto-configuration so that it's only autoconfigured when there is no bean defined yet.

Fixes gh-2034

Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
---
 .../autoconfigure/chat/client/ChatClientAutoConfiguration.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/chat/client/ChatClientAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/chat/client/ChatClientAutoConfiguration.java
index b1d9f9aa923..f815dde2e37 100644
--- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/chat/client/ChatClientAutoConfiguration.java
+++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/chat/client/ChatClientAutoConfiguration.java
@@ -46,6 +46,7 @@
  * @author Mark Pollack
  * @author Josh Long
  * @author Arjen Poutsma
+ * @author Thomas Vitale
  * @since 1.0.0
  */
 @AutoConfiguration
@@ -67,6 +68,7 @@ ChatClientBuilderConfigurer chatClientBuilderConfigurer(ObjectProvider<ChatClien
 
 	@Bean
 	@Scope("prototype")
+	@ConditionalOnMissingBean
 	ChatClient.Builder chatClientBuilder(ChatClientBuilderConfigurer chatClientBuilderConfigurer, ChatModel chatModel,
 			ObjectProvider<ObservationRegistry> observationRegistry,
 			ObjectProvider<ChatClientObservationConvention> observationConvention) {