mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-01 07:01:41 +00:00
66827f8947
Remove unused imports (F401) and duplicate/shadowed import redefinitions (F811) across the codebase using ruff's safe autofixes. No behavioral changes -- imports only. - ~1400 safe autofixes applied across 644 files (net -1072 lines) - __init__.py re-exports preserved (excluded from F401 removal so public re-export surfaces stay intact) - Re-exports that are imported or monkeypatched by tests but look unused in their defining module are kept with explicit # noqa: F401 (gateway/run.py load_dotenv; run_agent re-exports from agent.message_sanitization, agent.context_compressor, agent.retry_utils, agent.prompt_builder, agent.process_bootstrap, agent.codex_responses_adapter) - Unsafe F841 (unused-variable) fixes deliberately skipped -- those can change behavior when the RHS has side effects - ruff lints remain disabled in pyproject.toml (only PLW1514 is selected); this is a one-time cleanup, not a config change Verification: - python -m compileall: clean - pytest --collect-only: all 27161 tests collect (zero import errors) - core entry points import clean (run_agent, model_tools, cli, toolsets, hermes_state, batch_runner, gateway) - static scan: every name any test imports directly from an edited module still resolves
227 lines
7.1 KiB
Python
227 lines
7.1 KiB
Python
"""Tests for auth-aware retry in Mattermost WS and Matrix sync loops.
|
|
|
|
Both Mattermost's _ws_loop and Matrix's _sync_loop previously caught all
|
|
exceptions with a broad ``except Exception`` and retried forever. Permanent
|
|
auth failures (401, 403, M_UNKNOWN_TOKEN) would loop indefinitely instead
|
|
of stopping. These tests verify that auth errors now stop the reconnect.
|
|
"""
|
|
|
|
import asyncio
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Mattermost: _ws_loop auth-aware retry
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestMattermostWSAuthRetry:
|
|
"""gateway/platforms/mattermost.py — _ws_loop()"""
|
|
|
|
def test_401_handshake_stops_reconnect(self):
|
|
"""A WSServerHandshakeError with status 401 should stop the loop."""
|
|
import aiohttp
|
|
|
|
exc = aiohttp.WSServerHandshakeError(
|
|
request_info=MagicMock(),
|
|
history=(),
|
|
status=401,
|
|
message="Unauthorized",
|
|
headers=MagicMock(),
|
|
)
|
|
|
|
from plugins.platforms.mattermost.adapter import MattermostAdapter
|
|
adapter = MattermostAdapter.__new__(MattermostAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_connect():
|
|
nonlocal call_count
|
|
call_count += 1
|
|
raise exc
|
|
|
|
adapter._ws_connect_and_listen = fake_connect
|
|
|
|
asyncio.run(adapter._ws_loop())
|
|
|
|
# Should have attempted once and stopped, not retried
|
|
assert call_count == 1
|
|
|
|
def test_403_handshake_stops_reconnect(self):
|
|
"""A WSServerHandshakeError with status 403 should stop the loop."""
|
|
import aiohttp
|
|
|
|
exc = aiohttp.WSServerHandshakeError(
|
|
request_info=MagicMock(),
|
|
history=(),
|
|
status=403,
|
|
message="Forbidden",
|
|
headers=MagicMock(),
|
|
)
|
|
|
|
from plugins.platforms.mattermost.adapter import MattermostAdapter
|
|
adapter = MattermostAdapter.__new__(MattermostAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_connect():
|
|
nonlocal call_count
|
|
call_count += 1
|
|
raise exc
|
|
|
|
adapter._ws_connect_and_listen = fake_connect
|
|
|
|
asyncio.run(adapter._ws_loop())
|
|
assert call_count == 1
|
|
|
|
def test_transient_error_retries(self):
|
|
"""A transient ConnectionError should retry (not stop immediately)."""
|
|
from plugins.platforms.mattermost.adapter import MattermostAdapter
|
|
adapter = MattermostAdapter.__new__(MattermostAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_connect():
|
|
nonlocal call_count
|
|
call_count += 1
|
|
if call_count >= 2:
|
|
# Stop the loop after 2 attempts
|
|
adapter._closing = True
|
|
return
|
|
raise ConnectionError("connection reset")
|
|
|
|
adapter._ws_connect_and_listen = fake_connect
|
|
|
|
async def run():
|
|
with patch("asyncio.sleep", new_callable=AsyncMock):
|
|
await adapter._ws_loop()
|
|
|
|
asyncio.run(run())
|
|
|
|
# Should have retried at least once
|
|
assert call_count >= 2
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Matrix: _sync_loop auth-aware retry
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestMatrixSyncAuthRetry:
|
|
"""gateway/platforms/matrix.py — _sync_loop()"""
|
|
|
|
def test_unknown_token_sync_error_stops_loop(self):
|
|
"""A SyncError with M_UNKNOWN_TOKEN should stop syncing."""
|
|
import types
|
|
nio_mock = types.ModuleType("nio")
|
|
|
|
class SyncError:
|
|
def __init__(self, message):
|
|
self.message = message
|
|
|
|
nio_mock.SyncError = SyncError
|
|
|
|
from gateway.platforms.matrix import MatrixAdapter
|
|
adapter = MatrixAdapter.__new__(MatrixAdapter)
|
|
adapter._closing = False
|
|
|
|
sync_count = 0
|
|
|
|
async def fake_sync(timeout=30000, since=None):
|
|
nonlocal sync_count
|
|
sync_count += 1
|
|
return SyncError("M_UNKNOWN_TOKEN: Invalid access token")
|
|
|
|
adapter._client = MagicMock()
|
|
adapter._client.sync = fake_sync
|
|
adapter._client.sync_store = MagicMock()
|
|
adapter._client.sync_store.get_next_batch = AsyncMock(return_value=None)
|
|
adapter._pending_megolm = []
|
|
adapter._joined_rooms = set()
|
|
|
|
async def run():
|
|
import sys
|
|
sys.modules["nio"] = nio_mock
|
|
try:
|
|
await adapter._sync_loop()
|
|
finally:
|
|
del sys.modules["nio"]
|
|
|
|
asyncio.run(run())
|
|
assert sync_count == 1
|
|
|
|
def test_exception_with_401_stops_loop(self):
|
|
"""An exception containing '401' should stop syncing."""
|
|
from gateway.platforms.matrix import MatrixAdapter
|
|
adapter = MatrixAdapter.__new__(MatrixAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_sync(timeout=30000, since=None):
|
|
nonlocal call_count
|
|
call_count += 1
|
|
raise RuntimeError("HTTP 401 Unauthorized")
|
|
|
|
adapter._client = MagicMock()
|
|
adapter._client.sync = fake_sync
|
|
adapter._client.sync_store = MagicMock()
|
|
adapter._client.sync_store.get_next_batch = AsyncMock(return_value=None)
|
|
adapter._pending_megolm = []
|
|
adapter._joined_rooms = set()
|
|
|
|
async def run():
|
|
import types
|
|
nio_mock = types.ModuleType("nio")
|
|
nio_mock.SyncError = type("SyncError", (), {})
|
|
|
|
import sys
|
|
sys.modules["nio"] = nio_mock
|
|
try:
|
|
await adapter._sync_loop()
|
|
finally:
|
|
del sys.modules["nio"]
|
|
|
|
asyncio.run(run())
|
|
assert call_count == 1
|
|
|
|
def test_transient_error_retries(self):
|
|
"""A transient error should retry (not stop immediately)."""
|
|
from gateway.platforms.matrix import MatrixAdapter
|
|
adapter = MatrixAdapter.__new__(MatrixAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_sync(timeout=30000, since=None):
|
|
nonlocal call_count
|
|
call_count += 1
|
|
if call_count >= 2:
|
|
adapter._closing = True
|
|
return MagicMock() # Normal response
|
|
raise ConnectionError("network timeout")
|
|
|
|
adapter._client = MagicMock()
|
|
adapter._client.sync = fake_sync
|
|
adapter._client.sync_store = MagicMock()
|
|
adapter._client.sync_store.get_next_batch = AsyncMock(return_value=None)
|
|
adapter._pending_megolm = []
|
|
adapter._joined_rooms = set()
|
|
|
|
async def run():
|
|
import types
|
|
nio_mock = types.ModuleType("nio")
|
|
nio_mock.SyncError = type("SyncError", (), {})
|
|
|
|
import sys
|
|
sys.modules["nio"] = nio_mock
|
|
try:
|
|
with patch("asyncio.sleep", new_callable=AsyncMock):
|
|
await adapter._sync_loop()
|
|
finally:
|
|
del sys.modules["nio"]
|
|
|
|
asyncio.run(run())
|
|
assert call_count >= 2
|