Update for ServerAssistantAI latest snapshot

Author: BlueTree242

anthropic/src/main/java/dev/bluetree242/saaiaddons/anthropic/AnthropicChatModelProvider.java

@@ -5,20 +5,18 @@
 import dev.bluetree242.serverassistantai.api.config.option.OptionMap;
 import dev.bluetree242.serverassistantai.api.registry.chatmodel.ChatModelContext;
 import dev.bluetree242.serverassistantai.api.registry.chatmodel.ChatModelProvider;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.message.SystemMessage;
 import dev.langchain4j.data.message.UserMessage;
 import dev.langchain4j.model.anthropic.AnthropicChatModel;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.output.Response;
+import dev.langchain4j.model.chat.ChatModel;
+import dev.langchain4j.model.chat.request.ChatRequest;
+import dev.langchain4j.model.chat.response.ChatResponse;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Duration;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -73,10 +71,21 @@ public String getDisplayName(@Nullable ChatModelContext context) {
         return "Anthropic";
     }
 
-    public record AnthropicWrapper(AnthropicChatModel model) implements ChatLanguageModel {
+    public record AnthropicWrapper(AnthropicChatModel model) implements ChatModel {
         @Override
-        public Response<AiMessage> generate(List<ChatMessage> messages) {
-            return model.generate(UserMessage.userMessage(messages.stream().filter(m -> m instanceof SystemMessage).map(m -> (SystemMessage) m).map(SystemMessage::text).collect(Collectors.joining("\n\n\n\n"))));
+        public ChatResponse chat(ChatRequest request) {
+            return model.chat(new ChatRequest.Builder()
+                    .modelName(request.modelName())
+                    .maxOutputTokens(request.maxOutputTokens())
+                    .temperature(request.temperature())
+                    .stopSequences(request.stopSequences())
+                    .parameters(request.parameters())
+                    .topK(request.topK())
+                    .toolChoice(request.toolChoice())
+                    .toolSpecifications(request.toolSpecifications())
+                    .responseFormat(request.responseFormat())
+                    .messages(UserMessage.userMessage(request.messages().stream().filter(m -> m instanceof SystemMessage).map(m -> (SystemMessage) m).map(SystemMessage::text).collect(Collectors.joining("\n\n\n\n"))))
+                    .build());
         }
     }
 }

google-aistudio/src/main/java/dev/bluetree242/saaiaddons/aistudio/GoogleAiStudioChatModelProvider.java

@@ -8,7 +8,9 @@
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.message.SystemMessage;
 import dev.langchain4j.data.message.UserMessage;
-import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.chat.ChatModel;
+import dev.langchain4j.model.chat.request.ChatRequest;
+import dev.langchain4j.model.chat.response.ChatResponse;
 import dev.langchain4j.model.googleai.GeminiHarmBlockThreshold;
 import dev.langchain4j.model.googleai.GeminiHarmCategory;
 import dev.langchain4j.model.googleai.GoogleAiGeminiChatModel;
@@ -80,10 +82,21 @@ public String getDisplayName(@Nullable ChatModelContext context) {
         return "Google AI Studio";
     }
 
-    public record GoogleAiWrapper(GoogleAiGeminiChatModel model) implements ChatLanguageModel {
+    public record GoogleAiWrapper(GoogleAiGeminiChatModel model) implements ChatModel {
         @Override
-        public Response<AiMessage> generate(List<ChatMessage> messages) {
-            return model.generate(UserMessage.userMessage(messages.stream().filter(m -> m instanceof SystemMessage).map(m -> (SystemMessage) m).map(SystemMessage::text).collect(Collectors.joining("\n\n\n\n"))));
+        public ChatResponse chat(ChatRequest request) {
+            return model.chat(new ChatRequest.Builder()
+                    .modelName(request.modelName())
+                    .maxOutputTokens(request.maxOutputTokens())
+                    .temperature(request.temperature())
+                    .stopSequences(request.stopSequences())
+                    .parameters(request.parameters())
+                    .topK(request.topK())
+                    .toolChoice(request.toolChoice())
+                    .toolSpecifications(request.toolSpecifications())
+                    .responseFormat(request.responseFormat())
+                    .messages(UserMessage.userMessage(request.messages().stream().filter(m -> m instanceof SystemMessage).map(m -> (SystemMessage) m).map(SystemMessage::text).collect(Collectors.joining("\n\n\n\n"))))
+                    .build());
         }
     }
 }

gradle/libs.versions.toml

@@ -6,10 +6,10 @@ metadata.format.version = "1.1"
 spigot = "1.16.5-R0.1-SNAPSHOT"
 
 # ServerAssistantAI itself
-serverassistantai = "1.3.1"
+serverassistantai = "1.3.3-SNAPSHOT"
 
 # Dependencies
-langchain4j = "0.36.2"
+langchain4j = "1.0.1-beta6"
 retrofit2 = "3.0.0"
 
 # Annotations