# Conflicts: # apps/desktop/e2e/archived-hidden-session-recoverable.spec.ts # apps/desktop/e2e/bot-chat-message-agent-friendly-name.spec.ts # apps/desktop/e2e/bot-mailbox-unreadable-ticket.spec.ts # apps/desktop/e2e/bot-mode-roster-localized.spec.ts # apps/desktop/e2e/bot-mode-row-click-mirrors-registry.spec.ts # apps/desktop/e2e/bot-mode-tab-shows-bot-name.spec.ts # apps/desktop/e2e/bot-roster-group-row-organisation.spec.ts # apps/desktop/e2e/bot-roster-ignores-infra-dirs.spec.ts # apps/desktop/e2e/bot-roster-timestamp-meta.spec.ts # apps/desktop/e2e/bot-roster-user-sections.spec.ts # apps/desktop/e2e/bot-routines-pane-narrow.spec.ts # apps/desktop/e2e/bot-row-open-recent-session.spec.ts # apps/desktop/e2e/bot-tile-ignores-ambient-composer-model.spec.ts # apps/desktop/e2e/group-composer-auto-grow.spec.ts # apps/desktop/e2e/group-create-gate-remote-roster.spec.ts # apps/desktop/e2e/group-prompt-renamed-primary-handle.spec.ts # apps/desktop/e2e/hosted-room-backend-continuity.spec.ts # apps/desktop/e2e/hosted-room-legacy-store-migration.spec.ts # apps/desktop/e2e/settings-scope-chips-bot-title.spec.ts # apps/desktop/e2e/worktree-branch-status.spec.ts # apps/desktop/electron/backend-probes.test.ts # apps/desktop/electron/connection-apply.test.ts # apps/desktop/electron/desktop-electron-pin.test.ts # apps/desktop/electron/desktop-uninstall.test.ts # apps/desktop/electron/gateway-file-download-transport.test.ts # apps/desktop/electron/gateway-stop-before-update.test.ts # apps/desktop/electron/github-api-auth.test.ts # apps/desktop/electron/registry-primary-profile-scope.test.ts # apps/desktop/electron/update-api-check.test.ts # apps/desktop/electron/update-handoff-marker.test.ts # apps/desktop/electron/venv-blocker-scan.test.ts # apps/desktop/scripts/after-extract.test.mjs # apps/desktop/scripts/local-pack-publish.test.mjs # apps/desktop/scripts/tasks-scroll.test.mjs # apps/desktop/src/app/settings/model-settings.test.tsx # apps/desktop/src/app/updates-overlay.blockers.test.tsx # apps/desktop/src/components/desktop-install-overlay.test.tsx # apps/desktop/src/lib/update-copy.test.ts # scripts/ci/check_os_marker_fakes.py # tests-js/desktop-mac-usage-descriptions.test.ts # tests-js/node-engine-alignment.test.ts # tests/agent/lsp/test_install_and_lint_fixes.py # tests/agent/test_command_token_source.py # tests/agent/test_compression_boundary_hook.py # tests/agent/test_create_openai_client_ssl_verify.py # tests/agent/test_custom_provider_ca_probes.py # tests/agent/test_endpoint_blackhole.py # tests/agent/test_estimator_parity.py # tests/agent/test_in_place_compaction.py # tests/agent/test_moa_loop_mode.py # tests/agent/test_model_metadata.py # tests/agent/test_skill_session_platform_gate.py # tests/agent/test_skill_utils.py # tests/agent/test_ssl_ca_guard.py # tests/computer_use/test_doctor.py # tests/cron/test_codex_execution_paths.py # tests/cron/test_cron_bot_chat_delivery.py # tests/cron/test_cron_script.py # tests/cron/test_media_delivery_parity.py # tests/cron/test_misfire_catchup.py # tests/cron/test_parallel_pool.py # tests/cron/test_recurring_eagain_redispatch.py # tests/gateway/test_choice_picker.py # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_dingtalk.py # tests/gateway/test_feishu.py # tests/gateway/test_feishu_onboard.py # tests/gateway/test_gateway_shutdown.py # tests/gateway/test_matrix.py # tests/gateway/test_model_command_custom_providers.py # tests/gateway/test_reasoning_command.py # tests/gateway/test_runtime_footer.py # tests/gateway/test_session.py # tests/gateway/test_session_hygiene.py # tests/gateway/test_status.py # tests/gateway/test_teams.py # tests/gateway/test_turn_lease.py # tests/gateway/test_whatsapp_connect.py # tests/hermes_cli/test_approvals_command.py # tests/hermes_cli/test_auth_store_lock_concurrent.py # tests/hermes_cli/test_backup.py # tests/hermes_cli/test_banner_git_state.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_compat_manifest_targets.py # tests/hermes_cli/test_computer_use_cli.py # tests/hermes_cli/test_cpr_local_leak.py # tests/hermes_cli/test_dashboard_auth_gate.py # tests/hermes_cli/test_dashboard_procs_kill_grace.py # tests/hermes_cli/test_desktop_lifecycle_windows_live.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_command_install.py # tests/hermes_cli/test_fleet_config_migration_windows_live.py # tests/hermes_cli/test_gateway.py # tests/hermes_cli/test_gateway_platform_gating.py # tests/hermes_cli/test_gateway_restart_loop.py # tests/hermes_cli/test_gateway_task_probe.py # tests/hermes_cli/test_gateway_wsl.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_install_cua_driver.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_command_exports.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_linux_desktop_entry.py # tests/hermes_cli/test_local_runtime.py # tests/hermes_cli/test_local_runtime_updates.py # tests/hermes_cli/test_managed_uv.py # tests/hermes_cli/test_mcp_reload_confirm_gate.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_npm_engine.py # tests/hermes_cli/test_personality_none.py # tests/hermes_cli/test_pet_toggle.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_plugin_event_bus.py # tests/hermes_cli/test_plugin_manifest_v2.py # tests/hermes_cli/test_plugin_packs.py # tests/hermes_cli/test_plugins_cmd.py # tests/hermes_cli/test_plugins_cmd_enable_disable_nested.py # tests/hermes_cli/test_process_identity.py # tests/hermes_cli/test_profiles.py # tests/hermes_cli/test_profiles_sidebar_cache.py # tests/hermes_cli/test_pty_bridge.py # tests/hermes_cli/test_resolve_turn_limit.py # tests/hermes_cli/test_serve_runtime_inventory.py # tests/hermes_cli/test_session_vacuum_config.py # tests/hermes_cli/test_set_config_value.py # tests/hermes_cli/test_signal_handler_kanban_worker.py # tests/hermes_cli/test_slash_confirm_windows.py # tests/hermes_cli/test_stale_pid_guard.py # tests/hermes_cli/test_startup_fast_guards.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_telegram_managed_bot.py # tests/hermes_cli/test_tools_config.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_autostash.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_fetch_failure_classifier.py # tests/hermes_cli/test_update_fleet_probe_resume_token.py # tests/hermes_cli/test_update_handoff_backend_reap.py # tests/hermes_cli/test_update_handoff_desktop_rebuild.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_host_obligation.py # tests/hermes_cli/test_update_import_guard.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_update_inventory.py # tests/hermes_cli/test_update_launchd_unloaded_gateway.py # tests/hermes_cli/test_update_missing_configured_deps.py # tests/hermes_cli/test_update_modified_notice.py # tests/hermes_cli/test_update_multiplex_migration_hook.py # tests/hermes_cli/test_update_no_gateway_restart.py # tests/hermes_cli/test_update_orphan_backend_reap.py # tests/hermes_cli/test_update_parked_branch_guard.py # tests/hermes_cli/test_update_post_pull_syntax_guard.py # tests/hermes_cli/test_update_receipt.py # tests/hermes_cli/test_update_self_lock.py # tests/hermes_cli/test_update_shim_fail_closed.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_update_sqlite_remediation.py # tests/hermes_cli/test_update_stale_dashboard.py # tests/hermes_cli/test_update_stale_virtualenv.py # tests/hermes_cli/test_update_venv_health.py # tests/hermes_cli/test_update_venv_ownership_preflight.py # tests/hermes_cli/test_update_wedged_gateway.py # tests/hermes_cli/test_update_yes_flag.py # tests/hermes_cli/test_update_zip_two_phase.py # tests/hermes_cli/test_urllib_security.py # tests/hermes_cli/test_ux_messages_auth_config.py # tests/hermes_cli/test_ux_messages_startup.py # tests/hermes_cli/test_venv_holder_classifier.py # tests/hermes_cli/test_verify_console_scripts.py # tests/hermes_cli/test_verify_core_dependencies.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_server_console_ws.py # tests/hermes_cli/test_web_server_ws_ping.py # tests/hermes_cli/test_web_ui_build.py # tests/hermes_state/test_fts_rebuild_admission.py # tests/hermes_state/test_hermes_state.py # tests/plugins/memory/test_memory_lazy_install.py # tests/plugins/test_google_meet_plugin.py # tests/plugins/test_langfuse_plugin.py # tests/plugins/test_security_guidance_plugin.py # tests/plugins/test_transform_llm_output_hook.py # tests/scripts/desktop_update/test_desktop_update_windows_gateway_flag.py # tests/scripts/desktop_update/test_desktop_update_windows_python_handoff.py # tests/scripts/desktop_update/test_desktop_update_windows_timestamp.py # tests/scripts/install/test_install_clone_throttle_fallback.py # tests/scripts/install/test_install_lockfile_churn.py # tests/scripts/install/test_install_no_initial_commit.py # tests/scripts/install/test_install_sh_browser_install.py # tests/scripts/install/test_install_sh_node_prerelease.py # tests/scripts/install/test_install_sh_symlink_stomp.py # tests/scripts/install/test_install_sh_uv_lock_config.py # tests/scripts/install/test_install_unmerged_index.py # tests/scripts/test_contributor_map.py # tests/scripts/test_run_tests_parallel.py # tests/skills/test_competitor_news_monitor_skill.py # tests/skills/test_document_to_action_items_skill.py # tests/skills/test_google_workspace_setup.py # tests/skills/test_google_workspace_setup_deps.py # tests/skills/test_grounded_citations_skill.py # tests/skills/test_ip_as_logo_skill.py # tests/skills/test_live_dashboard_skill.py # tests/skills/test_mcp_oauth_remote_gateway_skill.py # tests/skills/test_office_document_skills.py # tests/skills/test_openclaw_migration.py # tests/skills/test_product_price_monitor_skill.py # tests/skills/test_scrollcraft_skill.py # tests/skills/test_setup_wizard_generator_skill.py # tests/skills/test_weekly_review_planning_skill.py # tests/test_engines_satisfiable.py # tests/test_fast_safe_load.py # tests/test_hermes_bootstrap.py # tests/test_hermes_constants.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/test_model_tools_async_bridge.py # tests/test_packaging_build_guard.py # tests/test_packaging_metadata.py # tests/test_yaml_indent_consistency.py # tests/tools/test_approval_timeout_overflow.py # tests/tools/test_base_environment.py # tests/tools/test_bot_mode_dm.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_hardening.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_use_cli.py # tests/tools/test_clipboard.py # tests/tools/test_code_execution.py # tests/tools/test_code_execution_modes.py # tests/tools/test_code_execution_windows_env.py # tests/tools/test_computer_use.py # tests/tools/test_delegate_liveness_timeout.py # tests/tools/test_execute_code_approval_cluster.py # tests/tools/test_execution_flag_detection.py # tests/tools/test_fal_common.py # tests/tools/test_file_operations.py # tests/tools/test_file_tools.py # tests/tools/test_file_tools_cwd_resolution.py # tests/tools/test_file_tools_live.py # tests/tools/test_lazy_deps.py # tests/tools/test_lazy_deps_durable_target.py # tests/tools/test_lazy_deps_managed.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_local_tempdir.py # tests/tools/test_macos_protected_search.py # tests/tools/test_mcp_npx_cached_bin.py # tests/tools/test_oneshot_completion_linger.py # tests/tools/test_process_registry.py # tests/tools/test_read_file_schema_gating.py # tests/tools/test_skill_improvements.py # tests/tools/test_skills_sync.py # tests/tools/test_termux_api_detection.py # tests/tools/test_tirith_security.py # tests/tools/test_transcription_tools.py # tests/tools/test_tts_streaming.py # tests/tools/test_wake_word.py # tests/tui_gateway/test_compute_host_borrowed_lease.py # tests/tui_gateway/test_compute_host_turn_protocol.py # tests/tui_gateway/test_isolated_orphan_activity.py # tests/tui_gateway/test_protocol.py # tests/tui_gateway/test_slash_worker_profile_home.py # tests/tui_gateway/test_subprocess_encoding.py # tests/tui_gateway/test_tui_gateway_server.py # ui-tui/src/__tests__/terminalParity.test.ts # ui-tui/src/__tests__/termuxComposerLayout.test.ts # ui-tui/src/__tests__/textInputFastEcho.test.ts
163 lines
7.3 KiB
Python
163 lines
7.3 KiB
Python
"""Tests for fallback credential pool isolation.
|
|
|
|
Verifies that fallback activation isolates the credential pool from the
|
|
primary provider, preventing two bugs:
|
|
|
|
1. GH #33163: fallback retains primary's base_url → requests go to wrong endpoint
|
|
2. GH #33088: fallback provider's 429 exhausts primary credential pool
|
|
|
|
Both bugs share the same root cause: _recover_with_credential_pool and
|
|
_swap_credential continue operating on the PRIMARY's credential pool during
|
|
fallback calls, contaminating primary state with fallback-provider errors.
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
# ── Helpers ──────────────────────────────────────────────────────────
|
|
|
|
def _make_pool(provider, n_entries=1):
|
|
"""Create a mock credential pool with N entries."""
|
|
pool = MagicMock()
|
|
pool.provider = provider
|
|
pool.has_credentials.return_value = n_entries > 0
|
|
pool.has_available.return_value = n_entries > 0
|
|
entry = MagicMock()
|
|
entry.id = f"{provider}-entry-0"
|
|
entry.runtime_api_key = f"key-{provider}"
|
|
entry.runtime_base_url = f"https://{provider}.example.com/v1"
|
|
entry.access_token = f"token-{provider}"
|
|
entry.base_url = f"https://{provider}.example.com/v1"
|
|
pool.current.return_value = entry
|
|
pool.mark_exhausted_and_rotate.return_value = entry
|
|
return pool
|
|
|
|
def _make_agent(provider="openai-codex", model="gpt-5.5",
|
|
base_url="https://chatgpt.com/backend-api/codex",
|
|
api_mode="codex_responses"):
|
|
"""Create a minimal AIAgent-like object with just the fields we need."""
|
|
agent = MagicMock()
|
|
agent.provider = provider
|
|
agent.model = model
|
|
agent.base_url = base_url
|
|
agent.api_mode = api_mode
|
|
agent.api_key = "primary-key"
|
|
agent._fallback_activated = False
|
|
agent._fallback_index = 0
|
|
agent._fallback_chain = []
|
|
agent._primary_runtime = {
|
|
"provider": provider,
|
|
"model": model,
|
|
"base_url": base_url,
|
|
"api_mode": api_mode,
|
|
"api_key": "primary-key",
|
|
"client_kwargs": {
|
|
"api_key": "primary-key",
|
|
"base_url": base_url,
|
|
},
|
|
"use_prompt_caching": False,
|
|
"use_native_cache_layout": False,
|
|
"anthropic_api_key": "",
|
|
"anthropic_base_url": "",
|
|
}
|
|
agent._config_context_length = None
|
|
agent._credential_pool = _make_pool(provider)
|
|
agent._rate_limited_until = 0
|
|
agent._transport_cache = {}
|
|
agent._client_kwargs = {
|
|
"api_key": "primary-key",
|
|
"base_url": base_url,
|
|
}
|
|
return agent
|
|
|
|
# ── Test: _try_activate_fallback clears mismatched pool ──────────────
|
|
|
|
class TestFallbackCredentialIsolation:
|
|
"""Test that _try_activate_fallback isolates the credential pool."""
|
|
|
|
def test_fallback_attaches_matching_pool_after_clear(self):
|
|
"""Provider-switch fallback should attach the fallback provider's pool."""
|
|
from agent.chat_completion_helpers import try_activate_fallback
|
|
|
|
agent = _make_agent(
|
|
provider="ollama-cloud",
|
|
model="glm-5.2",
|
|
base_url="https://ollama.com/v1",
|
|
api_mode="chat_completions",
|
|
)
|
|
agent._fallback_chain = [{"provider": "openai-codex", "model": "gpt-5.5"}]
|
|
agent._credential_pool = _make_pool("ollama-cloud")
|
|
agent._buffer_status = MagicMock()
|
|
agent._is_azure_openai_url.return_value = False
|
|
agent._is_direct_openai_url.return_value = False
|
|
agent._provider_model_requires_responses_api.return_value = False
|
|
agent._anthropic_prompt_cache_policy.return_value = (False, False)
|
|
agent._ensure_lmstudio_runtime_loaded = MagicMock()
|
|
agent._replace_primary_openai_client = MagicMock()
|
|
agent.context_compressor = None
|
|
|
|
fallback_client = SimpleNamespace(
|
|
api_key="codex-key",
|
|
base_url="https://chatgpt.com/backend-api/codex",
|
|
_custom_headers={},
|
|
)
|
|
fallback_pool = _make_pool("openai-codex")
|
|
|
|
with patch(
|
|
"agent.auxiliary_client.resolve_provider_client",
|
|
return_value=(fallback_client, "gpt-5.5"),
|
|
) as resolve_provider_client, patch(
|
|
"agent.credential_pool.load_pool",
|
|
return_value=fallback_pool,
|
|
) as load_pool:
|
|
assert try_activate_fallback(agent) is True
|
|
|
|
resolve_provider_client.assert_called_once()
|
|
# Loaded once for the exhausted-pool pre-check and once to attach; both for the fallback provider only.
|
|
assert {c.args for c in load_pool.call_args_list} == {("openai-codex",)}
|
|
assert agent.provider == "openai-codex"
|
|
assert agent.model == "gpt-5.5"
|
|
assert agent.base_url == "https://chatgpt.com/backend-api/codex"
|
|
assert agent.api_mode == "codex_responses"
|
|
assert agent._credential_pool is fallback_pool
|
|
assert agent._credential_pool.provider == "openai-codex"
|
|
assert agent._transport_cache == {}
|
|
|
|
def test_fallback_skips_a_candidate_whose_pool_is_exhausted_for_hours(self):
|
|
"""#89401: a fallback whose every credential is benched until the weekly quota resets is
|
|
skipped before any client is built; a short throttle on the next candidate is still tried."""
|
|
import time
|
|
from agent.chat_completion_helpers import try_activate_fallback
|
|
|
|
agent = _make_agent(provider="anthropic", model="claude", base_url="https://api.anthropic.com", api_mode="chat_completions")
|
|
agent._fallback_chain = [{"provider": "openai-codex", "model": "gpt-5.5"}, {"provider": "openrouter", "model": "m"}]
|
|
agent._credential_pool = _make_pool("anthropic")
|
|
agent._buffer_status = MagicMock()
|
|
agent._is_azure_openai_url.return_value = False
|
|
agent._is_direct_openai_url.return_value = False
|
|
agent._provider_model_requires_responses_api.return_value = False
|
|
agent._anthropic_prompt_cache_policy.return_value = (False, False)
|
|
agent._ensure_lmstudio_runtime_loaded = MagicMock()
|
|
agent._replace_primary_openai_client = MagicMock()
|
|
agent.context_compressor = None
|
|
|
|
benched = _make_pool("openai-codex")
|
|
benched.has_available.return_value = False
|
|
benched.next_available_at.return_value = time.time() + 30995
|
|
throttled = _make_pool("openrouter")
|
|
throttled.has_available.return_value = False
|
|
throttled.next_available_at.return_value = time.time() + 30
|
|
pools = {"openai-codex": benched, "openrouter": throttled}
|
|
client = SimpleNamespace(api_key="k", base_url="https://openrouter.ai/api/v1", _custom_headers={})
|
|
|
|
with patch("agent.auxiliary_client.resolve_provider_client", return_value=(client, "m")) as resolve, \
|
|
patch("agent.credential_pool.load_pool", side_effect=lambda p: pools[p]):
|
|
assert try_activate_fallback(agent) is True
|
|
|
|
assert resolve.call_count == 1 and resolve.call_args.args[0] == "openrouter"
|
|
assert agent.provider == "openrouter" and agent._credential_pool is throttled
|
|
|
|
# ── Test: _recover_with_credential_pool rejects mismatched pool ──────
|
|
|
|
# ── Test: base_url not overwritten after fallback ────────────────────
|