From aa24a56f9b4ba4da8c512ccb41fa80e3bb910241 Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Wed, 30 Apr 2025 10:54:44 -0400 Subject: [PATCH] Add deprecated tools(String...) method for backwards compat on ChatClient --- .../org/springframework/ai/chat/client/ChatClient.java | 9 +++++++++ .../ai/chat/client/DefaultChatClient.java | 5 +++++ .../ai/chat/client/DefaultChatClientBuilder.java | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClient.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClient.java index d6fe27574..59d044636 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClient.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/ChatClient.java @@ -222,6 +222,12 @@ public interface ChatClient { ChatClientRequestSpec toolNames(String... toolNames); + /** + * Use toolNames instead + */ + @Deprecated(forRemoval = true, since = "1.0.0-m8") + ChatClientRequestSpec tools(String... toolNames); + ChatClientRequestSpec tools(Object... toolObjects); ChatClientRequestSpec toolCallbacks(ToolCallback... toolCallbacks); @@ -289,6 +295,9 @@ public interface ChatClient { Builder defaultToolNames(String... toolNames); + @Deprecated + Builder defaultTools(String... tools); + Builder defaultTools(Object... toolObjects); Builder defaultToolCallbacks(ToolCallback... toolCallbacks); diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java index b680a99c4..1ecb7cdca 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClient.java @@ -833,6 +833,11 @@ public class DefaultChatClient implements ChatClient { return this; } + @Override + public ChatClientRequestSpec tools(String... toolNames) { + return this.toolNames(toolNames); + } + @Override public ChatClientRequestSpec toolNames(String... toolNames) { Assert.notNull(toolNames, "toolNames cannot be null"); diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java index 35e011af4..5dc5d9853 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClientBuilder.java @@ -150,6 +150,11 @@ public class DefaultChatClientBuilder implements Builder { return this; } + @Override + public Builder defaultTools(String... toolNames) { + return defaultToolNames(toolNames); + } + @Override public Builder defaultToolNames(String... toolNames) { this.defaultRequest.toolNames(toolNames);