Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 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
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
26 changes: 13 additions & 13 deletions examples/mem_scheduler/memos_w_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
from memos.mem_cube.general import GeneralMemCube
from memos.mem_os.main import MOS
from memos.mem_scheduler.general_scheduler import GeneralScheduler
from memos.mem_scheduler.schemas.general_schemas import (
ADD_LABEL,
ANSWER_LABEL,
MEM_ARCHIVE_LABEL,
MEM_ORGANIZE_LABEL,
MEM_UPDATE_LABEL,
QUERY_LABEL,
)
from memos.mem_scheduler.schemas.message_schemas import ScheduleLogForWebItem
from memos.mem_scheduler.schemas.task_schemas import (
ADD_TASK_LABEL,
ANSWER_TASK_LABEL,
MEM_ARCHIVE_TASK_LABEL,
MEM_ORGANIZE_TASK_LABEL,
MEM_UPDATE_TASK_LABEL,
QUERY_TASK_LABEL,
)
from memos.mem_scheduler.utils.filter_utils import transform_name_to_key


Expand Down Expand Up @@ -118,24 +118,24 @@ def _first_content() -> str:
return memcube_content[0].get("content", "") or content
return content

if label in ("addMessage", QUERY_LABEL, ANSWER_LABEL):
if label in ("addMessage", QUERY_TASK_LABEL, ANSWER_TASK_LABEL):
target_cube = cube_display.replace("MemCube", "")
title = _format_title(item.timestamp, f"addMessages to {target_cube} MemCube")
return title, _truncate_with_rules(_first_content())

if label in ("addMemory", ADD_LABEL):
if label in ("addMemory", ADD_TASK_LABEL):
title = _format_title(item.timestamp, f"{cube_display} added {memory_len} memories")
return title, _truncate_with_rules(_first_content())

if label in ("updateMemory", MEM_UPDATE_LABEL):
if label in ("updateMemory", MEM_UPDATE_TASK_LABEL):
title = _format_title(item.timestamp, f"{cube_display} updated {memory_len} memories")
return title, _truncate_with_rules(_first_content())

if label in ("archiveMemory", MEM_ARCHIVE_LABEL):
if label in ("archiveMemory", MEM_ARCHIVE_TASK_LABEL):
title = _format_title(item.timestamp, f"{cube_display} archived {memory_len} memories")
return title, _truncate_with_rules(_first_content())

if label in ("mergeMemory", MEM_ORGANIZE_LABEL):
if label in ("mergeMemory", MEM_ORGANIZE_TASK_LABEL):
title = _format_title(item.timestamp, f"{cube_display} merged {memory_len} memories")
merged = [c for c in memcube_content if c.get("type") == "merged"]
post = [c for c in memcube_content if c.get("type") == "postMerge"]
Expand Down
4 changes: 2 additions & 2 deletions examples/mem_scheduler/redis_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from memos.configs.mem_scheduler import SchedulerConfigFactory
from memos.mem_cube.general import GeneralMemCube
from memos.mem_scheduler.scheduler_factory import SchedulerFactory
from memos.mem_scheduler.schemas.general_schemas import QUERY_LABEL
from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
from memos.mem_scheduler.schemas.task_schemas import QUERY_TASK_LABEL


if TYPE_CHECKING:
Expand Down Expand Up @@ -55,7 +55,7 @@ def service_run():
message_item = ScheduleMessageItem(
user_id=user_id,
mem_cube_id="mem_cube_2",
label=QUERY_LABEL,
label=QUERY_TASK_LABEL,
mem_cube=mem_cube,
content=query,
timestamp=datetime.now(),
Expand Down
2 changes: 1 addition & 1 deletion examples/mem_scheduler/try_schedule_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from memos.mem_cube.general import GeneralMemCube
from memos.mem_scheduler.analyzer.mos_for_test_scheduler import MOSForTestScheduler
from memos.mem_scheduler.general_scheduler import GeneralScheduler
from memos.mem_scheduler.schemas.general_schemas import (
from memos.mem_scheduler.schemas.task_schemas import (
NOT_APPLICABLE_TYPE,
)

Expand Down
14 changes: 7 additions & 7 deletions src/memos/api/handlers/chat_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
prepare_reference_data,
process_streaming_references_complete,
)
from memos.mem_scheduler.schemas.general_schemas import (
ANSWER_LABEL,
QUERY_LABEL,
)
from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
from memos.mem_scheduler.schemas.task_schemas import (
ANSWER_TASK_LABEL,
QUERY_TASK_LABEL,
)
from memos.templates.mos_prompts import (
FURTHER_SUGGESTION_PROMPT,
get_memos_prompt,
Expand Down Expand Up @@ -244,7 +244,7 @@ def generate_chat_response() -> Generator[str, None, None]:
user_id=chat_req.user_id,
mem_cube_id=scheduler_cube_id,
query=chat_req.query,
label=QUERY_LABEL,
label=QUERY_TASK_LABEL,
)
# Extract memories from search results
memories_list = []
Expand Down Expand Up @@ -423,7 +423,7 @@ def generate_chat_response() -> Generator[str, None, None]:
user_id=chat_req.user_id,
mem_cube_id=scheduler_cube_id,
query=chat_req.query,
label=QUERY_LABEL,
label=QUERY_TASK_LABEL,
)
# Extract memories from search results
memories_list = []
Expand Down Expand Up @@ -1034,7 +1034,7 @@ async def _post_chat_processing(

# Send answer to scheduler
self._send_message_to_scheduler(
user_id=user_id, mem_cube_id=cube_id, query=clean_response, label=ANSWER_LABEL
user_id=user_id, mem_cube_id=cube_id, query=clean_response, label=ANSWER_TASK_LABEL
)

self.logger.info(f"Post-chat processing completed for user {user_id}")
Expand Down
5 changes: 4 additions & 1 deletion src/memos/configs/mem_reader.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from datetime import datetime
from typing import Any, ClassVar

from pydantic import Field, field_validator, model_validator
from pydantic import ConfigDict, Field, field_validator, model_validator

from memos.configs.base import BaseConfig
from memos.configs.chunker import ChunkerConfigFactory
Expand Down Expand Up @@ -44,6 +44,9 @@ def parse_datetime(cls, value):
class SimpleStructMemReaderConfig(BaseMemReaderConfig):
"""SimpleStruct MemReader configuration class."""

# Allow passing additional fields without raising validation errors
model_config = ConfigDict(extra="allow", strict=True)


class MultiModalStructMemReaderConfig(BaseMemReaderConfig):
"""MultiModalStruct MemReader configuration class."""
Expand Down
30 changes: 15 additions & 15 deletions src/memos/mem_os/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
from memos.mem_reader.factory import MemReaderFactory
from memos.mem_scheduler.general_scheduler import GeneralScheduler
from memos.mem_scheduler.scheduler_factory import SchedulerFactory
from memos.mem_scheduler.schemas.general_schemas import (
ADD_LABEL,
ANSWER_LABEL,
MEM_READ_LABEL,
PREF_ADD_LABEL,
QUERY_LABEL,
)
from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
from memos.mem_scheduler.schemas.task_schemas import (
ADD_TASK_LABEL,
ANSWER_TASK_LABEL,
MEM_READ_TASK_LABEL,
PREF_ADD_TASK_LABEL,
QUERY_TASK_LABEL,
)
from memos.mem_user.user_manager import UserManager, UserRole
from memos.memories.activation.item import ActivationMemoryItem
from memos.memories.parametric.item import ParametricMemoryItem
Expand Down Expand Up @@ -283,7 +283,7 @@ def chat(self, query: str, user_id: str | None = None, base_prompt: str | None =
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=QUERY_LABEL,
label=QUERY_TASK_LABEL,
content=query,
timestamp=datetime.utcnow(),
)
Expand Down Expand Up @@ -343,7 +343,7 @@ def chat(self, query: str, user_id: str | None = None, base_prompt: str | None =
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=ANSWER_LABEL,
label=ANSWER_TASK_LABEL,
content=response,
timestamp=datetime.utcnow(),
)
Expand Down Expand Up @@ -771,7 +771,7 @@ def process_textual_memory():
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=MEM_READ_LABEL,
label=MEM_READ_TASK_LABEL,
content=json.dumps(mem_ids),
timestamp=datetime.utcnow(),
task_id=task_id,
Expand All @@ -783,7 +783,7 @@ def process_textual_memory():
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=ADD_LABEL,
label=ADD_TASK_LABEL,
content=json.dumps(mem_ids),
timestamp=datetime.utcnow(),
task_id=task_id,
Expand Down Expand Up @@ -824,7 +824,7 @@ def process_preference_memory():
user_id=target_user_id,
session_id=target_session_id,
mem_cube_id=mem_cube_id,
label=PREF_ADD_LABEL,
label=PREF_ADD_TASK_LABEL,
content=json.dumps(messages_list),
timestamp=datetime.utcnow(),
)
Expand Down Expand Up @@ -878,7 +878,7 @@ def process_preference_memory():
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=MEM_READ_LABEL,
label=MEM_READ_TASK_LABEL,
content=json.dumps(mem_ids),
timestamp=datetime.utcnow(),
)
Expand All @@ -889,7 +889,7 @@ def process_preference_memory():
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=ADD_LABEL,
label=ADD_TASK_LABEL,
content=json.dumps(mem_ids),
timestamp=datetime.utcnow(),
)
Expand Down Expand Up @@ -920,7 +920,7 @@ def process_preference_memory():
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=ADD_LABEL,
label=ADD_TASK_LABEL,
content=json.dumps(mem_ids),
timestamp=datetime.utcnow(),
)
Expand Down
12 changes: 6 additions & 6 deletions src/memos/mem_os/product.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
prepare_reference_data,
process_streaming_references_complete,
)
from memos.mem_scheduler.schemas.general_schemas import (
ANSWER_LABEL,
QUERY_LABEL,
)
from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
from memos.mem_scheduler.schemas.task_schemas import (
ANSWER_TASK_LABEL,
QUERY_TASK_LABEL,
)
from memos.mem_user.persistent_factory import PersistentUserManagerFactory
from memos.mem_user.user_manager import UserRole
from memos.memories.textual.item import (
Expand Down Expand Up @@ -710,7 +710,7 @@ async def _post_chat_processing(
logger.warning(f"Failed to send chat notification (async): {e}")

self._send_message_to_scheduler(
user_id=user_id, mem_cube_id=cube_id, query=clean_response, label=ANSWER_LABEL
user_id=user_id, mem_cube_id=cube_id, query=clean_response, label=ANSWER_TASK_LABEL
)

self.add(
Expand Down Expand Up @@ -1151,7 +1151,7 @@ def chat_with_references(
f"time chat: search text_mem time user_id: {user_id} time is: {search_time_end - time_start}"
)
self._send_message_to_scheduler(
user_id=user_id, mem_cube_id=cube_id, query=query, label=QUERY_LABEL
user_id=user_id, mem_cube_id=cube_id, query=query, label=QUERY_TASK_LABEL
)
if memories_result:
memories_list = memories_result[0]["memories"]
Expand Down
10 changes: 6 additions & 4 deletions src/memos/mem_scheduler/analyzer/mos_for_test_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
from memos.log import get_logger
from memos.mem_os.main import MOS
from memos.mem_scheduler.schemas.general_schemas import (
ANSWER_LABEL,
MONITOR_WORKING_MEMORY_TYPE,
QUERY_LABEL,
)
from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
from memos.mem_scheduler.schemas.task_schemas import (
ANSWER_TASK_LABEL,
QUERY_TASK_LABEL,
)


logger = get_logger(__name__)
Expand Down Expand Up @@ -427,7 +429,7 @@ def chat(self, query: str, user_id: str | None = None) -> str:
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=QUERY_LABEL,
label=QUERY_TASK_LABEL,
content=query,
timestamp=datetime.now(),
)
Expand Down Expand Up @@ -517,7 +519,7 @@ def chat(self, query: str, user_id: str | None = None) -> str:
message_item = ScheduleMessageItem(
user_id=target_user_id,
mem_cube_id=mem_cube_id,
label=ANSWER_LABEL,
label=ANSWER_TASK_LABEL,
content=response,
timestamp=datetime.now(),
)
Expand Down
4 changes: 2 additions & 2 deletions src/memos/mem_scheduler/analyzer/scheduler_for_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

from memos.log import get_logger
from memos.mem_scheduler.general_scheduler import GeneralScheduler
from memos.mem_scheduler.schemas.general_schemas import (
from memos.mem_scheduler.schemas.monitor_schemas import QueryMonitorItem
from memos.mem_scheduler.schemas.task_schemas import (
DEFAULT_MAX_QUERY_KEY_WORDS,
)
from memos.mem_scheduler.schemas.monitor_schemas import QueryMonitorItem


if TYPE_CHECKING:
Expand Down
32 changes: 18 additions & 14 deletions src/memos/mem_scheduler/base_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
)
from memos.mem_scheduler.schemas.monitor_schemas import MemoryMonitorItem
from memos.mem_scheduler.task_schedule_modules.dispatcher import SchedulerDispatcher
from memos.mem_scheduler.task_schedule_modules.orchestrator import SchedulerOrchestrator
from memos.mem_scheduler.task_schedule_modules.task_queue import ScheduleTaskQueue
from memos.mem_scheduler.utils import metrics
from memos.mem_scheduler.utils.db_utils import get_utc_now
Expand Down Expand Up @@ -121,10 +122,12 @@ def __init__(self, config: BaseSchedulerConfig):
self.max_internal_message_queue_size = self.config.get(
"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
Expand All @@ -143,6 +146,7 @@ def __init__(self, config: BaseSchedulerConfig):
status_tracker=self.status_tracker,
metrics=self.metrics,
submit_web_logs=self._submit_web_logs,
orchestrator=self.orchestrator,
)
# Task schedule monitor: initialize with underlying queue implementation
self.get_status_parallel = self.config.get("get_status_parallel", True)
Expand Down Expand Up @@ -697,22 +701,22 @@ def get_web_log_messages(self) -> list[dict]:
break

def _map_label(label: str) -> str:
from memos.mem_scheduler.schemas.general_schemas import (
ADD_LABEL,
ANSWER_LABEL,
MEM_ARCHIVE_LABEL,
MEM_ORGANIZE_LABEL,
MEM_UPDATE_LABEL,
QUERY_LABEL,
from memos.mem_scheduler.schemas.task_schemas import (
ADD_TASK_LABEL,
ANSWER_TASK_LABEL,
MEM_ARCHIVE_TASK_LABEL,
MEM_ORGANIZE_TASK_LABEL,
MEM_UPDATE_TASK_LABEL,
QUERY_TASK_LABEL,
)

mapping = {
QUERY_LABEL: "addMessage",
ANSWER_LABEL: "addMessage",
ADD_LABEL: "addMemory",
MEM_UPDATE_LABEL: "updateMemory",
MEM_ORGANIZE_LABEL: "mergeMemory",
MEM_ARCHIVE_LABEL: "archiveMemory",
QUERY_TASK_LABEL: "addMessage",
ANSWER_TASK_LABEL: "addMessage",
ADD_TASK_LABEL: "addMemory",
MEM_UPDATE_TASK_LABEL: "updateMemory",
MEM_ORGANIZE_TASK_LABEL: "mergeMemory",
MEM_ARCHIVE_TASK_LABEL: "archiveMemory",
}
return mapping.get(label, label)

Expand Down Expand Up @@ -785,7 +789,7 @@ def _message_consumer(self) -> None:
if enqueue_epoch is not None:
queue_wait_ms = max(0.0, now - enqueue_epoch) * 1000

# Avoid pydantic attribute enforcement
# Avoid pydantic field enforcement by using object.__setattr__
object.__setattr__(msg, "_dequeue_ts", now)
emit_monitor_event(
"dequeue",
Expand Down
Loading
Loading