From 0acf7cd37304dc24181fa009692ad5eb11b15c45 Mon Sep 17 00:00:00 2001 From: chengyongru <2755839590@qq.com> Date: Sun, 31 May 2026 19:16:32 +0800 Subject: [PATCH] refactor: remove gateway-specific kwargs from WebSocketChannel --- nanobot/channels/websocket.py | 8 -------- tests/channels/test_websocket_channel.py | 6 ------ 2 files changed, 14 deletions(-) diff --git a/nanobot/channels/websocket.py b/nanobot/channels/websocket.py index 062765d24..6b1308c11 100644 --- a/nanobot/channels/websocket.py +++ b/nanobot/channels/websocket.py @@ -455,11 +455,7 @@ class WebSocketChannel(BaseChannel): config: Any, bus: MessageBus, *, - session_manager: "SessionManager | None" = None, http_handler: Any | None = None, - workspace_path: Path | None = None, - restrict_to_workspace: bool = False, - runtime_surface: str = "browser", ): if isinstance(config, dict): config = WebSocketConfig.model_validate(config) @@ -473,10 +469,6 @@ class WebSocketChannel(BaseChannel): self._conn_default: dict[Any, str] = {} self._stop_event: asyncio.Event | None = None self._server_task: asyncio.Task[None] | None = None - self._default_restrict_to_workspace = restrict_to_workspace - self._runtime_surface = ( - "native" if runtime_surface in {"native", "desktop"} else "browser" - ) # HTTP handler injected from outside (ChannelManager / gateway startup). # Owns tokens, sessions, media, settings, static serving. diff --git a/tests/channels/test_websocket_channel.py b/tests/channels/test_websocket_channel.py index e3482ab56..51fb28e7d 100644 --- a/tests/channels/test_websocket_channel.py +++ b/tests/channels/test_websocket_channel.py @@ -310,7 +310,6 @@ async def test_webui_message_scope_inherits_persisted_session_scope( channel = WebSocketChannel( {"enabled": True, "allowFrom": ["*"], "host": "127.0.0.1"}, bus, - session_manager=sessions, http_handler=_basic_handler(bus, session_manager=sessions, workspace_path=default_workspace), ) conn = AsyncMock() @@ -357,7 +356,6 @@ async def test_webui_scope_expands_home_project_path( channel = WebSocketChannel( {"enabled": True, "allowFrom": ["*"], "host": "127.0.0.1"}, bus, - session_manager=SessionManager(tmp_path / "sessions"), http_handler=_basic_handler(bus, session_manager=SessionManager(tmp_path / "sessions"), workspace_path=default_workspace), ) conn = AsyncMock() @@ -395,7 +393,6 @@ async def test_webui_scope_rejects_missing_project_path(bus: MagicMock, tmp_path channel = WebSocketChannel( {"enabled": True, "allowFrom": ["*"], "host": "127.0.0.1"}, bus, - session_manager=SessionManager(tmp_path / "sessions"), http_handler=_basic_handler(bus, session_manager=SessionManager(tmp_path / "sessions"), workspace_path=default_workspace), ) conn = AsyncMock() @@ -433,7 +430,6 @@ async def test_webui_scope_rejects_running_scope_change(bus: MagicMock, tmp_path channel = WebSocketChannel( {"enabled": True, "allowFrom": ["*"], "host": "127.0.0.1"}, bus, - session_manager=sessions, http_handler=_basic_handler(bus, session_manager=sessions, workspace_path=default_workspace), ) conn = AsyncMock() @@ -490,7 +486,6 @@ async def test_webui_set_workspace_scope_rejects_running_chat(bus: MagicMock, tm channel = WebSocketChannel( {"enabled": True, "allowFrom": ["*"], "host": "127.0.0.1"}, bus, - session_manager=sessions, http_handler=_basic_handler(bus, session_manager=sessions, workspace_path=default_workspace), ) conn = AsyncMock() @@ -550,7 +545,6 @@ async def test_webui_scope_rejects_non_loopback_custom_scope(bus: MagicMock, tmp channel = WebSocketChannel( {"enabled": True, "allowFrom": ["*"], "host": "127.0.0.1"}, bus, - session_manager=sessions, http_handler=_basic_handler(bus, session_manager=sessions, workspace_path=default_workspace), ) conn = AsyncMock()