bot/src/main/java/de/hhhammer/dchat/bot/App.java

@@ -1,6 +1,5 @@
 package de.hhhammer.dchat.bot;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import de.hhhammer.dchat.bot.openai.ChatGPTService;
@@ -33,7 +32,7 @@ public class App {
             System.exit(1);
         }
 
-        var chatGPTService = new ChatGPTService(openaiApiKey, HttpClient.newHttpClient(), new ObjectMapper());
+        var chatGPTService = new ChatGPTService(openaiApiKey, HttpClient.newHttpClient());
 
         var config = new HikariConfig();
         config.setJdbcUrl(postgresUrl);

bot/src/main/java/de/hhhammer/dchat/bot/discord/MessageCreateHandler.java

@@ -21,7 +21,7 @@ public class MessageCreateHandler implements MessageCreateListener {
     @Override
     public void onMessageCreate(MessageCreateEvent event) {
         Thread.ofVirtual().start(() -> {
-            if (!event.canYouReadContent() || event.getMessageAuthor().isBotUser() || !isNormalOrReplyMessageType(event)) {
+            if (!event.canYouReadContent() || event.getMessageAuthor().isBotUser() || !(event.getMessage().getType() == MessageType.NORMAL || event.getMessage().getType() == MessageType.REPLY)) {
                 return;
             }
             if (!this.messageHandler.canHandle(event)) {
@@ -42,9 +42,4 @@ public class MessageCreateHandler implements MessageCreateListener {
             }
         });
     }
-
-    private boolean isNormalOrReplyMessageType(MessageCreateEvent event) {
-        MessageType type = event.getMessage().getType();
-        return type == MessageType.NORMAL || type == MessageType.REPLY;
-    }
 }

bot/src/main/java/de/hhhammer/dchat/bot/discord/ServerMessageHandler.java

@@ -2,7 +2,6 @@ package de.hhhammer.dchat.bot.discord;
 
 import de.hhhammer.dchat.bot.openai.ChatGPTRequestBuilder;
 import de.hhhammer.dchat.bot.openai.ChatGPTService;
-import de.hhhammer.dchat.bot.openai.MessageContext.ReplyInteraction;
 import de.hhhammer.dchat.bot.openai.ResponseException;
 import de.hhhammer.dchat.db.ServerDBService;
 import de.hhhammer.dchat.db.models.server.ServerMessage;
@@ -11,12 +10,10 @@ import org.javacord.api.entity.message.Message;
 import org.javacord.api.entity.message.MessageReference;
 import org.javacord.api.entity.message.MessageType;
 import org.javacord.api.event.message.MessageCreateEvent;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.List;
 
 public class ServerMessageHandler implements MessageHandler {
 
@@ -34,8 +31,16 @@ public class ServerMessageHandler implements MessageHandler {
         String content = extractContent(event);
         var serverId = event.getServer().get().getId();
         var systemMessage = this.serverDBService.getConfig(String.valueOf(serverId)).get().systemMessage();
-        List<ReplyInteraction> messageContext = event.getMessage().getType() == MessageType.REPLY ? getContextMessages(event) : List.of();
-        var request = new ChatGPTRequestBuilder().contextRequest(messageContext, content, systemMessage);
+        var request = event.getMessage().getType() == MessageType.REPLY ?
+                new ChatGPTRequestBuilder()
+                        .replyRequest(event.getMessage()
+                                        .getMessageReference()
+                                        .map(MessageReference::getMessage)
+                                        .flatMap(m -> m)
+                                        .map(Message::getReadableContent)
+                                        .stream().toList(),
+                                content, systemMessage) :
+                new ChatGPTRequestBuilder().simpleRequest(content, systemMessage);
         var response = this.chatGPTService.submit(request);
         if (response.choices().isEmpty()) {
             event.getMessage().reply("No response available");
@@ -92,16 +97,4 @@ public class ServerMessageHandler implements MessageHandler {
         long ownId = event.getApi().getYourself().getId();
         return event.getMessageContent().replaceFirst("<" + ownId + "> ", "");
     }
-
-    @NotNull
-    private List<ReplyInteraction> getContextMessages(MessageCreateEvent event) {
-        return event.getMessage()
-                .getMessageReference()
-                .map(MessageReference::getMessage)
-                .flatMap(m -> m)
-                .map(Message::getReadableContent)
-                .map(ReplyInteraction::new)
-                .stream()
-                .toList();
-    }
 }

bot/src/main/java/de/hhhammer/dchat/bot/discord/UserMessageHandler.java

@@ -2,7 +2,6 @@ package de.hhhammer.dchat.bot.discord;
 
 import de.hhhammer.dchat.bot.openai.ChatGPTRequestBuilder;
 import de.hhhammer.dchat.bot.openai.ChatGPTService;
-import de.hhhammer.dchat.bot.openai.MessageContext.PreviousInteraction;
 import de.hhhammer.dchat.bot.openai.ResponseException;
 import de.hhhammer.dchat.db.UserDBService;
 import de.hhhammer.dchat.db.models.user.UserMessage;
@@ -11,7 +10,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.List;
 
 public class UserMessageHandler implements MessageHandler {
     private static final Logger logger = LoggerFactory.getLogger(UserMessageHandler.class);
@@ -29,9 +27,9 @@ public class UserMessageHandler implements MessageHandler {
         var userId = String.valueOf(event.getMessageAuthor().getId());
         var config = this.userDBService.getConfig(userId).get();
         var systemMessage = config.systemMessage();
-        List<PreviousInteraction> context = this.userDBService.getLastMessages(userId, config.contextLength())
+        var context = this.userDBService.getLastMessages(userId, config.contextLength())
                 .stream()
-                .map(userMessage -> new PreviousInteraction(userMessage.question(), userMessage.answer()))
+                .map(userMessage -> new ChatGPTRequestBuilder.PreviousInteraction(userMessage.question(), userMessage.answer()))
                 .toList();
         var request = new ChatGPTRequestBuilder().contextRequest(context, content, systemMessage);
         var response = this.chatGPTService.submit(request);

bot/src/main/java/de/hhhammer/dchat/bot/openai/ChatGPTRequestBuilder.java

@@ -1,59 +1,59 @@
 package de.hhhammer.dchat.bot.openai;
 
-import de.hhhammer.dchat.bot.openai.MessageContext.PreviousInteraction;
-import de.hhhammer.dchat.bot.openai.MessageContext.ReplyInteraction;
 import de.hhhammer.dchat.bot.openai.models.ChatGPTRequest;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class ChatGPTRequestBuilder {
-    private static final String smallContextModel = "gpt-3.5-turbo";
-    private static final String bigContextModel = "gpt-3.5-turbo-16k";
+    private final String smallContextModel = "gpt-3.5-turbo";
+    private final String bigContextModel = "gpt-3.5-turbo-16k";
 
     public ChatGPTRequestBuilder() {
     }
 
-    public ChatGPTRequest contextRequest(List<? extends MessageContext> contextMessages, String message, String systemMessage) {
-        List<ChatGPTRequest.Message> messages = getMessages(contextMessages, message, systemMessage);
-        String contextModel = contextMessages.size() <= 1 ? smallContextModel : bigContextModel;
+    public ChatGPTRequest simpleRequest(String content, String systemMessage) {
         return new ChatGPTRequest(
-                contextModel,
+                smallContextModel,
+                List.of(new ChatGPTRequest.Message("system", systemMessage), new ChatGPTRequest.Message("user", content)),
+                0.7f
+        );
+    }
+
+    public ChatGPTRequest replyRequest(List<String> contextMessages, String message, String systemMessage) {
+        List<ChatGPTRequest.Message> messages = new ArrayList<>();
+        messages.add(new ChatGPTRequest.Message("system", systemMessage));
+        var context = contextMessages.stream()
+                .map(m -> new ChatGPTRequest.Message("assistant", m))
+                .toList();
+        messages.addAll(context);
+        messages.add(new ChatGPTRequest.Message("user", message));
+        return new ChatGPTRequest(
+                smallContextModel,
                 messages,
                 0.7f
         );
     }
 
-    @NotNull
-    private static List<ChatGPTRequest.Message> getMessages(List<? extends MessageContext> contextMessages, String message, String systemMessage) {
-        var systemMsg = new ChatGPTRequest.Message("system", systemMessage);
-        List<ChatGPTRequest.Message> contextMsgs = getContextMessages(contextMessages);
-        var userMessage = new ChatGPTRequest.Message("user", message);
+    public ChatGPTRequest contextRequest(List<PreviousInteraction> contextMessages, String message, String systemMessage) {
         List<ChatGPTRequest.Message> messages = new ArrayList<>();
-        messages.add(systemMsg);
-        messages.addAll(contextMsgs);
-        messages.add(userMessage);
-        return messages;
-    }
-
-    @NotNull
-    private static List<ChatGPTRequest.Message> getContextMessages(List<? extends MessageContext> contextMessages) {
-        return contextMessages.stream()
-                .map(ChatGPTRequestBuilder::mapContextMessages)
+        messages.add(new ChatGPTRequest.Message("system", systemMessage));
+        var context = contextMessages.stream()
+                .map(m -> List.of(
+                        new ChatGPTRequest.Message("user", m.question),
+                        new ChatGPTRequest.Message("assistant", m.answer)
+                ))
                 .flatMap(List::stream)
                 .toList();
+        messages.addAll(context);
+        messages.add(new ChatGPTRequest.Message("user", message));
+        return new ChatGPTRequest(
+                bigContextModel,
+                messages,
+                0.7f
+        );
     }
 
-    @NotNull
-    private static List<ChatGPTRequest.Message> mapContextMessages(MessageContext contextMessage) {
-        return switch (contextMessage) {
-            case PreviousInteraction previousInteractions -> List.of(
-                    new ChatGPTRequest.Message("user", previousInteractions.question()),
-                    new ChatGPTRequest.Message("assistant", previousInteractions.answer())
-            );
-            case ReplyInteraction replyInteractions ->
-                    List.of(new ChatGPTRequest.Message("assistant", replyInteractions.answer()));
-        };
+    public record PreviousInteraction(String question, String answer) {
     }
 }

bot/src/main/java/de/hhhammer/dchat/bot/openai/ChatGPTService.java

@@ -13,14 +13,14 @@ import java.time.Duration;
 
 public class ChatGPTService {
     private static final String url = "https://api.openai.com/v1/chat/completions";
+    private final ObjectMapper mapper = new ObjectMapper();
     private final String apiKey;
     private final HttpClient httpClient;
-    private final ObjectMapper mapper;
 
-    public ChatGPTService(String apiKey, HttpClient httpClient, ObjectMapper mapper) {
+
+    public ChatGPTService(String apiKey, HttpClient httpClient) {
         this.apiKey = apiKey;
         this.httpClient = httpClient;
-        this.mapper = mapper;
     }
 
     public ChatGPTResponse submit(ChatGPTRequest chatGPTRequest) throws IOException, InterruptedException, ResponseException {

bot/src/main/java/de/hhhammer/dchat/bot/openai/MessageContext.java

@@ -1,9 +0,0 @@
-package de.hhhammer.dchat.bot.openai;
-
-public sealed interface MessageContext {
-    record ReplyInteraction(String answer) implements MessageContext {
-    }
-
-    record PreviousInteraction(String question, String answer) implements MessageContext {
-    }
-}