Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
11b63e6
debug an error function name
tangg555 Oct 20, 2025
72e8f39
feat: Add DynamicCache compatibility for different transformers versions
tangg555 Oct 20, 2025
5702870
feat: implement APIAnalyzerForScheduler for memory operations
tangg555 Oct 21, 2025
4655b41
feat: Add search_ws API endpoint and enhance API analyzer functionality
tangg555 Oct 21, 2025
c20736c
fix: resolve test failures and warnings in test suite
tangg555 Oct 21, 2025
da72e7e
feat: add a test_robustness execution to test thread pool execution
tangg555 Oct 21, 2025
5b9b1e4
feat: optimize scheduler configuration and API search functionality
tangg555 Oct 22, 2025
6dac11e
feat: Add Redis auto-initialization with fallback strategies
tangg555 Oct 22, 2025
a207bf4
feat: add database connection management to ORM module
tangg555 Oct 24, 2025
8c1cc04
remove part of test
tangg555 Oct 24, 2025
f2b0da4
feat: add Redis-based ORM with multiprocess synchronization
tangg555 Oct 24, 2025
f0e8aab
fix: resolve scheduler module import and Redis integration issues
tangg555 Oct 24, 2025
731f00d
revise naive memcube creation in server router
tangg555 Oct 25, 2025
6d442fb
remove long-time tests in test_scheduler
tangg555 Oct 25, 2025
157f858
remove redis test which needs .env
tangg555 Oct 25, 2025
c483011
refactor all codes about mixture search with scheduler
tangg555 Oct 25, 2025
b81b82e
fix: resolve Redis API synchronization issues and implement search AP…
tangg555 Oct 26, 2025
90d1a0b
remove a test for api module
tangg555 Oct 26, 2025
1de72cf
revise to pass the test suite
tangg555 Oct 26, 2025
c72858e
addressed all conflicts
tangg555 Oct 27, 2025
3245376
address some bugs to make mix_search normally running
tangg555 Oct 27, 2025
57482cf
modify codes according to evaluation logs
tangg555 Oct 27, 2025
e4b8313
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Oct 27, 2025
011d248
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Oct 28, 2025
8c8d672
feat: Optimize mixture search and enhance API client
tangg555 Oct 28, 2025
aabad8d
feat: Add conversation_turn tracking for session-based memory search
tangg555 Oct 28, 2025
3faa5c3
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Oct 28, 2025
c6376cd
adress time bug in monitor
tangg555 Oct 29, 2025
bd0b234
revise simple tree
tangg555 Oct 29, 2025
5332d12
add mode to evaluation client; rewrite print to logger.info in db files
tangg555 Oct 29, 2025
aee13ba
feat: 1. add redis queue for scheduler 2. finish the code related to …
tangg555 Nov 5, 2025
f957967
debug the working memory code
tangg555 Nov 5, 2025
f520cca
addressed conflicts to merge
tangg555 Nov 5, 2025
a3f6636
addressed a range of bugs to make scheduler running correctly
tangg555 Nov 5, 2025
47e9851
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Nov 5, 2025
161af12
remove test_dispatch_parallel test
tangg555 Nov 5, 2025
1d8d14b
print change to logger.info
tangg555 Nov 5, 2025
00e3a75
addressed conflicts
tangg555 Nov 6, 2025
2852e56
adjucted the core code related to fine and mixture apis
tangg555 Nov 17, 2025
5d3cf45
addressed conflicts
tangg555 Nov 17, 2025
ab71f17
feat: create task queue to wrap local queue and redis queue. queue no…
tangg555 Nov 18, 2025
7665cda
fix bugs: debug bugs about internet trigger
tangg555 Nov 18, 2025
3559323
debug get searcher mode
tangg555 Nov 18, 2025
7c8e0d0
feat: add manual internet
fridayL Nov 18, 2025
27b0971
Merge branch 'feat/redis_scheduler' of https://github.com/MemTensor/M…
fridayL Nov 18, 2025
94d456b
Fix: fix code format
fridayL Nov 18, 2025
87b5358
feat: add strategy for fine search
tangg555 Nov 18, 2025
127fdc7
debug redis queue
tangg555 Nov 18, 2025
0911ced
debug redis queue
tangg555 Nov 18, 2025
d1a7261
fix bugs: completely addressed bugs about redis queue
tangg555 Nov 18, 2025
232be6f
refactor: add searcher to handler_init; remove info log from task_queue
tangg555 Nov 19, 2025
d16a7c8
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Nov 19, 2025
bc7236f
refactor: modify analyzer
tangg555 Nov 19, 2025
afaf8df
refactor: revise locomo_eval to make it support llm other than gpt-4o…
tangg555 Nov 19, 2025
0b02d3c
feat: develop advanced searcher with deep search
tangg555 Nov 20, 2025
2097eae
feat: finish a complete version of deep search
tangg555 Nov 21, 2025
aff2932
refactor: refactor deep search feature, now only allowing one-round d…
tangg555 Nov 24, 2025
4226a77
feat: implement the feature of get_tasks_status, but completed tasks …
tangg555 Nov 24, 2025
e27483c
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Nov 24, 2025
51964ec
debuging merged code; searching memories have bugs
tangg555 Nov 24, 2025
1e28ee5
change logging level
tangg555 Nov 24, 2025
e0001ea
debug api evaluation
tangg555 Nov 24, 2025
bae7022
fix bugs: change top to top_k
tangg555 Nov 24, 2025
d6cf824
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Nov 24, 2025
742df4e
change log
tangg555 Nov 24, 2025
9b310c4
refactor: rewrite deep search to make it work better
tangg555 Nov 25, 2025
7e4cfc5
change num_users
tangg555 Nov 26, 2025
c0cadac
feat: developed and test task broker and orchestrator
tangg555 Nov 26, 2025
e0eb490
Fix: Include task_id in ScheduleMessageItem serialization
Nov 29, 2025
2606fc7
Fix(Scheduler): Correct event log creation and task_id serialization
Nov 29, 2025
b3a6f1b
Feat(Scheduler): Add conditional detailed logging for KB updates
Nov 29, 2025
4b2cc2f
Fix(Scheduler): Correct create_event_log call sites
Nov 29, 2025
d8726ec
Fix(Scheduler): Deserialize task_id in ScheduleMessageItem.from_dict
Nov 29, 2025
b8cc42a
Refactor(Config): Centralize RabbitMQ config override logic
Nov 29, 2025
b6ebee6
Revert "Refactor(Config): Centralize RabbitMQ config override logic"
Nov 29, 2025
702d3e1
Fix(Redis): Convert None task_id to empty string during serialization
Nov 29, 2025
975e585
Feat(Log): Add diagnostic log to /product/add endpoint
Nov 29, 2025
bceaf68
Merge branch 'dev' into hotfix/task-id-loss
glin93 Nov 29, 2025
82a95c4
Feat(Log): Add comprehensive diagnostic logs for /product/add flow
Nov 29, 2025
c5631cc
Feat(Log): Add comprehensive diagnostic logs for /product/add flow an…
Nov 29, 2025
600fe24
Fix(rabbitmq): Use env vars for KB updates and improve logging
Nov 29, 2025
1da7c71
Fix(rabbitmq): Explicitly use MEMSCHEDULER_RABBITMQ_EXCHANGE_NAME and…
Nov 29, 2025
f32399b
Fix(add_handler): Update diagnostic log timestamp
Nov 29, 2025
42fea63
Fix(add_handler): Update diagnostic log timestamp again (auto-updated)
Nov 29, 2025
003a169
Update default scheduler redis stream prefix
Nov 29, 2025
6b5d5c6
Update diagnostic timestamp in add handler
Nov 29, 2025
5339b08
Allow optional log_content in scheduler event log
Nov 29, 2025
e1304c1
feat: new examples to test scheduelr
tangg555 Dec 1, 2025
045d154
feat: fair scheduler and refactor of search function
tangg555 Dec 1, 2025
85611c8
Merge remote-tracking branch 'upstream/hotfix/task-id-loss' into dev
tangg555 Dec 1, 2025
4aaeb54
fix bugs: address bugs caused by outdated test code
tangg555 Dec 1, 2025
480c8e3
feat: add task_schedule_monitor
tangg555 Dec 1, 2025
c49a498
fix: handle nil mem_cube in scheduler message consumers
Dec 2, 2025
b772d88
fix bugs: response messaged changed in memos code
tangg555 Dec 1, 2025
630c21c
refactor: revise task queue to allow it dealing with pending tasks wh…
tangg555 Dec 1, 2025
198aade
refactor: revise mixture search and scheduler logger
tangg555 Dec 2, 2025
5ba44d6
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 2, 2025
28e1368
Fix scheduler task tracking
Dec 2, 2025
173bebc
fix bugs: address ai review issues
tangg555 Dec 2, 2025
9708f4d
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 2, 2025
6746563
fix bugs: address rabbitmq initialization failed when doing pytest
tangg555 Dec 2, 2025
9613258
fix(scheduler): Correct dispatcher task and future tracking
Dec 2, 2025
8d7053b
Remove dump.rdb
tangg555 Dec 2, 2025
73b4711
fix bugs: revised message ack logics; refactor add log function
tangg555 Dec 2, 2025
11654e5
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 2, 2025
bcd5d8f
fix bugs: change Chinese notation to English
tangg555 Dec 2, 2025
5b6cd2e
fix indent error in logger
Dec 2, 2025
48a3e9d
fix bugs: addressed the issues caused by multiprocessing codes obtain…
tangg555 Dec 2, 2025
13abb20
addMemory/updateMemory log
Dec 2, 2025
eeb31ed
Merge origin/dev into scheduler
Dec 2, 2025
9198b85
fix bugs: modify redis queue logics to make it run as expected
tangg555 Dec 2, 2025
4c10503
feat: add a default mem cube initialization for scheduler
tangg555 Dec 2, 2025
3ac309d
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 2, 2025
fb6ddc5
Merge remote-tracking branch 'upstream/scheduler' into dev
tangg555 Dec 2, 2025
cc7bc86
address scheduler init bug
tangg555 Dec 3, 2025
c7ecdae
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 3, 2025
5994a27
feat(scheduler): Propagate trace_id across process boundaries for mem…
tangg555 Dec 3, 2025
bd19c4c
fix bugs: redis queue allows to reget pending tasks which exceeding i…
tangg555 Dec 3, 2025
3fd189f
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 3, 2025
c7090c8
fix(scheduler): Correct lazy-loading logic for mem_cube property
Dec 3, 2025
30109f6
Add MONITOR_EVENT logs for scheduler lifecycle
Dec 3, 2025
5850d7a
fix: Resolve Ruff linting and formatting issues
Dec 3, 2025
57c45dc
Handle dequeue timestamp without pydantic errors
Dec 3, 2025
7ed1f42
feat: orchestrator add task priority; move task labels into task_sche…
tangg555 Dec 4, 2025
3b927e2
feat: more logs for debug
tangg555 Dec 4, 2025
b56f57a
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 4, 2025
4e65f58
fix bugs: addresss some bugs
tangg555 Dec 4, 2025
d3dd54d
refactor: remove logger info in pref add function
tangg555 Dec 4, 2025
9be93fb
refactor: change redis queue to periodically refresh pending tasks
tangg555 Dec 5, 2025
41ea8b7
feat: a faster and better redis queue
tangg555 Dec 5, 2025
99f61f3
refactor: remove cleanup in redis queue
tangg555 Dec 5, 2025
d03f960
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 7, 2025
f892678
feat: allow directly execute task if task priority is level 1
tangg555 Dec 7, 2025
0a522b3
refactor: refactor log_add_handler and redis queue to make the code r…
tangg555 Dec 7, 2025
3280f25
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 7, 2025
1ddfe9c
fix bugs: fix the bug in _process_chat_data
tangg555 Dec 7, 2025
2a10311
fix: use message item_id for task status updates instead of execution id
Dec 7, 2025
d18a917
style: format dispatcher.py with ruff
Dec 7, 2025
8d4c854
chore: emit dequeue for immediate tasks
Dec 7, 2025
6476442
fix: resolve ruff UP038 in base_scheduler.py
Dec 7, 2025
257b7f6
feat: add scheduler queue status endpoint
Dec 7, 2025
6048b2b
fix: lazy-init redis in queue status handler
Dec 7, 2025
4d9cef4
fix: unwrap queue wrapper for redis status
Dec 7, 2025
248e86a
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 7, 2025
5d83f7c
Merge remote-tracking branch 'upstream/scheduler' into dev
tangg555 Dec 7, 2025
dce178f
fix bugs: fix a bug causing no schedule memory
tangg555 Dec 7, 2025
73a190e
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 7, 2025
0e0dcb5
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 8, 2025
7b9db93
feat: add a new env variable to set stream_prefix in redis; make add …
tangg555 Dec 8, 2025
e0f2be5
Merge remote-tracking branch 'upstream/dev' into dev
tangg555 Dec 8, 2025
f95e3ba
fix bugs: update start_listening in redis_queue
tangg555 Dec 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions examples/mem_scheduler/try_schedule_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,26 @@ def init_task():
"role": "user",
"content": "Max needs joint supplements. Actually, we're moving to Chicago next month.",
},
{
"role": "assistant",
"content": "Got it — Max is on joint supplements, and you’re relocating to Chicago soon. That’s a big move! Have you looked into how the change in climate or vet access might affect his needs?",
},
{
"role": "user",
"content": "Correction: Bella is 6, not 5. And she's allergic to chicken.",
},
{
"role": "assistant",
"content": "Thanks for the update! So Bella is 6 years old and has a chicken allergy — good to know. You’ll want to double-check her food and treats, especially during the move. Has she had any reactions recently?",
},
{
"role": "user",
"content": "My partner's cat Whiskers visits weekends. Bella chases her sometimes.",
},
{
"role": "assistant",
"content": "Ah, the classic dog-and-cat dynamic! Since Bella chases Whiskers, it might help to give them gradual supervised interactions or create safe zones for the cat—especially important as you settle into a new home in Chicago. Keeping Bella’s routine stable during the move could also reduce her urge to chase. How do they usually get along when Whiskers visits?",
},
]

questions = [
Expand Down Expand Up @@ -145,18 +157,25 @@ def start_conversation(self, user_id="test_user", mem_cube_id="test_cube", sessi
print(f" User ID: {self.current_user_id}")
print(f" Mem Cube ID: {self.current_mem_cube_id}")

def add_msgs(self, messages: list[dict]):
def add_msgs(
self,
messages: list[dict],
extract_mode: str = "fine",
async_mode: str = "sync",
):
# Create add request
add_req = self.create_test_add_request(
user_id=self.current_user_id,
mem_cube_id=self.current_mem_cube_id,
messages=messages,
session_id=self.current_session_id,
extract_mode=extract_mode,
async_mode=async_mode,
)

# Add to memory
result = self.add_memories(add_req)
print(f" ✅ Added to memory successfully: \n{messages}")
print(f" ✅ Added to memory successfully: \n{result}")

return result

Expand Down
86 changes: 86 additions & 0 deletions src/memos/mem_reader/simple_struct.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import concurrent.futures
import copy
import json
import os
import re
import traceback

Expand All @@ -25,6 +26,7 @@
from memos.templates.mem_reader_prompts import (
CUSTOM_TAGS_INSTRUCTION,
CUSTOM_TAGS_INSTRUCTION_ZH,
PROMPT_MAPPING,
SIMPLE_STRUCT_DOC_READER_PROMPT,
SIMPLE_STRUCT_DOC_READER_PROMPT_ZH,
SIMPLE_STRUCT_MEM_READER_EXAMPLE,
Expand Down Expand Up @@ -80,6 +82,7 @@ def from_config(_config):
"custom_tags": {"en": CUSTOM_TAGS_INSTRUCTION, "zh": CUSTOM_TAGS_INSTRUCTION_ZH},
}


try:
import tiktoken

Expand Down Expand Up @@ -448,6 +451,81 @@ def get_memory(
standard_scene_data = coerce_scene_data(scene_data, type)
return self._read_memory(standard_scene_data, type, info, mode)

@staticmethod
def _parse_hallucination_filter_response(text: str) -> tuple[bool, dict[int, dict]]:
"""Parse index-keyed JSON from hallucination filter response.
Expected shape: { "0": {"if_delete": bool, "rewritten memory content": str}, ... }
Returns (success, parsed_dict) with int keys.
"""
try:
data = json.loads(text)
except Exception:
return False, {}

if not isinstance(data, dict):
return False, {}

result: dict[int, dict] = {}
for k, v in data.items():
try:
idx = int(k)
except Exception:
# allow integer keys as-is
if isinstance(k, int):
idx = k
else:
continue
if not isinstance(v, dict):
continue
delete_flag = v.get("delete_flag")
rewritten = v.get("rewritten memory content", "")
if isinstance(delete_flag, bool) and isinstance(rewritten, str):
result[idx] = {"delete_flag": delete_flag, "rewritten memory content": rewritten}

return (len(result) > 0), result

def filter_hallucination_in_memories(
self, user_messages: list[str], memory_list: list[list[TextualMemoryItem]]
):
filtered_memory_list = []
for group in memory_list:
try:
flat_memories = [one.memory for one in group]
template = PROMPT_MAPPING["hallucination_filter"]
prompt_args = {
"user_messages_inline": "\n".join(user_messages),
"memories_inline": json.dumps(flat_memories, ensure_ascii=False, indent=2),
}
prompt = template.format(**prompt_args)

# Optionally run filter and parse the output
try:
raw = self.llm.generate(prompt)
success, parsed = self._parse_hallucination_filter_response(raw)
logger.info(f"Hallucination filter parsed successfully: {success}")
new_mem_list = []
if success:
logger.info(f"Hallucination filter result: {parsed}")
for mem_idx, (delete_flag, rewritten_mem_content) in parsed.items():
if not delete_flag:
group[mem_idx].memory = rewritten_mem_content
new_mem_list.append(group[mem_idx])
filtered_memory_list.append(new_mem_list)
logger.info(
f"Successfully transform origianl memories from {group} to {new_mem_list}."
)
else:
logger.warning(
"Hallucination filter parsing failed or returned empty result."
)
except Exception as e:
logger.error(f"Hallucination filter execution error: {e}", stack_info=True)
filtered_memory_list.append(group)
except Exception:
logger.error("Fail to filter memories", stack_info=True)
filtered_memory_list.append(group)
return filtered_memory_list

def _read_memory(
self, messages: list[MessagesType], type: str, info: dict[str, Any], mode: str = "fine"
) -> list[list[TextualMemoryItem]]:
Expand Down Expand Up @@ -492,6 +570,14 @@ def _read_memory(
except Exception as e:
logger.error(f"Task failed with exception: {e}")
logger.error(traceback.format_exc())

if os.getenv("SIMPLE_STRUCT_ADD_FILTER", "false") == "true":
# Build inputs
user_messages = [msg.content for msg in messages if msg.role == "user"]
memory_list = self.filter_hallucination_in_memories(
user_messages=user_messages, memory_list=memory_list
)

return memory_list

def fine_transfer_simple_mem(
Expand Down
4 changes: 4 additions & 0 deletions src/memos/mem_scheduler/analyzer/api_analyzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,8 @@ def create_test_add_request(
messages=None,
memory_content=None,
session_id=None,
extract_mode=None,
async_mode="sync",
):
"""
Create a test APIADDRequest object with the given parameters.
Expand Down Expand Up @@ -637,6 +639,8 @@ def create_test_add_request(
source="api_analyzer_test",
chat_history=None,
operation=None,
mode=extract_mode,
async_mode=async_mode,
)

def run_all_tests(self, mode=SearchMode.MIXTURE):
Expand Down
16 changes: 10 additions & 6 deletions src/memos/mem_scheduler/base_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,7 @@ def __init__(self, config: BaseSchedulerConfig):
"max_internal_message_queue_size", DEFAULT_MAX_INTERNAL_MESSAGE_QUEUE_SIZE
)
self.orchestrator = SchedulerOrchestrator()
self.memos_message_queue = ScheduleTaskQueue(
use_redis_queue=self.use_redis_queue,
maxsize=self.max_internal_message_queue_size,
disabled_handlers=self.disabled_handlers,
orchestrator=self.orchestrator,
)

self.searcher: Searcher | None = None
self.retriever: SchedulerRetriever | None = None
self.db_engine: Engine | None = None
Expand All @@ -155,6 +150,13 @@ def __init__(self, config: BaseSchedulerConfig):
self.status_tracker: TaskStatusTracker | None = None
self.metrics = metrics
self._monitor_thread = None
self.memos_message_queue = ScheduleTaskQueue(
use_redis_queue=self.use_redis_queue,
maxsize=self.max_internal_message_queue_size,
disabled_handlers=self.disabled_handlers,
orchestrator=self.orchestrator,
status_tracker=self.status_tracker,
)
self.dispatcher = SchedulerDispatcher(
config=self.config,
memos_message_queue=self.memos_message_queue,
Expand Down Expand Up @@ -228,6 +230,8 @@ def initialize_modules(
self.status_tracker = TaskStatusTracker(redis_client)
if self.dispatcher:
self.dispatcher.status_tracker = self.status_tracker
if self.memos_message_queue:
self.memos_message_queue.status_tracker = self.status_tracker
# initialize submodules
self.chat_llm = chat_llm
self.process_llm = process_llm
Expand Down
2 changes: 1 addition & 1 deletion src/memos/mem_scheduler/general_modules/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def put(self, item: T, block: bool = False, timeout: float | None = None) -> Non

def get(
self, block: bool = True, timeout: float | None = None, batch_size: int | None = None
) -> list[T] | T:
) -> list[T]:
"""Get items from the queue.

Args:
Expand Down
7 changes: 3 additions & 4 deletions src/memos/mem_scheduler/schemas/task_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ class TaskPriorityLevel(Enum):


# task queue
DEFAULT_STREAM_KEY_PREFIX = "scheduler:messages:stream:v1.7"
exchange_name = os.getenv("MEMSCHEDULER_RABBITMQ_EXCHANGE_NAME", None)
if exchange_name is not None:
DEFAULT_STREAM_KEY_PREFIX += f":{exchange_name}"
DEFAULT_STREAM_KEY_PREFIX = os.getenv(
"MEMSCHEDULER_STREAM_KEY_PREFIX", "scheduler:messages:stream:v2.0"
)


# ============== Running Tasks ==============
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ def wrapped_handler(messages: list[ScheduleMessageItem]):
mem_cube_id=msg.mem_cube_id,
task_label=msg.label,
redis_message_id=redis_message_id,
message=msg,
)
except Exception as ack_err:
logger.warning(f"Ack in finally failed: {ack_err}")
Expand Down
23 changes: 17 additions & 6 deletions src/memos/mem_scheduler/task_schedule_modules/redis_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,12 @@ def put(
raise

def ack_message(
self, user_id: str, mem_cube_id: str, task_label: str, redis_message_id
self,
user_id: str,
mem_cube_id: str,
task_label: str,
redis_message_id,
message: ScheduleMessageItem | None,
) -> None:
stream_key = self.get_stream_key(
user_id=user_id, mem_cube_id=mem_cube_id, task_label=task_label
Expand All @@ -347,6 +352,12 @@ def ack_message(

try:
self._redis_conn.xack(stream_key, self.consumer_group, redis_message_id)

if message:
self.status_tracker.task_completed(task_id=message.item_id, user_id=message.user_id)
logger.info(
f"Message {message.item_id} | {message.label} | {message.content} has been acknowledged."
)
except Exception as e:
logger.warning(
f"xack failed for stream '{stream_key}', msg_id='{redis_message_id}': {e}"
Expand All @@ -364,7 +375,7 @@ def get(
stream_key: str,
block: bool = True,
timeout: float | None = None,
batch_size: int | None = None,
batch_size: int | None = 1,
) -> list[ScheduleMessageItem]:
if not self._redis_conn:
raise ConnectionError("Not connected to Redis. Redis connection not available.")
Expand All @@ -385,7 +396,7 @@ def get(
self.consumer_group,
self.consumer_name,
{stream_key: ">"},
count=(batch_size if batch_size is not None else None),
count=batch_size,
block=redis_timeout,
)
except Exception as read_err:
Expand All @@ -400,7 +411,7 @@ def get(
self.consumer_group,
self.consumer_name,
{stream_key: ">"},
count=(batch_size if batch_size is not None else None),
count=batch_size,
block=redis_timeout,
)
else:
Expand Down Expand Up @@ -492,7 +503,7 @@ def get(

raise Empty("No messages available in Redis queue")

return result_messages if batch_size is not None else result_messages[0]
return result_messages

except Exception as e:
if "Empty" in str(type(e).__name__):
Expand Down Expand Up @@ -630,7 +641,7 @@ def start_listening(

try:
while self._is_listening:
messages = self.get(timeout=poll_interval, count=batch_size)
messages = self.get_messages(batch_size=1)

for message in messages:
try:
Expand Down
5 changes: 5 additions & 0 deletions src/memos/mem_scheduler/task_schedule_modules/task_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
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.mem_scheduler.utils.monitor_event_utils import emit_monitor_event, to_iso
from memos.mem_scheduler.utils.status_tracker import TaskStatusTracker


logger = get_logger(__name__)
Expand All @@ -26,10 +27,12 @@ def __init__(
maxsize: int,
disabled_handlers: list | None = None,
orchestrator: SchedulerOrchestrator | None = None,
status_tracker: TaskStatusTracker | None = None,
):
self.use_redis_queue = use_redis_queue
self.maxsize = maxsize
self.orchestrator = SchedulerOrchestrator() if orchestrator is None else orchestrator
self.status_tracker = status_tracker

if self.use_redis_queue:
if maxsize is None or not isinstance(maxsize, int) or maxsize <= 0:
Expand All @@ -51,6 +54,7 @@ def ack_message(
mem_cube_id: str,
task_label: str,
redis_message_id,
message: ScheduleMessageItem | None,
) -> None:
if not isinstance(self.memos_message_queue, SchedulerRedisQueue):
logger.warning("ack_message is only supported for Redis queues")
Expand All @@ -61,6 +65,7 @@ def ack_message(
mem_cube_id=mem_cube_id,
task_label=task_label,
redis_message_id=redis_message_id,
message=message,
)

def get_stream_keys(self) -> list[str]:
Expand Down
10 changes: 8 additions & 2 deletions src/memos/multi_mem_cube/single_cube.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ def add_memories(self, add_req: APIADDRequest) -> list[dict[str, Any]]:
for item in pref_results:
item["cube_id"] = self.cube_id

return text_results + pref_results
all_memories = text_results + pref_results

# TODO: search existing memories and compare

return all_memories

def search_memories(self, search_req: APISearchRequest) -> dict[str, Any]:
# Create UserContext object
Expand Down Expand Up @@ -692,11 +696,13 @@ def _process_text_mem(
sync_mode=sync_mode,
)

return [
text_memories = [
{
"memory": memory.memory,
"memory_id": memory_id,
"memory_type": memory.metadata.memory_type,
}
for memory_id, memory in zip(mem_ids_local, flattened_local, strict=False)
]

return text_memories
Loading
Loading