fix: Fixed the issue where tool call information was lost when using DefaultChatOptions.

optimization: Simplify the method for converting `defaultChatOptions` to `DefaultToolCallingChatOptions`

Signed-off-by: Sun Yuhan <[email protected]>

Author: sunyuhan1998

spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/DefaultChatClientUtils.java

@@ -27,8 +27,11 @@
 import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.prompt.ChatOptions;
+import org.springframework.ai.chat.prompt.DefaultChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.chat.prompt.PromptTemplate;
+import org.springframework.ai.model.ModelOptionsUtils;
+import org.springframework.ai.model.tool.DefaultToolCallingChatOptions;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.tool.ToolCallback;
 import org.springframework.util.Assert;
@@ -39,6 +42,7 @@
  * Utilities for supporting the {@link DefaultChatClient} implementation.
  *
  * @author Thomas Vitale
+ * @author Sun Yuhan
  * @since 1.0.0
  */
 final class DefaultChatClientUtils {
@@ -101,6 +105,15 @@ static ChatClientRequest toChatClientRequest(DefaultChatClient.DefaultChatClient
 		 */
 
 		ChatOptions processedChatOptions = inputRequest.getChatOptions();
+
+		if (processedChatOptions instanceof DefaultChatOptions defaultChatOptions) {
+			if (!inputRequest.getToolNames().isEmpty() || !inputRequest.getToolCallbacks().isEmpty()
+					|| !CollectionUtils.isEmpty(inputRequest.getToolContext())) {
+				processedChatOptions = ModelOptionsUtils.copyToTarget(defaultChatOptions, ChatOptions.class,
+						DefaultToolCallingChatOptions.class);
+			}
+		}
+
 		if (processedChatOptions instanceof ToolCallingChatOptions toolCallingChatOptions) {
 			if (!inputRequest.getToolNames().isEmpty()) {
 				Set<String> toolNames = ToolCallingChatOptions

spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/DefaultChatClientUtilsTests.java

@@ -26,6 +26,7 @@
 import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.ai.chat.prompt.DefaultChatOptions;
 import org.springframework.ai.content.Media;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.template.TemplateRenderer;
@@ -43,6 +44,7 @@
  * Unit tests for {@link DefaultChatClientUtils}.
  *
  * @author Thomas Vitale
+ * @author Sun Yuhan
  */
 class DefaultChatClientUtilsTests {
 
@@ -322,6 +324,64 @@ void whenToolContextAndChatOptionsAreProvidedThenTheValuesAreMerged() {
 			.containsAllEntriesOf(toolContext2);
 	}
 
+	@Test
+	void whenToolNamesAndChatOptionsAreDefaultChatOptions() {
+		Set<String> toolNames1 = Set.of("toolA", "toolB");
+		DefaultChatOptions chatOptions = new DefaultChatOptions();
+		ChatModel chatModel = mock(ChatModel.class);
+		DefaultChatClient.DefaultChatClientRequestSpec inputRequest = (DefaultChatClient.DefaultChatClientRequestSpec) ChatClient
+			.create(chatModel)
+			.prompt()
+			.options(chatOptions)
+			.toolNames(toolNames1.toArray(new String[0]));
+
+		ChatClientRequest result = DefaultChatClientUtils.toChatClientRequest(inputRequest);
+
+		assertThat(result).isNotNull();
+		assertThat(result.prompt().getOptions()).isInstanceOf(ToolCallingChatOptions.class);
+		ToolCallingChatOptions resultOptions = (ToolCallingChatOptions) result.prompt().getOptions();
+		assertThat(resultOptions).isNotNull();
+		assertThat(resultOptions.getToolNames()).containsExactlyInAnyOrderElementsOf(toolNames1);
+	}
+
+	@Test
+	void whenToolCallbacksAndChatOptionsAreDefaultChatOptions() {
+		ToolCallback toolCallback1 = new TestToolCallback("tool1");
+		DefaultChatOptions chatOptions = new DefaultChatOptions();
+		ChatModel chatModel = mock(ChatModel.class);
+		DefaultChatClient.DefaultChatClientRequestSpec inputRequest = (DefaultChatClient.DefaultChatClientRequestSpec) ChatClient
+			.create(chatModel)
+			.prompt()
+			.options(chatOptions)
+			.toolCallbacks(toolCallback1);
+
+		ChatClientRequest result = DefaultChatClientUtils.toChatClientRequest(inputRequest);
+
+		assertThat(result).isNotNull();
+		assertThat(result.prompt().getOptions()).isInstanceOf(ToolCallingChatOptions.class);
+		ToolCallingChatOptions resultOptions = (ToolCallingChatOptions) result.prompt().getOptions();
+		assertThat(resultOptions).isNotNull();
+		assertThat(resultOptions.getToolCallbacks()).containsExactlyInAnyOrder(toolCallback1);
+	}
+
+	@Test
+	void whenToolContextAndChatOptionsAreDefaultChatOptions() {
+		Map<String, Object> toolContext1 = Map.of("key1", "value1");
+		DefaultChatOptions chatOptions = new DefaultChatOptions();
+		ChatModel chatModel = mock(ChatModel.class);
+		DefaultChatClient.DefaultChatClientRequestSpec inputRequest = (DefaultChatClient.DefaultChatClientRequestSpec) ChatClient
+			.create(chatModel)
+			.prompt()
+			.options(chatOptions)
+			.toolContext(toolContext1);
+
+		ChatClientRequest result = DefaultChatClientUtils.toChatClientRequest(inputRequest);
+		assertThat(result.prompt().getOptions()).isInstanceOf(ToolCallingChatOptions.class);
+		ToolCallingChatOptions resultOptions = (ToolCallingChatOptions) result.prompt().getOptions();
+		assertThat(resultOptions).isNotNull();
+		assertThat(resultOptions.getToolContext()).containsAllEntriesOf(toolContext1);
+	}
+
 	@Test
 	void whenAdvisorParamsAreProvidedThenTheyAreAddedToContext() {
 		Map<String, Object> advisorParams = Map.of("key1", "value1", "key2", "value2");