diff --git a/evals/delivery_flood_wire.py b/evals/delivery_flood_wire.py index 64783d0c7e..2db290ebf3 100644 --- a/evals/delivery_flood_wire.py +++ b/evals/delivery_flood_wire.py @@ -95,7 +95,7 @@ async def setup(url): async def produce(runner, adapter, chat): from gateway.config import Platform - from gateway.platforms.base import MessageEvent + from gateway.platforms.event import MessageEvent from gateway.session import SessionSource source = SessionSource(platform=Platform.TELEGRAM, chat_id=chat, thread_id='77') entry = await runner.async_session_store.get_or_create_session(source) diff --git a/evals/gateway_status_render/iteration_ceiling_ab.py b/evals/gateway_status_render/iteration_ceiling_ab.py index 8c4dabcb06..bb10a68783 100644 --- a/evals/gateway_status_render/iteration_ceiling_ab.py +++ b/evals/gateway_status_render/iteration_ceiling_ab.py @@ -39,7 +39,8 @@ def _agent(max_iterations: int | None): async def _busy_ack(agent) -> str: import gateway.run as gr - from gateway.platforms.base import MessageEvent, MessageType, SessionSource, build_session_key + from gateway.platforms.base import SessionSource, build_session_key + from gateway.platforms.event import MessageEvent, MessageType gr._load_gateway_config = lambda: {"display": {"platforms": {"telegram": {"busy_ack_detail": True}}}} runner = object.__new__(gr.GatewayRunner) diff --git a/evals/heartbeat_idle_wire.py b/evals/heartbeat_idle_wire.py index d9e88e848b..9603ae5285 100644 --- a/evals/heartbeat_idle_wire.py +++ b/evals/heartbeat_idle_wire.py @@ -17,7 +17,8 @@ from unittest.mock import patch sys.path.insert(0, str(Path(__file__).resolve().parents[1])) from gateway.config import GatewayConfig, Platform, PlatformConfig # noqa: E402 -from gateway.platforms.base import BasePlatformAdapter, MessageEvent, SendResult # noqa: E402 +from gateway.platforms.base import BasePlatformAdapter, SendResult # noqa: E402 +from gateway.platforms.event import MessageEvent # noqa: E402 from gateway.run import GatewayRunner # noqa: E402 from gateway.session import SessionSource, SessionStore, build_session_key # noqa: E402 from hermes_cli import heartbeat # noqa: E402 diff --git a/evals/postmortem/review_probes/goal_repaste_probe.py b/evals/postmortem/review_probes/goal_repaste_probe.py index 6f6c8c852a..8614b8cbc5 100644 --- a/evals/postmortem/review_probes/goal_repaste_probe.py +++ b/evals/postmortem/review_probes/goal_repaste_probe.py @@ -35,7 +35,7 @@ from cli import HermesCLI from hermes_cli import cli_commands_mixin, goals from gateway.slash_commands_goals import GatewayGoalCommandsMixin from gateway.config import Platform -from gateway.platforms.base import MessageEvent, MessageType +from gateway.platforms.event import MessageEvent, MessageType from gateway.session import SessionSource from tui_gateway import server diff --git a/evals/token_accounting/display_provenance.py b/evals/token_accounting/display_provenance.py index 527412a929..3091386e0d 100644 --- a/evals/token_accounting/display_provenance.py +++ b/evals/token_accounting/display_provenance.py @@ -25,7 +25,7 @@ def child(out: Path) -> None: from gateway.config import GatewayConfig from gateway.session import SessionStore, SessionSource from gateway.config import Platform - from gateway.platforms.base import MessageEvent + from gateway.platforms.event import MessageEvent runner = GatewayRunner.__new__(GatewayRunner) runner.config = GatewayConfig() diff --git a/tests/gateway/test_busy_steer_origin.py b/tests/gateway/test_busy_steer_origin.py index dccf7d5472..bd180325d4 100644 --- a/tests/gateway/test_busy_steer_origin.py +++ b/tests/gateway/test_busy_steer_origin.py @@ -5,7 +5,7 @@ import json import pytest from gateway.config import GatewayConfig, Platform -from gateway.platforms.base import MessageEvent +from gateway.platforms.event import MessageEvent from gateway.run import GatewayRunner from gateway.session import SessionSource diff --git a/tests/gateway/test_heartbeat_poller.py b/tests/gateway/test_heartbeat_poller.py index a49547e777..07d21af506 100644 --- a/tests/gateway/test_heartbeat_poller.py +++ b/tests/gateway/test_heartbeat_poller.py @@ -6,7 +6,8 @@ from types import SimpleNamespace import pytest from gateway.config import Platform, PlatformConfig -from gateway.platforms.base import BasePlatformAdapter, MessageEvent, SendResult +from gateway.platforms.base import BasePlatformAdapter, SendResult +from gateway.platforms.event import MessageEvent from gateway.run import GatewayRunner from gateway.session import SessionSource, build_session_key from hermes_cli.heartbeat import HeartbeatManager diff --git a/tests/gateway/test_reply_to_injection.py b/tests/gateway/test_reply_to_injection.py index c260b2274a..bbd9de33b2 100644 --- a/tests/gateway/test_reply_to_injection.py +++ b/tests/gateway/test_reply_to_injection.py @@ -63,7 +63,7 @@ async def test_reply_prefix_injected_when_text_absent_from_history(): @pytest.mark.asyncio async def test_telegram_long_reply_reaches_prompt_without_losing_later_items(): """The native reply already has the full message; preparation must not trim it.""" - from gateway.platforms.base import MessageType + from gateway.platforms.event import MessageType from tests.gateway.test_telegram_reply_quote import _make_adapter, _make_message quoted = "\n".join( diff --git a/tests/gateway/test_slack_model_picker.py b/tests/gateway/test_slack_model_picker.py index 4830b6ab11..9a0d27ff78 100644 --- a/tests/gateway/test_slack_model_picker.py +++ b/tests/gateway/test_slack_model_picker.py @@ -628,7 +628,7 @@ class TestSlackModelPickerGatewayIntegration: import yaml - from gateway.platforms.base import MessageEvent, MessageType + from gateway.platforms.event import MessageEvent, MessageType from gateway.session import SessionSource captured = {} @@ -684,7 +684,7 @@ class TestSlackModelPickerGatewayIntegration: async def test_text_fallback_when_no_picker(self, tmp_path, monkeypatch): import yaml - from gateway.platforms.base import MessageEvent, MessageType + from gateway.platforms.event import MessageEvent, MessageType from gateway.session import SessionSource class SlackNoPickerAdapter: diff --git a/tests/gateway/test_telegram_mention_context.py b/tests/gateway/test_telegram_mention_context.py index b20b6b63e5..3d567d3057 100644 --- a/tests/gateway/test_telegram_mention_context.py +++ b/tests/gateway/test_telegram_mention_context.py @@ -7,7 +7,7 @@ from unittest.mock import AsyncMock import pytest -from gateway.platforms.base import MessageType +from gateway.platforms.event import MessageType from gateway.run import GatewayRunner from tests.gateway.test_telegram_group_gating import ( _dm_message, _group_message, _group_voice_message, _make_adapter,