Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.
Python agent-contextagent-memoryagent-pluginsagentic-ragcontext-databasedsh-pluginknowledge-basememorymemory-managementself-evolvingvector-database
fix(memory): preserve role and peer in event chatlogs (#5113)
JamesHuc493dfc68ba6
diff --git a/openviking/session/memory/memory_updater.py b/openviking/session/memory/memory_updater.pyindex b178e2df0..865356930 100644--- a/openviking/session/memory/memory_updater.py+++ b/openviking/session/memory/memory_updater.py@@ -660,14 +660,19 @@ class MessageRange:@staticmethoddef _speaker_for(message: Message) -> str:- return getattr(message, "peer_id", None) or message.role+ peer_id = getattr(message, "peer_id", None)+ return f"{message.role} [peer={peer_id}]" if peer_id else message.roledef _can_merge_messages(self, previous: Message, current: Message) -> bool:previous_meta = self._chunk_meta_for(previous)current_meta = self._chunk_meta_for(current)if previous_meta is None or current_meta is None:return False- if self._speaker_for(previous) != self._speaker_for(current):+ # 身份比较独立于展示格式,避免同一 peer 的不同角色被合并。+ if (previous.role, getattr(previous, "peer_id", None)) != (+ current.role,+ getattr(current, "peer_id", None),+ ):return Falsereturn (previous_meta.source_message_id == current_meta.source_message_iddiff --git a/tests/session/memory/test_memory_updater.py b/tests/session/memory/test_memory_updater.pyindex 64bf1c074..99a616923 100644--- a/tests/session/memory/test_memory_updater.py+++ b/tests/session/memory/test_memory_updater.py@@ -27,6 +27,7 @@ from openviking.session.memory.dataclass import ()from openviking.session.memory.memory_type_registry import MemoryTypeRegistryfrom openviking.session.memory.memory_updater import (+ ChunkMeta,ExtractContext,MemoryReadError,MemoryUpdater,@@ -68,6 +69,81 @@ class TestMemoryUpdateResult:class TestMemoryUpdater:"""Tests for MemoryUpdater."""+ @pytest.mark.parametrize(+ ("user_peer", "assistant_peer", "expected"),+ [+ (None, None, "**user**: OWNER_REQUEST\n**assistant**: AGENT_RESPONSE"),+ (+ "workspace-agent",+ "workspace-agent",+ "**user [peer=workspace-agent]**: OWNER_REQUEST\n"+ "**assistant [peer=workspace-agent]**: AGENT_RESPONSE",+ ),+ (+ "owner",+ "agent",+ "**user [peer=owner]**: OWNER_REQUEST\n**assistant [peer=agent]**: AGENT_RESPONSE",+ ),+ ],+ )+ def test_event_chatlog_preserves_role_and_peer(self, user_peer, assistant_peer, expected):+ """通过事件模板验证持久化正文保留角色和 peer。"""+ context = ExtractContext(+ [+ Message(id="u", role="user", peer_id=user_peer, parts=[TextPart("OWNER_REQUEST")]),+ Message(+ id="a",+ role="assistant",+ peer_id=assistant_peer,+ parts=[TextPart("AGENT_RESPONSE")],+ ),+ ]+ )+ registry = MemoryTypeRegistry(load_schemas=False)+ registry.load_from_yaml(str(builtin_memory_templates_dir() / "events.yaml"))+ schema = registry.get("events")+ assert schema is not None+ rendered = MemoryFileUtils.write(+ MemoryFile(extra_fields={"ranges": "0-1", "summary": "对话记录"}),+ content_template=schema.content_template,+ extract_context=context,+ )+ assert expected in rendered++ @pytest.mark.parametrize(+ ("second_role", "second_peer", "expected"),+ [+ ("user", "workspace-agent", "**user [peer=workspace-agent]**: first second"),+ (+ "assistant",+ "workspace-agent",+ "**user [peer=workspace-agent]**: first...\n"+ "**assistant [peer=workspace-agent]**: ...second",+ ),+ (+ "user",+ "other-agent",+ "**user [peer=workspace-agent]**: first...\n**user [peer=other-agent]**: ...second",+ ),+ ],+ )+ def test_event_chatlog_merges_chunks_only_for_same_role_and_peer(+ self, second_role, second_peer, expected+ ):+ """即使分块来源相同,也不能跨角色或 peer 合并正文。"""+ messages = [+ Message(id="c0", role="user", peer_id="workspace-agent", parts=[TextPart("first ")]),+ Message(id="c1", role=second_role, peer_id=second_peer, parts=[TextPart("second")]),+ ]+ context = ExtractContext(+ messages,+ chunk_meta={+ id(message): ChunkMeta(source_message_id="source", chunk_index=i, chunk_count=2)+ for i, message in enumerate(messages)+ },+ )+ assert context.get_event_content("0-1", "") == expected+def test_extract_context_initializes_page_id_map(self):extract_context = ExtractContext(messages=[Message(id="1", role="user", parts=[TextPart(text="hi")])]@@ -192,7 +268,7 @@ class TestMemoryUpdater:]original = deepcopy(messages)context = ExtractContext(messages)- speaker = peer_id or "assistant"+ speaker = f"assistant [peer={peer_id}]" if peer_id else "assistant"expected = (f"**{speaker}**: Started writing. Keep spacing.\n**{speaker}**: Finished writing.")@@ -244,8 +320,10 @@ class TestMemoryUpdater:context = ExtractContext(messages)assert len(context.messages) > len(messages)+ assistant_speaker = f"assistant [peer={peer_id}]" if peer_id else "assistant"+ user_speaker = f"user [peer={peer_id}]" if peer_id else "user"assert context.get_event_content(f"0-{len(context.messages) - 1}", "", 0) == (- f"**{peer_id or 'assistant'}**: {text}\n**{peer_id or 'user'}**: Confirmed."+ f"**{assistant_speaker}**: {text}\n**{user_speaker}**: Confirmed.")def test_create(self):