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).
144 lines
4.3 KiB
Python
144 lines
4.3 KiB
Python
"""Tests for Discord message reactions tied to processing lifecycle hooks."""
|
|
|
|
import asyncio
|
|
import sys
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform, PlatformConfig
|
|
from gateway.platforms.base import SendResult
|
|
from gateway.platforms.event import MessageEvent, MessageType, ProcessingOutcome
|
|
from gateway.session import SessionSource, build_session_key
|
|
|
|
|
|
def _ensure_discord_mock():
|
|
if "discord" in sys.modules and hasattr(sys.modules["discord"], "__file__"):
|
|
return
|
|
|
|
discord_mod = MagicMock()
|
|
discord_mod.Intents.default.return_value = MagicMock()
|
|
discord_mod.DMChannel = type("DMChannel", (), {})
|
|
discord_mod.Thread = type("Thread", (), {})
|
|
discord_mod.ForumChannel = type("ForumChannel", (), {})
|
|
discord_mod.Interaction = object
|
|
discord_mod.app_commands = SimpleNamespace(
|
|
describe=lambda **kwargs: (lambda fn: fn),
|
|
choices=lambda **kwargs: (lambda fn: fn),
|
|
Choice=lambda **kwargs: SimpleNamespace(**kwargs),
|
|
)
|
|
|
|
ext_mod = MagicMock()
|
|
commands_mod = MagicMock()
|
|
commands_mod.Bot = MagicMock
|
|
ext_mod.commands = commands_mod
|
|
|
|
sys.modules.setdefault("discord", discord_mod)
|
|
sys.modules.setdefault("discord.ext", ext_mod)
|
|
sys.modules.setdefault("discord.ext.commands", commands_mod)
|
|
|
|
|
|
_ensure_discord_mock()
|
|
|
|
from plugins.platforms.discord.adapter import DiscordAdapter # noqa: E402
|
|
|
|
|
|
class FakeTree:
|
|
def __init__(self):
|
|
self.commands = {}
|
|
|
|
def command(self, *, name, description):
|
|
def decorator(fn):
|
|
self.commands[name] = fn
|
|
return fn
|
|
|
|
return decorator
|
|
|
|
|
|
@pytest.fixture
|
|
def adapter():
|
|
config = PlatformConfig(enabled=True, token="***")
|
|
adapter = DiscordAdapter(config)
|
|
adapter._client = SimpleNamespace(
|
|
tree=FakeTree(),
|
|
get_channel=lambda _id: None,
|
|
fetch_channel=AsyncMock(),
|
|
user=SimpleNamespace(id=99999, name="HermesBot"),
|
|
)
|
|
return adapter
|
|
|
|
|
|
def _make_event(message_id: str, raw_message) -> MessageEvent:
|
|
return MessageEvent(
|
|
text="hello",
|
|
message_type=MessageType.TEXT,
|
|
source=SessionSource(
|
|
platform=Platform.DISCORD,
|
|
chat_id="123",
|
|
chat_type="dm",
|
|
user_id="42",
|
|
user_name="Jezza",
|
|
),
|
|
raw_message=raw_message,
|
|
message_id=message_id,
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_process_message_background_adds_and_swaps_reactions(adapter):
|
|
raw_message = SimpleNamespace(
|
|
add_reaction=AsyncMock(),
|
|
remove_reaction=AsyncMock(),
|
|
)
|
|
|
|
async def handler(_event):
|
|
await asyncio.sleep(0)
|
|
return "ack"
|
|
|
|
async def hold_typing(_chat_id, interval=2.0, metadata=None):
|
|
await asyncio.Event().wait()
|
|
|
|
adapter.set_message_handler(handler)
|
|
adapter.send = AsyncMock(return_value=SendResult(success=True, message_id="999"))
|
|
adapter._keep_typing = hold_typing
|
|
|
|
event = _make_event("1", raw_message)
|
|
await adapter._process_message_background(event, build_session_key(event.source))
|
|
|
|
assert raw_message.add_reaction.await_args_list[0].args == ("👀",)
|
|
assert raw_message.remove_reaction.await_args_list[0].args == ("👀", adapter._client.user)
|
|
assert raw_message.add_reaction.await_args_list[1].args == ("✅",)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_reactions_disabled_via_env(adapter, monkeypatch):
|
|
"""When DISCORD_REACTIONS=false, no reactions should be added."""
|
|
monkeypatch.setenv("DISCORD_REACTIONS", "false")
|
|
|
|
raw_message = SimpleNamespace(
|
|
add_reaction=AsyncMock(),
|
|
remove_reaction=AsyncMock(),
|
|
)
|
|
|
|
async def handler(_event):
|
|
await asyncio.sleep(0)
|
|
return "ack"
|
|
|
|
async def hold_typing(_chat_id, interval=2.0, metadata=None):
|
|
await asyncio.Event().wait()
|
|
|
|
adapter.set_message_handler(handler)
|
|
adapter.send = AsyncMock(return_value=SendResult(success=True, message_id="999"))
|
|
adapter._keep_typing = hold_typing
|
|
|
|
event = _make_event("4", raw_message)
|
|
await adapter._process_message_background(event, build_session_key(event.source))
|
|
|
|
raw_message.add_reaction.assert_not_awaited()
|
|
raw_message.remove_reaction.assert_not_awaited()
|
|
# Response should still be sent
|
|
adapter.send.assert_awaited_once()
|
|
|
|
|