merge dev

Author: yuan.wang

docker/requirements.txt

@@ -160,4 +160,3 @@ xlrd==2.0.2
 xlsxwriter==3.2.5
 prometheus-client==0.23.1
 pymilvus==2.5.12
-langchain-text-splitters==1.0.0

src/memos/embedders/universal_api.py

@@ -4,7 +4,7 @@
 from memos.configs.embedder import UniversalAPIEmbedderConfig
 from memos.embedders.base import BaseEmbedder
 from memos.log import get_logger
-from memos.utils import timed
+from memos.utils import timed_with_status
 
 
 logger = get_logger(__name__)
@@ -30,8 +30,7 @@ def __init__(self, config: UniversalAPIEmbedderConfig):
         else:
             raise ValueError(f"Embeddings unsupported provider: {self.provider}")
 
-    @timed(
-        log=True,
+    @timed_with_status(
         log_prefix="model_timed_embedding",
         log_extra_args={"model_name_or_path": "text-embedding-3-large"},
     )

src/memos/llms/openai.py

@@ -12,7 +12,7 @@
 from memos.llms.utils import remove_thinking_tags
 from memos.log import get_logger
 from memos.types import MessageList
-from memos.utils import timed
+from memos.utils import timed_with_status
 
 
 logger = get_logger(__name__)
@@ -28,7 +28,7 @@ def __init__(self, config: OpenAILLMConfig):
         )
         logger.info("OpenAI LLM instance initialized")
 
-    @timed(log=True, log_prefix="OpenAI LLM", log_args=["model_name_or_path"])
+    @timed_with_status(log_prefix="OpenAI LLM", log_args=["model_name_or_path"])
     def generate(self, messages: MessageList, **kwargs) -> str:
         """Generate a response from OpenAI LLM, optionally overriding generation params."""
         response = self.client.chat.completions.create(
@@ -55,7 +55,7 @@ def generate(self, messages: MessageList, **kwargs) -> str:
             return reasoning_content + response_content
         return response_content
 
-    @timed(log=True, log_prefix="OpenAI LLM", log_args=["model_name_or_path"])
+    @timed_with_status(log_prefix="OpenAI LLM", log_args=["model_name_or_path"])
     def generate_stream(self, messages: MessageList, **kwargs) -> Generator[str, None, None]:
         """Stream response from OpenAI LLM with optional reasoning support."""
         if kwargs.get("tools"):

src/memos/mem_feedback/feedback.py

@@ -17,7 +17,7 @@
 from memos.mem_feedback.base import BaseMemFeedback
 from memos.mem_feedback.utils import should_keep_update, split_into_chunks
 from memos.mem_reader.factory import MemReaderFactory
-from memos.mem_reader.simple_struct import detect_lang
+from memos.mem_reader.read_multi_modal import detect_lang
 from memos.memories.textual.item import TextualMemoryItem, TreeNodeTextualMemoryMetadata
 from memos.memories.textual.tree_text_memory.organize.manager import (
     MemoryManager,

src/memos/mem_reader/multi_modal_struct.py

@@ -7,8 +7,8 @@
 from memos import log
 from memos.configs.mem_reader import MultiModalStructMemReaderConfig
 from memos.context.context import ContextThreadPoolExecutor
-from memos.mem_reader.read_multi_modal import MultiModalParser
-from memos.mem_reader.simple_struct import SimpleStructMemReader, detect_lang
+from memos.mem_reader.read_multi_modal import MultiModalParser, detect_lang
+from memos.mem_reader.simple_struct import SimpleStructMemReader
 from memos.memories.textual.item import TextualMemoryItem
 from memos.templates.tool_mem_prompts import TOOL_TRAJECTORY_PROMPT_EN, TOOL_TRAJECTORY_PROMPT_ZH
 from memos.types import MessagesType

src/memos/mem_reader/read_multi_modal/__init__.py

@@ -23,7 +23,7 @@
 from .text_content_parser import TextContentParser
 from .tool_parser import ToolParser
 from .user_parser import UserParser
-from .utils import coerce_scene_data, extract_role
+from .utils import coerce_scene_data, detect_lang, extract_role
 
 
 __all__ = [
@@ -38,5 +38,6 @@
     "ToolParser",
     "UserParser",
     "coerce_scene_data",
+    "detect_lang",
     "extract_role",
 ]