README.md

@@ -1 +1,3 @@
-A scriptable Java library for chatbots
+This is a Java library you can write scripts for to support an api with conversational language models
+
+I can't really say much because I'm still working out stuff so see `thinkings` directory

src/main/java/eu/m724/Main.java

@@ -3,14 +3,20 @@ package eu.m724;
 import eu.m724.chat.Chat;
 import eu.m724.chat.ChatEvent;
 import eu.m724.chat.ChatMessage;
+import eu.m724.example.ExampleSource;
 import eu.m724.example.OaiSource;
 import eu.m724.source.ChatResponse;
 import eu.m724.source.ChatSource;
 import eu.m724.source.option.Option;
 
-import java.util.Arrays;
+import java.io.BufferedReader;
-import java.util.Map;
+import java.io.InputStream;
-import java.util.Scanner;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
 
 public class Main {
     public static void main(String[] args) throws InterruptedException {
@@ -18,13 +24,11 @@ public class Main {
         //source.options().setValue("name", "nekalakininahappenenawiwanatin");
 
         ChatSource source = new OaiSource(System.getenv("API_KEY"));
-        source.options().setValue("model", "chatgpt-4o-latest");
+        //source.options().setValue("model", "chatgpt-4o-latest");
 
-        Chat chat = new Chat("Speak in super wuper uwu wanguage.");
+        Chat chat = new Chat("Speak in uwu wanguage.");
 
         System.out.println("Welcome to CHUT chat. Say something after the \033[1m>\033[0m, or type \033[1m:help\033[0m to see available commands");
-        System.out.printf("Source: \033[1m%s\033[0m %s (%d) by %s\n", source.info().name(), source.info().versionName(), source.info().version(), source.info().author());
-
         Scanner scanner = new Scanner(System.in);
 
         while (true) {
@@ -41,10 +45,8 @@ public class Main {
                     token = chatResponse.eventQueue().take();
 
                     if (token.finishReason() != "error") {
-                        if (token.text() != null) {
                         System.out.print(i++ % 2 == 1 ? "\033[1m" : "\033[0m");
                         System.out.print(token.text());
-                        }
                     } else {
                         System.out.print("Error: " + token.error().toString());
                     }
@@ -53,31 +55,24 @@ public class Main {
                 System.out.println();
             } else {
                 String[] parts = prompt.substring(1).split(" ");
-                if (parts[0].startsWith(":")) {
-                    System.out.println("If you want to start a message with a \033[1m:\033[0m, you can't");
-                }
 
                 switch (parts[0]) {
                     case "help":
                     case "h":
                     case "":
-                        System.out.println("Source: " + source.getClass().getName());
                         System.out.println("Available commands:");
                         System.out.println(":help - this");
                         System.out.println(":dump - recap of the chat");
                         System.out.println(":opt - change source options");
-                        System.out.println(":system - system prompt");
-                        System.out.println("Most commands have a few abbreviations like \033[1m:s\033[0m or \033[1m:sys\033[0m for :system");
                         break;
                     case "dump":
                     case "d":
-                        int size = chat.messages.size();
-                        System.out.printf("This chat has %d messages, or %d pairs", size, size / 2);
-
                         if (chat.systemPrompt == null) {
-                            System.out.println(".\nThere's no system prompt.");
+                            System.out.printf("This chat has %d messages.\n", chat.messages.size());
+                            System.out.println("There's no system prompt.");
                         } else {
-                            System.out.printf(", excluding system prompt.\nSystem prompt:\n\"\"\"%s\"\"\"\n", chat.systemPrompt);
+                            System.out.printf("This chat has %d messages, excluding system prompt.\n", chat.messages.size());
+                            System.out.printf("System prompt:\n\"\"\"%s\"\"\"\n", chat.systemPrompt);
                         }
                         for (ChatMessage message : chat.messages) {
                             System.out.printf("%s: %s\n", message.assistant() ? "ASSISTANT" : "USER", message.text());
@@ -86,66 +81,20 @@ public class Main {
                     case "options":
                     case "opt":
                     case "o":
-                        boolean shouldShowOptions = parts.length < 3;
+                        if (parts.length < 3 || Arrays.stream(source.options().keys()).noneMatch(parts[1]::equals)) {
-                        boolean optionExists = parts.length > 1 && Arrays.asList(source.options().keys()).contains(parts[1]);
+                            System.out.println("Available options:");
-                        boolean complainNoOption = parts.length > 1 && !optionExists;
+                            for (Map.Entry<String, Option<?>> entry : source.options().getOptions().entrySet()) {
-                        String chosenOption = parts.length > 1 ? parts[1] : null;
+                                System.out.printf("%s (%s) = %s\n", entry.getValue().label, entry.getKey(), entry.getValue().getValue().toString());
-
+                            }
-                        if (!shouldShowOptions) {
+                        } else {
                             Option<?> option = source.options().getOptions().get(parts[1]);
-                            if (option != null) {
                             Object value = option.fromString(parts[2]);
                             option.setValue(value);
                             System.out.printf("Set %s to %s\n", option.label, option.getValue());
-                            } else {
-                                shouldShowOptions = true;
-                                System.out.printf("Unknown option \"%s\". ", parts[1]);
-                            }
-                        }
-
-                        if (shouldShowOptions) {
-                            if (complainNoOption)
-                                System.out.printf("Unknown option \"%s\". ", chosenOption);
-                            System.out.println("Available options:");
-
-                            for (Map.Entry<String, Option<?>> entry : source.options().getOptions().entrySet()) {
-                                String value = entry.getValue().getValue().toString() + " (" + entry.getValue().getType().getName() + ")";
-
-                                if (entry.getKey().equals(chosenOption)) {
-                                    System.out.printf("\033[1m%s (%s) = %s\033[0m\n", entry.getValue().label, entry.getKey(), value);
-                                } else {
-                                    if (entry.getValue().label.toLowerCase().contains("key")) {
-                                        value = "(looks confidential, specify to see)";
-                                    }
-                                    System.out.printf("%s (%s) = %s\n", entry.getValue().label, entry.getKey(), value);
-                                }
-                            }
-                        }
-
-                        break;
-                    case "system":
-                    case "sys":
-                    case "s":
-                        if (parts.length == 1) {
-                            if (chat.systemPrompt != null) {
-                                System.out.printf("System prompt:\n\033[1m%s\033[0m\n\n", chat.systemPrompt);
-                                System.out.println("Set to \033[1mnull\033[0m to remove");
-                            } else {
-                                System.out.println("No system prompt");
-                            }
-                        } else {
-                            System.out.printf("Previous system prompt:\n%s\n\n", chat.systemPrompt);
-                            if (parts[1].equals("null")) {
-                                chat.systemPrompt = null;
-                                System.out.println("System prompt removed");
-                            } else {
-                                chat.systemPrompt = prompt.substring(parts[0].length() + 2).replace("\\n", "\n");
-                                System.out.printf("New system prompt:\n\033[1m%s\033[0m\n", chat.systemPrompt);
-                            }
                         }
                         break;
                     default:
-                        System.out.println("Invalid command: \033[1m" + parts[0] + "\033[0m");
+                        System.out.println("Invalid command: " + parts[0]);
                         break;
                 }
             }

src/main/java/eu/m724/chat/ChatMessage.java

@@ -1,7 +1,7 @@
 package eu.m724.chat;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Flow;
+
 public record ChatMessage(boolean assistant, String text) {
-    public static ChatMessage assistant(String text) {
-        return new ChatMessage(true, text);
-    }
 }

src/main/java/eu/m724/example/OaiSource.groovy

@@ -1,11 +1,15 @@
 package eu.m724.example
 
 import eu.m724.chat.Chat
+import eu.m724.chat.ChatEvent
+import eu.m724.chat.ChatMessage
 import eu.m724.source.ChatResponse
 import eu.m724.source.ChatSource
 import eu.m724.source.ChatSourceInfo
+import eu.m724.source.NonStreamingChatResponse
 import eu.m724.source.SimpleChatResponse
 import eu.m724.source.option.DoubleOption
+import eu.m724.source.option.NumberOption
 import eu.m724.source.option.Options
 import eu.m724.source.option.StringOption
 import org.json.JSONArray
@@ -14,6 +18,9 @@ import org.json.JSONObject
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.LinkedBlockingQueue
+
 // for now let's not focus on readability
 // this is more about find out what is common and should be included in the common api
 class OaiSource implements ChatSource {
@@ -29,7 +36,7 @@ class OaiSource implements ChatSource {
     private def options = new Options(
             new StringOption("apiKey", "API key", apiKey),
             new StringOption("model", "Model", "gpt-4o-mini"),
-            new DoubleOption("temperature", "Temperature", 1.1)
+            new DoubleOption("temperature", "Temperature", 1.2)
     )
 
     @Override
@@ -49,7 +56,7 @@ class OaiSource implements ChatSource {
                 .put("model", options.getStringValue("model"))
                 .put("temperature", options.getOptionValue("temperature", Double::class))
                 .put("presence_penalty", 0.1)
-                .put("stream", true)
+                .put("frequency_penalty", 0.1)
                 .put("messages", formatChat(chat)).toString()
 
         def request = HttpRequest.newBuilder()
@@ -61,10 +68,9 @@ class OaiSource implements ChatSource {
 
         def client = HttpClient.newHttpClient()
 
-        def chatResponse = new SimpleChatResponse()
+        ChatResponse chatResponse = new NonStreamingChatResponse()
-
-        def response = client.sendAsync(request, HttpResponse.BodyHandlers.ofLines())
 
+        def response = client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
 
         response.thenAccept {
             Exception exception = null
@@ -73,30 +79,6 @@ class OaiSource implements ChatSource {
                 exception = new Exception("Non 200 status code: %d".formatted(it.statusCode()))
             }
 
-            it.body().forEach {
-                //System.out.println(it);
-                for (String line : it.split("\n")) {
-                    if (line.startsWith("data: ")) {
-                        def data = line.substring(6)
-
-                        if (data != "[DONE]") {
-                            def json = new JSONObject(data)
-                            def choice = json.getJSONArray("choices").getJSONObject(0)
-                            def finishReason = choice.get("finish_reason")
-
-                            if (finishReason != JSONObject.NULL) {
-                                //System.out.println("ending");
-                                chatResponse.end(finishReason.toString())
-                            } else {
-                                def token = choice.getJSONObject("delta").getString("content")
-                                chatResponse.put(token)
-                            }
-                        }
-                    }
-                }
-            }
-/*
-
             if (exception != null) {
                 chatResponse.completeExceptionally(exception)
             } else {
@@ -104,7 +86,7 @@ class OaiSource implements ChatSource {
                 //System.out.println(json)
                 def completion = json.getJSONArray("choices").getJSONObject(0).getJSONObject("message").getString("content")
                 chatResponse.complete(completion)
-            }*/
+            }
 
         }
 

src/main/java/eu/m724/source/ChatSource.java

@@ -1,6 +1,7 @@
 package eu.m724.source;
 
 import eu.m724.chat.Chat;
+import eu.m724.source.option.Option;
 import eu.m724.source.option.Options;
 
 public interface ChatSource {
@@ -32,25 +33,6 @@ public interface ChatSource {
     default ChatResponse ask(Chat chat) {
         ChatResponse chatResponse = onAsked(chat);
 
-        /* if (chatResponse.streaming()) {
-            StringBuilder total = new StringBuilder();
-            CompletableFuture.runAsync(() -> {
-                ChatEvent event;
-                while (true) {
-                    try {
-                        event = chatResponse.eventQueue().take();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                    total.append(event.text());
-                    if (event.finishReason() != null) {
-                        chatResponse.message().complete(new ChatMessage(true, total.toString()));
-                        break;
-                    }
-                }
-            });
-        } this was a draft I'm keeping because I might change my mind */
-
         // TODO make sure it works in parallel
         chatResponse.message().thenAccept(message -> {
             if (message != null) chat.addMessage(message);

src/main/java/eu/m724/source/NonStreamingChatResponse.java

@@ -7,8 +7,8 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public class NonStreamingChatResponse implements ChatResponse {
-    private final LinkedBlockingQueue<ChatEvent> eventQueue = new LinkedBlockingQueue<>();
+    private LinkedBlockingQueue<ChatEvent> eventQueue = new LinkedBlockingQueue<>();
-    private final CompletableFuture<ChatMessage> message = new CompletableFuture<>();
+    private CompletableFuture<ChatMessage> message = new CompletableFuture<>();
 
     @Override
     public boolean streaming() {

src/main/java/eu/m724/source/SimpleChatResponse.java

@@ -6,57 +6,6 @@ import eu.m724.chat.ChatMessage;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 
-public class SimpleChatResponse implements ChatResponse {
+public record SimpleChatResponse(boolean streaming, LinkedBlockingQueue<ChatEvent> eventQueue,
-    private final boolean streaming;
+                                 CompletableFuture<ChatMessage> message) implements ChatResponse {
-    private final LinkedBlockingQueue<ChatEvent> eventQueue;
-    private final CompletableFuture<ChatMessage> message;
-
-    private String total = "";
-
-    public SimpleChatResponse() {
-        this.streaming = true;
-        this.eventQueue = new LinkedBlockingQueue<>();
-        this.message = new CompletableFuture<>();
-    }
-
-    public void put(String token, String finishReason) {
-        //System.out.println(System.currentTimeMillis());
-
-        try {
-            eventQueue.put(ChatEvent.of(token, finishReason));
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e); // TODO I don't know what this is
-        }
-
-        if (token != null) {
-            total += token;
-        }
-
-        if (finishReason != null) {
-            message.complete(ChatMessage.assistant(total));
-        }
-    }
-
-    public void put(String token) {
-        put(token, null);
-    }
-
-    public void end(String finishReason) {
-        put(null, finishReason);
-    }
-
-    @Override
-    public boolean streaming() {
-        return streaming;
-    }
-
-    @Override
-    public LinkedBlockingQueue<ChatEvent> eventQueue() {
-        return eventQueue;
-    }
-
-    @Override
-    public CompletableFuture<ChatMessage> message() {
-        return message;
-    }
 }

thinkings/thinking.txt

@@ -3,10 +3,6 @@ so, the api is mostly good now, but new things to focus on:
 - how to do requests
 - how to make it friendly
 
-delay
-right now streaming seems delayed and batched, I don't know why
-maybe it's just me
-
 network
 every platform has different libraries for that, so abstraction
 how? I still don't know