Skip to content

GH-4170 Fixed the issue where SystemMessage was not being saved to the chat memory #4189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-4170 Fixed the issue where SystemMessage was not being saved to the chat memory #4189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...at/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.List;

import org.springframework.ai.chat.messages.SystemMessage;
import org.springframework.util.CollectionUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
Expand Down Expand Up @@ -91,9 +93,17 @@ public ChatClientRequest before(ChatClientRequest chatClientRequest, AdvisorChai
.prompt(chatClientRequest.prompt().mutate().messages(processedMessages).build())
.build();

// 4. Add the new user message to the conversation memory.
// 4. Add user message and system message to the conversation memory: if the
// current conversation is the first round, or if the `systemMessage` has been
// updated, add both to the conversation memory.
SystemMessage systemMessage = chatClientRequest.prompt().getSystemMessage();
UserMessage userMessage = processedChatClientRequest.prompt().getUserMessage();
this.chatMemory.add(conversationId, userMessage);
if (CollectionUtils.isEmpty(memoryMessages) || !memoryMessages.contains(systemMessage)) {
this.chatMemory.add(conversationId, List.of(systemMessage, userMessage));
}
else {
this.chatMemory.add(conversationId, userMessage);
}

return processedChatClientRequest;
}
Expand Down