Bedrock converse chat model to merge toolcalling chat options

 - When building the chat client request, if the ToolCallingChatOptions is passed via prompt, merge the options into Bedrock chat options. Previously, this was ignored.
 - Add test to verify function calling when ToolCallingChatOptions is passed

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

Author: ilayaperumalg

models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModel.java

@@ -273,6 +273,10 @@ Prompt buildRequestPrompt(Prompt prompt) {
 			if (prompt.getOptions() instanceof BedrockChatOptions bedrockChatOptions) {
 				runtimeOptions = bedrockChatOptions.copy();
 			}
+			else if (prompt.getOptions() instanceof ToolCallingChatOptions toolCallingChatOptions) {
+				runtimeOptions = ModelOptionsUtils.copyToTarget(toolCallingChatOptions, ToolCallingChatOptions.class,
+						BedrockChatOptions.class);
+			}
 			else {
 				runtimeOptions = from(prompt.getOptions());
 			}

models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelIT.java

@@ -46,6 +46,7 @@
 import org.springframework.ai.converter.BeanOutputConverter;
 import org.springframework.ai.converter.ListOutputConverter;
 import org.springframework.ai.converter.MapOutputConverter;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -279,6 +280,29 @@ void functionCallTest() {
 		assertThat(generation.getOutput().getText()).contains("30", "10", "15");
 	}
 
+	@Test
+	void functionCallTestWithToolCallingOptions() {
+
+		UserMessage userMessage = new UserMessage(
+				"What's the weather like in San Francisco, Tokyo and Paris? Return the result in Celsius.");
+
+		List<Message> messages = new ArrayList<>(List.of(userMessage));
+
+		var promptOptions = ToolCallingChatOptions.builder()
+			.toolCallbacks(List.of(FunctionToolCallback.builder("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location. Return in 36°C format")
+				.inputType(MockWeatherService.Request.class)
+				.build()))
+			.build();
+
+		ChatResponse response = this.chatModel.call(new Prompt(messages, promptOptions));
+
+		logger.info("Response: {}", response);
+
+		Generation generation = response.getResult();
+		assertThat(generation.getOutput().getText()).contains("30", "10", "15");
+	}
+
 	@Test
 	void streamFunctionCallTest() {