From 9d9c10e123d26372f27474cefc67e60ff204216d Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Sun, 11 May 2025 06:37:15 -0400 Subject: [PATCH] apply java formatting --- .../client/advisor/AbstractConversationHistoryAdvisor.java | 5 +++-- .../ai/chat/client/advisor/MessageChatMemoryAdvisor.java | 4 ++-- .../ai/chat/client/advisor/PromptChatMemoryAdvisor.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/AbstractConversationHistoryAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/AbstractConversationHistoryAdvisor.java index d31864fab..b4f5bf59e 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/AbstractConversationHistoryAdvisor.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/AbstractConversationHistoryAdvisor.java @@ -10,6 +10,7 @@ import org.springframework.ai.chat.messages.Message; /** * Advisor for standard ChatMemory implementations + * * @author Mark Pollack * @since 1.0.0 */ @@ -19,8 +20,8 @@ public abstract class AbstractConversationHistoryAdvisor extends AbstractChatMem this(chatMemory, ChatMemory.DEFAULT_CONVERSATION_ID, true, DEFAULT_CHAT_MEMORY_PRECEDENCE_ORDER); } - public AbstractConversationHistoryAdvisor(ChatMemory chatMemory, String defaultConversationId, boolean protectFromBlocking, - int order) { + public AbstractConversationHistoryAdvisor(ChatMemory chatMemory, String defaultConversationId, + boolean protectFromBlocking, int order) { super(chatMemory, defaultConversationId, protectFromBlocking, order); } diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java index d8cc07d63..dfb4431a1 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java @@ -78,13 +78,13 @@ public class MessageChatMemoryAdvisor extends AbstractConversationHistoryAdvisor @Override protected ChatClientRequest before(ChatClientRequest request) { String conversationId = this.doGetConversationId(request.context()); - + // Add the new user messages from the current prompt to memory List newUserMessages = request.prompt().getUserMessages(); for (UserMessage userMessage : newUserMessages) { this.getChatMemoryStore().add(conversationId, userMessage); } - + // Use the parent class implementation to handle retrieving and applying messages return super.before(request); } diff --git a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java index 2c39e64ad..afa1b7015 100644 --- a/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java +++ b/spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java @@ -118,7 +118,7 @@ public class PromptChatMemoryAdvisor extends AbstractConversationHistoryAdvisor @Override protected ChatClientRequest before(ChatClientRequest chatClientRequest) { String conversationId = this.doGetConversationId(chatClientRequest.context()); - + // 1. Add all user messages from the current prompt to memory List userMessages = chatClientRequest.prompt().getUserMessages(); for (UserMessage userMessage : userMessages) { @@ -126,7 +126,7 @@ public class PromptChatMemoryAdvisor extends AbstractConversationHistoryAdvisor logger.info("[PromptChatMemoryAdvisor.before] Added USER message to memory for conversationId={}: {}", conversationId, userMessage.getText()); } - + // 2. Retrieve the chat memory for the current conversation. List memoryMessages = this.getChatMemoryStore().get(conversationId); logger.info("[PromptChatMemoryAdvisor.before] Memory after USER add for conversationId={}: {}", conversationId,