wip: base code for gpt-formatter

Author: christolis

application/src/main/java/org/togetherjava/tjbot/features/Features.java

@@ -88,9 +88,9 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         ModAuditLogWriter modAuditLogWriter = new ModAuditLogWriter(config);
         ScamHistoryStore scamHistoryStore = new ScamHistoryStore(database);
         GitHubReference githubReference = new GitHubReference(config);
-        CodeMessageHandler codeMessageHandler =
-                new CodeMessageHandler(blacklistConfig.special(), jshellEval);
         ChatGptService chatGptService = new ChatGptService(config);
+        CodeMessageHandler codeMessageHandler =
+                new CodeMessageHandler(blacklistConfig.special(), jshellEval, chatGptService);
         HelpSystemHelper helpSystemHelper = new HelpSystemHelper(config, database, chatGptService);
 
         // NOTE The system can add special system relevant commands also by itself,

application/src/main/java/org/togetherjava/tjbot/features/basic/ChatGPTFormatter.java

@@ -0,0 +1,17 @@
+package org.togetherjava.tjbot.features.basic;
+
+import org.togetherjava.tjbot.features.chatgpt.ChatGptService;
+
+import java.util.Optional;
+
+public final class ChatGPTFormatter {
+    private final ChatGptService chatGptService;
+
+    public ChatGPTFormatter(ChatGptService chatGptService) {
+        this.chatGptService = chatGptService;
+    }
+
+    public Optional<String> format(CharSequence code) {
+        return chatGptService.formatCode(code);
+    }
+}

application/src/main/java/org/togetherjava/tjbot/features/chatgpt/ChatGptService.java

@@ -100,28 +100,8 @@ public Optional<String> ask(String question, String context) {
             String instructions = "KEEP IT CONCISE, NOT MORE THAN 280 WORDS";
             String questionWithContext = "context: Category %s on a Java Q&A discord server. %s %s"
                 .formatted(context, instructions, question);
-            ChatMessage chatMessage = new ChatMessage(ChatMessageRole.USER.value(),
-                    Objects.requireNonNull(questionWithContext));
-            ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
-                .model(AI_MODEL)
-                .messages(List.of(chatMessage))
-                .frequencyPenalty(FREQUENCY_PENALTY)
-                .temperature(TEMPERATURE)
-                .maxTokens(MAX_TOKENS)
-                .n(MAX_NUMBER_OF_RESPONSES)
-                .build();
-
-            String response = openAiService.createChatCompletion(chatCompletionRequest)
-                .getChoices()
-                .getFirst()
-                .getMessage()
-                .getContent();
-
-            if (response == null) {
-                return Optional.empty();
-            }
-
-            return Optional.of(response);
+
+            return getMessageResponse(questionWithContext);
         } catch (OpenAiHttpException openAiHttpException) {
             logger.warn(
                     "There was an error using the OpenAI API: {} Code: {} Type: {} Status Code: {}",
@@ -133,4 +113,61 @@ public Optional<String> ask(String question, String context) {
         }
         return Optional.empty();
     }
+
+    public Optional<String> formatCode(CharSequence code) {
+        if (isDisabled) {
+            return Optional.empty();
+        }
+
+        String payload = String.format(
+                """
+                                If you happen to find any code in the container below, FORMAT \
+                                IT regardless of the programming language you find. MAKE IT HUMANLY READABLE. \
+                                If you don't find any, then your only answer should say empty. Output with no \
+                                introduction, no explanation, no ``` stuff, only code. Double check that \
+                                your response is correct. The code provided might not be readable.
+
+                                --- BEGIN CODE ---
+                                %s
+                                --- END CODE ---
+                        """,
+                code);
+        Optional<String> response = getMessageResponse(payload);
+
+        if (response.isEmpty() || response.get().equalsIgnoreCase("empty")) {
+            return Optional.empty();
+        }
+
+        return response;
+    }
+
+    private Optional<String> getMessageResponse(String message) {
+        ChatMessage chatMessage =
+                new ChatMessage(ChatMessageRole.USER.value(), Objects.requireNonNull(message));
+        ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
+            .model(AI_MODEL)
+            .messages(List.of(chatMessage))
+            .frequencyPenalty(FREQUENCY_PENALTY)
+            .temperature(TEMPERATURE)
+            .maxTokens(MAX_TOKENS)
+            .n(MAX_NUMBER_OF_RESPONSES)
+            .build();
+
+        logger.debug("GPT tx payload: {}", message);
+
+        String response = openAiService.createChatCompletion(chatCompletionRequest)
+            .getChoices()
+            .getFirst()
+            .getMessage()
+            .getContent();
+
+        if (response == null) {
+            logger.debug("Got empty response");
+            return Optional.empty();
+        }
+
+        logger.debug("GPT rx: {}", response);
+
+        return Optional.of(response);
+    }
 }

application/src/main/java/org/togetherjava/tjbot/features/code/CodeMessageHandler.java

@@ -17,6 +17,7 @@
 import org.togetherjava.tjbot.features.MessageReceiverAdapter;
 import org.togetherjava.tjbot.features.UserInteractionType;
 import org.togetherjava.tjbot.features.UserInteractor;
+import org.togetherjava.tjbot.features.chatgpt.ChatGptService;
 import org.togetherjava.tjbot.features.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.features.componentids.ComponentIdInteractor;
 import org.togetherjava.tjbot.features.jshell.JShellEval;
@@ -49,6 +50,7 @@ public final class CodeMessageHandler extends MessageReceiverAdapter implements
 
     private final ComponentIdInteractor componentIdInteractor;
     private final Map<String, CodeAction> labelToCodeAction;
+    private final ChatGptService chatGptService;
 
     /**
      * Memorizes the ID of the bots code-reply message that a message belongs to. That way, the
@@ -68,11 +70,13 @@ public final class CodeMessageHandler extends MessageReceiverAdapter implements
      *        disabled
      * @param jshellEval used to execute java code and build visual result
      */
-    public CodeMessageHandler(FeatureBlacklist<String> blacklist, JShellEval jshellEval) {
+    public CodeMessageHandler(FeatureBlacklist<String> blacklist, JShellEval jshellEval,
+            ChatGptService chatGptService) {
         componentIdInteractor = new ComponentIdInteractor(getInteractionType(), getName());
+        this.chatGptService = chatGptService;
 
         List<CodeAction> codeActions = blacklist
-            .filterStream(Stream.of(new FormatCodeCommand(), new EvalCodeCommand(jshellEval)),
+            .filterStream(Stream.of(new FormatCodeCommand(chatGptService), new EvalCodeCommand(jshellEval)),
                     codeAction -> codeAction.getClass().getName())
             .toList();
 

application/src/main/java/org/togetherjava/tjbot/features/code/FormatCodeCommand.java

@@ -3,6 +3,8 @@
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 
+import org.togetherjava.tjbot.features.basic.ChatGPTFormatter;
+import org.togetherjava.tjbot.features.chatgpt.ChatGptService;
 import org.togetherjava.tjbot.features.utils.CodeFence;
 import org.togetherjava.tjbot.formatter.Formatter;
 
@@ -13,6 +15,11 @@
  */
 final class FormatCodeCommand implements CodeAction {
     private final Formatter formatter = new Formatter();
+    private final ChatGPTFormatter chatGPTFormatter;
+
+    public FormatCodeCommand(ChatGptService service) {
+        this.chatGPTFormatter = new ChatGPTFormatter(service);
+    }
 
     @Override
     public String getLabel() {
@@ -34,6 +41,6 @@ public MessageEmbed apply(CodeFence codeFence) {
     }
 
     private String formatCode(CharSequence code) {
-        return formatter.format(code);
+        return chatGPTFormatter.format(code).orElse(formatter.format(code));
     }
 }