Skip to content

Commit 2ee0754

Browse files
whipser030黑布林CaralHsifridayL
authored
add: get_memory return edges and count of items (#805)
* update reader and search strategy * set strategy reader and search config * fix install problem * fix * fix test * turn off graph recall * turn off graph recall * turn off graph recall * fix Searcher input bug * fix Searcher * fix Search * fix bug * adjust strategy reader * adjust strategy reader * adjust search config input * reformat code * re pr * format repair * fix time issue * develop feedback process * feedback handler configuration * upgrade feedback using * add threshold * update prompt * update prompt * fix handler * add feedback scheduler * add handler change node update * add handler change node update * add handler change node update * add handler change node update * fix interface input * add chunk and ratio filter * update stopwords * fix messages queue * add seach_by_keywords_LIKE * add doc filter * add retrieve query * add retrieve queies * patch info filter * add log and make embedding safety net * add log and make embedding safety net * deduplicate add objects * use _add_memories_parallel * delete Special characters * delete Special characters * delete Special characters * delete Special characters * add source_doc_id * add source_doc_id * add reranker in init com.. * fix circle import * add feedback judgement * add feedback judgement * add pref feedback * add pref feedback * patch: get_memory func filter user id and make page chunk * add total num * add total num --------- Co-authored-by: 黑布林 <11641432+heiheiyouyou@user.noreply.gitee.com> Co-authored-by: CaralHsi <caralhsi@gmail.com> Co-authored-by: chunyu li <78344051+fridayL@users.noreply.github.com>
1 parent 9c25b46 commit 2ee0754

2 files changed

Lines changed: 24 additions & 5 deletions

File tree

src/memos/api/handlers/memory_handler.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,12 @@ def handle_get_memories(
185185
user_id=get_mem_req.user_id,
186186
page=get_mem_req.page,
187187
page_size=get_mem_req.page_size,
188-
)["nodes"]
188+
)
189+
total_nodes = memories["total_nodes"]
190+
total_edges = memories["total_edges"]
191+
del memories["total_nodes"]
192+
del memories["total_edges"]
193+
189194
preferences: list[TextualMemoryItem] = []
190195
if get_mem_req.include_preference and naive_mem_cube.pref_mem is not None:
191196
filter_params: dict[str, Any] = {}
@@ -195,11 +200,25 @@ def handle_get_memories(
195200
filter_params["mem_cube_id"] = get_mem_req.mem_cube_id
196201
preferences = naive_mem_cube.pref_mem.get_memory_by_filter(filter_params)
197202
preferences = [format_memory_item(mem) for mem in preferences]
203+
198204
return GetMemoryResponse(
199205
message="Memories retrieved successfully",
200206
data={
201-
"text_mem": [{"cube_id": get_mem_req.mem_cube_id, "memories": memories}],
202-
"pref_mem": [{"cube_id": get_mem_req.mem_cube_id, "memories": preferences}],
207+
"text_mem": [
208+
{
209+
"cube_id": get_mem_req.mem_cube_id,
210+
"memories": memories,
211+
"total_nodes": total_nodes,
212+
"total_edges": total_edges,
213+
}
214+
],
215+
"pref_mem": [
216+
{
217+
"cube_id": get_mem_req.mem_cube_id,
218+
"memories": preferences,
219+
"total_nodes": len(preferences),
220+
}
221+
],
203222
},
204223
)
205224

src/memos/memories/textual/tree.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,10 @@ def get_all(
332332
Returns:
333333
list[TextualMemoryItem]: List of all memories.
334334
"""
335-
all_items = self.graph_store.export_graph(
335+
graph_output = self.graph_store.export_graph(
336336
user_name=user_name, user_id=user_id, page=page, page_size=page_size
337337
)
338-
return all_items
338+
return graph_output
339339

340340
def delete(self, memory_ids: list[str], user_name: str | None = None) -> None:
341341
"""Hard delete: permanently remove nodes and their edges from the graph."""

0 commit comments

Comments
 (0)