mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-18 04:41:56 +00:00
fix(gateway): keep running when platforms fail; add per-platform circuit breaker + /platform (#26600)
Stop the gateway from exiting (or systemd-restart-looping) when a single
messaging adapter fails at startup or runtime. A misconfigured WhatsApp
(npm install timeout, unpaired bridge, missing creds.json) used to take
the entire gateway down, killing cron jobs and any other connected
platforms with it.
Changes:
• Startup (gateway/run.py): when connected_count==0 but the only
errors are retryable, log a degraded-state warning and keep the
gateway alive instead of returning False. Reconnect watcher then
recovers platforms as their underlying problem clears.
• Runtime (gateway/run.py _handle_adapter_fatal_error): when the last
adapter goes down with a retryable error and is queued for
reconnection, stay alive instead of exit-with-failure. Previously
this triggered systemd Restart=on-failure, which created infinite
restart loops on persistent retryable failures (proxy outage,
repeated bridge crashes).
• Reconnect watcher (gateway/run.py _platform_reconnect_watcher):
replace the 20-attempt hard drop with a circuit-breaker pause.
After _PAUSE_AFTER_FAILURES (10) consecutive retryable failures, the
platform stays in _failed_platforms with paused=True so the watcher
skips it but the operator can still see and resume it. Non-retryable
errors still drop out of the queue immediately. Resolves #17063
(gateway giving up on Telegram after 20 attempts).
• WhatsApp preflight (gateway/platforms/whatsapp.py): refuse to start
the Node bridge when creds.json is missing. Sets a non-retryable
whatsapp_not_paired fatal error so the watcher drops it cleanly
with a single 'run hermes whatsapp' log line instead of paying the
30s bridge bootstrap timeout on every gateway start.
• WhatsApp setup ordering (hermes_cli/main.py cmd_whatsapp): only set
WHATSAPP_ENABLED=true once pairing actually succeeds. Previously
the wizard wrote the env var at step 2 (before npm install and QR
pairing), so any Ctrl+C left .env claiming WhatsApp was ready when
the bridge had no creds.json. Also propagate the env var when the
user keeps an existing pairing on a re-run.
• /platform slash command (hermes_cli/commands.py + gateway/run.py):
new gateway-only command for manual circuit-breaker control.
/platform list — show connected + failed/paused platforms
/platform pause <name> — silence a known-broken platform
/platform resume <name> — re-queue a paused platform
Tests:
• New: pause/resume helpers, /platform list|pause|resume command,
WhatsApp creds.json preflight, WhatsApp setup ordering.
• Updated: stale assertions that codified the old 'exit and let
systemd restart' behavior in test_runner_fatal_adapter.py,
test_runner_startup_failures.py, and test_platform_reconnect.py
(the 20-attempt give-up test became a circuit-breaker pause test).
5488 tests pass in tests/gateway/.
This commit is contained in:
parent
3b9368a0c4
commit
518f39557b
9 changed files with 745 additions and 62 deletions
140
tests/hermes_cli/test_whatsapp_setup_ordering.py
Normal file
140
tests/hermes_cli/test_whatsapp_setup_ordering.py
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
"""Regression tests for ``cmd_whatsapp`` env-var write ordering.
|
||||
|
||||
Before the fix, ``hermes whatsapp`` wrote ``WHATSAPP_ENABLED=true`` at
|
||||
step 2 — before npm install (step 4) and before QR pairing (step 6).
|
||||
If the user Ctrl+C'd at any later step, ``.env`` claimed WhatsApp was
|
||||
ready when the bridge still had no ``creds.json``. Every subsequent
|
||||
``hermes gateway`` then paid a 30s bridge-bootstrap timeout and queued
|
||||
WhatsApp for indefinite retries — looking like "the gateway is broken."
|
||||
|
||||
The fix: only set ``WHATSAPP_ENABLED=true`` once pairing actually
|
||||
succeeds (creds.json exists). Aborted setup leaves no enabled state.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import io
|
||||
import os
|
||||
from contextlib import redirect_stdout
|
||||
from pathlib import Path
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def isolated_home(tmp_path, monkeypatch):
|
||||
home = tmp_path / "home"
|
||||
hermes = home / ".hermes"
|
||||
hermes.mkdir(parents=True)
|
||||
monkeypatch.setattr(Path, "home", lambda: home)
|
||||
monkeypatch.setenv("HERMES_HOME", str(hermes))
|
||||
# Ensure get_env_value cache doesn't carry stale state.
|
||||
for key in list(os.environ):
|
||||
if key.startswith("WHATSAPP_"):
|
||||
monkeypatch.delenv(key, raising=False)
|
||||
return hermes
|
||||
|
||||
|
||||
def _env_value(hermes_home: Path, key: str) -> str | None:
|
||||
env_file = hermes_home / ".env"
|
||||
if not env_file.exists():
|
||||
return None
|
||||
for line in env_file.read_text().splitlines():
|
||||
if "=" not in line:
|
||||
continue
|
||||
k, _, v = line.partition("=")
|
||||
if k.strip() == key:
|
||||
return v.strip().strip('"').strip("'")
|
||||
return None
|
||||
|
||||
|
||||
def test_aborted_setup_does_not_enable_whatsapp(isolated_home, monkeypatch):
|
||||
"""User picks mode 1, then Ctrl+C's at the allowed-users prompt.
|
||||
|
||||
WHATSAPP_ENABLED must NOT be present in .env after abort.
|
||||
"""
|
||||
from hermes_cli.main import cmd_whatsapp
|
||||
|
||||
# First input() = mode choice, second input() = allowed-users prompt
|
||||
# We raise KeyboardInterrupt on the second call to simulate abort.
|
||||
inputs = iter(["1"])
|
||||
|
||||
def fake_input(_prompt=""):
|
||||
try:
|
||||
return next(inputs)
|
||||
except StopIteration:
|
||||
raise KeyboardInterrupt
|
||||
|
||||
monkeypatch.setattr("builtins.input", fake_input)
|
||||
# _require_tty calls sys.stdin.isatty — make it pass.
|
||||
monkeypatch.setattr("hermes_cli.main._require_tty", lambda *_a, **_kw: None)
|
||||
# No node, no bridge script — we shouldn't reach those steps anyway.
|
||||
|
||||
buf = io.StringIO()
|
||||
with redirect_stdout(buf):
|
||||
try:
|
||||
cmd_whatsapp(MagicMock())
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
|
||||
assert _env_value(isolated_home, "WHATSAPP_ENABLED") is None, (
|
||||
"Setup aborted before pairing — WHATSAPP_ENABLED must not be set. "
|
||||
f"Got .env: {(isolated_home / '.env').read_text() if (isolated_home / '.env').exists() else '(missing)'}"
|
||||
)
|
||||
|
||||
|
||||
def test_existing_pairing_skip_branch_enables_whatsapp(isolated_home, monkeypatch):
|
||||
"""User runs ``hermes whatsapp`` with an existing paired session and
|
||||
chooses "no, keep my session" at the re-pair prompt. The env var
|
||||
should be (re-)written to true so the gateway picks WhatsApp back up,
|
||||
even if the var was lost since the original pairing.
|
||||
"""
|
||||
from hermes_cli.main import cmd_whatsapp
|
||||
|
||||
# Pre-create a paired session WITHOUT WHATSAPP_ENABLED in .env.
|
||||
session = isolated_home / "whatsapp" / "session"
|
||||
session.mkdir(parents=True)
|
||||
(session / "creds.json").write_text("{}")
|
||||
monkeypatch.setenv("WHATSAPP_MODE", "bot")
|
||||
monkeypatch.setenv("WHATSAPP_ALLOWED_USERS", "15551234567")
|
||||
|
||||
# mode already set → skip mode prompt; users already set → skip update
|
||||
# prompt with "no"; pairing exists → "no, keep session" → return.
|
||||
inputs = iter(["n", "n"])
|
||||
|
||||
def fake_input(_prompt=""):
|
||||
try:
|
||||
return next(inputs)
|
||||
except StopIteration:
|
||||
return "n"
|
||||
|
||||
monkeypatch.setattr("builtins.input", fake_input)
|
||||
monkeypatch.setattr("hermes_cli.main._require_tty", lambda *_a, **_kw: None)
|
||||
# Skip the bridge npm install — we're testing setup-ordering, not bridge
|
||||
# bootstrapping. Pretend node_modules exists (Path.exists -> True for that
|
||||
# specific check is hard to scope, so instead pretend npm install would
|
||||
# succeed silently if reached).
|
||||
monkeypatch.setattr(
|
||||
"subprocess.run",
|
||||
lambda *_a, **_kw: MagicMock(returncode=0, stderr=""),
|
||||
)
|
||||
monkeypatch.setattr("shutil.which", lambda _name: "/usr/bin/npm")
|
||||
# Patch (bridge_dir / "node_modules").exists() by stubbing Path.exists
|
||||
# to True for that one specific subpath. Easier: pre-create it as a
|
||||
# symlink to /tmp. But we can't write to the repo. Instead, stub
|
||||
# Path.exists wholesale to True for node_modules; the creds.json check
|
||||
# in the same function still works because we wrote it ourselves.
|
||||
_orig_exists = Path.exists
|
||||
def _stub_exists(self):
|
||||
if self.name == "node_modules":
|
||||
return True
|
||||
return _orig_exists(self)
|
||||
monkeypatch.setattr(Path, "exists", _stub_exists)
|
||||
|
||||
buf = io.StringIO()
|
||||
with redirect_stdout(buf):
|
||||
cmd_whatsapp(MagicMock())
|
||||
|
||||
# The skip-rebar branch should have set the env var on its way out.
|
||||
assert _env_value(isolated_home, "WHATSAPP_ENABLED") == "true"
|
||||
Loading…
Add table
Add a link
Reference in a new issue