feat: Use new Model and Client APIs

Signed-off-by: Thomas Vitale <[email protected]>
ThomasVitale · May 23, 2024 · 775652a · 775652a
1 parent 5f05d43
commit 775652a
Show file tree

Hide file tree

Showing 62 changed files with 572 additions and 394 deletions.
diff --git a/...estion-answering-with-documents/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/...estion-answering-with-documents/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -1,15 +1,12 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.ChatClient;
-import org.springframework.ai.chat.messages.UserMessage;
-import org.springframework.ai.chat.prompt.SystemPromptTemplate;
 import org.springframework.ai.document.Document;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -24,25 +21,27 @@ class ChatService {
     }
 
     String chatWithDocument(String message) {
-        var systemPromptTemplate = new SystemPromptTemplate("""
+        var systemPromptTemplate = """
                 You are a helpful assistant, conversing with a user about the subjects contained in a set of documents.
                 Use the information from the DOCUMENTS section to provide accurate answers. If unsure or if the answer
                 isn't found in the DOCUMENTS section, simply state that you don't know the answer and do not mention
                 the DOCUMENTS section.
                 
                 DOCUMENTS:
                 {documents}
-                """);
+                """;
 
         List<Document> similarDocuments = vectorStore.similaritySearch(SearchRequest.query(message).withTopK(5));
         String content = similarDocuments.stream().map(Document::getContent).collect(Collectors.joining(System.lineSeparator()));
 
-        Map<String,Object> model = Map.of("documents", content);
-        var systemMessage = systemPromptTemplate.createMessage(model);
-
-        var userMessage = new UserMessage(message);
-
-        return chatClient.call(systemMessage, userMessage);
+        return chatClient.prompt()
+                .system(systemSpec -> systemSpec
+                        .text(systemPromptTemplate)
+                        .param("documents", content)
+                )
+                .user(message)
+                .call()
+                .content();
     }
 
 }
diff --git a/...th-documents/src/main/java/com/thomasvitale/ai/spring/QuestionAnsweringWithDocuments.java b/...th-documents/src/main/java/com/thomasvitale/ai/spring/QuestionAnsweringWithDocuments.java
@@ -1,6 +1,8 @@
 package com.thomasvitale.ai.spring;
 
-import org.springframework.ai.embedding.EmbeddingClient;
+import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.ChatModel;
+import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.vectorstore.SimpleVectorStore;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.boot.SpringApplication;
@@ -10,13 +12,18 @@
 @SpringBootApplication
 public class QuestionAnsweringWithDocuments {
 
+    public static void main(String[] args) {
+        SpringApplication.run(QuestionAnsweringWithDocuments.class, args);
+    }
+
     @Bean
-    VectorStore vectorStore(EmbeddingClient embeddingClient) {
-        return new SimpleVectorStore(embeddingClient);
+    ChatClient chatClient(ChatModel chatModel) {
+        return ChatClient.builder(chatModel).build();
     }
 
-    public static void main(String[] args) {
-        SpringApplication.run(QuestionAnsweringWithDocuments.class, args);
+    @Bean
+    VectorStore vectorStore(EmbeddingModel embeddingModel) {
+        return new SimpleVectorStore(embeddingModel);
     }
 
 }
diff --git a/01-chat-models/chat-models-mistral-ai/README.md b/01-chat-models/chat-models-mistral-ai/README.md
@@ -4,22 +4,22 @@ Text generation with LLMs via Mistral AI.
 
 ## Description
 
-Spring AI provides a `ChatClient` abstraction for integrating with LLMs via several providers, including Mistral AI.
+Spring AI provides a `ChatModel` abstraction for integrating with LLMs via several providers, including Mistral AI.
 
-When using the _Spring AI Mistral AI Spring Boot Starter_, a `ChatClient` object is autoconfigured for you to use Mistral AI.
+When using the _Spring AI Mistral AI Spring Boot Starter_, a `ChatModel` object is autoconfigured for you to use Mistral AI.
 
 ```java
 @RestController
 class ChatController {
-    private final ChatClient chatClient;
+    private final ChatModel chatModel;
 
-    ChatController(ChatClient chatClient) {
-        this.chatClient = chatClient;
+    ChatController(ChatModel chatModel) {
+        this.chatModel = chatModel;
     }
 
     @GetMapping("/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(message);
+        return chatModel.call(message);
     }
 }
 ```

diff --git a/...odels/chat-models-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...odels/chat-models-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -1,6 +1,6 @@
 package com.thomasvitale.ai.spring;
 
-import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.ChatModel;
 import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.mistralai.MistralAiChatOptions;
@@ -11,28 +11,28 @@
 @RestController
 class ChatController {
 
-    private final ChatClient chatClient;
+    private final ChatModel chatModel;
 
-    ChatController(ChatClient chatClient) {
-        this.chatClient = chatClient;
+    ChatController(ChatModel chatModel) {
+        this.chatModel = chatModel;
     }
 
     @GetMapping("/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(message);
+        return chatModel.call(message);
     }
 
     @GetMapping("/chat/generic-options")
     String chatWithGenericOptions(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(new Prompt(message, ChatOptionsBuilder.builder()
+        return chatModel.call(new Prompt(message, ChatOptionsBuilder.builder()
                         .withTemperature(0.9f)
                         .build()))
                 .getResult().getOutput().getContent();
     }
 
     @GetMapping("/chat/mistral-ai-options")
     String chatWithMistralAiOptions(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(new Prompt(message, MistralAiChatOptions.builder()
+        return chatModel.call(new Prompt(message, MistralAiChatOptions.builder()
                         .withModel("open-mixtral-8x7b")
                         .withSafePrompt(true)
                         .build()))

diff --git a/01-chat-models/chat-models-ollama/README.md b/01-chat-models/chat-models-ollama/README.md
@@ -4,22 +4,22 @@ Text generation with LLMs via Ollama.
 
 ## Description
 
-Spring AI provides a `ChatClient` abstraction for integrating with LLMs via several providers, including Ollama.
+Spring AI provides a `ChatModel` abstraction for integrating with LLMs via several providers, including Ollama.
 
-When using the _Spring AI Ollama Spring Boot Starter_, a `ChatClient` object is autoconfigured for you to use Ollama.
+When using the _Spring AI Ollama Spring Boot Starter_, a `ChatModel` object is autoconfigured for you to use Ollama.
 
 ```java
 @RestController
 class ChatController {
-    private final ChatClient chatClient;
+    private final ChatModel chatModel;
 
-    ChatController(ChatClient chatClient) {
-        this.chatClient = chatClient;
+    ChatController(ChatModel chatModel) {
+        this.chatModel = chatModel;
     }
 
     @GetMapping("/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(message);
+        return chatModel.call(message);
     }
 }
 ```
@@ -63,7 +63,7 @@ http :8080/chat
 Try passing your custom prompt and check the result.
 
 ```shell
-http :8080/ai/chat message=="What is the capital of Italy?"
+http :8080/chat message=="What is the capital of Italy?"
 ```
 
 The next request is configured with a custom temperature value to obtain a more creative, yet less precise answer.

diff --git a/...at-models/chat-models-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...at-models/chat-models-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -1,6 +1,6 @@
 package com.thomasvitale.ai.spring;
 
-import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.ChatModel;
 import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.ollama.api.OllamaOptions;
@@ -11,28 +11,28 @@
 @RestController
 class ChatController {
 
-    private final ChatClient chatClient;
+    private final ChatModel chatModel;
 
-    ChatController(ChatClient chatClient) {
-        this.chatClient = chatClient;
+    ChatController(ChatModel chatModel) {
+        this.chatModel = chatModel;
     }
 
     @GetMapping("/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(message);
+        return chatModel.call(message);
     }
 
     @GetMapping("/chat/generic-options")
     String chatWithGenericOptions(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(new Prompt(message, ChatOptionsBuilder.builder()
+        return chatModel.call(new Prompt(message, ChatOptionsBuilder.builder()
                         .withTemperature(1.3f)
                         .build()))
                 .getResult().getOutput().getContent();
     }
 
     @GetMapping("/chat/ollama-options")
     String chatWithOllamaOptions(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(new Prompt(message, OllamaOptions.create()
+        return chatModel.call(new Prompt(message, OllamaOptions.create()
                         .withModel("llama3")
                         .withRepeatPenalty(1.5f)))
                 .getResult().getOutput().getContent();

diff --git a/01-chat-models/chat-models-openai/README.md b/01-chat-models/chat-models-openai/README.md
@@ -4,22 +4,22 @@ Text generation with LLMs via OpenAI.
 
 ## Description
 
-Spring AI provides a `ChatClient` abstraction for integrating with LLMs via several providers, including OpenAI.
+Spring AI provides a `ChatModel` abstraction for integrating with LLMs via several providers, including OpenAI.
 
-When using the _Spring AI OpenAI Spring Boot Starter_, a `ChatClient` object is autoconfigured for you to use OpenAI.
+When using the _Spring AI OpenAI Spring Boot Starter_, a `ChatModel` object is autoconfigured for you to use OpenAI.
 
 ```java
 @RestController
 class ChatController {
-    private final ChatClient chatClient;
+    private final ChatModel chatModel;
 
-    ChatController(ChatClient chatClient) {
+    ChatController(ChatModel chatModel) {
         this.chatClient = chatClient;
     }
 
     @GetMapping("/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(message);
+        return chatModel.call(message);
     }
 }
 ```

diff --git a/...at-models/chat-models-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...at-models/chat-models-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -1,6 +1,6 @@
 package com.thomasvitale.ai.spring;
 
-import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.ChatModel;
 import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.openai.OpenAiChatOptions;
@@ -11,28 +11,28 @@
 @RestController
 class ChatController {
 
-    private final ChatClient chatClient;
+    private final ChatModel chatModel;
 
-    ChatController(ChatClient chatClient) {
-        this.chatClient = chatClient;
+    ChatController(ChatModel chatModel) {
+        this.chatModel = chatModel;
     }
 
     @GetMapping("/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(message);
+        return chatModel.call(message);
     }
 
     @GetMapping("/chat/generic-options")
     String chatWithGenericOptions(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(new Prompt(message, ChatOptionsBuilder.builder()
+        return chatModel.call(new Prompt(message, ChatOptionsBuilder.builder()
                         .withTemperature(1.3f)
                         .build()))
                 .getResult().getOutput().getContent();
     }
 
     @GetMapping("/chat/openai-options")
     String chatWithOpenAiOptions(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.call(new Prompt(message, OpenAiChatOptions.builder()
+        return chatModel.call(new Prompt(message, OpenAiChatOptions.builder()
                         .withModel("gpt-4-turbo")
                         .withUser("jon.snow")
                         .withFrequencyPenalty(1.3f)

diff --git a/01-chat-models/chat-models-openai/src/main/resources/application.yml b/01-chat-models/chat-models-openai/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
       api-key: ${OPENAI_API_KEY}
       chat:
         options:
-          model: gpt-4o
+          model: gpt-3.5-turbo
           temperature: 0.7
   threads:
     virtual:

diff --git a/02-prompts/prompts-basics-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/02-prompts/prompts-basics-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -15,11 +15,11 @@ class ChatService {
     }
 
     String chatWithText(String message) {
-        return chatClient.call(message);
+        return chatClient.prompt().user(message).call().content();
     }
 
     ChatResponse chatWithPrompt(String message) {
-        return chatClient.call(new Prompt(message));
+        return chatClient.prompt(new Prompt(message)).call().chatResponse();
     }
 
 }
diff --git a/...asics-ollama/src/main/java/com/thomasvitale/ai/spring/PromptsBasicsOllamaApplication.java b/...asics-ollama/src/main/java/com/thomasvitale/ai/spring/PromptsBasicsOllamaApplication.java
@@ -1,7 +1,10 @@
 package com.thomasvitale.ai.spring;
 
+import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.ChatModel;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class PromptsBasicsOllamaApplication {
@@ -10,4 +13,9 @@ public static void main(String[] args) {
         SpringApplication.run(PromptsBasicsOllamaApplication.class, args);
     }
 
+    @Bean
+    ChatClient chatClient(ChatModel chatModel) {
+        return ChatClient.builder(chatModel).build();
+    }
+
 }
diff --git a/02-prompts/prompts-basics-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/02-prompts/prompts-basics-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -15,11 +15,11 @@ class ChatService {
     }
 
     String chatWithText(String message) {
-        return chatClient.call(message);
+        return chatClient.prompt().user(message).call().content();
     }
 
     ChatResponse chatWithPrompt(String message) {
-        return chatClient.call(new Prompt(message));
+        return chatClient.prompt(new Prompt(message)).call().chatResponse();
     }
 
 }
diff --git a/...asics-openai/src/main/java/com/thomasvitale/ai/spring/PromptsBasicsOpenAiApplication.java b/...asics-openai/src/main/java/com/thomasvitale/ai/spring/PromptsBasicsOpenAiApplication.java
@@ -1,7 +1,10 @@
 package com.thomasvitale.ai.spring;
 
+import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.ChatModel;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class PromptsBasicsOpenAiApplication {
@@ -10,4 +13,9 @@ public static void main(String[] args) {
         SpringApplication.run(PromptsBasicsOpenAiApplication.class, args);
     }
 
+    @Bean
+    ChatClient chatClient(ChatModel chatModel) {
+        return ChatClient.builder(chatModel).build();
+    }
+
 }
diff --git a/02-prompts/prompts-basics-openai/src/main/resources/application.yml b/02-prompts/prompts-basics-openai/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
       api-key: ${OPENAI_API_KEY}
       chat:
         options:
-          model: gpt-4o
+          model: gpt-3.5-turbo
           temperature: 0.7
   threads:
     virtual: