Teknium
2a95791992
run_agent.py: delete the `# noqa: F401` re-export block (agent.process_bootstrap
OpenAI/_SafeWriter/_get_proxy_*, model_tools get_tool_definitions/
handle_function_call/check_toolset_requirements, FailoverReason,
_qwen_portal_headers/_routermint_headers, session_persistence names,
estimate_request_tokens_rough, ContextCompressor + friends, jittered_backoff,
prompt_builder names, message_sanitization names, tool_dispatch_helpers
names) — 41 names run_agent never used itself — and the `_STREAM_DIAG_HEADERS`
back-compat class alias (no in-tree reader). run_agent now imports only what
it uses (get_toolset_for_tool, is_local_endpoint, coalesce/uniquify tool-call
ids, cleanup_vm/get_active_env from terminal_tool_lifecycle).
agent/*: `_ra().X` late-binds that only reached a re-export now import the
defining module directly (agent_runtime_helpers -> process_bootstrap.OpenAI,
model_tools.handle_function_call, session_persistence._safe_session_filename_component;
agent_init -> model_tools.get_tool_definitions/check_toolset_requirements,
_lazy_headers("agent.client_lifecycle", ...) for qwen/routermint;
system_prompt -> agent.prompt_builder / model_tools directly, dropping its
own _ra() shim and the `_r` parameter threading). `_ra()` stays for
run_agent-resident names (logger, AIAgent, _hermes_home, _set_interrupt, ...).
toolsets.py: remove resolve_multiple_toolsets (shim-only, restored by
34abf954bd); tests/test_toolsets.py pins the same union behavior via
resolve_toolset over each name.
providers/__init__.py: drop the OMIT_TEMPERATURE re-export (no callers via the
package); ProviderProfile stays because __init__ uses it for annotations —
2 tests repointed to providers.base.
agent/iteration_budget.py: drop the "run_agent re-exports the class"
docstring pointer; 4 tests import IterationBudget from its home.
model_tools.py (arg_coercion names), agent/tool_executor.py, and
hermes_cli/cli_session_mixin.py repoints landed via a sibling commit on this
shared worktree.
Callers repointed: gateway/run.py, hermes_cli/cli_chat_turn_mixin.py,
hermes_cli/cli_tui_mixin.py, tui_gateway/session_workdir.py,
agent/transports/codex.py (one-line imports) + comment pointers in
tools/file_state.py, tools/schema_sanitizer.py, scripts/tool_search_livetest.py.
Tests: patch("run_agent.X") / monkeypatch.setattr(run_agent, "X") /
`from run_agent import X` -> defining module across 99 test files.
84 lines
3.2 KiB
Python
84 lines
3.2 KiB
Python
"""Regression test for #26145: credential pool rotation after interrupt-resume.
|
|
|
|
When has_retried_429 is lost (user cancels between 429s), the pool should
|
|
still rotate if the current credential is already marked exhausted.
|
|
"""
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from agent.credential_pool import PooledCredential, STATUS_EXHAUSTED
|
|
from agent.error_classifier import FailoverReason
|
|
|
|
|
|
def _make_entry(idx, **overrides):
|
|
defaults = dict(
|
|
provider="test-provider",
|
|
id=f"cred-{idx}",
|
|
label=f"Credential {idx}",
|
|
auth_type="api_key",
|
|
priority=idx,
|
|
source="manual",
|
|
access_token=f"key-{idx}",
|
|
)
|
|
defaults.update(overrides)
|
|
return PooledCredential(**defaults)
|
|
|
|
|
|
def _make_pool(entries):
|
|
pool = MagicMock()
|
|
pool.entries = MagicMock(return_value=entries)
|
|
pool.current.return_value = entries[0]
|
|
# Must be set explicitly — MagicMock.provider returns a truthy
|
|
# child mock, which would trigger the provider-mismatch guard.
|
|
pool.provider = ""
|
|
return pool
|
|
|
|
|
|
def test_rotate_immediately_when_credential_already_exhausted():
|
|
"""If current credential has last_status='exhausted', rotate on first 429
|
|
instead of retrying (Option A fix for #26145)."""
|
|
entries = [_make_entry(0, last_status=STATUS_EXHAUSTED, last_error_code=429), _make_entry(1)]
|
|
pool = _make_pool(entries)
|
|
pool.mark_exhausted_and_rotate.return_value = entries[1]
|
|
|
|
from run_agent import AIAgent
|
|
with patch("model_tools.get_tool_definitions", return_value=[]), patch("model_tools.check_toolset_requirements", return_value={}), patch("agent.process_bootstrap.OpenAI"):
|
|
agent = MagicMock(spec=AIAgent)
|
|
agent._credential_pool = pool
|
|
agent._swap_credential = MagicMock()
|
|
recovered, retried = AIAgent._recover_with_credential_pool(
|
|
agent,
|
|
status_code=429,
|
|
has_retried_429=False, # Key: False on first 429 after interrupt
|
|
classified_reason=FailoverReason.rate_limit,
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retried is False
|
|
pool.mark_exhausted_and_rotate.assert_called_once()
|
|
agent._swap_credential.assert_called_once_with(entries[1])
|
|
|
|
|
|
|
|
|
|
def test_rotate_on_second_429_when_not_exhausted():
|
|
"""When credential is active and this is the second 429, rotate (existing behavior)."""
|
|
entries = [_make_entry(0, last_status=None), _make_entry(1)]
|
|
pool = _make_pool(entries)
|
|
pool.mark_exhausted_and_rotate.return_value = entries[1]
|
|
|
|
from run_agent import AIAgent
|
|
with patch("model_tools.get_tool_definitions", return_value=[]), patch("model_tools.check_toolset_requirements", return_value={}), patch("agent.process_bootstrap.OpenAI"):
|
|
agent = MagicMock(spec=AIAgent)
|
|
agent._credential_pool = pool
|
|
agent._swap_credential = MagicMock()
|
|
recovered, retried = AIAgent._recover_with_credential_pool(
|
|
agent,
|
|
status_code=429,
|
|
has_retried_429=True, # Second 429
|
|
classified_reason=FailoverReason.rate_limit,
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retried is False
|
|
pool.mark_exhausted_and_rotate.assert_called_once()
|