mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-08 08:11:38 +00:00
Add Honcho runtime peer mapping
This commit is contained in:
mavrickdeveloper
parent
519657aa98
commit
864cdb3d2e
10 changed files with 376 additions and 33 deletions
|
|
@ -99,6 +99,90 @@ class TestPinPeerNameConfigParsing:
|
|||
assert config.pin_peer_name is False
|
||||
|
||||
|
||||
class TestRuntimePeerMappingConfigParsing:
|
||||
def test_defaults_are_empty(self):
|
||||
config = HonchoClientConfig()
|
||||
assert config.user_peer_aliases == {}
|
||||
assert config.runtime_peer_prefix == ""
|
||||
|
||||
def test_root_level_aliases_and_prefix_parse(self, tmp_path):
|
||||
config_file = tmp_path / "honcho.json"
|
||||
config_file.write_text(json.dumps({
|
||||
"apiKey": "k",
|
||||
"userPeerAliases": {
|
||||
" 86701400 ": " Igor ",
|
||||
"": "ignored",
|
||||
"empty-value": " ",
|
||||
"null-value": None,
|
||||
},
|
||||
"runtimePeerPrefix": "telegram_",
|
||||
}))
|
||||
|
||||
config = HonchoClientConfig.from_global_config(config_path=config_file)
|
||||
|
||||
assert config.user_peer_aliases == {"86701400": "Igor"}
|
||||
assert config.runtime_peer_prefix == "telegram_"
|
||||
|
||||
def test_host_aliases_override_root_aliases_as_whole_map(self, tmp_path):
|
||||
config_file = tmp_path / "honcho.json"
|
||||
config_file.write_text(json.dumps({
|
||||
"apiKey": "k",
|
||||
"userPeerAliases": {"root-user": "root-peer"},
|
||||
"hosts": {
|
||||
"hermes": {
|
||||
"userPeerAliases": {"host-user": "host-peer"},
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
config = HonchoClientConfig.from_global_config(config_path=config_file)
|
||||
|
||||
assert config.user_peer_aliases == {"host-user": "host-peer"}
|
||||
|
||||
def test_host_empty_aliases_disable_root_aliases(self, tmp_path):
|
||||
config_file = tmp_path / "honcho.json"
|
||||
config_file.write_text(json.dumps({
|
||||
"apiKey": "k",
|
||||
"userPeerAliases": {"root-user": "root-peer"},
|
||||
"hosts": {
|
||||
"hermes": {
|
||||
"userPeerAliases": {},
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
config = HonchoClientConfig.from_global_config(config_path=config_file)
|
||||
|
||||
assert config.user_peer_aliases == {}
|
||||
|
||||
def test_host_empty_prefix_disables_root_prefix(self, tmp_path):
|
||||
config_file = tmp_path / "honcho.json"
|
||||
config_file.write_text(json.dumps({
|
||||
"apiKey": "k",
|
||||
"runtimePeerPrefix": "telegram_",
|
||||
"hosts": {
|
||||
"hermes": {
|
||||
"runtimePeerPrefix": "",
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
config = HonchoClientConfig.from_global_config(config_path=config_file)
|
||||
|
||||
assert config.runtime_peer_prefix == ""
|
||||
|
||||
def test_malformed_alias_config_is_ignored(self, tmp_path):
|
||||
config_file = tmp_path / "honcho.json"
|
||||
config_file.write_text(json.dumps({
|
||||
"apiKey": "k",
|
||||
"userPeerAliases": ["not", "a", "map"],
|
||||
}))
|
||||
|
||||
config = HonchoClientConfig.from_global_config(config_path=config_file)
|
||||
|
||||
assert config.user_peer_aliases == {}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Peer resolution (the actual bug fix)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
|
@ -119,13 +203,22 @@ def _patch_manager_for_resolution_test(mgr: HonchoSessionManager) -> None:
|
|||
class TestPeerResolutionOrder:
|
||||
"""Matrix of (runtime_id, pin_peer_name, peer_name) → expected user_peer_id."""
|
||||
|
||||
def _config(self, *, peer_name: str | None, pin_peer_name: bool) -> HonchoClientConfig:
|
||||
def _config(
|
||||
self,
|
||||
*,
|
||||
peer_name: str | None,
|
||||
pin_peer_name: bool,
|
||||
user_peer_aliases: dict[str, str] | None = None,
|
||||
runtime_peer_prefix: str = "",
|
||||
) -> HonchoClientConfig:
|
||||
# The test doesn't need auth / Honcho — disable the provider so
|
||||
# the manager doesn't try to open a real client.
|
||||
return HonchoClientConfig(
|
||||
api_key="test-key",
|
||||
peer_name=peer_name,
|
||||
pin_peer_name=pin_peer_name,
|
||||
user_peer_aliases=user_peer_aliases or {},
|
||||
runtime_peer_prefix=runtime_peer_prefix,
|
||||
enabled=False,
|
||||
write_frequency="turn", # avoid spawning the async writer thread
|
||||
)
|
||||
|
|
@ -148,11 +241,64 @@ class TestPeerResolutionOrder:
|
|||
"bot immediately merges memory across users."
|
||||
)
|
||||
|
||||
def test_alias_wins_for_known_runtime_id(self):
|
||||
"""Known platform IDs can preserve an existing stable Honcho peer."""
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(
|
||||
peer_name="Igor",
|
||||
pin_peer_name=False,
|
||||
user_peer_aliases={"86701400": "Igor"},
|
||||
runtime_peer_prefix="telegram_",
|
||||
),
|
||||
runtime_user_peer_name="86701400",
|
||||
)
|
||||
_patch_manager_for_resolution_test(mgr)
|
||||
|
||||
session = mgr.get_or_create("telegram:86701400")
|
||||
assert session.user_peer_id == "Igor"
|
||||
|
||||
def test_unknown_runtime_id_uses_prefix(self):
|
||||
"""Unknown gateway users stay isolated but become platform-scoped."""
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(
|
||||
peer_name="Igor",
|
||||
pin_peer_name=False,
|
||||
runtime_peer_prefix="telegram_",
|
||||
),
|
||||
runtime_user_peer_name="86701400",
|
||||
)
|
||||
_patch_manager_for_resolution_test(mgr)
|
||||
|
||||
session = mgr.get_or_create("telegram:86701400")
|
||||
assert session.user_peer_id == "telegram_86701400"
|
||||
|
||||
def test_alias_value_is_sanitized_after_selection(self):
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(
|
||||
peer_name=None,
|
||||
pin_peer_name=False,
|
||||
user_peer_aliases={"86701400": "Alice Smith!"},
|
||||
),
|
||||
runtime_user_peer_name="86701400",
|
||||
)
|
||||
_patch_manager_for_resolution_test(mgr)
|
||||
|
||||
session = mgr.get_or_create("telegram:86701400")
|
||||
assert session.user_peer_id == "Alice-Smith-"
|
||||
|
||||
def test_config_wins_when_pin_is_true(self):
|
||||
"""The #14984 fix: single-user deployments opt into config pinning."""
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(peer_name="Igor", pin_peer_name=True),
|
||||
config=self._config(
|
||||
peer_name="Igor",
|
||||
pin_peer_name=True,
|
||||
user_peer_aliases={"86701400": "Alias"},
|
||||
runtime_peer_prefix="telegram_",
|
||||
),
|
||||
runtime_user_peer_name="86701400", # Telegram pushes this in
|
||||
)
|
||||
_patch_manager_for_resolution_test(mgr)
|
||||
|
|
@ -167,7 +313,23 @@ class TestPeerResolutionOrder:
|
|||
def test_pin_noop_when_peer_name_missing(self):
|
||||
"""Safety: pinPeerName alone (no peer_name) must not silently drop
|
||||
the runtime identity. Without a configured peer_name there's
|
||||
nothing to pin to — fall back to runtime as before."""
|
||||
nothing to pin to — fall through to runtime mapping."""
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(
|
||||
peer_name=None,
|
||||
pin_peer_name=True,
|
||||
user_peer_aliases={"86701400": "Igor"},
|
||||
runtime_peer_prefix="telegram_",
|
||||
),
|
||||
runtime_user_peer_name="86701400",
|
||||
)
|
||||
_patch_manager_for_resolution_test(mgr)
|
||||
|
||||
session = mgr.get_or_create("telegram:86701400")
|
||||
assert session.user_peer_id == "Igor"
|
||||
|
||||
def test_pin_noop_without_peer_name_or_mapping_preserves_runtime(self):
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(peer_name=None, pin_peer_name=True),
|
||||
|
|
@ -176,11 +338,42 @@ class TestPeerResolutionOrder:
|
|||
_patch_manager_for_resolution_test(mgr)
|
||||
|
||||
session = mgr.get_or_create("telegram:86701400")
|
||||
assert session.user_peer_id == "86701400", (
|
||||
"pin_peer_name=True with no peer_name set must not strip the "
|
||||
"runtime ID — otherwise the user peer would collapse to the "
|
||||
"session-key fallback and lose per-user scoping entirely"
|
||||
assert session.user_peer_id == "86701400"
|
||||
|
||||
def test_alt_runtime_id_can_match_alias_without_changing_raw_fallback(self):
|
||||
"""Stable alternate IDs can map known users while primary ID fallback stays unchanged."""
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(
|
||||
peer_name=None,
|
||||
pin_peer_name=False,
|
||||
user_peer_aliases={"union-user": "Igor"},
|
||||
runtime_peer_prefix="feishu_",
|
||||
),
|
||||
runtime_user_peer_name="open-id",
|
||||
runtime_user_peer_name_alt="union-user",
|
||||
)
|
||||
_patch_manager_for_resolution_test(mgr)
|
||||
|
||||
session = mgr.get_or_create("feishu:chat")
|
||||
assert session.user_peer_id == "Igor"
|
||||
|
||||
def test_alt_runtime_id_does_not_replace_primary_prefix_fallback(self):
|
||||
mgr = HonchoSessionManager(
|
||||
honcho=MagicMock(),
|
||||
config=self._config(
|
||||
peer_name=None,
|
||||
pin_peer_name=False,
|
||||
user_peer_aliases={"other-union": "Igor"},
|
||||
runtime_peer_prefix="feishu_",
|
||||
),
|
||||
runtime_user_peer_name="open-id",
|
||||
runtime_user_peer_name_alt="union-user",
|
||||
)
|
||||
_patch_manager_for_resolution_test(mgr)
|
||||
|
||||
session = mgr.get_or_create("feishu:chat")
|
||||
assert session.user_peer_id == "feishu_open-id"
|
||||
|
||||
def test_runtime_missing_falls_back_to_peer_name(self):
|
||||
"""CLI-mode (no gateway runtime identity) uses config peer_name —
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ class TestToolsModeInitBehavior:
|
|||
"""Verify initOnSessionStart controls session init timing in tools mode."""
|
||||
|
||||
def _make_provider_with_config(self, recall_mode="tools", init_on_session_start=False,
|
||||
peer_name=None, user_id=None):
|
||||
peer_name=None, user_id=None, user_id_alt=None):
|
||||
"""Create a HonchoMemoryProvider with mocked config and dependencies."""
|
||||
from plugins.memory.honcho.client import HonchoClientConfig
|
||||
|
||||
|
|
@ -598,6 +598,8 @@ class TestToolsModeInitBehavior:
|
|||
init_kwargs = {}
|
||||
if user_id:
|
||||
init_kwargs["user_id"] = user_id
|
||||
if user_id_alt:
|
||||
init_kwargs["user_id_alt"] = user_id_alt
|
||||
|
||||
with patch("plugins.memory.honcho.client.HonchoClientConfig.from_global_config", return_value=cfg), \
|
||||
patch("plugins.memory.honcho.client.get_honcho_client", return_value=MagicMock()), \
|
||||
|
|
@ -655,6 +657,15 @@ class TestToolsModeInitBehavior:
|
|||
assert cfg.peer_name is None
|
||||
assert mock_manager_cls.call_args.kwargs["runtime_user_peer_name"] == "8439114563"
|
||||
|
||||
def test_user_id_alt_is_passed_to_session_manager(self):
|
||||
"""Gateway alternate user IDs are available for Honcho alias matching."""
|
||||
_, _, mock_manager_cls = self._make_provider_with_config(
|
||||
recall_mode="tools", init_on_session_start=True,
|
||||
peer_name=None, user_id="open-id", user_id_alt="union-id",
|
||||
)
|
||||
assert mock_manager_cls.call_args.kwargs["runtime_user_peer_name"] == "open-id"
|
||||
assert mock_manager_cls.call_args.kwargs["runtime_user_peer_name_alt"] == "union-id"
|
||||
|
||||
|
||||
class TestPerSessionMigrateGuard:
|
||||
"""Verify migrate_memory_files is skipped under per-session strategy.
|
||||
|
|
|
|||
|
|
@ -4,6 +4,27 @@ from types import SimpleNamespace
|
|||
from unittest.mock import patch
|
||||
|
||||
|
||||
class RecordingMemoryProvider:
|
||||
name = "recording"
|
||||
|
||||
def __init__(self):
|
||||
self.init_kwargs = None
|
||||
self.init_session_id = None
|
||||
|
||||
def is_available(self):
|
||||
return True
|
||||
|
||||
def initialize(self, session_id, **kwargs):
|
||||
self.init_session_id = session_id
|
||||
self.init_kwargs = dict(kwargs)
|
||||
|
||||
def get_tool_schemas(self):
|
||||
return []
|
||||
|
||||
def shutdown(self):
|
||||
pass
|
||||
|
||||
|
||||
def test_blank_memory_provider_does_not_auto_enable_honcho():
|
||||
"""Blank memory.provider should remain opt-out even if Honcho fallback looks configured."""
|
||||
cfg = {"memory": {"provider": ""}, "agent": {}}
|
||||
|
|
@ -37,3 +58,35 @@ def test_blank_memory_provider_does_not_auto_enable_honcho():
|
|||
load_memory_provider.assert_not_called()
|
||||
save_config.assert_not_called()
|
||||
|
||||
|
||||
def test_aiagent_forwards_user_id_alt_to_memory_provider():
|
||||
provider = RecordingMemoryProvider()
|
||||
cfg = {"memory": {"provider": "recording"}, "agent": {}}
|
||||
|
||||
with (
|
||||
patch("hermes_cli.config.load_config", return_value=cfg),
|
||||
patch("plugins.memory.load_memory_provider", return_value=provider),
|
||||
patch("agent.model_metadata.get_model_context_length", return_value=204_800),
|
||||
patch("run_agent.get_tool_definitions", return_value=[]),
|
||||
patch("run_agent.check_toolset_requirements", return_value={}),
|
||||
patch("run_agent.OpenAI"),
|
||||
):
|
||||
from run_agent import AIAgent
|
||||
|
||||
agent = AIAgent(
|
||||
api_key="test-key-1234567890",
|
||||
base_url="https://openrouter.ai/api/v1",
|
||||
quiet_mode=True,
|
||||
skip_context_files=True,
|
||||
skip_memory=False,
|
||||
session_id="sess-alt",
|
||||
platform="feishu",
|
||||
user_id="open-id",
|
||||
user_id_alt="union-id",
|
||||
)
|
||||
|
||||
assert agent._memory_manager is not None
|
||||
assert provider.init_session_id == "sess-alt"
|
||||
assert provider.init_kwargs["user_id"] == "open-id"
|
||||
assert provider.init_kwargs["user_id_alt"] == "union-id"
|
||||
assert provider.init_kwargs["platform"] == "feishu"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue