refactor(core): extract common function callback builder functionality

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelIT.java

@@ -276,9 +276,9 @@ void functionCallTest() {
 		var promptOptions = AnthropicChatOptions.builder()
 			.withModel(AnthropicApi.ChatModel.CLAUDE_3_OPUS.getName())
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
+				.function("getCurrentWeather", new MockWeatherService())
 				.description(
 						"Get the weather in location. Return temperature in 36°F or 36°C format. Use multi-turn if needed.")
-				.function("getCurrentWeather", new MockWeatherService())
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -304,9 +304,9 @@ void streamFunctionCallTest() {
 		var promptOptions = AnthropicChatOptions.builder()
 			.withModel(AnthropicApi.ChatModel.CLAUDE_3_5_SONNET.getName())
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
+				.function("getCurrentWeather", new MockWeatherService())
 				.description(
 						"Get the weather in location. Return temperature in 36°F or 36°C format. Use multi-turn if needed.")
-				.function("getCurrentWeather", new MockWeatherService())
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientIT.java

@@ -250,8 +250,8 @@ void defaultFunctionCallTest() {
 		// @formatter:off
 		String response = ChatClient.builder(this.chatModel)
 				.defaultFunctions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
 					.inputType(MockWeatherService.Request.class)
 					.build())
 				.defaultUser(u -> u.text("What's the weather like in San Francisco, Tokyo, and Paris? Use Celsius."))
@@ -273,8 +273,8 @@ void streamFunctionCallTest() {
 		Flux<String> response = ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in San Francisco, Tokyo, and Paris? Use Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
 					.inputType(MockWeatherService.Request.class)
 					.build())
 				.stream()

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientMethodInvokingFunctionCallbackIT.java

@@ -80,8 +80,8 @@ void methodGetWeatherStatic() {
 		String response = ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in San Francisco, Tokyo, and Paris?  Use Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.method("getWeatherStatic", String.class, Unit.class)
+					.description("Get the weather in location")
 					.targetClass(TestFunctionClass.class)
 					.build())
 				.call()
@@ -102,8 +102,8 @@ void methodTurnLightNoResponse() {
 		String response = ChatClient.create(this.chatModel).prompt()
 				.user("Turn light on in the living room.")
 				.functions(FunctionCallback.builder()
-					.description("Turn light on in the living room.")
 					.method("turnLight", String.class, boolean.class)
+					.description("Turn light on in the living room.")
 					.targetObject(targetObject)
 					.build())
 				.call()
@@ -125,8 +125,8 @@ void methodGetWeatherNonStatic() {
 		String response = ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in San Francisco, Tokyo, and Paris?  Use Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.method("getWeatherNonStatic", String.class, Unit.class)
+					.description("Get the weather in location")
 					.targetObject(targetObject)
 					.build())
 				.call()
@@ -147,8 +147,8 @@ void methodGetWeatherToolContext() {
 		String response = ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in San Francisco, Tokyo, and Paris?  Use Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.method("getWeatherWithContext", String.class, Unit.class, ToolContext.class)
+					.description("Get the weather in location")
 					.targetObject(targetObject)
 					.build())
 				.toolContext(Map.of("tool", "value"))
@@ -174,8 +174,8 @@ void methodGetWeatherToolContextButNonContextMethod() {
 		assertThatThrownBy(() -> ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in San Francisco, Tokyo, and Paris?  Use Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.method("getWeatherNonStatic", String.class, Unit.class)
+					.description("Get the weather in location")
 					.targetObject(targetObject)
 					.build())
 				.toolContext(Map.of("tool", "value"))
@@ -195,8 +195,8 @@ void methodNoParameters() {
 		String response = ChatClient.create(this.chatModel).prompt()
 				.user("Turn light on in the living room.")
 				.functions(FunctionCallback.builder()
-					.description("Can turn lights on in the Living Room")
 					.method("turnLivingRoomLightOn")
+					.description("Can turn lights on in the Living Room")
 					.targetObject(targetObject)
 					.build())
 				.call()

models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/function/AzureOpenAiChatModelFunctionCallIT.java

@@ -70,8 +70,8 @@ void functionCallTest() {
 		var promptOptions = AzureOpenAiChatOptions.builder()
 			.withDeploymentName(this.selectedModel)
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the current weather in a given location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the current weather in a given location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -94,8 +94,8 @@ void functionCallSequentialTest() {
 		var promptOptions = AzureOpenAiChatOptions.builder()
 			.withDeploymentName(this.selectedModel)
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the current weather in a given location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the current weather in a given location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -116,8 +116,8 @@ void streamFunctionCallTest() {
 		var promptOptions = AzureOpenAiChatOptions.builder()
 			.withDeploymentName(this.selectedModel)
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the current weather in a given location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the current weather in a given location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -153,8 +153,8 @@ void functionCallSequentialAndStreamTest() {
 		var promptOptions = AzureOpenAiChatOptions.builder()
 			.withDeploymentName(this.selectedModel)
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the current weather in a given location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the current weather in a given location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();

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

@@ -214,10 +214,10 @@ void functionCallTest() {
 		String response = ChatClient.create(this.chatModel)
 				.prompt("What's the weather like in San Francisco, Tokyo, and Paris? Return the temperature in Celsius.")
 				.functions(FunctionCallback.builder()
-						.description("Get the weather in location")
-						.function("getCurrentWeather", new MockWeatherService())
-						.inputType(MockWeatherService.Request.class)
-						.build())
+					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
+					.inputType(MockWeatherService.Request.class)
+					.build())
 				.call()
 				.content();
 		// @formatter:on
@@ -234,10 +234,10 @@ void functionCallWithUsageMetadataTest() {
 		ChatResponse response = ChatClient.create(this.chatModel)
 				.prompt("What's the weather like in San Francisco, Tokyo, and Paris? Return the temperature in Celsius.")
 				.functions(FunctionCallback.builder()
-						.description("Get the weather in location")
-						.function("getCurrentWeather", new MockWeatherService())
-						.inputType(MockWeatherService.Request.class)
-						.build())
+					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
+					.inputType(MockWeatherService.Request.class)
+					.build())
 				.call()
 				.chatResponse();
 		// @formatter:on
@@ -269,10 +269,10 @@ void functionCallWithAdvisorTest() {
 		String response = ChatClient.create(this.chatModel)
 				.prompt("What's the weather like in San Francisco, Tokyo, and Paris? Return the temperature in Celsius.")
 				.functions(FunctionCallback.builder()
-						.description("Get the weather in location")
-						.function("getCurrentWeather", new MockWeatherService())
-						.inputType(MockWeatherService.Request.class)
-						.build())
+					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
+					.inputType(MockWeatherService.Request.class)
+					.build())
 				.advisors(new SimpleLoggerAdvisor())
 				.call()
 				.content();
@@ -289,8 +289,8 @@ void defaultFunctionCallTest() {
 		// @formatter:off
 		String response = ChatClient.builder(this.chatModel)
 			.defaultFunctions(FunctionCallback.builder()
-				.description("Get the weather in location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location")
 				.inputType(MockWeatherService.Request.class)
 				.build())
 			.defaultUser(u -> u.text("What's the weather like in San Francisco, Tokyo, and Paris? Return the temperature in Celsius."))
@@ -312,8 +312,8 @@ void streamFunctionCallTest() {
 		Flux<ChatResponse> response = ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in San Francisco, Tokyo, and Paris? Return the temperature in Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
 					.inputType(MockWeatherService.Request.class)
 					.build())
 				.stream()
@@ -354,8 +354,8 @@ void singularStreamFunctionCallTest() {
 		Flux<String> response = ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in Paris? Return the temperature in Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
 					.inputType(MockWeatherService.Request.class)
 					.build())
 				.stream()

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

@@ -139,8 +139,8 @@ public void callWithToolUse() {
 			.willReturn(converseResponseFinal);
 
 		FunctionCallback functionCallback = FunctionCallback.builder()
-			.description("Gets the weather in location")
 			.function("getCurrentWeather", (Request request) -> "15.0°C")
+			.description("Gets the weather in location")
 			.inputType(Request.class)
 			.build();
 

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

@@ -255,9 +255,9 @@ void functionCallTest() {
 
 		var promptOptions = FunctionCallingOptions.builder()
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
+				.function("getCurrentWeather", new MockWeatherService())
 				.description(
 						"Get the weather in location. Return temperature in 36°F or 36°C format. Use multi-turn if needed.")
-				.function("getCurrentWeather", new MockWeatherService())
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -283,9 +283,9 @@ void streamFunctionCallTest() {
 		var promptOptions = FunctionCallingOptions.builder()
 			.withModel("anthropic.claude-3-5-sonnet-20240620-v1:0")
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
+				.function("getCurrentWeather", new MockWeatherService())
 				.description(
 						"Get the weather in location. Return temperature in 36°F or 36°C format. Use multi-turn if needed.")
-				.function("getCurrentWeather", new MockWeatherService())
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();

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

@@ -53,8 +53,8 @@ public static void main(String[] args) {
 				PortableFunctionCallingOptions.builder()
 					.withModel(modelId)
 					.withFunctionCallbacks(List.of(FunctionCallback.builder()
-						.description("Get the weather in location")
 						.function("getCurrentWeather", new MockWeatherService())
+						.description("Get the weather in location")
 						.inputType(MockWeatherService.Request.class)
 						.build()))
 					.build());

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

@@ -51,8 +51,8 @@ public static void main(String[] args) {
 				PortableFunctionCallingOptions.builder()
 					.withModel(modelId)
 					.withFunctionCallbacks(List.of(FunctionCallback.builder()
-						.description("Get the weather in location")
 						.function("getCurrentWeather", new MockWeatherService())
+						.description("Get the weather in location")
 						.inputType(MockWeatherService.Request.class)
 						.build()))
 					.build());

models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/ChatCompletionRequestTests.java

@@ -68,8 +68,8 @@ public void promptOptionsTools() {
 				MiniMaxChatOptions.builder()
 					.withModel("PROMPT_MODEL")
 					.withFunctionCallbacks(List.of(FunctionCallback.builder()
-						.description("Get the weather in location")
 						.function(TOOL_FUNCTION_NAME, new MockWeatherService())
+						.description("Get the weather in location")
 						.inputType(MockWeatherService.Request.class)
 						.build()))
 					.build()),
@@ -95,8 +95,8 @@ public void defaultOptionsTools() {
 				MiniMaxChatOptions.builder()
 					.withModel("DEFAULT_MODEL")
 					.withFunctionCallbacks(List.of(FunctionCallback.builder()
-						.description("Get the weather in location")
 						.function(TOOL_FUNCTION_NAME, new MockWeatherService())
+						.description("Get the weather in location")
 						.inputType(MockWeatherService.Request.class)
 						.build()))
 					.build());
@@ -127,8 +127,8 @@ public void defaultOptionsTools() {
 		request = client.createRequest(new Prompt("Test message content",
 				MiniMaxChatOptions.builder()
 					.withFunctionCallbacks(List.of(FunctionCallback.builder()
-						.description("Overridden function description")
 						.function(TOOL_FUNCTION_NAME, new MockWeatherService())
+						.description("Overridden function description")
 						.inputType(MockWeatherService.Request.class)
 						.build()))
 					.build()),

models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatClientIT.java

@@ -226,10 +226,10 @@ void functionCallTest() {
 				.options(MistralAiChatOptions.builder().withModel(MistralAiApi.ChatModel.SMALL).withToolChoice(ToolChoice.AUTO).build())
 				.user(u -> u.text("What's the weather like in San Francisco, Tokyo, and Paris? Use parallel function calling if required. Response should be in Celsius."))
 				.functions(FunctionCallback.builder()
-						.description("Get the weather in location")
-						.function("getCurrentWeather", new MockWeatherService())
-						.inputType(MockWeatherService.Request.class)
-						.build())
+					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
+					.inputType(MockWeatherService.Request.class)
+					.build())
 				.call()
 				.content();
 		// @formatter:on
@@ -248,8 +248,8 @@ void defaultFunctionCallTest() {
 		String response = ChatClient.builder(this.chatModel)
 				.defaultOptions(MistralAiChatOptions.builder().withModel(MistralAiApi.ChatModel.SMALL).build())
 				.defaultFunctions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
 					.inputType(MockWeatherService.Request.class)
 					.build())
 				.defaultUser(u -> u.text("What's the weather like in San Francisco, Tokyo, and Paris? Use parallel function calling if required. Response should be in Celsius."))
@@ -272,8 +272,8 @@ void streamFunctionCallTest() {
 				.options(MistralAiChatOptions.builder().withModel(MistralAiApi.ChatModel.SMALL).build())
 				.user("What's the weather like in San Francisco, Tokyo, and Paris? Use parallel function calling if required. Response should be in Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.function("getCurrentWeather", new MockWeatherService())
+					.description("Get the weather in location")
 					.inputType(MockWeatherService.Request.class)
 					.build())
 				.stream()

models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/MistralAiChatModelIT.java

@@ -194,8 +194,8 @@ void functionCallTest() {
 		var promptOptions = MistralAiChatOptions.builder()
 			.withModel(MistralAiApi.ChatModel.SMALL.getValue())
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the weather in location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -217,8 +217,8 @@ void streamFunctionCallTest() {
 		var promptOptions = MistralAiChatOptions.builder()
 			.withModel(MistralAiApi.ChatModel.SMALL.getValue())
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the weather in location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();

models/spring-ai-moonshot/src/test/java/org/springframework/ai/moonshot/chat/MoonshotChatModelFunctionCallingIT.java

@@ -64,8 +64,8 @@ void functionCallTest() {
 		var promptOptions = MoonshotChatOptions.builder()
 			.withModel(MoonshotApi.ChatModel.MOONSHOT_V1_8K.getValue())
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the weather in location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -87,8 +87,8 @@ void streamFunctionCallTest() {
 
 		var promptOptions = MoonshotChatOptions.builder()
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the weather in location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location")
 				.build()))
 			.build();
 

models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelFunctionCallingIT.java

@@ -64,9 +64,9 @@ void functionCallTest() {
 		var promptOptions = OllamaOptions.builder()
 			.withModel(MODEL)
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
+				.function("getCurrentWeather", new MockWeatherService())
 				.description(
 						"Find the weather conditions, forecasts, and temperatures for a location, like a city or state.")
-				.function("getCurrentWeather", new MockWeatherService())
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -89,9 +89,9 @@ void streamFunctionCallTest() {
 		var promptOptions = OllamaOptions.builder()
 			.withModel(MODEL)
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
+				.function("getCurrentWeather", new MockWeatherService())
 				.description(
 						"Find the weather conditions, forecasts, and temperatures for a location, like a city or state.")
-				.function("getCurrentWeather", new MockWeatherService())
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();