Skip to content

Refactor ChatResponse processing with Optional API #4292

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 3 commits into from
Closed

Refactor ChatResponse processing with Optional API #4292

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4c9754
Refactor ChatResponse processing with Optional API
eeaters Sep 2, 2025
860ae68
fix: spring-javaformat:apply
eeaters Sep 5, 2025
0f2dae7
fix: import order
eeaters Sep 5, 2025
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
19 changes: 8 additions & 11 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 @@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

import org.slf4j.Logger;
Expand All @@ -40,6 +41,8 @@
import org.springframework.ai.chat.messages.MessageType;
import org.springframework.ai.chat.messages.SystemMessage;
import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.model.Generation;
import org.springframework.ai.chat.prompt.PromptTemplate;
import org.springframework.util.Assert;

Expand Down Expand Up @@ -142,17 +145,11 @@ public ChatClientRequest before(ChatClientRequest chatClientRequest, AdvisorChai
public ChatClientResponse after(ChatClientResponse chatClientResponse, AdvisorChain advisorChain) {
List<Message> assistantMessages = new ArrayList<>();
// Handle streaming case where we have a single result
if (chatClientResponse.chatResponse() != null && chatClientResponse.chatResponse().getResult() != null
&& chatClientResponse.chatResponse().getResult().getOutput() != null) {
assistantMessages = List.of((Message) chatClientResponse.chatResponse().getResult().getOutput());
}
else if (chatClientResponse.chatResponse() != null) {
assistantMessages = chatClientResponse.chatResponse()
.getResults()
.stream()
.map(g -> (Message) g.getOutput())
.toList();
}
Optional.of(chatClientResponse)
.map(ChatClientResponse::chatResponse)
.map(ChatResponse::getResult)
.map(Generation::getOutput)
.ifPresent(assistantMessages::add);

if (!assistantMessages.isEmpty()) {
this.chatMemory.add(this.getConversationId(chatClientResponse.context(), this.defaultConversationId),
Expand Down