Use new Spring AI APIs for chat models

ThomasVitale · Jan 24, 2024 · 80fecb2 · 80fecb2
1 parent 64a311e
commit 80fecb2
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 79 deletions.
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
@@ -16,7 +16,7 @@ class ChatController {
 
     @GetMapping("/ai/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.generate(message);
+        return chatClient.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
@@ -16,7 +16,7 @@ class ChatController {
 
     @GetMapping("/ai/chat")
     String chat(@RequestParam(defaultValue = "What did Gandalf say to the Balrog?") String message) {
-        return chatClient.generate(message);
+        return chatClient.call(message);
     }
 
 }
diff --git a/...rompts/prompts-basics-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...rompts/prompts-basics-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -21,7 +21,7 @@ String chatWithText(@RequestBody String input) {
 
     @PostMapping("/ai/chat/prompt")
     String chatWithPrompt(@RequestBody String input) {
-        return chatService.chatWithPrompt(input).getGeneration().getContent();
+        return chatService.chatWithPrompt(input).getResult().getOutput().getContent();
     }
 
     @PostMapping("/ai/chat/full")

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
@@ -2,7 +2,7 @@
 
 import org.springframework.ai.chat.ChatClient;
 import org.springframework.ai.chat.ChatResponse;
-import org.springframework.ai.prompt.Prompt;
+import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -15,11 +15,11 @@ class ChatService {
     }
 
     String chatWithText(String message) {
-        return chatClient.generate(message);
+        return chatClient.call(message);
     }
 
     ChatResponse chatWithPrompt(String message) {
-        return chatClient.generate(new Prompt(message));
+        return chatClient.call(new Prompt(message));
     }
 
 }
diff --git a/...rompts/prompts-basics-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...rompts/prompts-basics-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -21,7 +21,7 @@ String chatWithText(@RequestBody String input) {
 
     @PostMapping("/ai/chat/prompt")
     String chatWithPrompt(@RequestBody String input) {
-        return chatService.chatWithPrompt(input).getGeneration().getContent();
+        return chatService.chatWithPrompt(input).getResult().getOutput().getContent();
     }
 
     @PostMapping("/ai/chat/full")

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
@@ -2,7 +2,7 @@
 
 import org.springframework.ai.chat.ChatClient;
 import org.springframework.ai.chat.ChatResponse;
-import org.springframework.ai.prompt.Prompt;
+import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -15,11 +15,11 @@ class ChatService {
     }
 
     String chatWithText(String message) {
-        return chatClient.generate(message);
+        return chatClient.call(message);
     }
 
     ChatResponse chatWithPrompt(String message) {
-        return chatClient.generate(new Prompt(message));
+        return chatClient.call(new Prompt(message));
     }
 
 }
diff --git a/02-prompts/prompts-messages-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/02-prompts/prompts-messages-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -1,10 +1,10 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.ChatClient;
-import org.springframework.ai.prompt.Prompt;
-import org.springframework.ai.prompt.messages.AssistantMessage;
-import org.springframework.ai.prompt.messages.SystemMessage;
-import org.springframework.ai.prompt.messages.UserMessage;
+import org.springframework.ai.chat.messages.AssistantMessage;
+import org.springframework.ai.chat.messages.SystemMessage;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
@@ -26,8 +26,8 @@ class ChatService {
     AssistantMessage chatWithSingleMessage(String message) {
         var userMessage = new UserMessage(message);
         var prompt = new Prompt(userMessage);
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithMultipleMessages(String message) {
@@ -38,16 +38,16 @@ AssistantMessage chatWithMultipleMessages(String message) {
                 """);
         var userMessage = new UserMessage(message);
         var prompt = new Prompt(List.of(systemMessage, userMessage));
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithExternalMessage(String message) {
         var systemMessage = new SystemMessage(systemMessageResource);
         var userMessage = new UserMessage(message);
         var prompt = new Prompt(List.of(systemMessage, userMessage));
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
 }
diff --git a/02-prompts/prompts-messages-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/02-prompts/prompts-messages-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -1,10 +1,10 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.ChatClient;
-import org.springframework.ai.prompt.Prompt;
-import org.springframework.ai.prompt.messages.AssistantMessage;
-import org.springframework.ai.prompt.messages.SystemMessage;
-import org.springframework.ai.prompt.messages.UserMessage;
+import org.springframework.ai.chat.messages.AssistantMessage;
+import org.springframework.ai.chat.messages.SystemMessage;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
@@ -26,8 +26,8 @@ class ChatService {
     AssistantMessage chatWithSingleMessage(String message) {
         var userMessage = new UserMessage(message);
         var prompt = new Prompt(userMessage);
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithMultipleMessages(String message) {
@@ -38,16 +38,16 @@ AssistantMessage chatWithMultipleMessages(String message) {
                 """);
         var userMessage = new UserMessage(message);
         var prompt = new Prompt(List.of(systemMessage, userMessage));
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithExternalMessage(String message) {
         var systemMessage = new SystemMessage(systemMessageResource);
         var userMessage = new UserMessage(message);
         var prompt = new Prompt(List.of(systemMessage, userMessage));
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
 }
diff --git a/...rompts/prompts-templates-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/...rompts/prompts-templates-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -1,11 +1,11 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.ChatClient;
-import org.springframework.ai.prompt.Prompt;
-import org.springframework.ai.prompt.PromptTemplate;
-import org.springframework.ai.prompt.SystemPromptTemplate;
-import org.springframework.ai.prompt.messages.AssistantMessage;
-import org.springframework.ai.prompt.messages.UserMessage;
+import org.springframework.ai.chat.messages.AssistantMessage;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.chat.prompt.PromptTemplate;
+import org.springframework.ai.chat.prompt.SystemPromptTemplate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
@@ -35,8 +35,8 @@ AssistantMessage chatWithUserMessageTemplate(MusicQuestion question) {
         var userMessage = userPromptTemplate.createMessage(model);
 
         var prompt = new Prompt(userMessage);
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithSystemMessageTemplate(String message) {
@@ -50,8 +50,8 @@ AssistantMessage chatWithSystemMessageTemplate(String message) {
 
         var prompt = new Prompt(List.of(systemMessage, userMessage));
 
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithSystemMessageTemplateExternal(String message) {
@@ -63,8 +63,8 @@ AssistantMessage chatWithSystemMessageTemplateExternal(String message) {
 
         var prompt = new Prompt(List.of(systemMessage, userMessage));
 
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     private String randomGreeting() {

diff --git a/...rompts/prompts-templates-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/...rompts/prompts-templates-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -1,11 +1,11 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.ChatClient;
-import org.springframework.ai.prompt.Prompt;
-import org.springframework.ai.prompt.PromptTemplate;
-import org.springframework.ai.prompt.SystemPromptTemplate;
-import org.springframework.ai.prompt.messages.AssistantMessage;
-import org.springframework.ai.prompt.messages.UserMessage;
+import org.springframework.ai.chat.messages.AssistantMessage;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.chat.prompt.PromptTemplate;
+import org.springframework.ai.chat.prompt.SystemPromptTemplate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
@@ -35,8 +35,8 @@ AssistantMessage chatWithUserMessageTemplate(MusicQuestion question) {
         var userMessage = userPromptTemplate.createMessage(model);
 
         var prompt = new Prompt(userMessage);
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithSystemMessageTemplate(String message) {
@@ -50,8 +50,8 @@ AssistantMessage chatWithSystemMessageTemplate(String message) {
 
         var prompt = new Prompt(List.of(systemMessage, userMessage));
 
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     AssistantMessage chatWithSystemMessageTemplateExternal(String message) {
@@ -63,8 +63,8 @@ AssistantMessage chatWithSystemMessageTemplateExternal(String message) {
 
         var prompt = new Prompt(List.of(systemMessage, userMessage));
 
-        var chatResponse = chatClient.generate(prompt);
-        return new AssistantMessage(chatResponse.getGeneration().getContent(), chatResponse.getGeneration().getProperties());
+        var chatResponse = chatClient.call(prompt);
+        return chatResponse.getResult().getOutput();
     }
 
     private String randomGreeting() {

diff --git a/...t-parsers/output-parsers-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/...t-parsers/output-parsers-ollama/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -1,10 +1,10 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.parser.BeanOutputParser;
 import org.springframework.ai.parser.ListOutputParser;
 import org.springframework.ai.parser.MapOutputParser;
-import org.springframework.ai.prompt.PromptTemplate;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.stereotype.Service;
 
@@ -31,8 +31,8 @@ ArtistInfo chatWithBeanOutput(MusicQuestion question) {
         Map<String,Object> model = Map.of("instrument", question.instrument(), "genre", question.genre(), "format", outputParser.getFormat());
         var prompt = userPromptTemplate.create(model);
 
-        var chatResponse = chatClient.generate(prompt);
-        return outputParser.parse(chatResponse.getGeneration().getContent());
+        var chatResponse = chatClient.call(prompt);
+        return outputParser.parse(chatResponse.getResult().getOutput().getContent());
     }
 
     Map<String,Object> chatWithMapOutput(MusicQuestion question) {
@@ -46,8 +46,8 @@ Map<String,Object> chatWithMapOutput(MusicQuestion question) {
         Map<String,Object> model = Map.of("instrument", question.instrument(), "genre", question.genre(), "format", outputParser.getFormat());
         var prompt = userPromptTemplate.create(model);
 
-        var chatResponse = chatClient.generate(prompt);
-        return outputParser.parse(chatResponse.getGeneration().getContent());
+        var chatResponse = chatClient.call(prompt);
+        return outputParser.parse(chatResponse.getResult().getOutput().getContent());
     }
 
     List<String> chatWithListOutput(MusicQuestion question) {
@@ -61,8 +61,8 @@ List<String> chatWithListOutput(MusicQuestion question) {
         Map<String,Object> model = Map.of("instrument", question.instrument(), "genre", question.genre(), "format", outputParser.getFormat());
         var prompt = userPromptTemplate.create(model);
 
-        var chatResponse = chatClient.generate(prompt);
-        return outputParser.parse(chatResponse.getGeneration().getContent());
+        var chatResponse = chatClient.call(prompt);
+        return outputParser.parse(chatResponse.getResult().getOutput().getContent());
     }
 
 }
diff --git a/...t-parsers/output-parsers-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java b/...t-parsers/output-parsers-openai/src/main/java/com/thomasvitale/ai/spring/ChatService.java
@@ -1,10 +1,10 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.ChatClient;
+import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.parser.BeanOutputParser;
 import org.springframework.ai.parser.ListOutputParser;
 import org.springframework.ai.parser.MapOutputParser;
-import org.springframework.ai.prompt.PromptTemplate;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.stereotype.Service;
 
@@ -31,8 +31,8 @@ ArtistInfo chatWithBeanOutput(MusicQuestion question) {
         Map<String,Object> model = Map.of("instrument", question.instrument(), "genre", question.genre(), "format", outputParser.getFormat());
         var prompt = userPromptTemplate.create(model);
 
-        var chatResponse = chatClient.generate(prompt);
-        return outputParser.parse(chatResponse.getGeneration().getContent());
+        var chatResponse = chatClient.call(prompt);
+        return outputParser.parse(chatResponse.getResult().getOutput().getContent());
     }
 
     Map<String,Object> chatWithMapOutput(MusicQuestion question) {
@@ -46,8 +46,8 @@ Map<String,Object> chatWithMapOutput(MusicQuestion question) {
         Map<String,Object> model = Map.of("instrument", question.instrument(), "genre", question.genre(), "format", outputParser.getFormat());
         var prompt = userPromptTemplate.create(model);
 
-        var chatResponse = chatClient.generate(prompt);
-        return outputParser.parse(chatResponse.getGeneration().getContent());
+        var chatResponse = chatClient.call(prompt);
+        return outputParser.parse(chatResponse.getResult().getOutput().getContent());
     }
 
     List<String> chatWithListOutput(MusicQuestion question) {
@@ -61,8 +61,8 @@ List<String> chatWithListOutput(MusicQuestion question) {
         Map<String,Object> model = Map.of("instrument", question.instrument(), "genre", question.genre(), "format", outputParser.getFormat());
         var prompt = userPromptTemplate.create(model);
 
-        var chatResponse = chatClient.generate(prompt);
-        return outputParser.parse(chatResponse.getGeneration().getContent());
+        var chatResponse = chatClient.call(prompt);
+        return outputParser.parse(chatResponse.getResult().getOutput().getContent());
     }
 
 }