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).
75 lines
2.2 KiB
Python
75 lines
2.2 KiB
Python
"""Tests for Telegram native partial-quote handling in _build_message_event.
|
|
|
|
When a Telegram user replies using Telegram's native quote feature to
|
|
select only part of a prior message, the adapter must use ``message.quote.text``
|
|
(the user-selected substring) rather than ``message.reply_to_message.text``
|
|
(the entire replied-to message). Otherwise the agent receives the full prior
|
|
message as ``reply_to_text``, which can cause it to act on unrelated
|
|
actionable-looking text the user did not quote (#22619).
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
|
|
from gateway.config import PlatformConfig
|
|
from plugins.platforms.telegram.adapter import TelegramAdapter # noqa: E402
|
|
|
|
|
|
def _make_adapter():
|
|
return TelegramAdapter(PlatformConfig(enabled=True, token="***", extra={}))
|
|
|
|
|
|
def _make_message(
|
|
text="follow-up",
|
|
reply_to_text=None,
|
|
reply_to_caption=None,
|
|
reply_to_id=42,
|
|
quote_text=None,
|
|
):
|
|
chat = SimpleNamespace(id=111, type="private", title=None, full_name="Alice")
|
|
user = SimpleNamespace(id=42, full_name="Alice")
|
|
|
|
reply_to_message = None
|
|
if reply_to_text is not None or reply_to_caption is not None:
|
|
reply_to_message = SimpleNamespace(
|
|
message_id=reply_to_id,
|
|
text=reply_to_text,
|
|
caption=reply_to_caption,
|
|
)
|
|
|
|
quote = None
|
|
if quote_text is not None:
|
|
quote = SimpleNamespace(text=quote_text)
|
|
|
|
return SimpleNamespace(
|
|
chat=chat,
|
|
from_user=user,
|
|
text=text,
|
|
message_thread_id=None,
|
|
message_id=1001,
|
|
reply_to_message=reply_to_message,
|
|
quote=quote,
|
|
date=None,
|
|
forum_topic_created=None,
|
|
)
|
|
|
|
|
|
def test_native_partial_quote_used_as_reply_to_text():
|
|
"""When ``message.quote`` is present, prefer the selected substring."""
|
|
from gateway.platforms.event import MessageType
|
|
|
|
adapter = _make_adapter()
|
|
msg = _make_message(
|
|
text="mark this one as done",
|
|
reply_to_text=(
|
|
"Briefing:\n- Item A: deploy fix\n- Item B: rotate keys\n- Item C: update docs"
|
|
),
|
|
quote_text="Item B: rotate keys",
|
|
)
|
|
|
|
event = adapter._build_message_event(msg, MessageType.TEXT)
|
|
|
|
assert event.reply_to_text == "Item B: rotate keys"
|
|
assert event.reply_to_message_id == "42"
|
|
|
|
|