# 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
538 lines
22 KiB
Python
538 lines
22 KiB
Python
"""Tests that `hermes model` always shows the model selection menu for custom
|
|
providers, even when a model is already saved.
|
|
|
|
Regression test for the bug where _model_flow_named_custom() returned
|
|
immediately when provider_info had a saved ``model`` field, making it
|
|
impossible to switch models on multi-model endpoints.
|
|
"""
|
|
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def config_home(tmp_path, monkeypatch):
|
|
"""Isolated HERMES_HOME with a minimal config."""
|
|
home = tmp_path / "hermes"
|
|
home.mkdir()
|
|
config_yaml = home / "config.yaml"
|
|
config_yaml.write_text("model: old-model\ncustom_providers: []\n")
|
|
env_file = home / ".env"
|
|
env_file.write_text("")
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
monkeypatch.delenv("HERMES_MODEL", raising=False)
|
|
monkeypatch.delenv("LLM_MODEL", raising=False)
|
|
monkeypatch.delenv("HERMES_INFERENCE_PROVIDER", raising=False)
|
|
monkeypatch.delenv("OPENAI_BASE_URL", raising=False)
|
|
monkeypatch.delenv("OPENAI_API_KEY", raising=False)
|
|
return home
|
|
|
|
|
|
class TestCustomProviderModelSwitch:
|
|
"""Ensure _model_flow_named_custom always probes and shows menu."""
|
|
|
|
def test_custom_endpoint_switch_prunes_stale_model_config_pool_entry(
|
|
self,
|
|
config_home,
|
|
):
|
|
"""Switching custom endpoints must not leave the old model.api_key
|
|
credential selectable from the previous endpoint's pool."""
|
|
import hermes_yaml as yaml
|
|
from agent.credential_pool import load_pool
|
|
from hermes_cli.auth import read_credential_pool, write_credential_pool
|
|
from hermes_cli.model_setup_flows import _model_flow_custom
|
|
|
|
config_path = config_home / "config.yaml"
|
|
config_path.write_text(
|
|
"model:\n"
|
|
" default: old-model\n"
|
|
" provider: custom\n"
|
|
" base_url: https://old.example.test/v1\n"
|
|
" api_key: sk-old-model-config\n"
|
|
"custom_providers:\n"
|
|
"- name: Old Endpoint\n"
|
|
" base_url: https://old.example.test/v1\n"
|
|
" api_key: sk-old-config\n"
|
|
" model: old-model\n"
|
|
)
|
|
write_credential_pool(
|
|
"custom:old-endpoint",
|
|
[
|
|
{
|
|
"id": "old-model-config",
|
|
"source": "model_config",
|
|
"auth_type": "api_key",
|
|
"access_token": "sk-old-model-config",
|
|
"base_url": "https://old.example.test/v1",
|
|
"label": "model_config",
|
|
},
|
|
{
|
|
"id": "old-manual",
|
|
"source": "manual",
|
|
"auth_type": "api_key",
|
|
"access_token": "sk-old-manual",
|
|
"base_url": "https://old.example.test/v1",
|
|
"label": "manual",
|
|
},
|
|
],
|
|
)
|
|
|
|
with patch(
|
|
"hermes_cli.models.probe_api_models",
|
|
return_value={
|
|
"models": ["new-model"],
|
|
"used_fallback": False,
|
|
"probed_url": "https://new.example.test/v1/models",
|
|
},
|
|
), \
|
|
patch("hermes_cli.secret_prompt.masked_secret_prompt", return_value="sk-new"), \
|
|
patch("hermes_cli.main_provider_setup._prompt_custom_api_mode_selection", return_value=""), \
|
|
patch(
|
|
"builtins.input",
|
|
side_effect=[
|
|
"https://new.example.test/v1",
|
|
"",
|
|
"",
|
|
"New Endpoint",
|
|
],
|
|
), \
|
|
patch("builtins.print"):
|
|
_model_flow_custom({})
|
|
|
|
auth = read_credential_pool(None)
|
|
old_sources = [
|
|
entry.get("source")
|
|
for entry in auth.get("custom:old-endpoint", [])
|
|
if isinstance(entry, dict)
|
|
]
|
|
assert old_sources == ["manual"]
|
|
|
|
new_pool = load_pool("custom:new-endpoint")
|
|
selected = new_pool.select()
|
|
assert selected is not None
|
|
assert selected.access_token == "sk-new"
|
|
|
|
config = yaml.safe_load(config_path.read_text()) or {}
|
|
assert config["model"]["base_url"] == "https://new.example.test/v1"
|
|
|
|
|
|
|
|
|
|
def test_env_template_api_key_is_preserved_in_model_config(self, config_home, monkeypatch):
|
|
"""Selecting an env-backed custom provider must not inline the secret."""
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
config_path = config_home / "config.yaml"
|
|
config_path.write_text(
|
|
"model:\n"
|
|
" default: old-model\n"
|
|
" provider: openrouter\n"
|
|
"custom_providers:\n"
|
|
"- name: Example Provider\n"
|
|
" base_url: https://api.example-provider.test/v1\n"
|
|
" api_key: ${EXAMPLE_PROVIDER_API_KEY}\n"
|
|
" model: qwen3.6-35b-fast\n"
|
|
)
|
|
monkeypatch.setenv("EXAMPLE_PROVIDER_API_KEY", "sk-live-example-provider")
|
|
|
|
provider_info = {
|
|
"name": "Example Provider",
|
|
"base_url": "https://api.example-provider.test/v1",
|
|
"api_key": "sk-live-example-provider",
|
|
"api_key_ref": "${EXAMPLE_PROVIDER_API_KEY}",
|
|
"model": "qwen3.6-35b-fast",
|
|
}
|
|
|
|
with patch("hermes_cli.models.fetch_api_models", return_value=["qwen3.6-35b-fast"]) as mock_fetch, \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="1"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
assert mock_fetch.call_args.args[0] == "sk-live-example-provider"
|
|
config = yaml.safe_load(config_path.read_text()) or {}
|
|
assert config["model"]["api_key"] == "${EXAMPLE_PROVIDER_API_KEY}"
|
|
assert config["custom_providers"][0]["api_key"] == "${EXAMPLE_PROVIDER_API_KEY}"
|
|
assert "sk-live-example-provider" not in config_path.read_text()
|
|
|
|
def test_key_env_custom_provider_persists_reference_not_secret(self, config_home, monkeypatch):
|
|
"""key_env custom providers should also avoid writing plaintext keys."""
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
config_path = config_home / "config.yaml"
|
|
config_path.write_text(
|
|
"model:\n"
|
|
" default: old-model\n"
|
|
"custom_providers:\n"
|
|
"- name: Example Provider\n"
|
|
" base_url: https://api.example-provider.test/v1\n"
|
|
" key_env: EXAMPLE_PROVIDER_API_KEY\n"
|
|
" model: qwen3.6-35b-fast\n"
|
|
)
|
|
monkeypatch.setenv("EXAMPLE_PROVIDER_API_KEY", "sk-live-example-provider")
|
|
|
|
provider_info = {
|
|
"name": "Example Provider",
|
|
"base_url": "https://api.example-provider.test/v1",
|
|
"api_key": "",
|
|
"key_env": "EXAMPLE_PROVIDER_API_KEY",
|
|
"model": "qwen3.6-35b-fast",
|
|
}
|
|
|
|
with patch("hermes_cli.models.fetch_api_models", return_value=["qwen3.6-35b-fast"]), \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="1"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
config = yaml.safe_load(config_path.read_text()) or {}
|
|
assert config["model"]["api_key"] == "${EXAMPLE_PROVIDER_API_KEY}"
|
|
assert config["custom_providers"][0]["key_env"] == "EXAMPLE_PROVIDER_API_KEY"
|
|
assert "sk-live-example-provider" not in config_path.read_text()
|
|
|
|
def test_env_ref_base_url_preserves_api_key_ref_through_picker(
|
|
self, config_home, monkeypatch
|
|
):
|
|
"""Integration regression: when BOTH ``base_url`` and ``api_key`` use
|
|
``${VAR}`` templates (the Discord-reported NeuralWatt case), the picker
|
|
must still preserve the env reference in ``model.api_key``.
|
|
|
|
The earlier lookup went through ``get_compatible_custom_providers``
|
|
which dropped entries whose ``base_url`` was an env-ref template
|
|
(``urlparse("${NEURALWATT_API_BASE}")`` has no scheme/netloc), causing
|
|
``api_key_ref`` to stay empty and the resolved secret to be written to
|
|
``config.yaml``. This test drives the real picker-callsite code path.
|
|
"""
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.main import select_provider_and_model
|
|
|
|
config_path = config_home / "config.yaml"
|
|
config_path.write_text(
|
|
"model:\n"
|
|
" default: old-model\n"
|
|
" provider: openrouter\n"
|
|
"custom_providers:\n"
|
|
"- name: NeuralWatt\n"
|
|
" base_url: ${NEURALWATT_API_BASE}\n"
|
|
" api_key: ${NEURALWATT_API_KEY}\n"
|
|
" model: qwen3.6-35b-fast\n"
|
|
" models: []\n"
|
|
)
|
|
monkeypatch.setenv("NEURALWATT_API_BASE", "https://api.neuralwatt.com/v1")
|
|
monkeypatch.setenv("NEURALWATT_API_KEY", "sk-live-neuralwatt-secret")
|
|
|
|
# Exercise the real picker: select "custom:neuralwatt" from the
|
|
# provider menu. ``select_provider_and_model`` prompts for a provider
|
|
# choice (returns an index), then hands off to
|
|
# ``_model_flow_named_custom`` with the provider_info built by
|
|
# ``_named_custom_provider_map``.
|
|
def _pick_neuralwatt(labels, default=0):
|
|
for i, label in enumerate(labels):
|
|
if "NeuralWatt" in label:
|
|
return i
|
|
raise AssertionError(
|
|
f"NeuralWatt entry missing from provider menu: {labels}"
|
|
)
|
|
|
|
with patch("hermes_cli.main._prompt_provider_choice",
|
|
side_effect=_pick_neuralwatt), \
|
|
patch("hermes_cli.models.fetch_api_models",
|
|
return_value=["qwen3.6-35b-fast"]) as mock_fetch, \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="1"), \
|
|
patch("builtins.print"):
|
|
select_provider_and_model()
|
|
|
|
# The live probe must still use the resolved secret.
|
|
mock_fetch.assert_called_once()
|
|
probe_args, probe_kwargs = mock_fetch.call_args
|
|
assert probe_args[0] == "sk-live-neuralwatt-secret"
|
|
|
|
# But config.yaml must keep the env reference, not the plaintext secret.
|
|
saved = config_path.read_text()
|
|
config = yaml.safe_load(saved) or {}
|
|
assert config["model"]["api_key"] == "${NEURALWATT_API_KEY}"
|
|
assert config["custom_providers"][0]["api_key"] == "${NEURALWATT_API_KEY}"
|
|
assert "sk-live-neuralwatt-secret" not in saved
|
|
|
|
|
|
|
|
def test_key_env_providers_dict_entry_does_not_add_api_key(
|
|
self, config_home, monkeypatch
|
|
):
|
|
"""Regression for #15803: a ``providers:`` (keyed-schema) entry that
|
|
relies on ``key_env`` must not gain an ``api_key`` field after the
|
|
model picker runs.
|
|
|
|
Before the fix, ``_model_flow_named_custom`` synthesized
|
|
``api_key: ${KEY_ENV}`` from the resolved secret and wrote it to the
|
|
``providers.<key>`` entry, cluttering configs that intentionally keep
|
|
credentials out of ``config.yaml``. The entry already carries
|
|
``key_env``; the runtime resolves it directly, so no inline
|
|
``api_key`` belongs on disk.
|
|
"""
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
config_path = config_home / "config.yaml"
|
|
config_path.write_text(
|
|
"providers:\n"
|
|
" crs-henkee:\n"
|
|
" name: CRS Henkee\n"
|
|
" base_url: http://127.0.0.1:3000/api/v1\n"
|
|
" key_env: HERMES_CRS_HENKEE_KEY\n"
|
|
" transport: anthropic_messages\n"
|
|
" model: claude-opus-4-7\n"
|
|
" default_model: claude-opus-4-7\n"
|
|
"custom_providers: []\n"
|
|
)
|
|
monkeypatch.setenv("HERMES_CRS_HENKEE_KEY", "cr_live_secret_xyz")
|
|
|
|
# provider_info as built by _named_custom_provider_map for a
|
|
# ``providers:`` entry that has key_env but no inline api_key.
|
|
provider_info = {
|
|
"name": "CRS Henkee",
|
|
"base_url": "http://127.0.0.1:3000/api/v1",
|
|
"api_key": "",
|
|
"key_env": "HERMES_CRS_HENKEE_KEY",
|
|
"model": "claude-opus-4-7",
|
|
"api_mode": "anthropic_messages",
|
|
"provider_key": "crs-henkee",
|
|
"api_key_ref": "",
|
|
}
|
|
|
|
with patch(
|
|
"hermes_cli.models.fetch_api_models",
|
|
return_value=["claude-opus-4-7"],
|
|
) as mock_fetch, \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="1"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
# The /models probe must resolve the secret from the env var.
|
|
mock_fetch.assert_called_once()
|
|
probe_args, _ = mock_fetch.call_args
|
|
assert probe_args[0] == "cr_live_secret_xyz"
|
|
|
|
# The providers entry must NOT gain an api_key field — neither the
|
|
# plaintext secret nor a synthesized ${KEY_ENV} template.
|
|
saved_text = config_path.read_text()
|
|
saved = yaml.safe_load(saved_text) or {}
|
|
entry = saved["providers"]["crs-henkee"]
|
|
assert saved["model"]["provider"] == "custom:crs-henkee"
|
|
assert "api_key" not in entry, (
|
|
f"providers.crs-henkee gained an api_key field: {entry.get('api_key')!r}"
|
|
)
|
|
assert entry["key_env"] == "HERMES_CRS_HENKEE_KEY"
|
|
assert entry["default_model"] == "claude-opus-4-7"
|
|
|
|
# And the plaintext secret must never appear anywhere on disk.
|
|
assert "cr_live_secret_xyz" not in saved_text
|
|
# The synthesized template is also redundant here — key_env owns it.
|
|
assert "${HERMES_CRS_HENKEE_KEY}" not in saved_text
|
|
|
|
@pytest.mark.parametrize(
|
|
"stored_provider",
|
|
[
|
|
"local-127.0.0.1:11434",
|
|
"custom:local-ollama",
|
|
"custom:local-127.0.0.1:11434",
|
|
],
|
|
)
|
|
def test_picker_recognizes_current_provider_alias_when_name_differs(
|
|
self, config_home, monkeypatch, stored_provider
|
|
):
|
|
"""The classic picker maps legacy and stable IDs to the keyed row."""
|
|
from hermes_cli.main import select_provider_and_model
|
|
|
|
config_path = config_home / "config.yaml"
|
|
config_path.write_text(
|
|
"model:\n"
|
|
f" provider: {stored_provider}\n"
|
|
" default: qwen3.5:9b\n"
|
|
"providers:\n"
|
|
" local-127.0.0.1:11434:\n"
|
|
" name: Local Ollama\n"
|
|
" base_url: http://127.0.0.1:11434/v1\n"
|
|
" default_model: qwen3.5:9b\n"
|
|
" models:\n"
|
|
" qwen3.5:9b: {}\n"
|
|
"custom_providers: []\n",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
captured = {}
|
|
|
|
def _capture_and_cancel(labels, default=0):
|
|
captured["labels"] = labels
|
|
captured["default"] = default
|
|
return len(labels) - 1
|
|
|
|
with patch(
|
|
"hermes_cli.main._prompt_provider_choice",
|
|
side_effect=_capture_and_cancel,
|
|
), patch("builtins.print"):
|
|
select_provider_and_model()
|
|
|
|
active_label = captured["labels"][captured["default"]]
|
|
assert "Local Ollama" in active_label
|
|
assert "currently active" in active_label
|
|
|
|
def test_key_env_providers_dict_preserves_existing_api_key(
|
|
self, config_home, monkeypatch
|
|
):
|
|
"""A ``providers:`` entry that already has an inline ``api_key``
|
|
template must keep it untouched. Only entries that never declared
|
|
an ``api_key`` should skip the write."""
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
config_path = config_home / "config.yaml"
|
|
config_path.write_text(
|
|
"providers:\n"
|
|
" crs-henkee:\n"
|
|
" name: CRS Henkee\n"
|
|
" base_url: http://127.0.0.1:3000/api/v1\n"
|
|
" api_key: ${HERMES_CRS_HENKEE_KEY}\n"
|
|
" key_env: HERMES_CRS_HENKEE_KEY\n"
|
|
" transport: anthropic_messages\n"
|
|
" model: claude-opus-4-7\n"
|
|
" default_model: claude-opus-4-7\n"
|
|
"custom_providers: []\n"
|
|
)
|
|
monkeypatch.setenv("HERMES_CRS_HENKEE_KEY", "cr_live_secret_xyz")
|
|
|
|
provider_info = {
|
|
"name": "CRS Henkee",
|
|
"base_url": "http://127.0.0.1:3000/api/v1",
|
|
"api_key": "cr_live_secret_xyz", # expanded by load_config
|
|
"key_env": "HERMES_CRS_HENKEE_KEY",
|
|
"model": "claude-opus-4-7",
|
|
"api_mode": "anthropic_messages",
|
|
"provider_key": "crs-henkee",
|
|
"api_key_ref": "${HERMES_CRS_HENKEE_KEY}", # raw template preserved
|
|
}
|
|
|
|
with patch(
|
|
"hermes_cli.models.fetch_api_models",
|
|
return_value=["claude-opus-4-7"],
|
|
), \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="1"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
saved_text = config_path.read_text()
|
|
saved = yaml.safe_load(saved_text) or {}
|
|
entry = saved["providers"]["crs-henkee"]
|
|
# Existing api_key template must survive (the resolved secret must not
|
|
# clobber it via _preserve_env_ref_templates).
|
|
assert entry["api_key"] == "${HERMES_CRS_HENKEE_KEY}"
|
|
assert "cr_live_secret_xyz" not in saved_text
|
|
|
|
|
|
class TestCustomProviderDiscoverModels:
|
|
"""#18726: honor ``discover_models: false`` in the terminal ``hermes model``
|
|
named-custom flow so the picker shows the configured ``models:`` subset
|
|
instead of the endpoint's full live catalog."""
|
|
|
|
|
|
def test_discover_false_with_only_singular_model_skips_probe(self, config_home):
|
|
"""An active singular model is not an implicit discovery catalog."""
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
provider_info = {
|
|
"name": "Headered Ollama",
|
|
"base_url": "http://127.0.0.1:11434",
|
|
"api_key": "no-key-required",
|
|
"discover_models": False,
|
|
"model": "qwen3:8b",
|
|
}
|
|
|
|
with patch("hermes_cli.models.fetch_api_models") as mock_fetch, \
|
|
patch("hermes_cli.models_local.fetch_ollama_local_models") as mock_ollama, \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="1"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
mock_fetch.assert_not_called()
|
|
mock_ollama.assert_not_called()
|
|
|
|
def test_discover_false_saves_choice_from_configured_list(self, config_home):
|
|
"""User picks the 2nd configured model; it persists, list-driven."""
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
provider_info = {
|
|
"name": "Baidu Coding",
|
|
"base_url": "https://qianfan.baidubce.com/v2/coding",
|
|
"api_key": "sk-test",
|
|
"discover_models": False,
|
|
"models": {"kimi-k2.5": {}, "glm-5": {}},
|
|
"model": "kimi-k2.5",
|
|
}
|
|
|
|
with patch("hermes_cli.models.fetch_api_models") as mock_fetch, \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="2"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
mock_fetch.assert_not_called()
|
|
config = yaml.safe_load((config_home / "config.yaml").read_text()) or {}
|
|
model = config.get("model")
|
|
assert isinstance(model, dict)
|
|
assert model["default"] == "glm-5"
|
|
|
|
|
|
def test_probe_empty_falls_back_to_configured_list(self, config_home):
|
|
"""When discovery is on but the probe returns nothing, fall back to the
|
|
configured models: list instead of forcing manual entry."""
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
provider_info = {
|
|
"name": "My Gateway",
|
|
"base_url": "https://gw.example.com/v1",
|
|
"api_key": "sk-test",
|
|
"models": {"fallback-a": {}, "fallback-b": {}},
|
|
"model": "fallback-a",
|
|
}
|
|
|
|
with patch("hermes_cli.models.fetch_api_models", return_value=[]), \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="2"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
config = yaml.safe_load((config_home / "config.yaml").read_text()) or {}
|
|
model = config.get("model")
|
|
assert isinstance(model, dict)
|
|
assert model["default"] == "fallback-b"
|
|
|
|
def test_discover_false_string_is_normalised(self, config_home):
|
|
"""String 'false' (hand-edited configs) disables discovery too."""
|
|
from hermes_cli.model_setup_flows import _model_flow_named_custom
|
|
|
|
provider_info = {
|
|
"name": "Baidu Coding",
|
|
"base_url": "https://qianfan.baidubce.com/v2/coding",
|
|
"api_key": "sk-test",
|
|
"discover_models": "false",
|
|
"models": {"kimi-k2.5": {}, "glm-5": {}},
|
|
"model": "kimi-k2.5",
|
|
}
|
|
|
|
with patch("hermes_cli.models.fetch_api_models") as mock_fetch, \
|
|
patch("hermes_cli.curses_ui.curses_radiolist", side_effect=ImportError), \
|
|
patch("builtins.input", return_value="1"), \
|
|
patch("builtins.print"):
|
|
_model_flow_named_custom({}, provider_info)
|
|
|
|
mock_fetch.assert_not_called()
|