Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fixAgent memory错误的引入到peer下 (#3098)

DuTaof8208728e49f
diff --git a/openviking/prompts/templates/memory/experiences.yaml b/openviking/prompts/templates/memory/experiences.yaml
index c16b58ed9..4f416c25a 100644
--- a/openviking/prompts/templates/memory/experiences.yaml
+++ b/openviking/prompts/templates/memory/experiences.yaml
@@ -7,6 +7,7 @@ directory: "viking://user/{{ user_space }}/memories/experiences"
filename_template: "{{ experience_name }}.md"
enabled: true
operation_mode: "upsert"
+stage: agent
agent_only: true
fields:
diff --git a/openviking/prompts/templates/memory/trajectories.yaml b/openviking/prompts/templates/memory/trajectories.yaml
index d4318103d..108073246 100644
--- a/openviking/prompts/templates/memory/trajectories.yaml
+++ b/openviking/prompts/templates/memory/trajectories.yaml
@@ -14,6 +14,7 @@ directory: "viking://user/{{ user_space }}/memories/trajectories"
filename_template: "{{ trajectory_name }}_{{ extract_context.get_session_timestamp() }}.md"
enabled: true
operation_mode: "add_only"
+stage: agent
agent_only: true
fields:
diff --git a/openviking/session/memory/memory_isolation_handler.py b/openviking/session/memory/memory_isolation_handler.py
index 3a4c655bf..c80dbc2c7 100644
--- a/openviking/session/memory/memory_isolation_handler.py
+++ b/openviking/session/memory/memory_isolation_handler.py
@@ -132,6 +132,8 @@ class MemoryIsolationHandler:
return True
if self.allowed_memory_types is not None and memory_type not in self.allowed_memory_types:
return False
+ if not self.allow_self and not getattr(memory_type_schema, "peer_enabled", True):
+ return False
return True
def _can_write_peer(self, peer_id: str) -> bool:
@@ -207,7 +209,7 @@ class MemoryIsolationHandler:
has_ranges = operation.memory_fields.get("ranges") is not None
if not getattr(memory_type_schema, "peer_enabled", True):
operation.memory_fields.pop("peer_id", None)
- target_ids = [_SELF_PEER_ID]
+ target_ids = [_SELF_PEER_ID] if self.allow_self else []
elif operation.memory_fields.get("ranges") is not None:
target_ids = self._range_targets(
operation.memory_fields.get("ranges"),
diff --git a/openviking/session/memory/memory_type_registry.py b/openviking/session/memory/memory_type_registry.py
index 36abf081e..97f38a823 100644
--- a/openviking/session/memory/memory_type_registry.py
+++ b/openviking/session/memory/memory_type_registry.py
@@ -206,6 +206,11 @@ class MemoryTypeRegistry:
"""Parse memory type from YAML data."""
fields_data = data.get("fields", [])
fields = []
+ stage = data.get("stage")
+ if stage is None and data.get("agent_only", False):
+ stage = "agent"
+ if stage is None:
+ stage = "user"
for field_data in fields_data:
field = MemoryField(
@@ -227,7 +232,7 @@ class MemoryTypeRegistry:
directory=data.get("directory", ""),
enabled=data.get("enabled", data.get("enable", True)),
operation_mode=data.get("operation_mode", "upsert"),
- stage=data.get("stage", "user"),
+ stage=stage,
peer_enabled=data.get("peer_enabled", True),
overview_template=data.get("overview_template"),
)
diff --git a/tests/session/memory/test_agent_experience_context_provider.py b/tests/session/memory/test_agent_experience_context_provider.py
index 0f3ce2f65..c17a6bd85 100644
--- a/tests/session/memory/test_agent_experience_context_provider.py
+++ b/tests/session/memory/test_agent_experience_context_provider.py
@@ -13,6 +13,8 @@ from openviking.session.memory.agent_experience_context_provider import (
from openviking.session.memory.agent_trajectory_context_provider import (
AgentTrajectoryContextProvider,
)
+from openviking.session.memory.memory_isolation_handler import MemoryIsolationHandler
+from openviking.session.memory.memory_updater import ExtractContext
from openviking.session.memory.session_extract_context_provider import (
SessionExtractContextProvider,
)
@@ -50,6 +52,33 @@ def test_user_memory_provider_splits_but_trajectory_provider_keeps_messages_whol
assert trajectory_provider.get_extract_context().messages[0] is messages[0]
+def test_agent_only_schemas_are_excluded_from_peer_user_memory_extraction():
+ messages = [
+ Message(
+ id="1",
+ role="user",
+ parts=[TextPart(text="帮我导出 B 站投稿数据")],
+ peer_id="case_demo_peer",
+ )
+ ]
+ ctx = RequestContext(
+ user=UserIdentifier(account_id="acc", user_id="default"),
+ role=Role.USER,
+ )
+ provider = SessionExtractContextProvider(messages=messages)
+ provider._isolation_handler = MemoryIsolationHandler(
+ ctx,
+ ExtractContext(messages),
+ allow_self=False,
+ allowed_peer_ids={"case_demo_peer"},
+ )
+
+ schema_types = {schema.memory_type for schema in provider.get_memory_schemas(ctx)}
+
+ assert "experiences" not in schema_types
+ assert "trajectories" not in schema_types
+
+
@pytest.mark.asyncio
async def test_agent_experience_prefetch_starts_with_conversation_and_new_trajectory_read():
provider = AgentExperienceContextProvider(
diff --git a/tests/session/memory/test_memory_isolation_handler.py b/tests/session/memory/test_memory_isolation_handler.py
index 612737755..623d01b03 100644
--- a/tests/session/memory/test_memory_isolation_handler.py
+++ b/tests/session/memory/test_memory_isolation_handler.py
@@ -646,7 +646,7 @@ class TestCalculateMemoryUris:
assert "peer_id" not in operation.memory_fields
@patch("openviking.session.memory.memory_isolation_handler.generate_uri")
- def test_peer_enabled_false_uses_self_scope_even_when_self_disabled(self, mock_generate_uri):
+ def test_peer_enabled_false_does_not_write_self_when_self_disabled(self, mock_generate_uri):
mock_generate_uri.side_effect = lambda **kwargs: (
f"viking://user/{kwargs.get('user_space')}/memories/cases/demo"
)
@@ -676,11 +676,12 @@ class TestCalculateMemoryUris:
uris=[],
)
+ assert handler.allows_schema(schema) is False
+
uris = handler.calculate_memory_uris(schema, operation, extract_ctx)
- assert uris == ["viking://user/support_bot/memories/cases/demo"]
- assert operation.memory_fields["user_id"] == "support_bot"
- assert "peer_id" not in operation.memory_fields
+ assert uris == []
+ mock_generate_uri.assert_not_called()
@patch("openviking.session.memory.memory_isolation_handler.generate_uri")
def test_peer_enabled_false_ignores_ranges_peer_targets(self, mock_generate_uri):