优化记忆内容

Author: 970263611

spring-ai-alibaba-jmanus/pom.xml

@@ -34,8 +34,6 @@
         <maven-checkstyle-plugin.failOnViolation>true</maven-checkstyle-plugin.failOnViolation>
         <puppycrawl-tools-checkstyle.version>9.3</puppycrawl-tools-checkstyle.version>
 
-        <memory.version>1.0.0.3-SNAPSHOT</memory.version>
-
     </properties>
 
     <dependencyManagement>
@@ -316,13 +314,6 @@
             <artifactId>commons-io</artifactId>
             <version>2.15.1</version>
         </dependency>
-
-        <!-- support memory -->
-        <dependency>
-            <groupId>com.alibaba.cloud.ai</groupId>
-            <artifactId>spring-ai-alibaba-starter-memory-jdbc</artifactId>
-            <version>${memory.version}</version>
-        </dependency>
     </dependencies>
 
 

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/agent/BaseAgent.java

@@ -328,7 +328,7 @@ private void handleStuckState() {
 	protected boolean isStuck() {
 		// Currently, if the agent does not call the tool three times, it is considered
 		// stuck and the current step is exited.
-		List<Message> memoryEntries = llmService.getAgentMemory(manusProperties.getMaxMemory()).get(getMemoryId());
+		List<Message> memoryEntries = llmService.getAgentMemory(manusProperties.getMaxMemory()).get(getCurrentPlanId());
 		int zeroToolCallCount = 0;
 		for (Message msg : memoryEntries) {
 			if (msg instanceof AssistantMessage) {

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/config/MemoryConfig.java

@@ -15,9 +15,9 @@
  */
 package com.alibaba.cloud.ai.example.manus.config;
 
-import com.alibaba.cloud.ai.memory.jdbc.H2ChatMemoryRepository;
-import com.alibaba.cloud.ai.memory.jdbc.MysqlChatMemoryRepository;
-import com.alibaba.cloud.ai.memory.jdbc.PostgresChatMemoryRepository;
+import com.alibaba.cloud.ai.example.manus.dynamic.memory.repository.H2ChatMemoryRepository;
+import com.alibaba.cloud.ai.example.manus.dynamic.memory.repository.MysqlChatMemoryRepository;
+import com.alibaba.cloud.ai.example.manus.dynamic.memory.repository.PostgresChatMemoryRepository;
 import org.springframework.ai.chat.memory.ChatMemory;
 import org.springframework.ai.chat.memory.ChatMemoryRepository;
 import org.springframework.ai.chat.memory.MessageWindowChatMemory;

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/dynamic/agent/DynamicAgent.java

@@ -170,7 +170,7 @@ private boolean executeWithRetry(int maxRetries) throws Exception {
 			List<Message> messages = new ArrayList<>(Collections.singletonList(systemMessage));
 			// Add history message.
 			ChatMemory chatMemory = llmService.getAgentMemory(manusProperties.getMaxMemory());
-			List<Message> historyMem = chatMemory.get(getMemoryId());
+			List<Message> historyMem = chatMemory.get(getCurrentPlanId());
 			messages.addAll(historyMem);
 			messages.add(currentStepEnvMessage);
 			// Call the LLM
@@ -465,7 +465,7 @@ private void processUserInputToMemory(UserMessage userMessage) {
 			if (!StringUtils.isBlank(userInput)) {
 				// Add user input to memory
 
-				llmService.getAgentMemory(manusProperties.getMaxMemory()).add(getMemoryId(), userMessage);
+				llmService.getAgentMemory(manusProperties.getMaxMemory()).add(getCurrentPlanId(), userMessage);
 
 			}
 		}
@@ -481,7 +481,7 @@ private void processMemory(ToolExecutionResult toolExecutionResult) {
 			return;
 		}
 		// clear current plan memory
-		llmService.getAgentMemory(manusProperties.getMaxMemory()).clear(getMemoryId());
+		llmService.getAgentMemory(manusProperties.getMaxMemory()).clear(getCurrentPlanId());
 		for (Message message : messages) {
 			// exclude all system message
 			if (message instanceof SystemMessage) {
@@ -493,7 +493,7 @@ private void processMemory(ToolExecutionResult toolExecutionResult) {
 				continue;
 			}
 			// only keep assistant message and tool_call message
-			llmService.getAgentMemory(manusProperties.getMaxMemory()).add(getMemoryId(), message);
+			llmService.getAgentMemory(manusProperties.getMaxMemory()).add(getCurrentPlanId(), message);
 		}
 	}
 

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/dynamic/memory/advisor/CustomMessageChatMemoryAdvisor.java

@@ -45,8 +45,10 @@ public class CustomMessageChatMemoryAdvisor implements BaseChatMemoryAdvisor {
 
 	private String userRequest;
 
+	private AdvisorType advisorType;
+
 	private CustomMessageChatMemoryAdvisor(ChatMemory chatMemory, String defaultConversationId, int order,
-			Scheduler scheduler, String userRequest) {
+			Scheduler scheduler, String userRequest, AdvisorType advisorType) {
 		Assert.notNull(chatMemory, "chatMemory cannot be null");
 		Assert.hasText(defaultConversationId, "defaultConversationId cannot be null or empty");
 		Assert.notNull(scheduler, "scheduler cannot be null");
@@ -55,6 +57,7 @@ private CustomMessageChatMemoryAdvisor(ChatMemory chatMemory, String defaultConv
 		this.order = order;
 		this.scheduler = scheduler;
 		this.userRequest = userRequest;
+		this.advisorType = advisorType;
 	}
 
 	@Override
@@ -83,6 +86,10 @@ public ChatClientRequest before(ChatClientRequest chatClientRequest, AdvisorChai
 			.prompt(chatClientRequest.prompt().mutate().messages(processedMessages).build())
 			.build();
 
+		if (this.advisorType == AdvisorType.AFTER) {
+			return processedChatClientRequest;
+		}
+
 		// 4. Add the new user message to the conversation memory.
 		UserMessage userMessage = processedChatClientRequest.prompt().getUserMessage();
 
@@ -104,6 +111,9 @@ public ChatClientRequest before(ChatClientRequest chatClientRequest, AdvisorChai
 
 	@Override
 	public ChatClientResponse after(ChatClientResponse chatClientResponse, AdvisorChain advisorChain) {
+		if (this.advisorType == AdvisorType.BEFORE) {
+			return chatClientResponse;
+		}
 		List<Message> assistantMessages = new ArrayList<>();
 		if (chatClientResponse.chatResponse() != null) {
 			assistantMessages = chatClientResponse.chatResponse()
@@ -132,8 +142,9 @@ public Flux<ChatClientResponse> adviseStream(ChatClientRequest chatClientRequest
 					response -> this.after(response, streamAdvisorChain)));
 	}
 
-	public static CustomMessageChatMemoryAdvisor.Builder builder(ChatMemory chatMemory, String userRequest) {
-		return new CustomMessageChatMemoryAdvisor.Builder(chatMemory, userRequest);
+	public static CustomMessageChatMemoryAdvisor.Builder builder(ChatMemory chatMemory, String userRequest,
+			AdvisorType advisorType) {
+		return new CustomMessageChatMemoryAdvisor.Builder(chatMemory, userRequest, advisorType);
 	}
 
 	public static final class Builder {
@@ -148,9 +159,12 @@ public static final class Builder {
 
 		private String userRequest;
 
-		private Builder(ChatMemory chatMemory, String userRequest) {
+		private AdvisorType advisorType;
+
+		private Builder(ChatMemory chatMemory, String userRequest, AdvisorType advisorType) {
 			this.chatMemory = chatMemory;
 			this.userRequest = userRequest;
+			this.advisorType = advisorType;
 		}
 
 		/**
@@ -184,9 +198,15 @@ public CustomMessageChatMemoryAdvisor.Builder scheduler(Scheduler scheduler) {
 		 */
 		public CustomMessageChatMemoryAdvisor build() {
 			return new CustomMessageChatMemoryAdvisor(this.chatMemory, this.conversationId, this.order, this.scheduler,
-					this.userRequest);
+					this.userRequest, this.advisorType);
 		}
 
 	}
 
+	public enum AdvisorType {
+
+		BEFORE, AFTER, ALL
+
+	}
+
 }

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/dynamic/memory/repository/H2ChatMemoryRepository.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.cloud.ai.example.manus.dynamic.memory.repository;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+
+/**
+ * auth: dahua
+ */
+public class H2ChatMemoryRepository extends JdbcChatMemoryRepository {
+
+	// H2 specific query statements
+	private static final String H2_QUERY_ADD = "INSERT INTO ai_chat_memory (conversation_id, content, type, timestamp) VALUES (?, ?, ?, ?)";
+
+	private static final String H2_QUERY_GET = "SELECT content, type FROM ai_chat_memory WHERE conversation_id = ? ORDER BY timestamp";
+
+	private H2ChatMemoryRepository(JdbcTemplate jdbcTemplate) {
+		super(jdbcTemplate);
+	}
+
+	public static H2Builder h2Builder() {
+		return new H2Builder();
+	}
+
+	public static class H2Builder {
+
+		private JdbcTemplate jdbcTemplate;
+
+		public H2Builder jdbcTemplate(JdbcTemplate jdbcTemplate) {
+			this.jdbcTemplate = jdbcTemplate;
+			return this;
+		}
+
+		public H2ChatMemoryRepository build() {
+			return new H2ChatMemoryRepository(this.jdbcTemplate);
+		}
+
+	}
+
+	@Override
+	protected String hasTableSql(String tableName) {
+		return String.format("SELECT table_name FROM information_schema.tables WHERE table_name = '%s'", tableName);
+	}
+
+	@Override
+	protected String createTableSql(String tableName) {
+		return String.format(
+				"CREATE TABLE %s (id BIGINT AUTO_INCREMENT PRIMARY KEY, "
+						+ "conversation_id VARCHAR(256) NOT NULL, content LONGTEXT NOT NULL, "
+						+ "type VARCHAR(100) NOT NULL, timestamp TIMESTAMP NOT NULL, "
+						+ "CONSTRAINT chk_message_type CHECK (type IN ('USER', 'ASSISTANT', 'SYSTEM', 'TOOL')))",
+				tableName);
+	}
+
+	@Override
+	protected String getAddSql() {
+		return H2_QUERY_ADD;
+	}
+
+	@Override
+	protected String getGetSql() {
+		return H2_QUERY_GET;
+	}
+
+}