Update to last snapshot

ThomasVitale · Dec 14, 2024 · e097ed0 · e097ed0
1 parent f47aa7d
commit e097ed0
Show file tree

Hide file tree

Showing 48 changed files with 399 additions and 125 deletions.
diff --git a/...cument-readers-json-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java b/...cument-readers-json-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java
@@ -21,7 +21,7 @@ class SearchController {
     List<Document> searchSimilarDocuments(@RequestBody String query) {
         var documents = vectorStore.similaritySearch(query);
         return documents.stream()
-                .map(document -> new Document(document.getId(), document.getContent(), document.getMedia(), document.getMetadata()))
+                .map(document -> document.mutate().build())
                 .toList();
     }
 

diff --git a/...nt-readers-markdown-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java b/...nt-readers-markdown-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java
@@ -21,7 +21,7 @@ class SearchController {
     List<Document> searchSimilarDocuments(@RequestBody String query) {
         var documents = vectorStore.similaritySearch(query);
         return documents.stream()
-                .map(document -> new Document(document.getId(), document.getContent(), document.getMedia(), document.getMetadata()))
+                .map(document -> document.mutate().build())
                 .toList();
     }
 

diff --git a/...ocument-readers-pdf-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java b/...ocument-readers-pdf-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java
@@ -21,7 +21,7 @@ class SearchController {
     List<Document> searchSimilarDocuments(@RequestBody String query) {
         var documents = vectorStore.similaritySearch(query);
         return documents.stream()
-                .map(document -> new Document(document.getId(), document.getContent(), document.getMedia(), document.getMetadata()))
+                .map(document -> document.mutate().build())
                 .toList();
     }
 

diff --git a/...cument-readers-text-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java b/...cument-readers-text-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java
@@ -21,7 +21,7 @@ class SearchController {
     List<Document> searchSimilarDocuments(@RequestBody String query) {
         var documents = vectorStore.similaritySearch(query);
         return documents.stream()
-                .map(document -> new Document(document.getId(), document.getContent(), document.getMedia(), document.getMetadata()))
+                .map(document -> document.mutate().build())
                 .toList();
     }
 

diff --git a/...cument-readers-tika-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java b/...cument-readers-tika-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java
@@ -21,7 +21,7 @@ class SearchController {
     List<Document> searchSimilarDocuments(@RequestBody String query) {
         var documents = vectorStore.similaritySearch(query);
         return documents.stream()
-                .map(document -> new Document(document.getId(), document.getContent(), document.getMedia(), document.getMetadata()))
+                .map(document -> document.mutate().build())
                 .toList();
     }
 

diff --git a/...ansformers-metadata-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java b/...ansformers-metadata-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java
@@ -21,7 +21,7 @@ class SearchController {
     List<Document> searchSimilarDocuments(@RequestBody String query) {
         var documents = vectorStore.similaritySearch(query);
         return documents.stream()
-                .map(document -> new Document(document.getId(), document.getContent(), document.getMedia(), document.getMetadata()))
+                .map(document -> document.mutate().build())
                 .toList();
     }
 

diff --git a/...nsformers-splitters-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java b/...nsformers-splitters-ollama/src/main/java/com/thomasvitale/ai/spring/SearchController.java
@@ -21,7 +21,7 @@ class SearchController {
     List<Document> searchSimilarDocuments(@RequestBody String query) {
         var documents = vectorStore.similaritySearch(query);
         return documents.stream()
-                .map(document -> new Document(document.getId(), document.getContent(), document.getMedia(), document.getMetadata()))
+                .map(document -> document.mutate().build())
                 .toList();
     }
 

diff --git a/models/chat/chat-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/models/chat/chat-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -1,7 +1,7 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.mistralai.MistralAiChatOptions;
 import org.springframework.ai.mistralai.api.MistralAiApi;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,9 +32,9 @@ String chat(String question) {
     String chatGenericOptions(String question) {
         return chatClient
                 .prompt(question)
-                .options(ChatOptionsBuilder.builder()
-                        .withModel(MistralAiApi.ChatModel.OPEN_MIXTRAL_7B.getName())
-                        .withTemperature(0.9)
+                .options(ChatOptions.builder()
+                        .model(MistralAiApi.ChatModel.OPEN_MIXTRAL_7B.getName())
+                        .temperature(0.9)
                         .build())
                 .call()
                 .content();

diff --git a/...t/chat-mistral-ai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java b/...t/chat-mistral-ai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java
@@ -1,7 +1,7 @@
 package com.thomasvitale.ai.spring.model;
 
 import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.mistralai.MistralAiChatOptions;
 import org.springframework.ai.mistralai.api.MistralAiApi;
@@ -30,19 +30,19 @@ String chat(String question) {
 
     @GetMapping("/chat/generic-options")
     String chatGenericOptions(String question) {
-        return chatModel.call(new Prompt(question, ChatOptionsBuilder.builder()
-                        .withModel(MistralAiApi.ChatModel.OPEN_MIXTRAL_7B.getName())
-                        .withTemperature(0.9)
+        return chatModel.call(new Prompt(question, ChatOptions.builder()
+                        .model(MistralAiApi.ChatModel.OPEN_MIXTRAL_7B.getName())
+                        .temperature(0.9)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/provider-options")
     String chatProviderOptions(String question) {
         return chatModel.call(new Prompt(question, MistralAiChatOptions.builder()
                         .withSafePrompt(true)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/stream")

diff --git a/...ultiple-providers/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java b/...ultiple-providers/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java
@@ -42,7 +42,7 @@ String chatMistralAiOptions(String question) {
                         .withModel(MistralAiApi.ChatModel.OPEN_MIXTRAL_7B.getValue())
                         .withTemperature(1.0)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/openai-options")
@@ -51,7 +51,7 @@ String chatOpenAiOptions(String question) {
                         .withModel(OpenAiApi.ChatModel.GPT_4_O_MINI.getValue())
                         .withTemperature(1.0)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
 }
diff --git a/models/chat/chat-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/models/chat/chat-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -1,7 +1,7 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.ollama.api.OllamaOptions;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -31,9 +31,9 @@ String chat(String question) {
     String chatGenericOptions(String question) {
         return chatClient
                 .prompt(question)
-                .options(ChatOptionsBuilder.builder()
-                        .withModel("llama3.2:1b")
-                        .withTemperature(0.9)
+                .options(ChatOptions.builder()
+                        .model("llama3.2:1b")
+                        .temperature(0.9)
                         .build())
                 .call()
                 .content();
@@ -54,8 +54,8 @@ String chatProviderOptions(String question) {
     String chatHuggingFace(String question) {
         return chatClient
                 .prompt(question)
-                .options(ChatOptionsBuilder.builder()
-                        .withModel("hf.co/SanctumAI/Llama-3.2-1B-Instruct-GGUF")
+                .options(ChatOptions.builder()
+                        .model("hf.co/SanctumAI/Llama-3.2-1B-Instruct-GGUF")
                         .build())
                 .call()
                 .content();

diff --git a/.../chat/chat-ollama/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java b/.../chat/chat-ollama/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java
@@ -1,7 +1,7 @@
 package com.thomasvitale.ai.spring.model;
 
 import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.ollama.api.OllamaOptions;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,27 +29,27 @@ String chat(String question) {
 
     @GetMapping("/chat/generic-options")
     String chatGenericOptions(String question) {
-        return chatModel.call(new Prompt(question, ChatOptionsBuilder.builder()
-                        .withModel("llama3.2:1b")
-                        .withTemperature(0.9)
+        return chatModel.call(new Prompt(question, ChatOptions.builder()
+                        .model("llama3.2:1b")
+                        .temperature(0.9)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/provider-options")
     String chatProviderOptions(String question) {
         return chatModel.call(new Prompt(question, OllamaOptions.builder()
                         .withRepeatPenalty(1.5)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/huggingface")
     String chatHuggingFace(String question) {
-        return chatModel.call(new Prompt(question, ChatOptionsBuilder.builder()
-                        .withModel("hf.co/SanctumAI/Llama-3.2-1B-Instruct-GGUF")
+        return chatModel.call(new Prompt(question, ChatOptions.builder()
+                        .model("hf.co/SanctumAI/Llama-3.2-1B-Instruct-GGUF")
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/stream")

diff --git a/models/chat/chat-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/models/chat/chat-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -1,7 +1,7 @@
 package com.thomasvitale.ai.spring;
 
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.openai.OpenAiChatOptions;
 import org.springframework.ai.openai.api.OpenAiApi;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,9 +32,9 @@ String chat(String question) {
     String chatGenericOptions(String question) {
         return chatClient
                 .prompt(question)
-                .options(ChatOptionsBuilder.builder()
-                        .withModel(OpenAiApi.ChatModel.GPT_4_O_MINI.getValue())
-                        .withTemperature(0.9)
+                .options(ChatOptions.builder()
+                        .model(OpenAiApi.ChatModel.GPT_4_O_MINI.getValue())
+                        .temperature(0.9)
                         .build())
                 .call()
                 .content();

diff --git a/.../chat/chat-openai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java b/.../chat/chat-openai/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java
@@ -1,7 +1,7 @@
 package com.thomasvitale.ai.spring.model;
 
 import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.openai.OpenAiChatOptions;
 import org.springframework.ai.openai.api.OpenAiApi;
@@ -30,19 +30,19 @@ String chat(String question) {
 
     @GetMapping("/chat/generic-options")
     String chatGenericOptions(String question) {
-        return chatModel.call(new Prompt(question, ChatOptionsBuilder.builder()
-                        .withModel(OpenAiApi.ChatModel.GPT_4_O_MINI.getValue())
-                        .withTemperature(0.9)
+        return chatModel.call(new Prompt(question, ChatOptions.builder()
+                        .model(OpenAiApi.ChatModel.GPT_4_O_MINI.getValue())
+                        .temperature(0.9)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/provider-options")
     String chatProviderOptions(String question) {
         return chatModel.call(new Prompt(question, OpenAiChatOptions.builder()
                         .withLogprobs(true)
                         .build()))
-                .getResult().getOutput().getContent();
+                .getResult().getOutput().getText();
     }
 
     @GetMapping("/chat/stream")

diff --git a/...ervability-models-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...ervability-models-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.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.mistralai.MistralAiChatOptions;
 import org.springframework.ai.mistralai.api.MistralAiApi;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +18,7 @@ class ChatController {
     private final ChatClient chatClient;
 
     ChatController(ChatClient.Builder chatClientBuilder) {
-        this.chatClient = chatClientBuilder.build();
+        this.chatClient = chatClientBuilder.clone().build();
     }
 
     @GetMapping("/chat")
@@ -35,9 +35,9 @@ String chatGenericOptions(String question) {
         logger.info("Chatting with generic options: {}", question);
         return chatClient
                 .prompt(question)
-                .options(ChatOptionsBuilder.builder()
-                        .withModel(MistralAiApi.ChatModel.OPEN_MIXTRAL_7B.getName())
-                        .withTemperature(0.9)
+                .options(ChatOptions.builder()
+                        .model(MistralAiApi.ChatModel.OPEN_MIXTRAL_7B.getName())
+                        .temperature(0.9)
                         .build())
                 .call()
                 .content();

diff --git a/.../observability-models-ollama/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/.../observability-models-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.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.ollama.api.OllamaOptions;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,7 +17,7 @@ class ChatController {
     private final ChatClient chatClient;
 
     ChatController(ChatClient.Builder chatClientBuilder) {
-        this.chatClient = chatClientBuilder.build();
+        this.chatClient = chatClientBuilder.clone().build();
     }
 
     @GetMapping("/chat")
@@ -34,9 +34,9 @@ String chatGenericOptions(String question) {
         logger.info("Chatting with generic options: {}", question);
         return chatClient
                 .prompt(question)
-                .options(ChatOptionsBuilder.builder()
-                        .withModel("llama3.2:1b")
-                        .withTemperature(0.9)
+                .options(ChatOptions.builder()
+                        .model("llama3.2:1b")
+                        .temperature(0.9)
                         .build())
                 .call()
                 .content();

diff --git a/.../observability-models-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/.../observability-models-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.chat.prompt.ChatOptionsBuilder;
+import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.openai.OpenAiChatOptions;
 import org.springframework.ai.openai.api.OpenAiApi;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +18,7 @@ class ChatController {
     private final ChatClient chatClient;
 
     ChatController(ChatClient.Builder chatClientBuilder) {
-        this.chatClient = chatClientBuilder.build();
+        this.chatClient = chatClientBuilder.clone().build();
     }
 
     @GetMapping("/chat")
@@ -35,9 +35,9 @@ String chatGenericOptions(String question) {
         logger.info("Chatting with generic options: {}", question);
         return chatClient
                 .prompt(question)
-                .options(ChatOptionsBuilder.builder()
-                        .withModel(OpenAiApi.ChatModel.GPT_4_O_MINI.getValue())
-                        .withTemperature(0.9)
+                .options(ChatOptions.builder()
+                        .model(OpenAiApi.ChatModel.GPT_4_O_MINI.getValue())
+                        .temperature(0.9)
                         .build())
                 .call()
                 .content();

diff --git a/...ility-vector-stores-pgvector/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/...ility-vector-stores-pgvector/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -15,7 +15,7 @@ class ChatController {
     private final RetrievalAugmentationAdvisor retrievalAugmentationAdvisor;
 
     ChatController(ChatClient.Builder chatClientBuilder, VectorStore vectorStore) {
-        this.chatClient = chatClientBuilder.build();
+        this.chatClient = chatClientBuilder.clone().build();
         this.retrievalAugmentationAdvisor = RetrievalAugmentationAdvisor.builder()
                 .documentRetriever(VectorStoreDocumentRetriever.builder()
                         .vectorStore(vectorStore)

diff --git a/.../function-calling-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/.../function-calling-mistral-ai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -42,10 +42,10 @@ String chatVariant(String authorName) {
                 )
                 .functions(
                         FunctionCallback.builder()
-                                .description("Get the list of books written by the given author available in the library")
-                                .responseConverter(Object::toString)
                                 .function("BooksByAuthor", bookService::getBooksByAuthor)
+                                .description("Get the list of books written by the given author available in the library")
                                 .inputType(BookService.Author.class)
+                                .responseConverter(Object::toString)
                                 .build()
                 )
                 .call()