feat: develop advanced searcher with deep search

Author: tangg555

src/memos/api/handlers/base_handler.py

@@ -9,7 +9,7 @@
 
 from memos.log import get_logger
 from memos.mem_scheduler.base_scheduler import BaseScheduler
-from memos.memories.textual.tree_text_memory.retrieve.searcher import Searcher
+from memos.memories.textual.tree_text_memory.retrieve.advanced_searcher import AdvancedSearcher
 
 
 logger = get_logger(__name__)
@@ -132,7 +132,7 @@ def mem_scheduler(self) -> BaseScheduler:
         return self.deps.mem_scheduler
 
     @property
-    def searcher(self) -> Searcher:
+    def searcher(self) -> AdvancedSearcher:
         """Get scheduler instance."""
         return self.deps.searcher
 

src/memos/api/handlers/search_handler.py

@@ -18,8 +18,7 @@
 from memos.api.product_models import APISearchRequest, SearchResponse
 from memos.context.context import ContextThreadPoolExecutor
 from memos.log import get_logger
-from memos.mem_scheduler.schemas.general_schemas import FINE_STRATEGY, FineStrategy, SearchMode
-from memos.types import MOSSearchResult, UserContext
+from memos.types import FINE_STRATEGY, FineStrategy, MOSSearchResult, SearchMode, UserContext
 
 
 logger = get_logger(__name__)
@@ -212,10 +211,29 @@ def _fast_search(
         return formatted_memories
 
     def _deep_search(
-        self, search_req: APISearchRequest, user_context: UserContext, max_thinking_depth: int
+        self,
+        search_req: APISearchRequest,
+        user_context: UserContext,
     ) -> list:
-        logger.error("waiting to be implemented")
-        return []
+        target_session_id = search_req.session_id or "default_session"
+        search_filter = {"session_id": search_req.session_id} if search_req.session_id else None
+
+        info = {
+            "user_id": search_req.user_id,
+            "session_id": target_session_id,
+            "chat_history": search_req.chat_history,
+        }
+
+        return self.searcher.deep_search(
+            query=search_req.query,
+            user_name=user_context.mem_cube_id,
+            top_k=search_req.top_k,
+            mode=SearchMode.FINE,
+            manual_close_internet=not search_req.internet_search,
+            moscube=search_req.moscube,
+            search_filter=search_filter,
+            info=info,
+        )
 
     def _fine_search(
         self,

src/memos/api/product_models.py

@@ -6,8 +6,7 @@
 from pydantic import BaseModel, Field
 
 # Import message types from core types module
-from memos.mem_scheduler.schemas.general_schemas import SearchMode
-from memos.types import MessageDict, PermissionDict
+from memos.types import MessageDict, PermissionDict, SearchMode
 
 
 T = TypeVar("T")

src/memos/mem_scheduler/analyzer/eval_analyzer.py

@@ -216,4 +216,4 @@ def main(version_name="ct-1111"):
 
 
 if __name__ == "__main__":
-    main(version_name="ct-1111")
+    main(version_name="ct-1118")

src/memos/mem_scheduler/analyzer/scheduler_for_eval.py

@@ -9,13 +9,13 @@
 from memos.mem_scheduler.general_scheduler import GeneralScheduler
 from memos.mem_scheduler.schemas.general_schemas import (
     DEFAULT_MAX_QUERY_KEY_WORDS,
-    UserID,
 )
 from memos.mem_scheduler.schemas.monitor_schemas import QueryMonitorItem
 
 
 if TYPE_CHECKING:
     from memos.memories.textual.tree import TextualMemoryItem
+    from memos.types import UserID
 
 
 logger = get_logger(__name__)

src/memos/mem_scheduler/base_scheduler.py

@@ -33,9 +33,7 @@
     DEFAULT_TOP_K,
     DEFAULT_USE_REDIS_QUEUE,
     STARTUP_BY_PROCESS,
-    MemCubeID,
     TreeTextMemory_SEARCH_METHOD,
-    UserID,
 )
 from memos.mem_scheduler.schemas.message_schemas import (
     ScheduleLogForWebItem,
@@ -56,6 +54,10 @@
 from memos.memories.textual.tree import TextualMemoryItem, TreeTextMemory
 from memos.memories.textual.tree_text_memory.retrieve.searcher import Searcher
 from memos.templates.mem_scheduler_prompts import MEMORY_ASSEMBLY_TEMPLATE
+from memos.types import (
+    MemCubeID,
+    UserID,
+)
 
 
 if TYPE_CHECKING:

src/memos/mem_scheduler/general_scheduler.py

@@ -17,8 +17,6 @@
     PREF_ADD_LABEL,
     QUERY_LABEL,
     WORKING_MEMORY_TYPE,
-    MemCubeID,
-    UserID,
 )
 from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
 from memos.mem_scheduler.schemas.monitor_schemas import QueryMonitorItem
@@ -27,6 +25,10 @@
 from memos.memories.textual.item import TextualMemoryItem
 from memos.memories.textual.preference import PreferenceTextMemory
 from memos.memories.textual.tree import TreeTextMemory
+from memos.types import (
+    MemCubeID,
+    UserID,
+)
 
 
 logger = get_logger(__name__)

src/memos/mem_scheduler/memory_manage_modules/retriever.py

@@ -11,8 +11,6 @@
 from memos.mem_scheduler.schemas.general_schemas import (
     DEFAULT_SCHEDULER_RETRIEVER_BATCH_SIZE,
     DEFAULT_SCHEDULER_RETRIEVER_RETRIES,
-    FINE_STRATEGY,
-    FineStrategy,
     TreeTextMemory_FINE_SEARCH_METHOD,
     TreeTextMemory_SEARCH_METHOD,
 )
@@ -24,6 +22,7 @@
 from memos.mem_scheduler.utils.misc_utils import extract_json_obj, extract_list_items_in_answer
 from memos.memories.textual.item import TextualMemoryMetadata
 from memos.memories.textual.tree import TextualMemoryItem, TreeTextMemory
+from memos.types import FINE_STRATEGY, FineStrategy
 
 # Extract JSON response
 from .memory_filter import MemoryFilter

src/memos/mem_scheduler/monitors/general_monitor.py

@@ -20,8 +20,6 @@
     DEFAULT_WORKING_MEM_MONITOR_SIZE_LIMIT,
     MONITOR_ACTIVATION_MEMORY_TYPE,
     MONITOR_WORKING_MEMORY_TYPE,
-    MemCubeID,
-    UserID,
 )
 from memos.mem_scheduler.schemas.monitor_schemas import (
     MemoryMonitorItem,
@@ -31,6 +29,7 @@
 from memos.mem_scheduler.utils.db_utils import get_utc_now
 from memos.mem_scheduler.utils.misc_utils import extract_json_obj
 from memos.memories.textual.tree import TreeTextMemory
+from memos.types import MemCubeID, UserID
 
 
 logger = get_logger(__name__)

src/memos/mem_scheduler/optimized_scheduler.py

@@ -13,16 +13,18 @@
 from memos.mem_scheduler.general_scheduler import GeneralScheduler
 from memos.mem_scheduler.schemas.general_schemas import (
     API_MIX_SEARCH_LABEL,
-    MemCubeID,
-    SearchMode,
-    UserID,
 )
 from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
 from memos.mem_scheduler.utils.api_utils import format_textual_memory_item
 from memos.mem_scheduler.utils.db_utils import get_utc_now
 from memos.mem_scheduler.utils.misc_utils import group_messages_by_user_and_mem_cube
 from memos.memories.textual.tree import TextualMemoryItem, TreeTextMemory
-from memos.types import UserContext
+from memos.types import (
+    MemCubeID,
+    SearchMode,
+    UserContext,
+    UserID,
+)
 
 
 if TYPE_CHECKING: