Handle PR comments

Signed-off-by: Thomas Vitale <[email protected]>

Author: ThomasVitale

memory/spring-ai-model-chat-memory-jdbc/src/main/java/org/springframework/ai/chat/memory/jdbc/JdbcChatMemory.java

@@ -49,7 +49,7 @@ public class JdbcChatMemory implements ChatMemory {
 			INSERT INTO ai_chat_memory (conversation_id, content, type) VALUES (?, ?, ?)""";
 
 	private static final String QUERY_GET = """
-			SELECT content, type FROM ai_chat_memory WHERE conversation_id = ? ORDER BY "timestamp" DESC LIMIT ?""";
+			SELECT content, type FROM ai_chat_memory WHERE conversation_id = ? ORDER BY "timestamp" LIMIT ?""";
 
 	private static final String QUERY_CLEAR = "DELETE FROM ai_chat_memory WHERE conversation_id = ?";
 

memory/spring-ai-model-chat-memory-jdbc/src/main/java/org/springframework/ai/chat/memory/jdbc/JdbcChatMemoryRepository.java

@@ -40,7 +40,7 @@
 public class JdbcChatMemoryRepository implements ChatMemoryRepository {
 
 	private static final String QUERY_GET_IDS = """
-			SELECT conversation_id FROM ai_chat_memory
+			SELECT DISTINCT conversation_id FROM ai_chat_memory
 			""";
 
 	private static final String QUERY_ADD = """

memory/spring-ai-model-chat-memory-jdbc/src/main/resources/org/springframework/ai/chat/memory/jdbc/schema-mariadb.sql

@@ -1,10 +1,10 @@
 CREATE TABLE IF NOT EXISTS ai_chat_memory (
-    conversation_id VARCHAR(36) NOT NULL,
+    conversation_id VARCHAR(36) NOT NULL PRIMARY KEY,
     content TEXT NOT NULL,
     type VARCHAR(10) NOT NULL,
     `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     CONSTRAINT type_check CHECK (type IN ('USER', 'ASSISTANT', 'SYSTEM', 'TOOL'))
 );
 
 CREATE INDEX IF NOT EXISTS ai_chat_memory_conversation_id_timestamp_idx
-ON ai_chat_memory(conversation_id, `timestamp` DESC);
+ON ai_chat_memory(conversation_id, `timestamp`);

memory/spring-ai-model-chat-memory-jdbc/src/main/resources/org/springframework/ai/chat/memory/jdbc/schema-postgresql.sql

@@ -1,9 +1,9 @@
 CREATE TABLE IF NOT EXISTS ai_chat_memory (
-    conversation_id VARCHAR(36) NOT NULL,
+    conversation_id VARCHAR(36) NOT NULL PRIMARY KEY,
     content TEXT NOT NULL,
     type VARCHAR(10) NOT NULL CHECK (type IN ('USER', 'ASSISTANT', 'SYSTEM', 'TOOL')),
     "timestamp" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 CREATE INDEX IF NOT EXISTS ai_chat_memory_conversation_id_timestamp_idx
-ON ai_chat_memory(conversation_id, "timestamp" DESC);
+ON ai_chat_memory(conversation_id, "timestamp");

spring-ai-model/src/main/java/org/springframework/ai/chat/memory/MessageWindowChatMemory.java

@@ -21,7 +21,9 @@
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * A chat memory implementation that maintains a message window of a specified size,
@@ -85,9 +87,10 @@ public void clear(String conversationId) {
 	private List<Message> process(List<Message> memoryMessages, List<Message> newMessages) {
 		List<Message> processedMessages = new ArrayList<>();
 
+		Set<Message> memoryMessagesSet = new HashSet<>(memoryMessages);
 		boolean hasNewSystemMessage = newMessages.stream()
-			.filter(message -> message instanceof SystemMessage)
-			.anyMatch(message -> !memoryMessages.contains(message));
+			.filter(SystemMessage.class::isInstance)
+			.anyMatch(message -> !memoryMessagesSet.contains(message));
 
 		memoryMessages.stream()
 			.filter(message -> !(hasNewSystemMessage && message instanceof SystemMessage))