Skip to content

Commit 374045c

Browse files
committed
feat: delete chunker in internet retriever and add 'info' parameter in all retrievers
1 parent 0bdd54b commit 374045c

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

src/memos/configs/internet_retriever.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from pydantic import Field, field_validator, model_validator
66

7-
from memos.chunkers.factory import ChunkerConfigFactory
87
from memos.configs.base import BaseConfig
98
from memos.exceptions import ConfigurationError
109
from memos.mem_reader.factory import MemReaderConfigFactory
@@ -49,11 +48,6 @@ class XinyuSearchConfig(BaseInternetRetrieverConfig):
4948
num_per_request: int = Field(
5049
default=10, description="Number of results per API request (not used for Xinyu)"
5150
)
52-
chunker: ChunkerConfigFactory = Field(
53-
...,
54-
default_factory=ChunkerConfigFactory,
55-
description="Chunker configuration",
56-
)
5751
reader: MemReaderConfigFactory = Field(
5852
...,
5953
default_factory=MemReaderConfigFactory,

src/memos/memories/textual/tree_text_memory/retrieve/internet_retriever.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def __init__(
127127
self.embedder = embedder
128128

129129
def retrieve_from_internet(
130-
self, query: str, top_k: int = 10, parsed_goal=None
130+
self, query: str, top_k: int = 10, parsed_goal=None, info=None
131131
) -> list[TextualMemoryItem]:
132132
"""
133133
Retrieve information from the internet and convert to TextualMemoryItem format
@@ -136,6 +136,7 @@ def retrieve_from_internet(
136136
query: Search query
137137
top_k: Number of results to return
138138
parsed_goal: Parsed task goal (optional)
139+
info (dict): Leave a record of memory consumption.
139140
140141
Returns:
141142
List of TextualMemoryItem
@@ -157,8 +158,8 @@ def retrieve_from_internet(
157158
memory_content = f"Title: {title}\nSummary: {snippet}\nSource: {link}"
158159
# Create metadata
159160
metadata = TreeNodeTextualMemoryMetadata(
160-
user_id=None,
161-
session_id=None,
161+
user_id=info.get("user_id", ""),
162+
session_id=info.get("session_id", ""),
162163
status="activated",
163164
type="fact", # Internet search results are usually factual information
164165
memory_time=datetime.now().strftime("%Y-%m-%d"),

src/memos/memories/textual/tree_text_memory/retrieve/internet_retriever_factory.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from typing import Any, ClassVar
44

5-
from memos.chunkers.factory import ChunkerFactory
65
from memos.configs.internet_retriever import InternetRetrieverConfigFactory
76
from memos.embedders.base import BaseEmbedder
87
from memos.mem_reader.factory import MemReaderFactory
@@ -68,7 +67,6 @@ def from_config(
6867
access_key=config.api_key, # Use api_key as access_key for xinyu
6968
search_engine_id=config.search_engine_id,
7069
embedder=embedder,
71-
chunker=ChunkerFactory.from_config(config.chunker),
7270
reader=MemReaderFactory.from_config(config.reader),
7371
max_results=config.max_results,
7472
)

src/memos/memories/textual/tree_text_memory/retrieve/xinyusearch.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import requests
1010

11-
from memos.chunkers.base import BaseChunker
1211
from memos.embedders.factory import OllamaEmbedder
1312
from memos.log import get_logger
1413
from memos.mem_reader.base import BaseMemReader
@@ -115,7 +114,6 @@ def __init__(
115114
access_key: str,
116115
search_engine_id: str,
117116
embedder: OllamaEmbedder,
118-
chunker: BaseChunker,
119117
reader: BaseMemReader,
120118
max_results: int = 20,
121119
):
@@ -126,10 +124,10 @@ def __init__(
126124
access_key: Xinyu API access key
127125
embedder: Embedder instance for generating embeddings
128126
max_results: Maximum number of results to retrieve
127+
reader: MemReader Moduel to deal with internet contents
129128
"""
130129
self.xinyu_api = XinyuSearchAPI(access_key, search_engine_id, max_results=max_results)
131130
self.embedder = embedder
132-
self.chunker = chunker
133131
self.reader = reader
134132

135133
def retrieve_from_internet(

0 commit comments

Comments
 (0)