Skip to content

Commit 7722031

Browse files
committed
fix: fix code format
1 parent 2634421 commit 7722031

6 files changed

Lines changed: 25 additions & 28 deletions

File tree

examples/mem_api/pipeline_test.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
uvicorn memos.api.server_api:app --host 0.0.0.0 --port 8002 --workers 4
66
"""
77

8-
import time
9-
108
from typing import Any
119

1210
from dotenv import load_dotenv
@@ -45,8 +43,6 @@ def test_add_memories(
4543
"""
4644
logger.info(f"Testing add memories for user: {user_id}, mem_cube: {mem_cube_id}")
4745

48-
time_start = time.time()
49-
5046
# Create NaiveMemCube using server_router function
5147
naive_mem_cube = _create_naive_mem_cube()
5248

@@ -63,8 +59,6 @@ def test_add_memories(
6359
# Flatten memory list
6460
flattened_memories = [mm for m in memories for mm in m]
6561

66-
elapsed_time = time.time() - time_start
67-
6862
# Add memories to the system
6963
mem_id_list: list[str] = naive_mem_cube.text_mem.add(
7064
flattened_memories,
@@ -117,8 +111,6 @@ def test_search_memories(
117111
# Prepare search filter
118112
search_filter = {"session_id": session_id} if session_id != "default_session" else None
119113

120-
# Perform search
121-
time_start = time.time()
122114
search_results = naive_mem_cube.text_mem.search(
123115
query=query,
124116
user_name=mem_cube_id,

src/memos/api/routers/server_router.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
import time
32

43
from typing import Any
54

@@ -189,9 +188,11 @@ def search_memories(search_req: APISearchRequest):
189188
"""Search memories for a specific user."""
190189
# Create UserContext object - how to assign values
191190
user_context = UserContext(
192-
user_id=search_req.user_id, session_id=search_req.session_id or "default_session"
191+
user_id=search_req.user_id,
192+
mem_cube_id=search_req.mem_cube_id,
193+
session_id=search_req.session_id or "default_session",
193194
)
194-
195+
logger.info(f"Search user_id is: {user_context.mem_cube_id}")
195196
memories_result: MOSSearchResult = {
196197
"text_mem": [],
197198
"act_mem": [],
@@ -206,7 +207,7 @@ def search_memories(search_req: APISearchRequest):
206207
naive_mem_cube = _create_naive_mem_cube()
207208
search_results = naive_mem_cube.text_mem.search(
208209
query=search_req.query,
209-
user_name=search_req.mem_cube_id,
210+
user_name=user_context.mem_cube_id,
210211
top_k=search_req.top_k,
211212
mode=search_req.mode,
212213
manual_close_internet=not search_req.internet_search,
@@ -237,9 +238,11 @@ def search_memories(search_req: APISearchRequest):
237238
def add_memories(add_req: APIADDRequest):
238239
"""Add memories for a specific user."""
239240
# Create UserContext object - how to assign values
240-
user_context = UserContext(user_id=add_req.user_id, session_id=add_req.session_id)
241-
242-
time_start = time.time()
241+
user_context = UserContext(
242+
user_id=add_req.user_id,
243+
mem_cube_id=add_req.mem_cube_id,
244+
session_id=add_req.session_id or "default_session",
245+
)
243246
naive_mem_cube = _create_naive_mem_cube()
244247
target_session_id = add_req.session_id
245248
if not target_session_id:
@@ -255,12 +258,10 @@ def add_memories(add_req: APIADDRequest):
255258

256259
# Flatten memory list
257260
flattened_memories = [mm for m in memories for mm in m]
258-
259-
elapsed_time = time.time() - time_start
260-
logger.info(f"Memory extraction completed for user {add_req.user_id} in {elapsed_time:.2f}s")
261+
logger.info(f"Memory extraction completed for user {add_req.user_id}")
261262
mem_id_list: list[str] = naive_mem_cube.text_mem.add(
262263
flattened_memories,
263-
user_name=add_req.mem_cube_id,
264+
user_name=user_context.mem_cube_id,
264265
)
265266

266267
logger.info(

src/memos/graph_dbs/nebular.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,6 @@ def get_all_memory_items(
13301330

13311331
where_clause = f"WHERE n.memory_type = '{scope}'"
13321332
where_clause += f" AND n.user_name = '{user_name}'"
1333-
# where_clause = f"WHERE n.user_name = '{user_name}'"
13341333

13351334
return_fields = self._build_return_fields(include_embedding)
13361335

src/memos/mem_user/redis_persistent_user_manager.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import json
77

8+
from memos.configs.mem_os import MOSConfig
89
from memos.dependency import require_python_package
910
from memos.log import get_logger
1011

@@ -103,7 +104,7 @@ def save_user_config(self, user_id: str, config: MOSConfig) -> bool:
103104
logger.error(f"Error saving configuration for user {user_id}: {e}")
104105
return False
105106

106-
def get_user_config(self, user_id: str) -> MOSConfig | None:
107+
def get_user_config(self, user_id: str) -> dict | None:
107108
"""Get user configuration from Redis (search interface).
108109
109110
Args:
@@ -176,15 +177,15 @@ def exists_user_config(self, user_id: str) -> bool:
176177

177178
def list_user_configs(
178179
self, pattern: str = "user_config:*", count: int = 100
179-
) -> dict[str, MOSConfig]:
180+
) -> dict[str, dict]:
180181
"""List all user configurations.
181182
182183
Args:
183184
pattern (str): Redis key matching pattern. Defaults to "user_config:*".
184185
count (int): Number of keys to return per scan. Defaults to 100.
185186
186187
Returns:
187-
dict[str, MOSConfig]: Dictionary mapping user_id to MOSConfig objects.
188+
dict[str, dict]: Dictionary mapping user_id to dict objects.
188189
"""
189190
result = {}
190191
try:

src/memos/memories/textual/simple_tree.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import time
22

33
from datetime import datetime
4-
from typing import Any
4+
from typing import TYPE_CHECKING, Any
55

66
from memos.configs.memory import TreeTextMemoryConfig
77
from memos.embedders.base import BaseEmbedder
8-
from memos.embedders.factory import OllamaEmbedder
98
from memos.graph_dbs.base import BaseGraphDB
10-
from memos.graph_dbs.factory import Neo4jGraphDB
119
from memos.llms.base import BaseLLM
12-
from memos.llms.factory import AzureLLM, OllamaLLM, OpenAILLM
1310
from memos.log import get_logger
1411
from memos.mem_reader.base import BaseMemReader
1512
from memos.memories.textual.item import TextualMemoryItem, TreeNodeTextualMemoryMetadata
@@ -20,6 +17,12 @@
2017
from memos.types import MessageList
2118

2219

20+
if TYPE_CHECKING:
21+
from memos.embedders.factory import OllamaEmbedder
22+
from memos.graph_dbs.factory import Neo4jGraphDB
23+
from memos.llms.factory import AzureLLM, OllamaLLM, OpenAILLM
24+
25+
2326
logger = get_logger(__name__)
2427

2528

src/memos/types.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class PermissionDict(TypedDict, total=False):
7474
class UserContext(BaseModel):
7575
"""Model to represent user context."""
7676

77-
user_id: str
77+
user_id: str | None = None
78+
mem_cube_id: str | None = None
7879
session_id: str | None = None
7980
operation: list[PermissionDict] | None = None

0 commit comments

Comments
 (0)