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).
103 lines
3.6 KiB
Python
103 lines
3.6 KiB
Python
"""Tests that /new (and its /reset alias) clears session-scoped overrides."""
|
|
from datetime import datetime
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
|
|
from gateway.config import GatewayConfig, Platform, PlatformConfig
|
|
from gateway.platforms.event import MessageEvent
|
|
from gateway.session import SessionEntry, SessionSource, build_session_key
|
|
|
|
|
|
def _make_source() -> SessionSource:
|
|
return SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
user_id="u1",
|
|
chat_id="c1",
|
|
user_name="tester",
|
|
chat_type="dm",
|
|
)
|
|
|
|
|
|
def _make_event(text: str) -> MessageEvent:
|
|
return MessageEvent(text=text, source=_make_source(), message_id="m1")
|
|
|
|
|
|
def _make_runner():
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.config = GatewayConfig(
|
|
platforms={Platform.TELEGRAM: PlatformConfig(enabled=True, token="***")}
|
|
)
|
|
adapter = MagicMock()
|
|
adapter.send = AsyncMock()
|
|
runner.adapters = {Platform.TELEGRAM: adapter}
|
|
runner._voice_mode = {}
|
|
runner.hooks = SimpleNamespace(emit=AsyncMock(), loaded_hooks=False)
|
|
runner._session_model_overrides = {}
|
|
runner._session_reasoning_overrides = {}
|
|
runner._pending_model_notes = {}
|
|
runner._background_tasks = set()
|
|
|
|
session_key = build_session_key(_make_source())
|
|
session_entry = SessionEntry(
|
|
session_key=session_key,
|
|
session_id="sess-1",
|
|
created_at=datetime.now(),
|
|
updated_at=datetime.now(),
|
|
platform=Platform.TELEGRAM,
|
|
chat_type="dm",
|
|
)
|
|
runner.session_store = MagicMock()
|
|
runner.session_store.get_or_create_session.return_value = session_entry
|
|
runner.session_store.reset_session.return_value = session_entry
|
|
runner.session_store._entries = {session_key: session_entry}
|
|
runner.session_store._generate_session_key.return_value = session_key
|
|
runner._running_agents = {}
|
|
runner._pending_messages = {}
|
|
runner._pending_approvals = {}
|
|
runner._session_db = None
|
|
runner._agent_cache_lock = None # disables _evict_cached_agent lock path
|
|
runner._is_user_authorized = lambda _source: True
|
|
runner._format_session_info = lambda: ""
|
|
|
|
return runner
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_new_command_only_clears_own_session():
|
|
"""/new must only clear the override for the session that triggered it."""
|
|
runner = _make_runner()
|
|
session_key = build_session_key(_make_source())
|
|
other_key = "other_session_key"
|
|
|
|
runner._session_model_overrides[session_key] = {
|
|
"model": "gpt-4o",
|
|
"provider": "openai",
|
|
"api_key": "sk-test",
|
|
"base_url": "",
|
|
"api_mode": "openai",
|
|
}
|
|
runner._session_model_overrides[other_key] = {
|
|
"model": "claude-sonnet-4-6",
|
|
"provider": "anthropic",
|
|
"api_key": "***",
|
|
"base_url": "",
|
|
"api_mode": "anthropic",
|
|
}
|
|
runner._session_reasoning_overrides[session_key] = {"enabled": True, "effort": "high"}
|
|
runner._session_reasoning_overrides[other_key] = {"enabled": True, "effort": "low"}
|
|
runner._pending_model_notes[session_key] = "[Note: switched to gpt-4o.]"
|
|
runner._pending_model_notes[other_key] = "[Note: switched to claude-sonnet-4-6.]"
|
|
|
|
await runner._handle_reset_command(_make_event("/new"))
|
|
|
|
assert session_key not in runner._session_model_overrides
|
|
assert other_key in runner._session_model_overrides
|
|
assert session_key not in runner._session_reasoning_overrides
|
|
assert other_key in runner._session_reasoning_overrides
|
|
assert session_key not in runner._pending_model_notes
|
|
assert other_key in runner._pending_model_notes
|