Update tools examples

ThomasVitale · Jan 5, 2025 · 9220693 · 9220693
1 parent e7791af
commit 9220693
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 0 deletions.
diff --git a/patterns/function-calling/function-calling-ollama/README.md b/patterns/function-calling/function-calling-ollama/README.md
@@ -67,3 +67,7 @@ http :8080/chat/method/single authorName=="C.S. Lewis" -b
 ```shell
 http :8080/chat/method/list bookTitle1=="Narnia" bookTitle2=="The Hobbit" -b
 ```
+
+```shell
+http :8080/chat/method/non-public authorName=="C.S. Lewis" -b
+```
diff --git a/...ling/function-calling-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...ling/function-calling-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -139,4 +139,22 @@ String chatMethodList(String bookTitle1, String bookTitle2) {
                 .content();
     }
 
+    @GetMapping("/chat/method/non-public")
+    String chatMethodNonPublic(String authorName) {
+        var userPromptTemplate = "What books written by {author} are available in the library?";
+        return chatClient.prompt()
+                .user(userSpec -> userSpec
+                        .text(userPromptTemplate)
+                        .param("author", authorName)
+                )
+                .functions(FunctionCallback.builder()
+                        .method("findBooksByAuthor", String.class)
+                        .description("Get the list of books written by the given author available in the library")
+                        .targetObject(tools)
+                        .build()
+                )
+                .call()
+                .content();
+    }
+
 }
diff --git a/...ction-calling/function-calling-ollama/src/main/java/com/thomasvitale/ai/spring/Tools.java b/...ction-calling/function-calling-ollama/src/main/java/com/thomasvitale/ai/spring/Tools.java
@@ -35,4 +35,9 @@ public List<BookService.Author> authorsByBooks(List<String> books) {
         return bookService.getAuthorsByBook(books.stream().map(b -> new BookService.Book(b, "")).toList());
     }
 
+    List<BookService.Book> findBooksByAuthor(String author) {
+        logger.info("Getting books by author: {}", author);
+        return bookService.getBooksByAuthor(new BookService.Author(author));
+    }
+
 }
diff --git a/patterns/function-calling/function-calling-openai/README.md b/patterns/function-calling/function-calling-openai/README.md
@@ -70,3 +70,7 @@ http :8080/chat/method/single authorName=="C.S. Lewis" -b
 ```shell
 http :8080/chat/method/list bookTitle1=="Narnia" bookTitle2=="The Hobbit" -b
 ```
+
+```shell
+http :8080/chat/method/non-public authorName=="C.S. Lewis" -b
+```
diff --git a/...ling/function-calling-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...ling/function-calling-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -139,4 +139,22 @@ String chatMethodList(String bookTitle1, String bookTitle2) {
                 .content();
     }
 
+    @GetMapping("/chat/method/non-public")
+    String chatMethodNonPublic(String authorName) {
+        var userPromptTemplate = "What books written by {author} are available in the library?";
+        return chatClient.prompt()
+                .user(userSpec -> userSpec
+                        .text(userPromptTemplate)
+                        .param("author", authorName)
+                )
+                .functions(FunctionCallback.builder()
+                        .method("findBooksByAuthor", String.class)
+                        .description("Get the list of books written by the given author available in the library")
+                        .targetObject(tools)
+                        .build()
+                )
+                .call()
+                .content();
+    }
+
 }
diff --git a/...ction-calling/function-calling-openai/src/main/java/com/thomasvitale/ai/spring/Tools.java b/...ction-calling/function-calling-openai/src/main/java/com/thomasvitale/ai/spring/Tools.java
@@ -35,4 +35,9 @@ public List<BookService.Author> authorsByBooks(List<String> books) {
         return bookService.getAuthorsByBook(books.stream().map(b -> new BookService.Book(b, "")).toList());
     }
 
+    List<BookService.Book> findBooksByAuthor(String author) {
+        logger.info("Getting books by author: {}", author);
+        return bookService.getBooksByAuthor(new BookService.Author(author));
+    }
+
 }