Update to latest snapshot

Author: ThomasVitale

patterns/tool-calling/tool-calling-mistral-ai/src/main/java/com/thomasvitale/ai/spring/BookService.java

@@ -1,12 +1,14 @@
 package com.thomasvitale.ai.spring;
 
+import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Service
+@RegisterReflectionForBinding(classes = BookService.Book.class)
 public class BookService {
 
     private static final Map<Integer,Book> books = new ConcurrentHashMap<>();

patterns/tool-calling/tool-calling-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java

@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.model.function.FunctionCallback;
+import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -92,8 +92,7 @@ String chatFunctionVoidInput() {
     String chatFunctionVoidInputCallback() {
         return chatClient.prompt()
                 .user("Welcome the users to the library")
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("sayWelcome", (input) -> {
+                .toolCallbacks(FunctionToolCallback.builder("sayWelcome", (input) -> {
                             logger.info("CALLBACK - Welcoming users to the library");
                         })
                         .description("Welcome users to the library")
@@ -124,8 +123,7 @@ String chatFunctionVoidOutputCallback(String user) {
                         .text(userPromptTemplate)
                         .param("user", user)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("welcomeUser", (input) -> {
+                .toolCallbacks(FunctionToolCallback.builder("welcomeUser", (input) -> {
                             logger.info("CALLBACK - Welcoming {} to the library", ((Functions.User) input).name());
                         })
                         .description("Welcome a specific user to the library")
@@ -160,8 +158,7 @@ String chatFunctionSingleCallback(String authorName) {
                         .text(userPromptTemplate)
                         .param("author", authorName)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("availableBooksByAuthor", function)
+                .toolCallbacks(FunctionToolCallback.builder("availableBooksByAuthor", function)
                         .description("Get the list of books written by the given author available in the library")
                         .inputType(BookService.Author.class)
                         .build())
@@ -196,8 +193,7 @@ String chatFunctionListCallback(String bookTitle1, String bookTitle2) {
                         .param("bookTitle1", bookTitle1)
                         .param("bookTitle2", bookTitle2)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("authorsByAvailableBooks", function)
+                .toolCallbacks(FunctionToolCallback.builder("authorsByAvailableBooks", function)
                         .description("Get the list of authors who wrote the given books available in the library")
                         .inputType(BookService.Books.class)
                         .build())

patterns/tool-calling/tool-calling-mistral-ai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java

@@ -4,9 +4,8 @@
 import com.thomasvitale.ai.spring.Functions;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.prompt.PromptTemplate;
-import org.springframework.ai.model.function.FunctionCallback;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
-import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -49,12 +48,10 @@ String chatVariant(String authorName) {
                 """);
         Map<String,Object> model = Map.of("author", authorName);
         var prompt = userPromptTemplate.create(model, ToolCallingChatOptions.builder()
-                .toolCallbacks(
-                        (ToolCallback) FunctionCallback.builder()
-                                .function("BooksByAuthor", bookService::getBooksByAuthor)
-                                .description("Get the list of books written by the given author available in the library")
-                                .inputType(BookService.Author.class)
-                                .build()
+                .toolCallbacks(FunctionToolCallback.builder("booksByAuthor", bookService::getBooksByAuthor)
+                        .description("Get the list of books written by the given author available in the library")
+                        .inputType(BookService.Author.class)
+                        .build()
                 )
                 .build());
 

patterns/tool-calling/tool-calling-ollama/src/main/java/com/thomasvitale/ai/spring/BookService.java

@@ -1,12 +1,14 @@
 package com.thomasvitale.ai.spring;
 
+import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Service
+@RegisterReflectionForBinding(classes = BookService.Book.class)
 public class BookService {
 
     private static final Map<Integer,Book> books = new ConcurrentHashMap<>();

patterns/tool-calling/tool-calling-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java

@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.model.function.FunctionCallback;
+import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -92,8 +92,7 @@ String chatFunctionVoidInput() {
     String chatFunctionVoidInputCallback() {
         return chatClient.prompt()
                 .user("Welcome the users to the library")
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("sayWelcome", (input) -> {
+                .toolCallbacks(FunctionToolCallback.builder("sayWelcome", (input) -> {
                             logger.info("CALLBACK - Welcoming users to the library");
                         })
                         .description("Welcome users to the library")
@@ -124,8 +123,7 @@ String chatFunctionVoidOutputCallback(String user) {
                         .text(userPromptTemplate)
                         .param("user", user)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("welcomeUser", (input) -> {
+                .toolCallbacks(FunctionToolCallback.builder("welcomeUser", (input) -> {
                             logger.info("CALLBACK - Welcoming {} to the library", ((Functions.User) input).name());
                         })
                         .description("Welcome a specific user to the library")
@@ -160,8 +158,7 @@ String chatFunctionSingleCallback(String authorName) {
                         .text(userPromptTemplate)
                         .param("author", authorName)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("availableBooksByAuthor", function)
+                .toolCallbacks(FunctionToolCallback.builder("availableBooksByAuthor", function)
                         .description("Get the list of books written by the given author available in the library")
                         .inputType(BookService.Author.class)
                         .build())
@@ -196,8 +193,7 @@ String chatFunctionListCallback(String bookTitle1, String bookTitle2) {
                         .param("bookTitle1", bookTitle1)
                         .param("bookTitle2", bookTitle2)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("authorsByAvailableBooks", function)
+                .toolCallbacks(FunctionToolCallback.builder("authorsByAvailableBooks", function)
                         .description("Get the list of authors who wrote the given books available in the library")
                         .inputType(BookService.Books.class)
                         .build())

patterns/tool-calling/tool-calling-ollama/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java

@@ -4,9 +4,8 @@
 import com.thomasvitale.ai.spring.Functions;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.prompt.PromptTemplate;
-import org.springframework.ai.model.function.FunctionCallback;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
-import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -49,9 +48,7 @@ String chatVariant(String authorName) {
                 """);
         Map<String,Object> model = Map.of("author", authorName);
         var prompt = userPromptTemplate.create(model, ToolCallingChatOptions.builder()
-                .toolCallbacks(
-                        (ToolCallback) FunctionCallback.builder()
-                                .function("BooksByAuthor", bookService::getBooksByAuthor)
+                .toolCallbacks(FunctionToolCallback.builder("booksByAuthor", bookService::getBooksByAuthor)
                                 .description("Get the list of books written by the given author available in the library")
                                 .inputType(BookService.Author.class)
                                 .build()

patterns/tool-calling/tool-calling-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java

@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.model.function.FunctionCallback;
+import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -92,8 +92,7 @@ String chatFunctionVoidInput() {
     String chatFunctionVoidInputCallback() {
         return chatClient.prompt()
                 .user("Welcome the users to the library")
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("sayWelcome", (input) -> {
+                .toolCallbacks(FunctionToolCallback.builder("sayWelcome", (input) -> {
                             logger.info("CALLBACK - Welcoming users to the library");
                         })
                         .description("Welcome users to the library")
@@ -124,8 +123,7 @@ String chatFunctionVoidOutputCallback(String user) {
                         .text(userPromptTemplate)
                         .param("user", user)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("welcomeUser", (input) -> {
+                .toolCallbacks(FunctionToolCallback.builder("welcomeUser", (input) -> {
                             logger.info("CALLBACK - Welcoming {} to the library", ((Functions.User) input).name());
                         })
                         .description("Welcome a specific user to the library")
@@ -160,8 +158,7 @@ String chatFunctionSingleCallback(String authorName) {
                         .text(userPromptTemplate)
                         .param("author", authorName)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("availableBooksByAuthor", function)
+                .toolCallbacks(FunctionToolCallback.builder("availableBooksByAuthor", function)
                         .description("Get the list of books written by the given author available in the library")
                         .inputType(BookService.Author.class)
                         .build())
@@ -196,8 +193,7 @@ String chatFunctionListCallback(String bookTitle1, String bookTitle2) {
                         .param("bookTitle1", bookTitle1)
                         .param("bookTitle2", bookTitle2)
                 )
-                .toolCallbacks(FunctionCallback.builder()
-                        .function("authorsByAvailableBooks", function)
+                .toolCallbacks(FunctionToolCallback.builder("authorsByAvailableBooks", function)
                         .description("Get the list of authors who wrote the given books available in the library")
                         .inputType(BookService.Books.class)
                         .build())

patterns/tool-calling/tool-calling-openai/src/main/java/com/thomasvitale/ai/spring/ToolBeanRegistrationAotProcessor.java

@@ -4,9 +4,8 @@
 import com.thomasvitale.ai.spring.Functions;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.prompt.PromptTemplate;
-import org.springframework.ai.model.function.FunctionCallback;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
-import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,8 +49,7 @@ String chatVariant(String authorName) {
         Map<String,Object> model = Map.of("author", authorName);
         var prompt = userPromptTemplate.create(model, ToolCallingChatOptions.builder()
                 .toolCallbacks(
-                        (ToolCallback) FunctionCallback.builder()
-                                .function("BooksByAuthor", bookService::getBooksByAuthor)
+                        FunctionToolCallback.builder("booksByAuthor", bookService::getBooksByAuthor)
                                 .description("Get the list of books written by the given author available in the library")
                                 .inputType(BookService.Author.class)
                                 .build()