mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
280 lines
10 KiB
Python
280 lines
10 KiB
Python
"""Tests for Telegram inline keyboard clarify buttons.
|
|
|
|
Mirrors test_telegram_approval_buttons.py for the new ``send_clarify`` and
|
|
``cl:`` callback dispatch added in feat/clarify-gateway-buttons.
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Ensure the repo root is importable
|
|
# ---------------------------------------------------------------------------
|
|
_repo = str(Path(__file__).resolve().parents[2])
|
|
if _repo not in sys.path:
|
|
sys.path.insert(0, _repo)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Minimal Telegram mock so TelegramAdapter can be imported (mirrors
|
|
# test_telegram_approval_buttons.py)
|
|
# ---------------------------------------------------------------------------
|
|
def _ensure_telegram_mock():
|
|
if "telegram" in sys.modules and hasattr(sys.modules["telegram"], "__file__"):
|
|
return
|
|
|
|
mod = MagicMock()
|
|
mod.ext.ContextTypes.DEFAULT_TYPE = type(None)
|
|
mod.constants.ParseMode.MARKDOWN = "Markdown"
|
|
mod.constants.ParseMode.MARKDOWN_V2 = "MarkdownV2"
|
|
mod.constants.ParseMode.HTML = "HTML"
|
|
mod.constants.ChatType.PRIVATE = "private"
|
|
mod.constants.ChatType.GROUP = "group"
|
|
mod.constants.ChatType.SUPERGROUP = "supergroup"
|
|
mod.constants.ChatType.CHANNEL = "channel"
|
|
mod.error.NetworkError = type("NetworkError", (OSError,), {})
|
|
mod.error.TimedOut = type("TimedOut", (OSError,), {})
|
|
mod.error.BadRequest = type("BadRequest", (Exception,), {})
|
|
|
|
for name in ("telegram", "telegram.ext", "telegram.constants", "telegram.request"):
|
|
sys.modules.setdefault(name, mod)
|
|
sys.modules.setdefault("telegram.error", mod.error)
|
|
|
|
|
|
_ensure_telegram_mock()
|
|
|
|
from plugins.platforms.telegram.adapter import TelegramAdapter
|
|
from gateway.config import PlatformConfig
|
|
|
|
|
|
def _make_adapter(extra=None):
|
|
config = PlatformConfig(enabled=True, token="test-token", extra=extra or {})
|
|
adapter = TelegramAdapter(config)
|
|
adapter._bot = AsyncMock()
|
|
adapter._app = MagicMock()
|
|
return adapter
|
|
|
|
|
|
def _clear_clarify_state():
|
|
from tools import clarify_gateway as cm
|
|
with cm._lock:
|
|
cm._entries.clear()
|
|
cm._session_index.clear()
|
|
cm._notify_cbs.clear()
|
|
|
|
|
|
# ===========================================================================
|
|
# send_clarify — render
|
|
# ===========================================================================
|
|
|
|
class TestTelegramSendClarify:
|
|
"""Verify the rendered prompt has buttons or none, and stores state."""
|
|
|
|
def setup_method(self):
|
|
_clear_clarify_state()
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_multi_choice_renders_buttons_and_other(self):
|
|
adapter = _make_adapter()
|
|
mock_msg = MagicMock()
|
|
mock_msg.message_id = 100
|
|
adapter._bot.send_message = AsyncMock(return_value=mock_msg)
|
|
|
|
result = await adapter.send_clarify(
|
|
chat_id="12345",
|
|
question="Which option?",
|
|
choices=["alpha", "beta", "gamma"],
|
|
clarify_id="cid1",
|
|
session_key="sk1",
|
|
)
|
|
|
|
assert result.success is True
|
|
assert result.message_id == "100"
|
|
|
|
kwargs = adapter._bot.send_message.call_args[1]
|
|
assert kwargs["chat_id"] == 12345
|
|
assert "Which option?" in kwargs["text"]
|
|
# Full option text rendered in the message body (not just buttons)
|
|
assert "1. alpha" in kwargs["text"]
|
|
assert "2. beta" in kwargs["text"]
|
|
assert "3. gamma" in kwargs["text"]
|
|
# InlineKeyboardMarkup with N+1 buttons (3 choices + Other)
|
|
markup = kwargs["reply_markup"]
|
|
assert markup is not None
|
|
# Mocked InlineKeyboardMarkup — just verify it was constructed
|
|
# with rows. We check state instead of poking the mock structure.
|
|
assert "cid1" in adapter._clarify_state
|
|
assert adapter._clarify_state["cid1"] == "sk1"
|
|
|
|
|
|
# The button label should be short ("1"), not the long choice
|
|
# (we can't inspect mock button labels directly, but the send
|
|
# succeeded — old truncation code could raise on edge cases)
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_html_escapes_question(self):
|
|
adapter = _make_adapter()
|
|
mock_msg = MagicMock()
|
|
mock_msg.message_id = 103
|
|
adapter._bot.send_message = AsyncMock(return_value=mock_msg)
|
|
|
|
await adapter.send_clarify(
|
|
chat_id="12345",
|
|
question="<script>alert(1)</script>",
|
|
choices=["x"],
|
|
clarify_id="cid5",
|
|
session_key="sk5",
|
|
)
|
|
kwargs = adapter._bot.send_message.call_args[1]
|
|
# Must NOT contain raw <script> — html.escape should have neutralized
|
|
assert "<script>" not in kwargs["text"]
|
|
assert "<script>" in kwargs["text"]
|
|
|
|
|
|
# ===========================================================================
|
|
# Callback dispatch — _handle_callback_query routing for cl:* prefixes
|
|
# ===========================================================================
|
|
|
|
class TestTelegramClarifyCallback:
|
|
"""Verify clicking a button resolves the clarify primitive."""
|
|
|
|
def setup_method(self):
|
|
_clear_clarify_state()
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_numeric_choice_resolves_with_choice_text(self):
|
|
from tools import clarify_gateway as cm
|
|
|
|
adapter = _make_adapter()
|
|
# Pre-register a clarify entry so the callback can look up the choice text
|
|
cm.register("cidA", "sk-cb", "Pick", ["red", "green", "blue"])
|
|
adapter._clarify_state["cidA"] = "sk-cb"
|
|
|
|
query = AsyncMock()
|
|
query.data = "cl:cidA:1" # green
|
|
query.message = MagicMock()
|
|
query.message.chat_id = 12345
|
|
query.message.text = "Pick"
|
|
query.from_user = MagicMock()
|
|
query.from_user.id = "777"
|
|
query.from_user.first_name = "Tester"
|
|
query.answer = AsyncMock()
|
|
query.edit_message_text = AsyncMock()
|
|
|
|
update = MagicMock()
|
|
update.callback_query = query
|
|
context = MagicMock()
|
|
|
|
with patch.dict(os.environ, {"TELEGRAM_ALLOWED_USERS": "*"}, clear=False):
|
|
await adapter._handle_callback_query(update, context)
|
|
|
|
# State popped
|
|
assert "cidA" not in adapter._clarify_state
|
|
# Wait shouldn't be needed — resolve_gateway_clarify is sync.
|
|
# The entry's response should be set.
|
|
# We test by reading the entry's response directly.
|
|
with cm._lock:
|
|
entry = cm._entries.get("cidA")
|
|
# Entry might be popped by wait_for_response, but here we never
|
|
# called wait — so it's still in _entries with response set.
|
|
assert entry is not None
|
|
assert entry.response == "green"
|
|
assert entry.event.is_set()
|
|
query.answer.assert_called_once()
|
|
query.edit_message_text.assert_called_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_unauthorized_user_rejected(self):
|
|
from tools import clarify_gateway as cm
|
|
|
|
adapter = _make_adapter()
|
|
cm.register("cidC", "sk-auth", "Pick", ["a", "b"])
|
|
adapter._clarify_state["cidC"] = "sk-auth"
|
|
|
|
# Hook up a runner that says NOT authorized
|
|
class _DenyRunner:
|
|
async def _handle_message(self, event):
|
|
return None
|
|
def _is_user_authorized(self, source):
|
|
return False
|
|
|
|
adapter._message_handler = _DenyRunner()._handle_message
|
|
|
|
query = AsyncMock()
|
|
query.data = "cl:cidC:0"
|
|
query.message = MagicMock()
|
|
query.message.chat_id = 12345
|
|
query.message.chat.type = "private"
|
|
query.message.text = "Pick"
|
|
query.from_user = MagicMock()
|
|
query.from_user.id = "999"
|
|
query.from_user.first_name = "Mallory"
|
|
query.answer = AsyncMock()
|
|
query.edit_message_text = AsyncMock()
|
|
|
|
update = MagicMock()
|
|
update.callback_query = query
|
|
context = MagicMock()
|
|
|
|
await adapter._handle_callback_query(update, context)
|
|
|
|
# Must not resolve, must answer with not-authorized message
|
|
with cm._lock:
|
|
entry = cm._entries.get("cidC")
|
|
assert entry is not None
|
|
assert not entry.event.is_set()
|
|
query.answer.assert_called_once()
|
|
assert "not authorized" in query.answer.call_args[1]["text"].lower()
|
|
# State preserved
|
|
assert adapter._clarify_state["cidC"] == "sk-auth"
|
|
|
|
|
|
# ===========================================================================
|
|
# Base adapter fallback render — text numbered list
|
|
# ===========================================================================
|
|
|
|
class TestBaseAdapterClarifyFallback:
|
|
"""Adapters without button overrides should render numbered text."""
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_numbered_text_fallback(self):
|
|
from gateway.platforms.base import BasePlatformAdapter, SendResult
|
|
|
|
# Subclass just enough to instantiate
|
|
class _Stub(BasePlatformAdapter):
|
|
name = "stub"
|
|
|
|
def __init__(self):
|
|
# Skip base __init__ — we're not exercising it
|
|
self.sent: list = []
|
|
|
|
async def connect(self, *, is_reconnect: bool = False): pass
|
|
async def disconnect(self): pass
|
|
async def send(self, chat_id, content, **kw):
|
|
self.sent.append({"chat_id": chat_id, "content": content})
|
|
return SendResult(success=True, message_id="1")
|
|
async def edit(self, *a, **k): return SendResult(success=False)
|
|
async def get_history(self, *a, **k): return []
|
|
async def get_chat_info(self, *a, **k): return {}
|
|
|
|
adapter = _Stub()
|
|
|
|
result = await adapter.send_clarify(
|
|
chat_id="c",
|
|
question="Pick a fruit",
|
|
choices=["apple", "banana"],
|
|
clarify_id="x",
|
|
session_key="s",
|
|
)
|
|
assert result.success is True
|
|
assert len(adapter.sent) == 1
|
|
text = adapter.sent[0]["content"]
|
|
assert "Pick a fruit" in text
|
|
assert "1." in text and "apple" in text
|
|
assert "2." in text and "banana" in text
|
|
|