Skip to content

Use actual parameter values in userText when saving to chat memory (#… #2636

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

Use actual parameter values in userText when saving to chat memory (#… #2636

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
4 changes: 3 additions & 1 deletion ...re/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,7 @@
import java.util.ArrayList;
import java.util.List;

import org.springframework.ai.chat.prompt.PromptTemplate;
import reactor.core.publisher.Flux;

import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
Expand Down Expand Up @@ -94,7 +95,8 @@ private AdvisedRequest before(AdvisedRequest request) {
AdvisedRequest advisedRequest = AdvisedRequest.from(request).messages(advisedMessages).build();

// 4. Add the new user input to the conversation memory.
UserMessage userMessage = new UserMessage(request.userText(), request.media());
String userMessageText = new PromptTemplate(request.userText(), request.userParams()).render();
UserMessage userMessage = new UserMessage(userMessageText, request.media());
this.getChatMemoryStore().add(this.doGetConversationId(request.adviseContext()), userMessage);

return advisedRequest;
Expand Down
4 changes: 3 additions & 1 deletion ...ore/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 @@ -21,6 +21,7 @@
import java.util.Map;
import java.util.stream.Collectors;

import org.springframework.ai.chat.prompt.PromptTemplate;
import reactor.core.publisher.Flux;

import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
Expand Down Expand Up @@ -127,7 +128,8 @@ private AdvisedRequest before(AdvisedRequest request) {
.build();

// 4. Add the new user input to the conversation memory.
UserMessage userMessage = new UserMessage(request.userText(), request.media());
String userMessageText = new PromptTemplate(request.userText(), request.userParams()).render();
UserMessage userMessage = new UserMessage(userMessageText, request.media());
this.getChatMemoryStore().add(this.doGetConversationId(request.adviseContext()), userMessage);

return advisedRequest;
Expand Down
4 changes: 3 additions & 1 deletion ...rc/main/java/org/springframework/ai/chat/client/advisor/VectorStoreChatMemoryAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Map;
import java.util.stream.Collectors;

import org.springframework.ai.chat.prompt.PromptTemplate;
import reactor.core.publisher.Flux;

import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
Expand Down Expand Up @@ -185,7 +186,8 @@ private AdvisedRequest before(AdvisedRequest request) {
.systemParams(advisedSystemParams)
.build();

UserMessage userMessage = new UserMessage(request.userText(), request.media());
String userMessageText = new PromptTemplate(request.userText(), request.userParams()).render();
UserMessage userMessage = new UserMessage(userMessageText, request.media());
this.getChatMemoryStore()
.write(toDocuments(List.of(userMessage), this.doGetConversationId(request.adviseContext())));

Expand Down