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).
63 lines
1.9 KiB
Python
63 lines
1.9 KiB
Python
"""Tests for gateway /yolo session scoping."""
|
|
|
|
import os
|
|
|
|
import pytest
|
|
|
|
import gateway.run as gateway_run
|
|
from gateway.config import Platform
|
|
from gateway.platforms.event import MessageEvent
|
|
from gateway.session import SessionSource
|
|
from tools.approval import disable_session_yolo, is_session_yolo_enabled
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _clean_yolo_state(monkeypatch):
|
|
monkeypatch.delenv("HERMES_YOLO_MODE", raising=False)
|
|
disable_session_yolo("agent:main:telegram:dm:chat-a")
|
|
disable_session_yolo("agent:main:telegram:dm:chat-b")
|
|
yield
|
|
monkeypatch.delenv("HERMES_YOLO_MODE", raising=False)
|
|
disable_session_yolo("agent:main:telegram:dm:chat-a")
|
|
disable_session_yolo("agent:main:telegram:dm:chat-b")
|
|
|
|
|
|
def _make_runner():
|
|
runner = object.__new__(gateway_run.GatewayRunner)
|
|
runner.session_store = None
|
|
runner.config = None
|
|
return runner
|
|
|
|
|
|
def _make_event(chat_id: str) -> MessageEvent:
|
|
source = SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
user_id=f"user-{chat_id}",
|
|
chat_id=chat_id,
|
|
user_name="tester",
|
|
chat_type="dm",
|
|
)
|
|
return MessageEvent(text="/yolo", source=source)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_yolo_command_toggles_only_current_session(monkeypatch):
|
|
runner = _make_runner()
|
|
|
|
event_a = _make_event("chat-a")
|
|
session_a = runner._session_key_for_source(event_a.source)
|
|
session_b = runner._session_key_for_source(_make_event("chat-b").source)
|
|
|
|
result_on = await runner._handle_yolo_command(event_a)
|
|
|
|
assert "ON" in result_on
|
|
assert is_session_yolo_enabled(session_a) is True
|
|
assert is_session_yolo_enabled(session_b) is False
|
|
assert os.environ.get("HERMES_YOLO_MODE") is None
|
|
|
|
result_off = await runner._handle_yolo_command(event_a)
|
|
|
|
assert "OFF" in result_off
|
|
assert is_session_yolo_enabled(session_a) is False
|
|
assert os.environ.get("HERMES_YOLO_MODE") is None
|