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

@@ -1,18 +1,14 @@
 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.responsesource.ChatResponse;
 import eu.m724.responsesource.ChatResponseSource;
 import groovy.lang.GroovyShell;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Main {
-    public static void main(String[] args) throws InterruptedException {
+    public static void main(String[] args) {
         ChatResponseSource source = new ExampleSource();
 
         Chat chat = new Chat();
@@ -20,32 +16,7 @@ public class Main {
 
         ChatResponse chatResponse = source.ask(chat);
 
-        // I was thinking about integrating this into ChatMessage
+        System.out.println(chatResponse.text().join());
-        List<String> tokens = new ArrayList<>();
+        System.out.println(chatResponse.message().text);
-        List<Long> delays = new ArrayList<>();
-
-        System.out.println("Streaming response now\n");
-        ChatEvent token;
-
-        // usually finish reason will be alongside a token but this is simpler
-        while ((token = chatResponse.eventQueue().take()).finishReason() == null) {
-            System.out.print(token.text());
-            tokens.add(token.text());
-
-            long now = System.currentTimeMillis();
-            delays.add(now);
-        }
-
-        System.out.println("\n");
-        System.out.printf("Tokens: %d\n", tokens.size());
-
-        long time = delays.getFirst();
-        for (int i=0; i<tokens.size()-1; i++) {
-            System.out.printf("\"%s\" + %dms, ", tokens.get(i), delays.get(i+1) - time);
-            time = delays.get(i+1);
-        }
-        System.out.printf("\"%s\"\n\n", tokens.getLast());
-
-        System.out.printf("Text: %s\n", chatResponse.message().join().text());
     }
 }

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

@@ -12,8 +12,4 @@ public class Chat {
     }
 
     public Chat() {}
-
-    public void addMessage(ChatMessage message) {
-        this.messages.add(message);
-    }
 }

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

@@ -1,23 +0,0 @@
-package eu.m724.chat;
-
-public record ChatEvent(
-        String text,
-        String finishReason,
-        Throwable error
-) {
-    public static ChatEvent of(String text) {
-        return new ChatEvent(text, null, null);
-    }
-
-    public static ChatEvent of(String text, String finishReason) {
-        return new ChatEvent(text, finishReason, null);
-    }
-
-    public static ChatEvent finished(String finishReason) {
-        return ChatEvent.of(null, finishReason);
-    }
-
-    public static ChatEvent of(Throwable error) {
-        return new ChatEvent(null, "error", error);
-    }
-}

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

@@ -3,5 +3,12 @@ package eu.m724.chat;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
 
-public record ChatMessage(boolean assistant, String text) {
+public class ChatMessage {
+    public boolean assistant;
+    public String text; // TODO make it private and modifiable other way
+
+    public ChatMessage(boolean assistant, String text) {
+        this.assistant = assistant;
+        this.text = text;
+    }
 }

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

@@ -1,16 +1,12 @@
 package eu.m724.example
 
 import eu.m724.chat.Chat
-import eu.m724.chat.ChatEvent
 import eu.m724.chat.ChatMessage
 import eu.m724.responsesource.ChatResponse
 import eu.m724.responsesource.ChatResponseSource
 import eu.m724.responsesource.ChatResponseSourceInfo
 
 import java.util.concurrent.CompletableFuture
-import java.util.concurrent.Executors
-import java.util.concurrent.LinkedBlockingDeque
-import java.util.concurrent.LinkedBlockingQueue
 
 /**
  * an example chatresponsesource chatresponsesource ChatResponseSource CHATRESPONSESOURCE CAHTSERREPOSNECSOURCE
@@ -19,7 +15,6 @@ import java.util.concurrent.LinkedBlockingQueue
 class ExampleSource implements ChatResponseSource {
     private ChatResponseSourceInfo info =
             new ChatResponseSourceInfo("yo", "ye", "1.0", 1)
-    private Random random = new Random()
 
     @Override
     ChatResponseSourceInfo info() {
@@ -27,36 +22,24 @@ class ExampleSource implements ChatResponseSource {
     }
 
     @Override
-    ChatResponse onAsked(Chat chat) {
+    ChatResponse ask(Chat chat) {
-        String[] parts = "hello how can I assist you today".split(" ")
-
-        LinkedBlockingQueue<ChatEvent> queue = new LinkedBlockingQueue<>()
-
-        CompletableFuture<ChatMessage> future = CompletableFuture.supplyAsync {
-            for (int i=0; i<parts.length; i++) {
-                String token = (i > 0 ? " " : "") + parts[i]
-                queue.put(ChatEvent.of(token));
-                Thread.sleep(random.nextInt(200, 500))
-            }
-
-            queue.put(ChatEvent.finished("stop"))
-            return new ChatMessage(true, parts.join(" "))
-        }
-
         return new ChatResponse() {
+            String[] parts
+            CompletableFuture<String> completableFuture = new CompletableFuture<>();
+
             @Override
             boolean isStreaming() {
                 return false
             }
 
             @Override
-            LinkedBlockingQueue<ChatEvent> eventQueue() {
+            CompletableFuture<String> text() {
-                return queue
+                return CompletableFuture.completedFuture("hello how can i assist you today")
             }
 
             @Override
-            CompletableFuture<ChatMessage> message() {
+            ChatMessage message() {
-                return future
+                return new ChatMessage(true, "i assisted you already bye")
             }
         }
     }

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

@@ -1,16 +1,12 @@
 package eu.m724.responsesource;
 
-import eu.m724.chat.ChatEvent;
 import eu.m724.chat.ChatMessage;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.LinkedBlockingQueue;
 
 public interface ChatResponse {
     /**
      * is this response streaming
-     * if it's not, the queue will get one element that is the whole response
-     *
      * @return is this response streaming
      */
     boolean isStreaming();
@@ -18,15 +14,14 @@ public interface ChatResponse {
     /**
      * if streamed, text token by token as it goes (or other splitting depending on the source)
      * if not, the {@link CompletableFuture} returns just the whole response after it's ready
-     *
+     * @return yeah
-     * @return the fifo queue with each element being a part. null ends the sequence
      */
-    LinkedBlockingQueue<ChatEvent> eventQueue();
+    CompletableFuture<String> text(); // TODO completablefuture is not correct here also fix the doc
 
     /**
-     * gets the resulting {@link ChatMessage} when it's ready
+     * gets the resulting {@link ChatMessage}
-     *
+     * TODO I think it should be available after streaming is done so maybe wrap this in {@link CompletableFuture}
-     * @return the resulting {@link ChatMessage} as soon as the response is complete
+     * @return the resulting {@link ChatMessage}
      */
-     CompletableFuture<ChatMessage> message();
+    ChatMessage message();
 }

src/main/java/eu/m724/responsesource/ChatResponseSource.java

@@ -5,14 +5,5 @@ import eu.m724.chat.Chat;
 public interface ChatResponseSource {
     ChatResponseSourceInfo info();
 
-    ChatResponse onAsked(Chat chat);
+    ChatResponse ask(Chat chat);
-
-    default ChatResponse ask(Chat chat) {
-        ChatResponse chatResponse = onAsked(chat);
-
-        // TODO make sure it works in parallel
-        chatResponse.message().thenAccept(chat::addMessage);
-
-        return chatResponse;
-    }
 }