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.
102 lines
3.5 KiB
Python
102 lines
3.5 KiB
Python
"""Tests for Nous fallback local-availability suppression.
|
|
|
|
Blocker if Nous token material is missing locally: the fallback chain
|
|
should not repeatedly attempt Nous resolution; it must skip and continue
|
|
to the next provider.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import patch
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _make_agent(fallback_model=None):
|
|
with (
|
|
patch("model_tools.get_tool_definitions", return_value=[]),
|
|
patch("model_tools.check_toolset_requirements", return_value={}),
|
|
patch("agent.process_bootstrap.OpenAI"),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="test-key",
|
|
provider="openai-codex",
|
|
base_url="https://chatgpt.com/backend-api/codex",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
fallback_model=fallback_model,
|
|
)
|
|
agent.client = None
|
|
return agent
|
|
|
|
|
|
def _mock_client(base_url="https://chatgpt.com/backend-api/codex", api_key="fb-key"):
|
|
mock = type("Client", (), {})()
|
|
mock.base_url = base_url
|
|
mock.api_key = api_key
|
|
mock.chat = type("Chat", (), {})()
|
|
mock.chat.completions = type("Completions", (), {})()
|
|
mock.chat.completions.create = lambda *args, **kwargs: None
|
|
return mock
|
|
|
|
|
|
class TestNousFallbackLocalAvailability:
|
|
def test_missing_nous_token_is_skipped_once(self):
|
|
"""Nous fallback is skipped when no access/refresh token is stored."""
|
|
agent = _make_agent(
|
|
fallback_model=[
|
|
{"provider": "nous", "model": "anthropic/claude-sonnet-4.6"},
|
|
{"provider": "openai-codex", "model": "gpt-5.5"},
|
|
]
|
|
)
|
|
with patch(
|
|
"hermes_cli.auth.get_provider_auth_state",
|
|
return_value={},
|
|
), patch(
|
|
"agent.auxiliary_client.resolve_provider_client",
|
|
return_value=(_mock_client(api_key="fb"), "gpt-5.5"),
|
|
):
|
|
activated = agent._try_activate_fallback(None)
|
|
assert activated is True
|
|
assert agent.model == "gpt-5.5"
|
|
|
|
def test_nous_unavailable_not_retried_in_same_session(self):
|
|
"""After Nous is skipped once, subsequent activations continue further."""
|
|
agent = _make_agent(
|
|
fallback_model=[
|
|
{"provider": "nous", "model": "anthropic/claude-sonnet-4.6"},
|
|
{"provider": "openai-codex", "model": "gpt-5.5"},
|
|
]
|
|
)
|
|
with patch(
|
|
"hermes_cli.auth.get_provider_auth_state",
|
|
return_value={},
|
|
):
|
|
agent._try_activate_fallback(None)
|
|
key = (
|
|
"nous",
|
|
"anthropic/claude-sonnet-4.6",
|
|
"",
|
|
)
|
|
assert key in getattr(agent, "_unavailable_fallback_keys", set())
|
|
|
|
def test_present_nous_token_allows_activation(self):
|
|
"""Nous is considered when token material exists."""
|
|
agent = _make_agent(
|
|
fallback_model=[
|
|
{"provider": "nous", "model": "anthropic/claude-sonnet-4.6"},
|
|
{"provider": "openai-codex", "model": "gpt-5.5"},
|
|
]
|
|
)
|
|
with patch(
|
|
"hermes_cli.auth.get_provider_auth_state",
|
|
return_value={"access_token": "abc", "refresh_token": "xyz"},
|
|
), patch(
|
|
"agent.auxiliary_client.resolve_provider_client",
|
|
return_value=(_mock_client(api_key="fb"), "anthropic/claude-sonnet-4.6"),
|
|
):
|
|
activated = agent._try_activate_fallback(None)
|
|
assert activated is True
|
|
assert agent.provider == "nous"
|