README.md

@@ -1,3 +1,3 @@
 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
+I can't really say much because I'm still working out stuff so see `thinking.txt`

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

@@ -4,29 +4,27 @@ 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.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Scanner;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
 
 public class Main {
     public static void main(String[] args) throws InterruptedException {
-        //ChatSource source = new ExampleSource();
-        //source.options().setValue("name", "nekalakininahappenenawiwanatin");
+        ChatSource source = new ExampleSource();
+        source.options().setValue("name", "nekalakininahappenenawiwanatin");
 
-        ChatSource source = new OaiSource(System.getenv("API_KEY"));
-        //source.options().setValue("model", "chatgpt-4o-latest");
-
-        Chat chat = new Chat("Speak in uwu wanguage.");
+        Chat chat = new Chat();
 
         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");
         Scanner scanner = new Scanner(System.in);
@@ -41,21 +39,14 @@ public class Main {
                 ChatEvent token;
 
                 int i = 0;
-                do {
-                    token = chatResponse.eventQueue().take();
-
-                    if (token.finishReason() != "error") {
-                        System.out.print(i++ % 2 == 1 ? "\033[1m" : "\033[0m");
-                        System.out.print(token.text());
-                    } else {
-                        System.out.print("Error: " + token.error().toString());
-                    }
-                } while (token.finishReason() == null);
+                while ((token = chatResponse.eventQueue().take()).finishReason() == null) {
+                    System.out.print(i++ % 2 == 1 ? "\033[1m" : "\033[0m");
+                    System.out.print(token.text());
+                }
 
                 System.out.println();
             } else {
                 String[] parts = prompt.substring(1).split(" ");
-
                 switch (parts[0]) {
                     case "help":
                     case "h":
@@ -63,7 +54,6 @@ public class Main {
                         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");
                         break;
                     case "dump":
                     case "d":
@@ -78,21 +68,6 @@ public class Main {
                             System.out.printf("%s: %s\n", message.assistant() ? "ASSISTANT" : "USER", message.text());
                         }
                         break;
-                    case "options":
-                    case "opt":
-                    case "o":
-                        if (parts.length < 3 || Arrays.stream(source.options().keys()).noneMatch(parts[1]::equals)) {
-                            System.out.println("Available options:");
-                            for (Map.Entry<String, Option<?>> entry : source.options().getOptions().entrySet()) {
-                                System.out.printf("%s (%s) = %s\n", entry.getValue().label, entry.getKey(), entry.getValue().getValue().toString());
-                            }
-                        } else {
-                            Option<?> option = source.options().getOptions().get(parts[1]);
-                            Object value = option.fromString(parts[2]);
-                            option.setValue(value);
-                            System.out.printf("Set %s to %s\n", option.label, option.getValue());
-                        }
-                        break;
                     default:
                         System.out.println("Invalid command: " + parts[0]);
                         break;

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

@@ -58,7 +58,7 @@ class ExampleSource implements ChatSource {
 
         return new ChatResponse() {
             @Override
-            boolean streaming() {
+            boolean isStreaming() {
                 return false
             }
 

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

@@ -6,10 +6,7 @@ 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
@@ -24,19 +21,11 @@ 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 {
-    private final String apiKey
-
-    OaiSource(String apiKey) {
-        this.apiKey = apiKey
-    }
-
     private def info =
             new ChatSourceInfo("oai source", "me", "1.0", 1)
 
     private def options = new Options(
-            new StringOption("apiKey", "API key", apiKey),
-            new StringOption("model", "Model", "gpt-4o-mini"),
-            new DoubleOption("temperature", "Temperature", 1.2)
+            new StringOption("apiKey", "API key", null),
     )
 
     @Override
@@ -51,13 +40,8 @@ class OaiSource implements ChatSource {
 
     @Override
     ChatResponse onAsked(Chat chat) {
-        def apiKey = options.getStringValue("apiKey") // TODO handle null
-        def requestBody = new JSONObject()
-                .put("model", options.getStringValue("model"))
-                .put("temperature", options.getOptionValue("temperature", Double::class))
-                .put("presence_penalty", 0.1)
-                .put("frequency_penalty", 0.1)
-                .put("messages", formatChat(chat)).toString()
+        def apiKey = options.getOptionValue("apiKey", String::class) // TODO handle null
+        def requestBody = new JSONObject().put("model", "gpt-4o-mini").put("messages", formatChat(chat)).toString()
 
         def request = HttpRequest.newBuilder()
                 .uri(URI.create("https://api.openai.com/v1/chat/completions"))
@@ -68,7 +52,8 @@ class OaiSource implements ChatSource {
 
         def client = HttpClient.newHttpClient()
 
-        ChatResponse chatResponse = new NonStreamingChatResponse()
+        LinkedBlockingQueue<ChatEvent> eventQueue = new LinkedBlockingQueue<>()
+        CompletableFuture<ChatMessage> messageFuture = new CompletableFuture<>()
 
         def response = client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
 
@@ -80,26 +65,20 @@ class OaiSource implements ChatSource {
             }
 
             if (exception != null) {
-                chatResponse.completeExceptionally(exception)
+                eventQueue.put(ChatEvent.of(exception))
+                messageFuture.completeExceptionally(exception)
             } else {
-                def json = new JSONObject(it.body())
-                //System.out.println(json)
-                def completion = json.getJSONArray("choices").getJSONObject(0).getJSONObject("message").getString("content")
-                chatResponse.complete(completion)
+
             }
 
         }
 
-        return chatResponse
+        return new SimpleChatResponse(false, eventQueue, messageFuture)
     }
 
     static JSONArray formatChat(Chat chat) {
         def array = new JSONArray()
 
-        if (chat.systemPrompt != null) {
-            array.put(new JSONObject().put("role", "system").put("content", chat.systemPrompt))
-        }
-
         chat.messages.each {
             array.put(new JSONObject().put("role", it.assistant() ? "assistant" : "user").put("content", it.text()))
         }

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

@@ -13,7 +13,7 @@ public interface ChatResponse {
      *
      * @return is this response streaming
      */
-    boolean streaming();
+    boolean isStreaming();
 
     /**
      * if streamed, text token by token as it goes (or other splitting depending on the source)

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

@@ -34,9 +34,7 @@ public interface ChatSource {
         ChatResponse chatResponse = onAsked(chat);
 
         // TODO make sure it works in parallel
-        chatResponse.message().thenAccept(message -> {
-            if (message != null) chat.addMessage(message);
-        });
+        chatResponse.message().thenAccept(chat::addMessage);
 
         return chatResponse;
     }

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

@@ -1,53 +0,0 @@
-package eu.m724.source;
-
-import eu.m724.chat.ChatEvent;
-import eu.m724.chat.ChatMessage;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.LinkedBlockingQueue;
-
-public class NonStreamingChatResponse implements ChatResponse {
-    private LinkedBlockingQueue<ChatEvent> eventQueue = new LinkedBlockingQueue<>();
-    private CompletableFuture<ChatMessage> message = new CompletableFuture<>();
-
-    @Override
-    public boolean streaming() {
-        return false;
-    }
-
-    @Override
-    public LinkedBlockingQueue<ChatEvent> eventQueue() {
-        return eventQueue;
-    }
-
-    @Override
-    public CompletableFuture<ChatMessage> message() {
-        return message;
-    }
-
-    public boolean complete(String content) {
-        if (message.isDone()) return false;
-
-        try {
-            eventQueue.put(ChatEvent.of(content, "stop"));
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e); // TODO probably should handle this
-        }
-        message.complete(new ChatMessage(true, content));
-
-        return true;
-    }
-
-    public boolean completeExceptionally(Throwable throwable) {
-        if (message.isDone()) return false;
-
-        try {
-            eventQueue.put(ChatEvent.of(throwable));
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e); // TODO probably should handle this
-        }
-        message.complete(null);
-
-        return true;
-    }
-}

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

@@ -6,6 +6,29 @@ import eu.m724.chat.ChatMessage;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 
-public record SimpleChatResponse(boolean streaming, LinkedBlockingQueue<ChatEvent> eventQueue,
-                                 CompletableFuture<ChatMessage> message) implements ChatResponse {
+public class SimpleChatResponse implements ChatResponse {
+    public final boolean streaming;
+    public final LinkedBlockingQueue<ChatEvent> eventQueue;
+    public final CompletableFuture<ChatMessage> message;
+
+    public SimpleChatResponse(boolean streaming, LinkedBlockingQueue<ChatEvent> eventQueue, CompletableFuture<ChatMessage> message) {
+        this.streaming = streaming;
+        this.eventQueue = eventQueue;
+        this.message = message;
+    }
+
+    @Override
+    public boolean isStreaming() {
+        return streaming;
+    }
+
+    @Override
+    public LinkedBlockingQueue<ChatEvent> eventQueue() {
+        return eventQueue;
+    }
+
+    @Override
+    public CompletableFuture<ChatMessage> message() {
+        return message;
+    }
 }

src/main/java/eu/m724/source/option/DoubleOption.java

@@ -1,26 +0,0 @@
-package eu.m724.source.option;
-
-public class DoubleOption extends Option<Double> {
-    private double minValue = Double.MIN_VALUE;
-    private double maxValue = Double.MAX_VALUE;
-
-    public DoubleOption(String id, String label, Double value) {
-        super(id, label, value);
-    }
-
-    public DoubleOption(String id, String label, Double value, double minValue, double maxValue) {
-        super(id, label, value);
-        this.minValue = minValue;
-        this.maxValue = maxValue;
-    }
-
-    @Override
-    boolean isValid(Double value) {
-        return value >= minValue && value <= maxValue;
-    }
-
-    @Override
-    public Double fromString(String text) {
-        return Double.valueOf(text);
-    }
-}

src/main/java/eu/m724/source/option/NumberOption.java

@@ -18,9 +18,4 @@ public class NumberOption extends Option<Integer> {
     boolean isValid(Integer value) {
         return value >= minValue && value <= maxValue;
     }
-
-    @Override
-    public Integer fromString(String text) {
-        return Integer.valueOf(text);
-    }
 }

src/main/java/eu/m724/source/option/Option.java

@@ -1,6 +1,7 @@
 package eu.m724.source.option;
 
 import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 
 /**
  * represents an option that is a text label and value of any type
@@ -48,18 +49,5 @@ public abstract class Option<T> {
 
     // TODO I'm not a fan of that, probably should address the warnings
 
-    /**
-     * checks if the option is valid given current constraints
-     * @param value the checked value
-     * @return is it valid
-     */
     abstract boolean isValid(T value);
-
-    /**
-     * convert a string to the type of this option
-     * TODO fix english
-     * @param text a text representation of a value
-     * @return a value in an acceptable type
-     */
-    public abstract T fromString(String text);
 }

src/main/java/eu/m724/source/option/Options.java

@@ -34,10 +34,6 @@ public class Options {
         return (T) options.get(id).getValue();
     }
 
-    public String getStringValue(String id) {
-        return (String) getOptionValue(id, String.class);
-    }
-
     /**
      * set a value of an option
      * @param id the option id

src/main/java/eu/m724/source/option/StringOption.java

@@ -23,9 +23,4 @@ public class StringOption extends Option<String> {
     boolean isValid(String value) {
         return pattern == null || pattern.matcher(value).matches();
     }
-
-    @Override
-    public String fromString(String text) {
-        return text;
-    }
 }

thinking.txt

@@ -1,8 +1,3 @@
-THIS IS NOW OUTDATED
-original document below
-
----------
-
 okay so three things:
 1. the chat, thread, conversation itself
 2. the network thing

thinkings/thinking.txt

@@ -1,15 +0,0 @@
-so, the api is mostly good now, but new things to focus on:
-- what to include in the api (and what to not)
-- how to do requests
-- how to make it friendly
-
-network
-every platform has different libraries for that, so abstraction
-how? I still don't know
-actually javax
-
-naming
-work on that
-
-lua
-lua is a fun language. If there was a nice reason why, I would include it