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).
60 lines
1.7 KiB
Python
60 lines
1.7 KiB
Python
"""Gateway contract and live dispatch for /approvals."""
|
|
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
import yaml
|
|
|
|
import gateway.run as gateway_run
|
|
from gateway.config import Platform
|
|
from gateway.platforms.event import MessageEvent
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
def _event(text: str = "/approvals") -> MessageEvent:
|
|
return MessageEvent(
|
|
text=text,
|
|
source=SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
user_id="user-1",
|
|
chat_id="chat-1",
|
|
chat_type="dm",
|
|
),
|
|
)
|
|
|
|
|
|
def _runner():
|
|
runner = object.__new__(gateway_run.GatewayRunner)
|
|
runner.config = SimpleNamespace(platforms={})
|
|
runner.hooks = MagicMock(loaded_hooks=[])
|
|
runner.hooks.emit = AsyncMock(return_value=[])
|
|
runner._running_agents = {}
|
|
runner._get_or_create_gateway_honcho = lambda _key: (None, None)
|
|
runner._is_user_authorized = lambda _source: True
|
|
runner.session_store = SimpleNamespace(get_or_create_session=lambda _source: None)
|
|
return runner
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_gateway_rejects_non_admin_persistent_approval_change():
|
|
runner = _runner()
|
|
runner.config = SimpleNamespace(
|
|
platforms={
|
|
Platform.TELEGRAM: SimpleNamespace(
|
|
extra={
|
|
"allow_admin_from": ["admin-1"],
|
|
"user_allowed_commands": ["approvals"],
|
|
}
|
|
)
|
|
}
|
|
)
|
|
|
|
with patch("hermes_cli.approval_mode.run_approval_mode_command") as run:
|
|
output = await runner._handle_approvals_command(_event("/approvals off"))
|
|
|
|
assert "admin" in output.lower()
|
|
run.assert_not_called()
|
|
|
|
|