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).
97 lines
3.0 KiB
Python
97 lines
3.0 KiB
Python
import pytest
|
|
|
|
from gateway.config import GatewayConfig, Platform, PlatformConfig
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
from gateway.run import GatewayRunner
|
|
from gateway.session import SessionSource, build_session_key
|
|
|
|
|
|
def _make_runner() -> GatewayRunner:
|
|
runner = GatewayRunner.__new__(GatewayRunner)
|
|
runner.config = GatewayConfig(
|
|
platforms={Platform.TELEGRAM: PlatformConfig(enabled=True, token="fake")},
|
|
)
|
|
runner.adapters = {}
|
|
runner._model = "openai/gpt-4.1-mini"
|
|
runner._base_url = None
|
|
runner._decide_image_input_mode = lambda **_: "native"
|
|
return runner
|
|
|
|
|
|
def _source(chat_id: str) -> SessionSource:
|
|
return SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
chat_id=chat_id,
|
|
chat_type="private",
|
|
user_name=f"user-{chat_id}",
|
|
)
|
|
|
|
|
|
def _image_event(source: SessionSource, path: str) -> MessageEvent:
|
|
return MessageEvent(
|
|
text="see image",
|
|
message_type=MessageType.PHOTO,
|
|
source=source,
|
|
media_urls=[path],
|
|
media_types=["image/png"],
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_native_image_buffer_isolated_per_session():
|
|
runner = _make_runner()
|
|
source_a = _source("chat-a")
|
|
source_b = _source("chat-b")
|
|
|
|
await runner._prepare_inbound_message_text(
|
|
event=_image_event(source_a, "/tmp/a.png"),
|
|
source=source_a,
|
|
history=[],
|
|
)
|
|
await runner._prepare_inbound_message_text(
|
|
event=_image_event(source_b, "/tmp/b.png"),
|
|
source=source_b,
|
|
history=[],
|
|
)
|
|
|
|
assert runner._consume_pending_native_image_paths(build_session_key(source_a)) == ["/tmp/a.png"]
|
|
assert runner._consume_pending_native_image_paths(build_session_key(source_b)) == ["/tmp/b.png"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_native_image_buffer_not_cleared_by_other_sessions_without_images():
|
|
runner = _make_runner()
|
|
source_a = _source("chat-a")
|
|
source_b = _source("chat-b")
|
|
|
|
await runner._prepare_inbound_message_text(
|
|
event=_image_event(source_a, "/tmp/a.png"),
|
|
source=source_a,
|
|
history=[],
|
|
)
|
|
await runner._prepare_inbound_message_text(
|
|
event=MessageEvent(text="plain text", source=source_b),
|
|
source=source_b,
|
|
history=[],
|
|
)
|
|
|
|
assert runner._consume_pending_native_image_paths(build_session_key(source_a)) == ["/tmp/a.png"]
|
|
assert runner._consume_pending_native_image_paths(build_session_key(source_b)) == []
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_native_image_buffer_uses_resolved_session_key_when_provided():
|
|
runner = _make_runner()
|
|
source = _source("chat-a")
|
|
runner._session_key_for_source = lambda _source: "source-derived-key"
|
|
|
|
await runner._prepare_inbound_message_text(
|
|
event=_image_event(source, "/tmp/a.png"),
|
|
source=source,
|
|
history=[],
|
|
session_key="canonical-session-key",
|
|
)
|
|
|
|
assert runner._consume_pending_native_image_paths("source-derived-key") == []
|
|
assert runner._consume_pending_native_image_paths("canonical-session-key") == ["/tmp/a.png"]
|