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).
54 lines
1.6 KiB
Python
54 lines
1.6 KiB
Python
"""Text-debounce batching for the WhatsApp adapter (issue #35301).
|
|
|
|
WhatsApp delivers rapid multi-message bursts (forwarded batches, paste-splits)
|
|
individually. Without debounce each fragment triggers a separate agent
|
|
invocation, wasting tokens and flooding the user with reply fragments. This
|
|
mirrors the Telegram/WeCom/Feishu pattern.
|
|
|
|
Batch delays are read from ``config.extra`` (config.yaml), not env vars.
|
|
"""
|
|
|
|
import asyncio
|
|
|
|
from gateway.config import Platform, PlatformConfig
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
from plugins.platforms.whatsapp.adapter import WhatsAppAdapter
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
def _make_adapter(**extra):
|
|
base = {"session_name": "test"}
|
|
base.update(extra)
|
|
return WhatsAppAdapter(PlatformConfig(enabled=True, extra=base))
|
|
|
|
|
|
def _event(text):
|
|
src = SessionSource(
|
|
platform=Platform.WHATSAPP,
|
|
chat_id="chat123",
|
|
chat_type="dm",
|
|
user_id="user1",
|
|
user_name="tester",
|
|
)
|
|
return MessageEvent(text=text, message_type=MessageType.TEXT, source=src)
|
|
|
|
|
|
def test_batch_delays_overridden_via_config_extra():
|
|
adapter = _make_adapter(
|
|
text_batch_delay_seconds="2.5",
|
|
text_batch_split_delay_seconds=7,
|
|
)
|
|
assert adapter._text_batch_delay_seconds == 2.5
|
|
assert adapter._text_batch_split_delay_seconds == 7.0
|
|
|
|
|
|
def test_invalid_config_value_falls_back_to_default():
|
|
adapter = _make_adapter(
|
|
text_batch_delay_seconds="garbage",
|
|
text_batch_split_delay_seconds=-3,
|
|
)
|
|
assert adapter._text_batch_delay_seconds == 5.0
|
|
assert adapter._text_batch_split_delay_seconds == 10.0
|
|
|
|
|