Skip to content

Removed deprecated method in ChatMemory #3093

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

Closed
wants to merge 1 commit into from
Closed

Removed deprecated method in ChatMemory #3093

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 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 @@ -35,6 +35,7 @@
* Memory is retrieved added as a collection of messages to the prompt
*
* @author Christian Tzolov
* @author Hyunsang Han
* @since 1.0.0
*/
public class MessageChatMemoryAdvisor extends AbstractChatMemoryAdvisor<ChatMemory> {
Expand Down Expand Up @@ -79,10 +80,8 @@ public Flux<ChatClientResponse> adviseStream(ChatClientRequest chatClientRequest
private ChatClientRequest before(ChatClientRequest chatClientRequest) {
String conversationId = this.doGetConversationId(chatClientRequest.context());

int chatMemoryRetrieveSize = this.doGetChatMemoryRetrieveSize(chatClientRequest.context());

// 1. Retrieve the chat memory for the current conversation.
List<Message> memoryMessages = this.getChatMemoryStore().get(conversationId, chatMemoryRetrieveSize);
List<Message> memoryMessages = this.getChatMemoryStore().get(conversationId);

// 2. Advise the request messages list.
List<Message> processedMessages = new ArrayList<>(memoryMessages);
Expand Down
4 changes: 2 additions & 2 deletions ...hat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
* @author Christian Tzolov
* @author Miloš Havránek
* @author Thomas Vitale
* @author Hyunsang Han
* @since 1.0.0
*/
public class PromptChatMemoryAdvisor extends AbstractChatMemoryAdvisor<ChatMemory> {
Expand Down Expand Up @@ -112,10 +113,9 @@ public Flux<ChatClientResponse> adviseStream(ChatClientRequest chatClientRequest

private ChatClientRequest before(ChatClientRequest chatClientRequest) {
String conversationId = this.doGetConversationId(chatClientRequest.context());
int chatMemoryRetrieveSize = this.doGetChatMemoryRetrieveSize(chatClientRequest.context());

// 1. Retrieve the chat memory for the current conversation.
List<Message> memoryMessages = this.getChatMemoryStore().get(conversationId, chatMemoryRetrieveSize);
List<Message> memoryMessages = this.getChatMemoryStore().get(conversationId);

// 2. Processed memory messages as a string.
String memory = memoryMessages.stream()
Expand Down
12 changes: 2 additions & 10 deletions spring-ai-model/src/main/java/org/springframework/ai/chat/memory/ChatMemory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*
* @author Christian Tzolov
* @author Thomas Vitale
* @author Hyunsang Han
* @since 1.0.0
*/
public interface ChatMemory {
Expand All @@ -49,16 +50,7 @@ default void add(String conversationId, Message message) {
/**
* Get the messages in the chat memory for the specified conversation.
*/
default List<Message> get(String conversationId) {
Assert.hasText(conversationId, "conversationId cannot be null or empty");
return get(conversationId, Integer.MAX_VALUE);
}

/**
* @deprecated in favor of using {@link MessageWindowChatMemory}.
*/
@Deprecated
List<Message> get(String conversationId, int lastN);
List<Message> get(String conversationId);

/**
* Clear the chat memory for the specified conversation.
Expand Down
7 changes: 1 addition & 6 deletions ...ng-ai-model/src/main/java/org/springframework/ai/chat/memory/MessageWindowChatMemory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
*
* @author Thomas Vitale
* @author Ilayaperumal Gopinathan
* @author Hyunsang Han
* @since 1.0.0
*/
public final class MessageWindowChatMemory implements ChatMemory {
Expand Down Expand Up @@ -71,12 +72,6 @@ public List<Message> get(String conversationId) {
return this.chatMemoryRepository.findByConversationId(conversationId);
}

@Override
@Deprecated // in favor of get(conversationId)
public List<Message> get(String conversationId, int lastN) {
return get(conversationId);
}

@Override
public void clear(String conversationId) {
Assert.hasText(conversationId, "conversationId cannot be null or empty");
Expand Down