Changed internal representation of messages and added LLM required ordering of messages.

src/main/java/com/meta/cp4m/Service.java

@@ -41,7 +41,7 @@ public Service(
   }
 
   void handle(Context ctx) {
-    List<T> messages = handler.processRequest(ctx);
+    List<T> messages = handler.processRequest(ctx, store);
     // TODO: once we have a non-volatile store, on startup send stored but not replied to messages
     for (T m : messages) {
       ThreadState<T> thread = store.add(m);
@@ -69,6 +69,7 @@ private void execute(ThreadState<T> thread) {
       LOGGER.error("failed to communicate with LLM", e);
       return;
     }
+    llmResponse = thread.tail();
     store.add(llmResponse);
     try {
       handler.respond(llmResponse);

src/main/java/com/meta/cp4m/llm/HuggingFaceLlamaPlugin.java

@@ -50,7 +50,7 @@ public T handle(ThreadState<T> threadState) throws IOException {
     Optional<String> prompt = promptCreator.createPrompt(threadState);
     if (prompt.isEmpty()) {
       return threadState.newMessageFromBot(
-          Instant.now(), "I'm sorry but that request was too long for me.");
+          Instant.now(), "I'm sorry but that request was too long for me.", threadState.tail());
     }
 
     body.put("inputs", prompt.get());
@@ -72,6 +72,6 @@ public T handle(ThreadState<T> threadState) throws IOException {
     String llmResponse = allGeneratedText.strip().replace(prompt.get().strip(), "");
     Instant timestamp = Instant.now();
 
-    return threadState.newMessageFromBot(timestamp, llmResponse);
+    return threadState.newMessageFromBot(timestamp, llmResponse, threadState.tail());
   }
 }

src/main/java/com/meta/cp4m/llm/OpenAIPlugin.java

@@ -162,7 +162,7 @@ public T handle(ThreadState<T> threadState) throws IOException {
     Optional<ArrayNode> prunedMessages = pruneMessages(messages, null);
     if (prunedMessages.isEmpty()) {
       return threadState.newMessageFromBot(
-          Instant.now(), "I'm sorry but that request was too long for me.");
+          Instant.now(), "I'm sorry but that request was too long for me.",fromUser);
     }
     body.set("messages", prunedMessages.get());
 
@@ -182,6 +182,6 @@ public T handle(ThreadState<T> threadState) throws IOException {
     Instant timestamp = Instant.ofEpochSecond(responseBody.get("created").longValue());
     JsonNode choice = responseBody.get("choices").get(0);
     String messageContent = choice.get("message").get("content").textValue();
-    return threadState.newMessageFromBot(timestamp, messageContent);
+    return threadState.newMessageFromBot(timestamp, messageContent,fromUser);
   }
 }

src/main/java/com/meta/cp4m/message/FBMessage.java

@@ -17,5 +17,6 @@ public record FBMessage(
     Identifier senderId,
     Identifier recipientId,
     String message,
-    Role role)
+    Role role,
+    Message parentMessage)
     implements Message {}

src/main/java/com/meta/cp4m/message/FBMessageHandler.java

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.meta.cp4m.Identifier;
+import com.meta.cp4m.store.ChatStore;
 import io.javalin.http.BadRequestResponse;
 import io.javalin.http.Context;
 import io.javalin.http.HandlerType;
@@ -40,6 +41,8 @@ public class FBMessageHandler implements MessageHandler<FBMessage> {
   private static final Logger LOGGER = LoggerFactory.getLogger(FBMessageHandler.class);
   private static final TextChunker CHUNKER = TextChunker.standard(2000);
 
+  private static final MessageFactory<FBMessage> MESSAGE_FACTORY = MessageFactory.instance(FBMessage.class);
+
   private final String verifyToken;
   private final String appSecret;
 
@@ -92,14 +95,14 @@ public FBMessageHandler(String verifyToken, String pageAccessToken, String appSe
   }
 
   @Override
-  public List<FBMessage> processRequest(Context ctx) {
+  public List<FBMessage> processRequest(Context ctx, ChatStore<FBMessage> store) {
     try {
       switch (ctx.handlerType()) {
         case GET -> {
           return getHandler(ctx);
         }
         case POST -> {
-          return postHandler(ctx);
+          return postHandler(ctx,store);
         }
       }
     } catch (JsonProcessingException | NullPointerException e) {
@@ -133,7 +136,7 @@ String hmac(String body) {
     return MetaHandlerUtils.hmac(body, appSecret);
   }
 
-  private List<FBMessage> postHandler(Context ctx) throws JsonProcessingException {
+  private List<FBMessage> postHandler(Context ctx, ChatStore<FBMessage> store) throws JsonProcessingException {
     MetaHandlerUtils.postHeaderValidator(ctx, appSecret);
 
     String bodyString = ctx.body();
@@ -178,14 +181,9 @@ private List<FBMessage> postHandler(Context ctx) throws JsonProcessingException
 
           @Nullable JsonNode textObject = messageObject.get("text");
           if (textObject != null && textObject.isTextual()) {
-            FBMessage m =
-                new FBMessage(
-                    timestamp,
-                    messageId,
-                    senderId,
-                    recipientId,
-                    textObject.textValue(),
-                    Message.Role.USER);
+            ThreadState<FBMessage> thread = store.get(Message.threadId(senderId,recipientId));
+            FBMessage parentMessage = thread == null ? null : thread.tail();
+            FBMessage m = MESSAGE_FACTORY.newMessage(timestamp, textObject.textValue(), senderId, recipientId,messageId, Message.Role.USER,parentMessage);
             output.add(m);
           } else {
             LOGGER

src/main/java/com/meta/cp4m/message/Message.java

@@ -13,13 +13,17 @@
 
 public interface Message {
 
-  static Identifier threadId(Identifier id1, Identifier id2) {
+  public static Identifier threadId(Identifier id1, Identifier id2) {
     if (id1.compareTo(id2) <= 0) {
       return Identifier.from(id1.toString() + '|' + id2);
     }
     return Identifier.from(id2.toString() + '|' + id1);
   }
 
+  static void parentMessage(Message parentMessage){
+
+  }
+
   Instant timestamp();
 
   Identifier instanceId();
@@ -32,6 +36,8 @@ static Identifier threadId(Identifier id1, Identifier id2) {
 
   Role role();
 
+  Message parentMessage();
+
   default Identifier threadId() {
     return threadId(senderId(), recipientId());
   }

src/main/java/com/meta/cp4m/message/MessageFactory.java

@@ -21,9 +21,9 @@ public interface MessageFactory<T extends Message> {
   Map<Class<? extends Message>, MessageFactory<? extends Message>> FACTORY_MAP =
       Stream.<FactoryContainer<?>>of(
               new FactoryContainer<>(
-                  FBMessage.class, (t, m, si, ri, ii, r) -> new FBMessage(t, ii, si, ri, m, r)),
+                  FBMessage.class, (t, m, si, ri, ii, r, pm) -> new FBMessage(t, ii, si, ri, m, r, pm)),
               new FactoryContainer<>(
-                  WAMessage.class, (t, m, si, ri, ii, r) -> new WAMessage(t, ii, si, ri, m, r)))
+                  WAMessage.class, (t, m, si, ri, ii, r, pm) -> new WAMessage(t, ii, si, ri, m, r, pm)))
           .collect(
               Collectors.toUnmodifiableMap(FactoryContainer::clazz, FactoryContainer::factory));
 
@@ -46,7 +46,8 @@ T newMessage(
       Identifier senderId,
       Identifier recipientId,
       Identifier instanceId,
-      Role role);
+      Role role,
+      Message parentMessage);
 
   /** this exists to provide compiler guarantees for type matching in the FACTORY_MAP */
   record FactoryContainer<T extends Message>(Class<T> clazz, MessageFactory<T> factory) {}

src/main/java/com/meta/cp4m/message/MessageHandler.java

@@ -8,6 +8,7 @@
 
 package com.meta.cp4m.message;
 
+import com.meta.cp4m.store.ChatStore;
 import io.javalin.http.Context;
 import io.javalin.http.HandlerType;
 import java.io.IOException;
@@ -22,7 +23,7 @@ public interface MessageHandler<T extends Message> {
    * @param ctx the context corresponding to an incoming request
    * @return return a {@link Message} object if appropriate
    */
-  List<T> processRequest(Context ctx);
+  List<T> processRequest(Context ctx, ChatStore<T> store);
 
   /**
    * The method needed to respond to a message from a user

src/main/java/com/meta/cp4m/message/ThreadState.java

@@ -39,14 +39,19 @@ private ThreadState(ThreadState<T> old, T newMessage) {
         old.tail().threadId().equals(newMessage.threadId()),
         "all messages in a thread must have the same thread id");
     List<T> messages = old.messages;
-    if (newMessage.timestamp().isBefore(old.tail().timestamp())) {
-      this.messages =
+//    if (newMessage.timestamp().isBefore(old.tail().timestamp())) {
+//      this.messages =
+//          Stream.concat(messages.stream(), Stream.of(newMessage))
+//              .sorted(Comparator.comparing(Message::timestamp))
+//              .collect(Collectors.toUnmodifiableList());
+//    } else {
+//      this.messages = ImmutableList.<T>builder().addAll(messages).add(newMessage).build();
+//    }
+
+    this.messages =
           Stream.concat(messages.stream(), Stream.of(newMessage))
-              .sorted(Comparator.comparing(Message::timestamp))
+              .sorted((m1,m2) -> m1.parentMessage() == m2.parentMessage() ? (m1.role().compareTo(m2.role())) : (m1.timestamp().compareTo(m2.timestamp())))
               .collect(Collectors.toUnmodifiableList());
-    } else {
-      this.messages = ImmutableList.<T>builder().addAll(messages).add(newMessage).build();
-    }
 
     Preconditions.checkArgument(
         old.userId().equals(userId()) && old.botId().equals(botId()),
@@ -77,13 +82,13 @@ public Identifier botId() {
     };
   }
 
-  public T newMessageFromBot(Instant timestamp, String message) {
+  public T newMessageFromBot(Instant timestamp, String message, T parentMessage) {
     return messageFactory.newMessage(
-        timestamp, message, botId(), userId(), Identifier.random(), Role.ASSISTANT);
+        timestamp, message, botId(), userId(), Identifier.random(), Role.ASSISTANT, parentMessage);
   }
 
   public T newMessageFromUser(Instant timestamp, String message, Identifier instanceId) {
-    return messageFactory.newMessage(timestamp, message, userId(), botId(), instanceId, Role.USER);
+    return messageFactory.newMessage(timestamp, message, userId(), botId(), instanceId, Role.USER, this.tail());
   }
 
   public ThreadState<T> with(T message) {
@@ -97,4 +102,5 @@ public List<T> messages() {
   public T tail() {
     return messages.get(messages.size() - 1);
   }
+
 }

src/main/java/com/meta/cp4m/message/WAMessage.java

@@ -17,5 +17,6 @@ public record WAMessage(
     Identifier senderId,
     Identifier recipientId,
     String message,
-    Role role)
+    Role role,
+    Message parentMessage)
     implements Message {}

src/main/java/com/meta/cp4m/message/WAMessageHandler.java

@@ -16,6 +16,7 @@
 import com.meta.cp4m.message.webhook.whatsapp.Utils;
 import com.meta.cp4m.message.webhook.whatsapp.WebhookMessage;
 import com.meta.cp4m.message.webhook.whatsapp.WebhookPayload;
+import com.meta.cp4m.store.ChatStore;
 import io.javalin.http.Context;
 import io.javalin.http.HandlerType;
 import java.io.IOException;
@@ -40,6 +41,7 @@ public class WAMessageHandler implements MessageHandler<WAMessage> {
   private static final String API_VERSION = "v17.0";
   private static final JsonMapper MAPPER = Utils.JSON_MAPPER;
   private static final Logger LOGGER = LoggerFactory.getLogger(FBMessageHandler.class);
+  private static final MessageFactory<WAMessage> MESSAGE_FACTORY = MessageFactory.instance(WAMessage.class);
 
   /**
    * <a
@@ -85,7 +87,7 @@ public WAMessageHandler(WAMessengerConfig config) {
   }
 
   @Override
-  public List<WAMessage> processRequest(Context ctx) {
+  public List<WAMessage> processRequest(Context ctx, ChatStore<WAMessage> store) {
 
     try {
       switch (ctx.handlerType()) {
@@ -95,7 +97,7 @@ public List<WAMessage> processRequest(Context ctx) {
           return Collections.emptyList();
         }
         case POST -> {
-          return postHandler(ctx);
+          return postHandler(ctx,store);
         }
       }
     } catch (RuntimeException e) {
@@ -108,7 +110,7 @@ public List<WAMessage> processRequest(Context ctx) {
     throw new UnsupportedOperationException("Only accepting get and post methods");
   }
 
-  List<WAMessage> postHandler(Context ctx) {
+  List<WAMessage> postHandler(Context ctx, ChatStore<WAMessage> store) {
     MetaHandlerUtils.postHeaderValidator(ctx, appSecret);
     String bodyString = ctx.body();
     WebhookPayload payload;
@@ -142,14 +144,9 @@ List<WAMessage> postHandler(Context ctx) {
                   continue;
                 }
                 TextWebhookMessage textMessage = (TextWebhookMessage) message;
-                waMessages.add(
-                    new WAMessage(
-                        message.timestamp(),
-                        message.id(),
-                        message.from(),
-                        phoneNumberId,
-                        textMessage.text().body(),
-                        Message.Role.USER));
+                ThreadState<WAMessage> thread = store.get(Message.threadId(message.from(),phoneNumberId));
+                WAMessage parentMessage = thread == null ? null : thread.tail();
+                WAMessage m = MESSAGE_FACTORY.newMessage(message.timestamp(), textMessage.text().body(), message.from(), phoneNumberId,message.id(), Message.Role.USER,parentMessage);
                 readExecutor.execute(() -> markRead(phoneNumberId, textMessage.id().toString()));
               }
             });

src/main/java/com/meta/cp4m/store/ChatStore.java

@@ -8,6 +8,7 @@
 
 package com.meta.cp4m.store;
 
+import com.meta.cp4m.Identifier;
 import com.meta.cp4m.message.Message;
 import com.meta.cp4m.message.ThreadState;
 import java.util.List;
@@ -28,4 +29,6 @@ public interface ChatStore<T extends Message> {
   long size();
 
   List<ThreadState<T>> list();
+
+  ThreadState<T> get(Identifier threadId);
 }

src/main/java/com/meta/cp4m/store/MemoryStore.java

@@ -31,7 +31,7 @@ public class MemoryStore<T extends Message> implements ChatStore<T> {
   }
 
   @Override
-  public ThreadState<T> add(T message) {
+  public ThreadState<T>  add(T message) {
     return this.store
         .asMap()
         .compute(
@@ -53,4 +53,9 @@ public long size() {
   public List<ThreadState<T>> list() {
     return store.asMap().values().stream().toList();
   }
+
+  @Override
+  public ThreadState<T> get(Identifier threadId){
+    return this.store.asMap().get(threadId);
+  }
 }

src/test/java/com/meta/cp4m/llm/DummyLLMPlugin.java

@@ -46,6 +46,6 @@ public String dummyResponse() {
   @Override
   public T handle(ThreadState<T> threadState) {
     receivedThreadStates.add(threadState);
-    return threadState.newMessageFromBot(Instant.now(), dummyLLMResponse);
+    return threadState.newMessageFromBot(Instant.now(), dummyLLMResponse, threadState.tail());
   }
 }

src/test/java/com/meta/cp4m/llm/HuggingFaceLlamaPluginTest.java

@@ -66,7 +66,8 @@ public class HuggingFaceLlamaPluginTest {
                   Identifier.random(),
                   Identifier.random(),
                   Identifier.random(),
-                  Role.USER));
+                  Role.USER,
+                      null));
 
   static {
     SAMPLE_RESPONSE.addObject().put("generated_text", TEST_MESSAGE);
@@ -145,7 +146,7 @@ void createPayloadWithSystemMessage() {
                     Identifier.random(),
                     Identifier.random(),
                     Identifier.random(),
-                    Role.USER));
+                    Role.USER, null));
     HuggingFaceLlamaPrompt<FBMessage> promptBuilder =
         new HuggingFaceLlamaPrompt<>(config.systemMessage(), config.maxInputTokens());
     Optional<String> createdPayload = promptBuilder.createPrompt(stack);
@@ -173,7 +174,7 @@ void contextTooBig() throws IOException {
                     Identifier.random(),
                     Identifier.random(),
                     Identifier.random(),
-                    Role.USER));
+                    Role.USER, null));
     FBMessage response = plugin.handle(thread);
     assertThat(response.message()).isEqualTo("I'm sorry but that request was too long for me.");
   }
@@ -197,7 +198,7 @@ void truncatesContext() throws IOException {
                     Identifier.random(),
                     Identifier.random(),
                     Identifier.random(),
-                    Role.USER));
+                    Role.USER,null));
     thread =
         thread.with(thread.newMessageFromUser(Instant.now(), "test message", Identifier.from(2)));
     HuggingFaceLlamaPrompt<FBMessage> promptBuilder =
@@ -256,7 +257,7 @@ void orderedCorrectly() throws IOException, InterruptedException {
                     Identifier.random(),
                     Identifier.random(),
                     Identifier.random(),
-                    Role.USER));
+                    Role.USER, null));
     stack = stack.with(stack.newMessageFromUser(Instant.now(), "2", Identifier.from(2)));
     stack = stack.with(stack.newMessageFromUser(Instant.now(), "3", Identifier.from(3)));
     stack = stack.with(stack.newMessageFromUser(Instant.now(), "4", Identifier.from(4)));