Teknium
39975613b1
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.
64 lines
2.3 KiB
Python
64 lines
2.3 KiB
Python
"""Regression tests for #30479 — session-scoped /model and /reasoning overrides
|
|
silently lost on Telegram forum/DM topics and after compression session splits.
|
|
|
|
Root cause: ``_handle_message_with_agent`` rewrites ``source.thread_id`` via
|
|
``_recover_telegram_topic_thread_id`` (lobby/stripped reply -> the user's
|
|
last-active bound topic) *before* deriving the session key for a message turn.
|
|
The ``/model`` and ``/reasoning`` command handlers derived their override key
|
|
from the raw inbound ``event.source``, skipping that recovery — so the override
|
|
was stored under one key and the next message turn read a different key, and the
|
|
override was dropped.
|
|
|
|
Fix: both command handlers normalize the source via
|
|
``_normalize_source_for_session_key`` before deriving the override key, so
|
|
storage and read keys are identical.
|
|
"""
|
|
|
|
import threading
|
|
from unittest.mock import MagicMock
|
|
|
|
import gateway.run as gateway_run
|
|
from gateway.config import Platform
|
|
from gateway.session import SessionSource, build_session_key
|
|
|
|
|
|
def _make_runner(recovered_thread_id=None):
|
|
runner = object.__new__(gateway_run.GatewayRunner)
|
|
runner.config = None
|
|
runner.session_store = None
|
|
runner._session_db = None
|
|
runner._session_model_overrides = {}
|
|
runner._session_reasoning_overrides = {}
|
|
runner._agent_cache = {}
|
|
runner._agent_cache_lock = threading.Lock()
|
|
# Stub topic recovery: returns the bound topic id for a lobby message,
|
|
# None otherwise (the real method's contract).
|
|
runner._recover_telegram_topic_thread_id = MagicMock(return_value=recovered_thread_id)
|
|
return runner
|
|
|
|
|
|
def _topic_dm_source(thread_id):
|
|
"""A Telegram DM in topic mode. thread_id="" / "1" == General/lobby."""
|
|
return SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
chat_id="555",
|
|
chat_name="Forum DM",
|
|
chat_type="dm",
|
|
user_id="user-1",
|
|
thread_id=thread_id,
|
|
)
|
|
|
|
|
|
def test_normalize_rewrites_lobby_thread_to_bound_topic():
|
|
"""A lobby (stripped) reply gets pinned to the user's bound topic id."""
|
|
runner = _make_runner(recovered_thread_id="42")
|
|
src = _topic_dm_source(thread_id="") # lobby/General — no message_thread_id
|
|
|
|
normalized = runner._normalize_source_for_session_key(src)
|
|
|
|
assert normalized.thread_id == "42"
|
|
# Original source is left untouched (we return a copy).
|
|
assert src.thread_id == ""
|
|
|
|
|