kshitijk4poor
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).
47 lines
1.5 KiB
Python
47 lines
1.5 KiB
Python
"""Regression test: /retry must return the agent response, not None.
|
|
|
|
Before the fix in PR #441, _handle_retry_command() called
|
|
_handle_message(retry_event) but discarded its return value with `return None`,
|
|
so users never received the final response.
|
|
"""
|
|
import pytest
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
from gateway.run import GatewayRunner
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
|
|
|
|
@pytest.fixture
|
|
def gateway(tmp_path):
|
|
config = MagicMock()
|
|
config.sessions_dir = tmp_path
|
|
config.max_context_messages = 20
|
|
gw = GatewayRunner.__new__(GatewayRunner)
|
|
gw.config = config
|
|
gw.session_store = MagicMock()
|
|
return gw
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_retry_returns_response_not_none(gateway):
|
|
"""_handle_retry_command must return the inner handler response, not None."""
|
|
gateway.session_store.get_or_create_session.return_value = MagicMock(
|
|
session_id="test-session"
|
|
)
|
|
gateway.session_store.load_transcript.return_value = [
|
|
{"role": "user", "content": "Hello Hermes"},
|
|
{"role": "assistant", "content": "Hi there!"},
|
|
]
|
|
gateway.session_store.rewrite_transcript = MagicMock()
|
|
expected_response = "Hi there! (retried)"
|
|
gateway._handle_message = AsyncMock(return_value=expected_response)
|
|
event = MessageEvent(
|
|
text="/retry",
|
|
message_type=MessageType.TEXT,
|
|
source=MagicMock(),
|
|
)
|
|
result = await gateway._handle_retry_command(event)
|
|
assert result is not None, "/retry must not return None"
|
|
assert result == expected_response
|
|
|
|
|