Skip to content

Commit 563f846

Browse files
glin93glin93
authored
revert: remove create log item_id inheritance (#743)
revert: remove item_id inheritance Co-authored-by: [email protected] <>
1 parent 9fa93db commit 563f846

File tree

3 files changed

+10
-34
lines changed

3 files changed

+10
-34
lines changed

‎src/memos/mem_scheduler/general_modules/scheduler_logger.py‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ def create_autofilled_log_item(
4949
user_id: str,
5050
mem_cube_id: str,
5151
mem_cube: GeneralMemCube,
52-
item_id: str | None = None,
5352
) -> ScheduleLogForWebItem:
5453
if mem_cube is None:
5554
logger.error(
@@ -95,19 +94,16 @@ def create_autofilled_log_item(
9594
)
9695
memory_capacities["parameter_memory_capacity"] = 1
9796

98-
log_kwargs = {
99-
"user_id": user_id,
100-
"mem_cube_id": mem_cube_id,
101-
"label": label,
102-
"from_memory_type": from_memory_type,
103-
"to_memory_type": to_memory_type,
104-
"log_content": log_content,
105-
"current_memory_sizes": current_memory_sizes,
106-
"memory_capacities": memory_capacities,
107-
}
108-
if item_id:
109-
log_kwargs["item_id"] = item_id
110-
log_message = ScheduleLogForWebItem(**log_kwargs)
97+
log_message = ScheduleLogForWebItem(
98+
user_id=user_id,
99+
mem_cube_id=mem_cube_id,
100+
label=label,
101+
from_memory_type=from_memory_type,
102+
to_memory_type=to_memory_type,
103+
log_content=log_content,
104+
current_memory_sizes=current_memory_sizes,
105+
memory_capacities=memory_capacities,
106+
)
111107
return log_message
112108

113109
@log_exceptions(logger=logger)
@@ -124,7 +120,6 @@ def create_event_log(
124120
memory_len: int,
125121
memcube_name: str | None = None,
126122
log_content: str | None = None,
127-
item_id: str | None = None,
128123
) -> ScheduleLogForWebItem:
129124
item = self.create_autofilled_log_item(
130125
log_content=log_content or "",
@@ -134,7 +129,6 @@ def create_event_log(
134129
user_id=user_id,
135130
mem_cube_id=mem_cube_id,
136131
mem_cube=mem_cube,
137-
item_id=item_id,
138132
)
139133
item.memcube_log_content = memcube_log_content
140134
item.metadata = metadata

‎src/memos/mem_scheduler/general_scheduler.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ def _query_message_consumer(self, messages: list[ScheduleMessageItem]) -> None:
266266
metadata=[],
267267
memory_len=1,
268268
memcube_name=self._map_memcube_name(msg.mem_cube_id),
269-
item_id=msg.item_id,
270269
)
271270
event.task_id = msg.task_id
272271
self._submit_web_logs([event])
@@ -323,7 +322,6 @@ def _answer_message_consumer(self, messages: list[ScheduleMessageItem]) -> None:
323322
metadata=[],
324323
memory_len=1,
325324
memcube_name=self._map_memcube_name(msg.mem_cube_id),
326-
item_id=msg.item_id,
327325
)
328326
event.task_id = msg.task_id
329327
self._submit_web_logs([event])
@@ -494,7 +492,6 @@ def send_add_log_messages_to_local_env(
494492
metadata=add_meta_legacy,
495493
memory_len=len(add_content_legacy),
496494
memcube_name=self._map_memcube_name(msg.mem_cube_id),
497-
item_id=msg.item_id,
498495
)
499496
event.task_id = msg.task_id
500497
events.append(event)
@@ -510,7 +507,6 @@ def send_add_log_messages_to_local_env(
510507
metadata=update_meta_legacy,
511508
memory_len=len(update_content_legacy),
512509
memcube_name=self._map_memcube_name(msg.mem_cube_id),
513-
item_id=msg.item_id,
514510
)
515511
event.task_id = msg.task_id
516512
events.append(event)
@@ -577,7 +573,6 @@ def send_add_log_messages_to_cloud_env(
577573
metadata=None,
578574
memory_len=len(kb_log_content),
579575
memcube_name=self._map_memcube_name(msg.mem_cube_id),
580-
item_id=msg.item_id,
581576
)
582577
event.log_content = f"Knowledge Base Memory Update: {len(kb_log_content)} changes."
583578
event.task_id = msg.task_id
@@ -724,7 +719,6 @@ def _extract_fields(mem_item):
724719
metadata=None,
725720
memory_len=len(kb_log_content),
726721
memcube_name=self._map_memcube_name(mem_cube_id),
727-
item_id=message.item_id,
728722
)
729723
event.log_content = (
730724
f"Knowledge Base Memory Update: {len(kb_log_content)} changes."
@@ -794,7 +788,6 @@ def process_message(message: ScheduleMessageItem):
794788
user_name=user_name,
795789
custom_tags=info.get("custom_tags", None),
796790
task_id=message.task_id,
797-
item_id=message.item_id,
798791
info=info,
799792
)
800793

@@ -822,7 +815,6 @@ def _process_memories_with_reader(
822815
user_name: str,
823816
custom_tags: list[str] | None = None,
824817
task_id: str | None = None,
825-
item_id: str | None = None,
826818
info: dict | None = None,
827819
) -> None:
828820
logger.info(
@@ -942,7 +934,6 @@ def _process_memories_with_reader(
942934
metadata=None,
943935
memory_len=len(kb_log_content),
944936
memcube_name=self._map_memcube_name(mem_cube_id),
945-
item_id=item_id,
946937
)
947938
event.log_content = (
948939
f"Knowledge Base Memory Update: {len(kb_log_content)} changes."
@@ -988,7 +979,6 @@ def _process_memories_with_reader(
988979
metadata=add_meta_legacy,
989980
memory_len=len(add_content_legacy),
990981
memcube_name=self._map_memcube_name(mem_cube_id),
991-
item_id=item_id,
992982
)
993983
event.task_id = task_id
994984
self._submit_web_logs([event])
@@ -1055,7 +1045,6 @@ def _process_memories_with_reader(
10551045
metadata=None,
10561046
memory_len=len(kb_log_content),
10571047
memcube_name=self._map_memcube_name(mem_cube_id),
1058-
item_id=item_id,
10591048
)
10601049
event.log_content = f"Knowledge Base Memory Update failed: {exc!s}"
10611050
event.task_id = task_id
@@ -1223,7 +1212,6 @@ def process_message(message: ScheduleMessageItem):
12231212
metadata=meta,
12241213
memory_len=len(keys),
12251214
memcube_name=self._map_memcube_name(mem_cube_id),
1226-
item_id=message.item_id,
12271215
)
12281216
self._submit_web_logs([event])
12291217

‎src/memos/mem_scheduler/task_schedule_modules/dispatcher.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ def _maybe_emit_task_completion(
329329
# messages in one batch can belong to different business task_ids; check each
330330
task_ids = set()
331331
task_id_to_doc_id = {}
332-
task_id_to_item_id = {}
333332

334333
for msg in messages:
335334
tid = getattr(msg, "task_id", None)
@@ -341,8 +340,6 @@ def _maybe_emit_task_completion(
341340
sid = info.get("source_doc_id")
342341
if sid:
343342
task_id_to_doc_id[tid] = sid
344-
if tid not in task_id_to_item_id:
345-
task_id_to_item_id[tid] = msg.item_id
346343

347344
if not task_ids:
348345
return
@@ -359,7 +356,6 @@ def _maybe_emit_task_completion(
359356

360357
for task_id in task_ids:
361358
source_doc_id = task_id_to_doc_id.get(task_id)
362-
event_item_id = task_id_to_item_id.get(task_id)
363359
status_data = self.status_tracker.get_task_status_by_business_id(
364360
business_task_id=task_id, user_id=user_id
365361
)
@@ -373,7 +369,6 @@ def _maybe_emit_task_completion(
373369
# (Although if status is 'completed', local error shouldn't happen theoretically,
374370
# unless status update lags or is inconsistent. We trust status_tracker here.)
375371
event = ScheduleLogForWebItem(
376-
item_id=event_item_id,
377372
task_id=task_id,
378373
user_id=user_id,
379374
mem_cube_id=mem_cube_id,
@@ -398,7 +393,6 @@ def _maybe_emit_task_completion(
398393
error_msg = "Unknown error (check system logs)"
399394

400395
event = ScheduleLogForWebItem(
401-
item_id=event_item_id,
402396
task_id=task_id,
403397
user_id=user_id,
404398
mem_cube_id=mem_cube_id,

0 commit comments

Comments
 (0)