Skip to content

Commit 2d4fda9

Browse files
committed
fix(retrieval): write relativity in place instead of full rebuild
The textual branch of _sort_and_trim rebuilt every selected item (model_dump + two-level pydantic construction, including re-validating the full embedding list and sources) only to set metadata.relativity to the final score. When the metadata type already declares the relativity field (vector/fulltext recall results), write the score in place with the same float() coercion pydantic validation would have applied. Items whose metadata lacks the field (e.g. graph/bm25 results) still go through the rebuild for the type upgrade, preserving behavior.
1 parent 3a16e5f commit 2d4fda9

2 files changed

Lines changed: 160 additions & 10 deletions

File tree

‎src/memos/memories/textual/tree_text_memory/retrieve/searcher.py‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,14 @@ def _sort_and_trim(
11651165
include_preference_memory=False,
11661166
pref_mem_top_k=6,
11671167
):
1168-
"""Sort results by score and trim to top_k"""
1168+
"""Sort results by score and trim to top_k.
1169+
1170+
Note:
1171+
Takes ownership of ``results``: selected textual items have their
1172+
``metadata.relativity`` overwritten in place when the metadata type
1173+
already declares the field; other metadata types are rebuilt into
1174+
``SearchedTreeNodeTextualMemoryMetadata`` as before.
1175+
"""
11691176
final_items = []
11701177
if search_tool_memory:
11711178
tool_schema_results = [
@@ -1266,15 +1273,25 @@ def _sort_and_trim(
12661273
for item, score in sorted_results:
12671274
if plugin and round(score, 2) == 0.00:
12681275
continue
1269-
meta_data = item.metadata.model_dump()
1270-
meta_data["relativity"] = score
1271-
final_items.append(
1272-
TextualMemoryItem(
1273-
id=item.id,
1274-
memory=item.memory,
1275-
metadata=SearchedTreeNodeTextualMemoryMetadata(**meta_data),
1276+
metadata = item.metadata
1277+
if isinstance(metadata, SearchedTreeNodeTextualMemoryMetadata):
1278+
# The field already exists on this metadata type: write the
1279+
# score in place, applying the same float() coercion the
1280+
# rebuild path below would apply through pydantic validation.
1281+
metadata.relativity = float(score)
1282+
final_items.append(item)
1283+
else:
1284+
# Type upgrade (e.g. graph/bm25 results without relativity):
1285+
# rebuild into the searched metadata type as before.
1286+
meta_data = metadata.model_dump()
1287+
meta_data["relativity"] = score
1288+
final_items.append(
1289+
TextualMemoryItem(
1290+
id=item.id,
1291+
memory=item.memory,
1292+
metadata=SearchedTreeNodeTextualMemoryMetadata(**meta_data),
1293+
)
12761294
)
1277-
)
12781295
return final_items
12791296

12801297
@timed

‎tests/memories/textual/test_tree_searcher.py‎

Lines changed: 134 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22

33
from unittest.mock import MagicMock
44

5+
import numpy as np
56
import pytest
67

7-
from memos.memories.textual.item import TextualMemoryItem, TreeNodeTextualMemoryMetadata
8+
from memos.memories.textual.item import (
9+
SearchedTreeNodeTextualMemoryMetadata,
10+
TextualMemoryItem,
11+
TreeNodeTextualMemoryMetadata,
12+
)
813
from memos.memories.textual.tree_text_memory.retrieve.searcher import Searcher
914
from memos.reranker.base import BaseReranker
1015

@@ -168,3 +173,131 @@ def test_deduplicate_rawfile_results_uses_knowledge_summary_ids(mock_searcher):
168173

169174
assert result == [raw_file]
170175
mock_searcher.graph_store.get_edges.assert_not_called()
176+
177+
178+
def make_searched_item(content: str, score: float, relativity: float = 0.5):
179+
"""Build a Searched-type candidate as produced by vector/fulltext recall."""
180+
return (
181+
TextualMemoryItem(
182+
id=str(uuid.uuid4()),
183+
memory=content,
184+
metadata=SearchedTreeNodeTextualMemoryMetadata(
185+
memory_type="LongTermMemory",
186+
embedding=[0.1] * 5,
187+
usage=[],
188+
sources=[{"type": "chat", "role": "user", "content": "context"}],
189+
relativity=relativity,
190+
),
191+
),
192+
score,
193+
)
194+
195+
196+
def rebuild_like_before(item: TextualMemoryItem, score: float) -> TextualMemoryItem:
197+
"""Reference implementation of the pre-optimization dump-and-rebuild behavior."""
198+
meta_data = item.metadata.model_dump()
199+
meta_data["relativity"] = score
200+
return TextualMemoryItem(
201+
id=item.id,
202+
memory=item.memory,
203+
metadata=SearchedTreeNodeTextualMemoryMetadata(**meta_data),
204+
)
205+
206+
207+
def test_sort_and_trim_hot_path_in_place_equivalence(mock_searcher):
208+
"""Searched-type items are reused in place and match the old rebuild output."""
209+
inputs = [
210+
make_searched_item("m-high", 0.9),
211+
make_searched_item("m-mid", 0.8),
212+
make_searched_item("m-low", 0.7),
213+
]
214+
input_items = {item.id: item for item, _ in inputs}
215+
216+
result = mock_searcher._sort_and_trim(inputs, top_k=2)
217+
218+
assert [item.memory for item in result] == ["m-high", "m-mid"]
219+
for item, score in zip(result, [0.9, 0.8], strict=True):
220+
# Selected items are the very same objects, relativity overwritten in place.
221+
assert item is input_items[item.id]
222+
assert item.metadata.relativity == score
223+
assert isinstance(item.metadata.relativity, float)
224+
# Output is exactly what the old dump-and-rebuild path produced.
225+
assert item.to_dict() == rebuild_like_before(input_items[item.id], score).to_dict()
226+
227+
228+
def test_sort_and_trim_cold_path_type_upgrade(mock_searcher):
229+
"""Non-Searched metadata (e.g. graph/bm25 results) is still rebuilt."""
230+
original = make_item("graph-mem", 0.8)
231+
232+
result = mock_searcher._sort_and_trim([original], top_k=2)
233+
234+
assert len(result) == 1
235+
rebuilt = result[0]
236+
assert rebuilt is not original[0] # cold path produces a new item
237+
assert isinstance(rebuilt.metadata, SearchedTreeNodeTextualMemoryMetadata)
238+
assert rebuilt.metadata.relativity == 0.8
239+
assert rebuilt.to_dict() == rebuild_like_before(original[0], 0.8).to_dict()
240+
241+
242+
def test_sort_and_trim_mixed_types(mock_searcher):
243+
"""Mixed Searched/TreeNode candidates all come back as Searched with final scores."""
244+
inputs = [
245+
make_searched_item("hot-1", 0.6),
246+
make_item("cold-1", 0.95),
247+
make_searched_item("hot-2", 0.7),
248+
]
249+
250+
result = mock_searcher._sort_and_trim(inputs, top_k=3)
251+
252+
assert [item.memory for item in result] == ["cold-1", "hot-2", "hot-1"]
253+
assert all(isinstance(item.metadata, SearchedTreeNodeTextualMemoryMetadata) for item in result)
254+
assert [item.metadata.relativity for item in result] == [0.95, 0.7, 0.6]
255+
256+
257+
def test_sort_and_trim_beyond_top_k_untouched(mock_searcher):
258+
"""Candidates trimmed away keep the relativity injected at recall time."""
259+
inputs = [
260+
make_searched_item("keep", 0.9),
261+
make_searched_item("drop-1", 0.5),
262+
make_searched_item("drop-2", 0.4),
263+
]
264+
265+
result = mock_searcher._sort_and_trim(inputs, top_k=1)
266+
267+
assert [item.memory for item in result] == ["keep"]
268+
for item, _ in inputs[1:]:
269+
assert item.metadata.relativity == 0.5
270+
271+
272+
def test_sort_and_trim_plugin_filters_zero_scores(mock_searcher):
273+
"""plugin=True drops candidates whose score rounds to 0.00 without writing."""
274+
inputs = [make_searched_item("near-zero", 0.001, relativity=0.42)]
275+
276+
result = mock_searcher._sort_and_trim(inputs, top_k=5, plugin=True)
277+
278+
assert result == []
279+
assert inputs[0][0].metadata.relativity == 0.42
280+
281+
282+
def test_sort_and_trim_reuses_input_list_safely(mock_searcher):
283+
"""Calling _sort_and_trim twice on the same candidates is idempotent."""
284+
inputs = [
285+
make_searched_item("m-1", 0.9),
286+
make_item("m-2", 0.8),
287+
]
288+
289+
first = mock_searcher._sort_and_trim(list(inputs), top_k=2)
290+
second = mock_searcher._sort_and_trim(list(inputs), top_k=2)
291+
292+
assert [item.to_dict() for item in first] == [item.to_dict() for item in second]
293+
assert [item.metadata.relativity for item in first] == [0.9, 0.8]
294+
295+
296+
def test_sort_and_trim_coerces_numpy_score(mock_searcher):
297+
"""The in-place write applies the same float() coercion pydantic validation did."""
298+
item, _score = make_searched_item("np-mem", 0.0)
299+
300+
result = mock_searcher._sort_and_trim([(item, np.float64(0.9))], top_k=1)
301+
302+
assert isinstance(result[0].metadata.relativity, float)
303+
assert result[0].metadata.relativity == 0.9

0 commit comments

Comments
 (0)