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).
71 lines
2.2 KiB
Python
71 lines
2.2 KiB
Python
"""Regression tests for gateway /model support of config.yaml custom_providers."""
|
|
|
|
import yaml
|
|
import pytest
|
|
|
|
from gateway.config import Platform
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
from gateway.run import GatewayRunner
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
def _make_runner():
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.adapters = {}
|
|
runner._voice_mode = {}
|
|
runner._session_model_overrides = {}
|
|
return runner
|
|
|
|
|
|
def _make_event(text="/model"):
|
|
return MessageEvent(
|
|
text=text,
|
|
message_type=MessageType.TEXT,
|
|
source=SessionSource(platform=Platform.TELEGRAM, chat_id="12345", chat_type="dm"),
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_direct_model_switch_offloads_to_thread(tmp_path, monkeypatch):
|
|
"""A direct `/model <name>` switch must route switch_model() through
|
|
asyncio.to_thread so the blocking models.dev HTTP fetch can't freeze the
|
|
gateway event loop (#20525)."""
|
|
import asyncio
|
|
|
|
from hermes_cli.model_switch import ModelSwitchResult
|
|
|
|
hermes_home = tmp_path / ".hermes"
|
|
hermes_home.mkdir()
|
|
(hermes_home / "config.yaml").write_text(
|
|
yaml.safe_dump(
|
|
{"model": {"default": "gpt-5.4", "provider": "openrouter"}}
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
import gateway.run as gateway_run
|
|
|
|
monkeypatch.setattr(gateway_run, "_hermes_home", hermes_home)
|
|
|
|
# Fail the switch so the handler returns before _finish_switch (which needs
|
|
# full runner state) — we only care that the offload happened.
|
|
def _fake_switch(**kwargs):
|
|
return ModelSwitchResult(success=False, error_message="nope")
|
|
|
|
monkeypatch.setattr("hermes_cli.model_switch.switch_model", _fake_switch)
|
|
|
|
offloaded = []
|
|
real_to_thread = asyncio.to_thread
|
|
|
|
async def _spy_to_thread(func, /, *args, **kwargs):
|
|
offloaded.append(getattr(func, "__name__", repr(func)))
|
|
return await real_to_thread(func, *args, **kwargs)
|
|
|
|
monkeypatch.setattr(asyncio, "to_thread", _spy_to_thread)
|
|
|
|
result = await _make_runner()._handle_model_command(_make_event("/model gpt-5.4"))
|
|
|
|
# switch_model was offloaded to a worker thread, not run on the event loop.
|
|
assert "_fake_switch" in offloaded
|
|
assert result is not None and "nope" in result
|