From b707186ea72f9394323442f77daaadfcd7e49829 Mon Sep 17 00:00:00 2001 From: HarveyXiang <695369200@qq.com> Date: Thu, 5 Feb 2026 16:27:18 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20The=20"total=20nodes"=20inform?= =?UTF-8?q?ation=20returned=20by=20the=20"get=20memory"=20inter=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit da91ffc8ad807ae22210cd365096ffc2272047a3. --- src/memos/api/handlers/memory_handler.py | 65 ++++-------------------- src/memos/memories/textual/tree.py | 8 +-- 2 files changed, 10 insertions(+), 63 deletions(-) diff --git a/src/memos/api/handlers/memory_handler.py b/src/memos/api/handlers/memory_handler.py index 0adf99568..2b9c137ca 100644 --- a/src/memos/api/handlers/memory_handler.py +++ b/src/memos/api/handlers/memory_handler.py @@ -9,6 +9,7 @@ from memos.api.handlers.formatters_handler import ( format_memory_item, post_process_pref_mem, + post_process_textual_mem, ) from memos.api.product_models import ( DeleteMemoryRequest, @@ -249,68 +250,22 @@ def handle_get_memories( get_mem_req: GetMemoryRequest, naive_mem_cube: NaiveMemCube ) -> GetMemoryResponse: results: dict[str, Any] = {"text_mem": [], "pref_mem": [], "tool_mem": [], "skill_mem": []} - text_memory_type = ["WorkingMemory", "LongTermMemory", "UserMemory", "OuterMemory"] - text_memories_info = naive_mem_cube.text_mem.get_all( + memories = naive_mem_cube.text_mem.get_all( user_name=get_mem_req.mem_cube_id, user_id=get_mem_req.user_id, page=get_mem_req.page, page_size=get_mem_req.page_size, filter=get_mem_req.filter, - memory_type=text_memory_type, - ) - text_memories, total_text_nodes = text_memories_info["nodes"], text_memories_info["total_nodes"] - results["text_mem"] = [ - { - "cube_id": get_mem_req.mem_cube_id, - "memories": text_memories, - "total_nodes": total_text_nodes, - } - ] + )["nodes"] - if get_mem_req.include_tool_memory: - tool_memories_info = naive_mem_cube.text_mem.get_all( - user_name=get_mem_req.mem_cube_id, - user_id=get_mem_req.user_id, - page=get_mem_req.page, - page_size=get_mem_req.page_size, - filter=get_mem_req.filter, - memory_type=["ToolSchemaMemory", "ToolTrajectoryMemory"], - ) - tool_memories, total_tool_nodes = ( - tool_memories_info["nodes"], - tool_memories_info["total_nodes"], - ) + results = post_process_textual_mem(results, memories, get_mem_req.mem_cube_id) - results["tool_mem"] = [ - { - "cube_id": get_mem_req.mem_cube_id, - "memories": tool_memories, - "total_nodes": total_tool_nodes, - } - ] - if get_mem_req.include_skill_memory: - skill_memories_info = naive_mem_cube.text_mem.get_all( - user_name=get_mem_req.mem_cube_id, - user_id=get_mem_req.user_id, - page=get_mem_req.page, - page_size=get_mem_req.page_size, - filter=get_mem_req.filter, - memory_type=["SkillMemory"], - ) - skill_memories, total_skill_nodes = ( - skill_memories_info["nodes"], - skill_memories_info["total_nodes"], - ) + if not get_mem_req.include_tool_memory: + results["tool_mem"] = [] + if not get_mem_req.include_skill_memory: + results["skill_mem"] = [] - results["skill_mem"] = [ - { - "cube_id": get_mem_req.mem_cube_id, - "memories": skill_memories, - "total_nodes": total_skill_nodes, - } - ] preferences: list[TextualMemoryItem] = [] - total_preference_nodes = 0 format_preferences = [] if get_mem_req.include_preference and naive_mem_cube.pref_mem is not None: @@ -339,7 +294,7 @@ def handle_get_memories( filter_params.update(filter_copy) - preferences, total_preference_nodes = naive_mem_cube.pref_mem.get_memory_by_filter( + preferences, _ = naive_mem_cube.pref_mem.get_memory_by_filter( filter_params, page=get_mem_req.page, page_size=get_mem_req.page_size ) format_preferences = [format_memory_item(item, save_sources=False) for item in preferences] @@ -347,8 +302,6 @@ def handle_get_memories( results = post_process_pref_mem( results, format_preferences, get_mem_req.mem_cube_id, get_mem_req.include_preference ) - if total_preference_nodes > 0 and results.get("pref_mem", []): - results["pref_mem"][0]["total_nodes"] = total_preference_nodes # Filter to only keep text_mem, pref_mem, tool_mem filtered_results = { diff --git a/src/memos/memories/textual/tree.py b/src/memos/memories/textual/tree.py index eaac3bb7c..ea3d536c4 100644 --- a/src/memos/memories/textual/tree.py +++ b/src/memos/memories/textual/tree.py @@ -364,19 +364,13 @@ def get_all( page: int | None = None, page_size: int | None = None, filter: dict | None = None, - memory_type: list[str] | None = None, ) -> dict: """Get all memories. Returns: list[TextualMemoryItem]: List of all memories. """ graph_output = self.graph_store.export_graph( - user_name=user_name, - user_id=user_id, - page=page, - page_size=page_size, - filter=filter, - memory_type=memory_type, + user_name=user_name, user_id=user_id, page=page, page_size=page_size, filter=filter ) return graph_output