Skip to content

Commit 706d494

Browse files
author
yuan.wang
committed
feat: modify init components in scheduler
1 parent e994c0e commit 706d494

File tree

4 files changed

+4
-108
lines changed

4 files changed

+4
-108
lines changed

examples/mem_feedback/example_feedback.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def init_components():
144144
mem_reader=mem_reader,
145145
searcher=searcher,
146146
reranker=mem_reranker,
147-
pref_mem=None,
147+
pref_feedback=True,
148148
)
149149

150150
return feedback_server, memory_manager, embedder

src/memos/api/handlers/component_init.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ def init_server() -> dict[str, Any]:
249249
mem_reader=mem_reader,
250250
searcher=searcher,
251251
reranker=feedback_reranker,
252+
pref_feedback=True,
252253
)
253254

254255
# Initialize Scheduler

src/memos/api/product_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ class APISearchRequest(BaseRequest):
434434
# Internal field for search memory type
435435
search_memory_type: str = Field(
436436
"All",
437-
description="Type of memory to search: All, WorkingMemory, LongTermMemory, UserMemory, OuterMemory, ToolSchemaMemory, ToolTrajectoryMemory, RawFileMemory, AllSummaryMemory, SkillMemory",
437+
description="Type of memory to search: All, WorkingMemory, LongTermMemory, UserMemory, OuterMemory, ToolSchemaMemory, ToolTrajectoryMemory, RawFileMemory, AllSummaryMemory, SkillMemory, PreferenceMemory",
438438
)
439439

440440
# ==== Context ====

src/memos/mem_scheduler/general_modules/init_components_for_scheduler.py

Lines changed: 1 addition & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@
1818
from memos.mem_cube.navie import NaiveMemCube
1919
from memos.mem_feedback.simple_feedback import SimpleMemFeedback
2020
from memos.mem_reader.factory import MemReaderFactory
21-
from memos.memories.textual.prefer_text_memory.config import (
22-
AdderConfigFactory,
23-
ExtractorConfigFactory,
24-
RetrieverConfigFactory,
25-
)
26-
from memos.memories.textual.prefer_text_memory.factory import (
27-
AdderFactory,
28-
ExtractorFactory,
29-
RetrieverFactory,
30-
)
31-
from memos.memories.textual.simple_preference import SimplePreferenceTextMemory
3221
from memos.memories.textual.simple_tree import SimpleTreeTextMemory
3322
from memos.memories.textual.tree_text_memory.organize.manager import MemoryManager
3423
from memos.memories.textual.tree_text_memory.retrieve.internet_retriever_factory import (
@@ -40,7 +29,6 @@
4029
if TYPE_CHECKING:
4130
from memos.memories.textual.tree_text_memory.retrieve.searcher import Searcher
4231
from memos.reranker.factory import RerankerFactory
43-
from memos.vec_dbs.factory import VecDBFactory
4432

4533

4634
logger = get_logger(__name__)
@@ -182,36 +170,6 @@ def build_internet_retriever_config() -> dict[str, Any]:
182170
return InternetRetrieverConfigFactory.model_validate(APIConfig.get_internet_config())
183171

184172

185-
def build_pref_extractor_config() -> dict[str, Any]:
186-
"""
187-
Build preference memory extractor configuration.
188-
189-
Returns:
190-
Validated extractor configuration dictionary
191-
"""
192-
return ExtractorConfigFactory.model_validate({"backend": "naive", "config": {}})
193-
194-
195-
def build_pref_adder_config() -> dict[str, Any]:
196-
"""
197-
Build preference memory adder configuration.
198-
199-
Returns:
200-
Validated adder configuration dictionary
201-
"""
202-
return AdderConfigFactory.model_validate({"backend": "naive", "config": {}})
203-
204-
205-
def build_pref_retriever_config() -> dict[str, Any]:
206-
"""
207-
Build preference memory retriever configuration.
208-
209-
Returns:
210-
Validated retriever configuration dictionary
211-
"""
212-
return RetrieverConfigFactory.model_validate({"backend": "naive", "config": {}})
213-
214-
215173
def _get_default_memory_size(cube_config: Any) -> dict[str, int]:
216174
"""
217175
Get default memory size configuration.
@@ -291,20 +249,11 @@ def init_components() -> dict[str, Any]:
291249
reranker_config = build_reranker_config()
292250
feedback_reranker_config = build_feedback_reranker_config()
293251
internet_retriever_config = build_internet_retriever_config()
294-
vector_db_config = build_vec_db_config()
295-
pref_extractor_config = build_pref_extractor_config()
296-
pref_adder_config = build_pref_adder_config()
297-
pref_retriever_config = build_pref_retriever_config()
298252

299253
logger.debug("Component configurations built successfully")
300254

301255
# Create component instances
302256
graph_db = GraphStoreFactory.from_config(graph_db_config)
303-
vector_db = (
304-
VecDBFactory.from_config(vector_db_config)
305-
if os.getenv("ENABLE_PREFERENCE_MEMORY", "false") == "true"
306-
else None
307-
)
308257
llm = LLMFactory.from_config(llm_config)
309258
embedder = EmbedderFactory.from_config(embedder_config)
310259
# Pass graph_db to mem_reader for recall operations (deduplication, conflict detection)
@@ -345,63 +294,9 @@ def init_components() -> dict[str, Any]:
345294

346295
logger.debug("Text memory initialized")
347296

348-
# Initialize preference memory components
349-
pref_extractor = (
350-
ExtractorFactory.from_config(
351-
config_factory=pref_extractor_config,
352-
llm_provider=llm,
353-
embedder=embedder,
354-
vector_db=vector_db,
355-
)
356-
if os.getenv("ENABLE_PREFERENCE_MEMORY", "false") == "true"
357-
else None
358-
)
359-
360-
pref_adder = (
361-
AdderFactory.from_config(
362-
config_factory=pref_adder_config,
363-
llm_provider=llm,
364-
embedder=embedder,
365-
vector_db=vector_db,
366-
text_mem=text_mem,
367-
)
368-
if os.getenv("ENABLE_PREFERENCE_MEMORY", "false") == "true"
369-
else None
370-
)
371-
372-
pref_retriever = (
373-
RetrieverFactory.from_config(
374-
config_factory=pref_retriever_config,
375-
llm_provider=llm,
376-
embedder=embedder,
377-
reranker=feedback_reranker,
378-
vector_db=vector_db,
379-
)
380-
if os.getenv("ENABLE_PREFERENCE_MEMORY", "false") == "true"
381-
else None
382-
)
383-
384-
logger.debug("Preference memory components initialized")
385-
386-
# Initialize preference memory
387-
pref_mem = (
388-
SimplePreferenceTextMemory(
389-
extractor_llm=llm,
390-
vector_db=vector_db,
391-
embedder=embedder,
392-
reranker=feedback_reranker,
393-
extractor=pref_extractor,
394-
adder=pref_adder,
395-
retriever=pref_retriever,
396-
)
397-
if os.getenv("ENABLE_PREFERENCE_MEMORY", "false") == "true"
398-
else None
399-
)
400-
401297
# Create MemCube with pre-initialized memory instances
402298
naive_mem_cube = NaiveMemCube(
403299
text_mem=text_mem,
404-
pref_mem=pref_mem,
405300
act_mem=None,
406301
para_mem=None,
407302
)
@@ -421,7 +316,7 @@ def init_components() -> dict[str, Any]:
421316
mem_reader=mem_reader,
422317
searcher=searcher,
423318
reranker=feedback_reranker,
424-
pref_mem=pref_mem,
319+
pref_feedback=True,
425320
)
426321
# Return all components as a dictionary for easy access and extension
427322
return {"naive_mem_cube": naive_mem_cube, "feedback_server": feedback_server}

0 commit comments

Comments
 (0)