b4fbd6fe9f
Deploy Site / deploy-vercel (push) Has been skipped
Deploy Site / deploy-docs (push) Has been skipped
Build Skills Index / build-index (push) Has been skipped
CI / Deny unrelated histories (push) Has been skipped
CI / Detect affected areas (push) Successful in 27m35s
CI / OSV scan (push) Failing after 4s
CI / Build&Test Docker image (push) Successful in 9s
CI / Supply-chain scan (push) Has been skipped
CI / Lint Docker scripts (push) Failing after 5m13s
CI / Check contributors (push) Failing after 12m8s
CI / Docs Site (push) Failing after 12m8s
CI / TypeScript (push) Failing after 12m8s
CI / Python lints (push) Failing after 12m9s
CI / Python tests (push) Failing after 12m9s
CI / Check uv.lock (push) Failing after 23m22s
CI / CI timing report (push) Has been cancelled
Build Skills Index / trigger-deploy (push) Has been cancelled
CI / All required checks pass (push) Has been cancelled
72 lines
2.6 KiB
Python
72 lines
2.6 KiB
Python
"""Regression guard for #62151 — gateway cron must not wedge on 2nd+ API call.
|
|
|
|
Gateway-fired cron jobs hung forever on the 2nd+ non-streaming API call when
|
|
``interruptible_api_call`` spawned a daemon worker inside nested cron thread
|
|
pools. The worker logged client creation but never opened a TCP connection.
|
|
The same job succeeded via ``hermes cron tick``. Cron has no interactive
|
|
interrupt surface, so the fix routes cron through a synchronous direct call on
|
|
the conversation thread instead of the interrupt worker.
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock
|
|
|
|
from agent.chat_completion_helpers import (
|
|
direct_api_call,
|
|
should_use_direct_api_call,
|
|
)
|
|
|
|
|
|
def _make_agent(*, platform="cron"):
|
|
agent = MagicMock()
|
|
agent.platform = platform
|
|
agent.api_mode = "chat_completions"
|
|
agent.provider = "openrouter"
|
|
agent._interrupt_requested = False
|
|
agent._touch_activity = MagicMock()
|
|
agent._create_request_openai_client = MagicMock()
|
|
agent._close_request_openai_client = MagicMock()
|
|
return agent
|
|
|
|
|
|
def test_should_use_direct_api_call_only_for_cron_openai_wire():
|
|
assert should_use_direct_api_call(_make_agent(platform="cron")) is True
|
|
assert should_use_direct_api_call(_make_agent(platform="cli")) is False
|
|
assert should_use_direct_api_call(_make_agent(platform="telegram")) is False
|
|
assert should_use_direct_api_call(_make_agent(platform=None)) is False
|
|
|
|
for api_mode in ("codex_responses", "anthropic_messages", "bedrock_converse"):
|
|
agent = _make_agent(platform="cron")
|
|
agent.api_mode = api_mode
|
|
assert should_use_direct_api_call(agent) is False
|
|
|
|
moa = _make_agent(platform="cron")
|
|
moa.provider = "moa"
|
|
assert should_use_direct_api_call(moa) is False
|
|
|
|
|
|
def test_direct_api_call_runs_two_sequential_requests_on_same_thread():
|
|
"""Mirror the 2nd+ call failure mode: two back-to-back completions.create."""
|
|
agent = _make_agent()
|
|
calls = {"n": 0}
|
|
fake_client = MagicMock()
|
|
|
|
def _create(**_kwargs):
|
|
calls["n"] += 1
|
|
return fake_client
|
|
|
|
fake_client.chat.completions.create.side_effect = [
|
|
SimpleNamespace(id="first"),
|
|
SimpleNamespace(id="second"),
|
|
]
|
|
agent._create_request_openai_client.side_effect = _create
|
|
|
|
first = direct_api_call(agent, {"model": "m", "messages": []})
|
|
second = direct_api_call(agent, {"model": "m", "messages": []})
|
|
|
|
assert first.id == "first"
|
|
assert second.id == "second"
|
|
assert calls["n"] == 2
|
|
assert fake_client.chat.completions.create.call_count == 2
|
|
assert agent._close_request_openai_client.call_count == 2
|