mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-15 14:22:43 +00:00
729bbb7a30
The gateway HALF of the D-Q2.5c cleanup (connector half: gateway-gateway #92). Scope is STRICTLY the relay adapter (gateway/relay/) — session.py and every native platform adapter are untouched (SessionSource.guild_id remains for their use; it is NOT relay-only). Within gateway/relay/, drop the D-Q2.5 wire dual-write/dual-read alias AND genericize all platform-specific (Discord "guild") scope terminology: - ws_transport._event_from_wire: read scope_id only (drop the ?? guild_id fallback). - adapter._with_scope: emit scope_id only on outbound metadata (drop the guild_id dual-write); genericize the "GUILD reply" docstring to "SCOPED reply". - adapter._capture_scope: read source.scope_id only; rename the local `guild` var to `scope`; genericize the docstring + the _scope_by_chat/_dm_user_by_chat field comments ("guild_id (Discord)" -> "scope_id (server/workspace scope)"). - __init__.relay_route_keys docstring: "guild_ids" -> "scope_ids". - The ONE real Discord `guild_id` kept: the raw inbound interaction payload field (payload.get("guild_id")), which is Discord's own wire field, mapped straight into the generic scope_id slot — unchanged. Contract doc (docs/relay-connector-contract.md): reframe the `guild_id` row as a legacy alias the connector no longer reads (session.py's agent-wide to_dict() still emits it for non-relay persistence, so it stays documented + wire-present but ignored) — accurate, and keeps the to_dict()-vs-doc conformance test green. Tests (relay only): migrate the wire-key writes + assertions guild_id -> scope_id across test_relay_adapter / _ws_transport / _passthrough / _roundtrip / _roundtrip_telegram / _multiplatform; keep raw Discord `type:2` interaction payloads' guild_id (real Discord field) and the conformance test's guild_id parametrize (validates the kept legacy field stays wire-reachable). Gate: 156 relay tests pass, ruff clean. Cross-repo E2E — all 14 drivers pass BOTH ways: connector#92 (scope_id-only) x agent-main (still dual-reads) AND connector#92 x this worktree (scope_id-only). Deploy-order-safe either way.
122 lines
4.1 KiB
Python
122 lines
4.1 KiB
Python
"""End-to-end relay round-trip against the in-memory stub connector.
|
|
|
|
Proves the gateway side of the relay works with no real connector:
|
|
- connect() registers the inbound handler,
|
|
- a connector-delivered MessageEvent reaches the adapter's message path,
|
|
- SessionSource discriminators (scope_id) drive build_session_key isolation,
|
|
- an outbound send round-trips through the transport.
|
|
|
|
These target the transport contract + session-key derivation (Task 1.2's gate),
|
|
not the full agent turn — handle_message is patched to capture the event.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform, PlatformConfig
|
|
from gateway.platforms.base import MessageEvent, MessageType
|
|
from gateway.session import SessionSource, build_session_key
|
|
from gateway.relay.adapter import RelayAdapter
|
|
from gateway.relay.descriptor import CONTRACT_VERSION, CapabilityDescriptor
|
|
|
|
from tests.gateway.relay.stub_connector import StubConnector
|
|
|
|
|
|
def _discord_descriptor() -> CapabilityDescriptor:
|
|
return CapabilityDescriptor(
|
|
contract_version=CONTRACT_VERSION,
|
|
platform="discord",
|
|
label="Discord",
|
|
max_message_length=2000,
|
|
supports_draft_streaming=False,
|
|
supports_edit=True,
|
|
supports_threads=True,
|
|
markdown_dialect="discord",
|
|
len_unit="chars",
|
|
emoji="\U0001f47e",
|
|
platform_hint="You are on Discord.",
|
|
pii_safe=False,
|
|
)
|
|
|
|
|
|
def _discord_event(scope_id: str, channel_id: str, user_id: str, text: str) -> MessageEvent:
|
|
"""Synthetic inbound the connector would build from a discord.js message."""
|
|
source = SessionSource(
|
|
platform=Platform.DISCORD,
|
|
chat_id=channel_id,
|
|
chat_type="group",
|
|
user_id=user_id,
|
|
scope_id=scope_id,
|
|
)
|
|
return MessageEvent(text=text, message_type=MessageType.TEXT, source=source)
|
|
|
|
|
|
@pytest.fixture
|
|
def wired():
|
|
stub = StubConnector(_discord_descriptor())
|
|
adapter = RelayAdapter(PlatformConfig(), _discord_descriptor(), transport=stub)
|
|
return adapter, stub
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_connect_registers_inbound_handler(wired):
|
|
adapter, stub = wired
|
|
assert stub._inbound is None
|
|
ok = await adapter.connect()
|
|
assert ok is True
|
|
assert stub.connected is True
|
|
assert stub._inbound is not None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_inbound_event_reaches_adapter(wired, monkeypatch):
|
|
adapter, stub = wired
|
|
captured = []
|
|
monkeypatch.setattr(adapter, "handle_message", lambda ev: _async_capture(captured, ev))
|
|
await adapter.connect()
|
|
ev = _discord_event("guildA", "chan1", "userX", "hello")
|
|
await stub.push_inbound(ev)
|
|
assert len(captured) == 1
|
|
assert captured[0].text == "hello"
|
|
assert captured[0].source.scope_id == "guildA"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_two_scopes_isolate_into_distinct_session_keys(wired):
|
|
adapter, _ = wired
|
|
ev_a = _discord_event("guildA", "chan1", "userX", "hi from A")
|
|
ev_b = _discord_event("guildB", "chan2", "userX", "hi from B")
|
|
key_a = build_session_key(ev_a.source)
|
|
key_b = build_session_key(ev_b.source)
|
|
assert key_a != key_b
|
|
# Same scope + channel + user collapses to one session.
|
|
ev_a2 = _discord_event("guildA", "chan1", "userX", "again")
|
|
assert build_session_key(ev_a2.source) == key_a
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_outbound_send_round_trips(wired):
|
|
adapter, stub = wired
|
|
await adapter.connect()
|
|
stub.next_send_result = {"success": True, "message_id": "msg-42"}
|
|
result = await adapter.send("chan1", "a reply", metadata={"k": "v"})
|
|
assert result.success is True
|
|
assert result.message_id == "msg-42"
|
|
assert len(stub.sent) == 1
|
|
assert stub.sent[0]["op"] == "send"
|
|
assert stub.sent[0]["chat_id"] == "chan1"
|
|
assert stub.sent[0]["content"] == "a reply"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_get_chat_info_proxied_to_connector(wired):
|
|
adapter, stub = wired
|
|
stub.chat_info["chan1"] = {"name": "general", "type": "group"}
|
|
info = await adapter.get_chat_info("chan1")
|
|
assert info == {"name": "general", "type": "group"}
|
|
|
|
|
|
async def _async_capture(sink, event):
|
|
sink.append(event)
|
|
return None
|