kshitijk4poor
ab2f4602de
Breaks the two import cycles that forced Protocol stand-ins in the F821 sweep, so the two sites now name the real types. gateway/platforms/event.py (new leaf): MessageType, ProcessingOutcome, MessageEvent moved out of base.py verbatim. Their only dependency is gateway.session.SessionSource; base.py imported helpers.py at module level, so helpers could not name MessageEvent. Now TextBatchAggregator is typed by the real MessageEvent. 249 importers repointed (`from gateway.platforms.base import` -> `.event`, preserving each import's layout); gateway.platforms.__init__ re-exports from .event. The three revert-scheduled PLUGIN-COMPAT pointers that named these symbols (gateway.slash_commands → MessageType, dingtalk → MessageType, photon → ProcessingOutcome) and their COMPAT_MANIFEST rows now target gateway.platforms.event. Docs updated: ADDING_A_PLATFORM.md, adding-platform-adapters.md (en + zh-Hans). tools/mcp_tool_sampling.py: ElicitationHandler no longer holds a back-reference to its MCPServerTask (mcp_tool imports sampling, so the task type cannot be named there). It only ever read owner._pending_call_context, so it takes `call_context: Callable[[], Context | None]` and MCPServerTask passes `lambda: self._pending_call_context`. The consent call is one `functools.partial`, run directly or inside the captured Context. ty on the 11 touched production files vs origin/main: 0 new diagnostics, 14 resolved. (The one `source: SessionSource = None` diagnostic moves with the class; typing it Optional exposes ~60 unguarded call sites — separate follow-up.) Tests: tests/gateway + tests/plugins + tests/tools + touched files, 18,235 passed; the 31 failures reproduce identically on origin/main (macOS /private/tmp, systemd socket, long-path fixtures, live-service tests).
118 lines
4.4 KiB
Python
118 lines
4.4 KiB
Python
"""Group-chat mention-gating tests for PhotonAdapter.
|
|
|
|
Parity with the BlueBubbles iMessage channel: when ``require_mention`` is
|
|
enabled, group messages are dropped unless they hit a wake-word pattern,
|
|
and the leading wake word is stripped from the ones that pass. DMs are
|
|
never gated.
|
|
|
|
These call ``_dispatch_inbound`` directly (no aiohttp / ports) and assert
|
|
on what reaches ``handle_message``.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from typing import List
|
|
|
|
import pytest
|
|
|
|
from gateway.config import PlatformConfig
|
|
from gateway.platforms.event import MessageEvent
|
|
from plugins.platforms.photon.adapter import PhotonAdapter
|
|
|
|
|
|
def _make_adapter(monkeypatch: pytest.MonkeyPatch, extra: dict | None = None) -> PhotonAdapter:
|
|
monkeypatch.setenv("PHOTON_PROJECT_ID", "test-project-id")
|
|
monkeypatch.setenv("PHOTON_PROJECT_SECRET", "test-project-secret")
|
|
monkeypatch.delenv("PHOTON_REQUIRE_MENTION", raising=False)
|
|
monkeypatch.delenv("PHOTON_MENTION_PATTERNS", raising=False)
|
|
cfg = PlatformConfig(enabled=True, token="", extra=extra or {})
|
|
return PhotonAdapter(cfg)
|
|
|
|
|
|
def _group_payload(text: str) -> dict:
|
|
return {
|
|
"messageId": f"grp-{abs(hash(text))}",
|
|
"space": {"id": "group-guid-xyz", "type": "group", "phone": None},
|
|
"sender": {"id": "+15551234567"},
|
|
"content": {"type": "text", "text": text},
|
|
"timestamp": "2026-05-14T19:06:32.000Z",
|
|
}
|
|
|
|
|
|
def _dm_payload(text: str) -> dict:
|
|
return {
|
|
"messageId": f"dm-{abs(hash(text))}",
|
|
"space": {"id": "+15551234567", "type": "dm", "phone": "+15551234567"},
|
|
"sender": {"id": "+15551234567"},
|
|
"content": {"type": "text", "text": text},
|
|
"timestamp": "2026-05-14T19:06:32.000Z",
|
|
}
|
|
|
|
|
|
def _capture(adapter: PhotonAdapter, monkeypatch: pytest.MonkeyPatch) -> List[MessageEvent]:
|
|
captured: List[MessageEvent] = []
|
|
|
|
async def fake_handle(event: MessageEvent) -> None:
|
|
captured.append(event)
|
|
|
|
monkeypatch.setattr(adapter, "handle_message", fake_handle)
|
|
return captured
|
|
|
|
|
|
def test_require_mention_defaults_off(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
adapter = _make_adapter(monkeypatch)
|
|
assert adapter.require_mention is False
|
|
# Defaults compile to the two Hermes wake-word patterns.
|
|
assert len(adapter._mention_patterns) == 2
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_group_message_dropped_without_mention(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
adapter = _make_adapter(monkeypatch, extra={"require_mention": True})
|
|
captured = _capture(adapter, monkeypatch)
|
|
|
|
await adapter._dispatch_inbound(_group_payload("just chatting, no wake word"))
|
|
assert captured == []
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_dm_never_gated(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
adapter = _make_adapter(monkeypatch, extra={"require_mention": True})
|
|
captured = _capture(adapter, monkeypatch)
|
|
|
|
await adapter._dispatch_inbound(_dm_payload("no wake word here"))
|
|
assert len(captured) == 1
|
|
assert captured[0].text == "no wake word here"
|
|
|
|
|
|
def test_custom_mention_patterns_from_config(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
adapter = _make_adapter(
|
|
monkeypatch,
|
|
extra={"require_mention": True, "mention_patterns": [r"(?<![\w@])@?amos\b[,:\-]?"]},
|
|
)
|
|
assert adapter.require_mention is True
|
|
assert len(adapter._mention_patterns) == 1
|
|
assert adapter._message_matches_mention_patterns("amos help me") is True
|
|
assert adapter._message_matches_mention_patterns("hermes help me") is False
|
|
|
|
|
|
def test_mention_patterns_env_comma_separated(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
monkeypatch.setenv("PHOTON_PROJECT_ID", "test-project-id")
|
|
monkeypatch.setenv("PHOTON_PROJECT_SECRET", "test-project-secret")
|
|
monkeypatch.setenv("PHOTON_REQUIRE_MENTION", "true")
|
|
monkeypatch.setenv("PHOTON_MENTION_PATTERNS", r"bot\b, assistant\b")
|
|
cfg = PlatformConfig(enabled=True, token="", extra={})
|
|
adapter = PhotonAdapter(cfg)
|
|
assert adapter.require_mention is True
|
|
assert len(adapter._mention_patterns) == 2
|
|
assert adapter._message_matches_mention_patterns("hey bot") is True
|
|
|
|
|
|
def test_invalid_pattern_skipped(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
adapter = _make_adapter(
|
|
monkeypatch,
|
|
extra={"require_mention": True, "mention_patterns": ["(unclosed", r"good\b"]},
|
|
)
|
|
# Bad regex dropped, good one kept.
|
|
assert len(adapter._mention_patterns) == 1
|
|
assert adapter._message_matches_mention_patterns("a good thing") is True
|