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).
42 lines
1.1 KiB
Python
42 lines
1.1 KiB
Python
import pytest
|
|
|
|
from gateway.config import Platform
|
|
from gateway.platforms.event import MessageType
|
|
from gateway.relay.ws_transport import _event_from_wire
|
|
|
|
|
|
def _wire(text: str, *, platform: str = "slack") -> dict:
|
|
return {
|
|
"text": text,
|
|
"message_type": "command",
|
|
"source": {
|
|
"platform": platform,
|
|
"chat_id": "D123",
|
|
"chat_type": "dm",
|
|
"user_id": "U123",
|
|
},
|
|
}
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("wire_text", "expected"),
|
|
[
|
|
("/hermes sethome", "/sethome"),
|
|
("/hermes\tsethome", "/sethome"),
|
|
(
|
|
"/hermes model gpt-5.6 --provider openai",
|
|
"/model gpt-5.6 --provider openai",
|
|
),
|
|
("/hermes", "/help"),
|
|
],
|
|
)
|
|
def test_slack_relay_parent_becomes_gateway_command(wire_text: str, expected: str):
|
|
event = _event_from_wire(_wire(wire_text))
|
|
|
|
assert event.text == expected
|
|
assert event.message_type == MessageType.COMMAND
|
|
assert event.source.platform == Platform.SLACK
|
|
assert event.source.delivered_via_upstream_relay is True
|
|
|
|
|