APEX/BrowserUse_and_ComputerUse_skills
5
0
Fork 0
Code Issues 6 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

refactor: tie api_mode to provider config instead of env var (#1656)

Browse source 
Remove HERMES_API_MODE env var. api_mode is now configured where the
endpoint is defined:

- model.api_mode in config.yaml (for the active model config)
- custom_providers[].api_mode (for named custom providers)

Replace _get_configured_api_mode() with _parse_api_mode() which just
validates a value against the whitelist without reading env vars.

Both paths (model config and named custom providers) now read api_mode
from their respective config entries rather than a global override.
This commit is contained in:
Teknium 2026-03-17 02:13:26 -07:00 • committed by GitHub
parent 4e66d22151
commit 766f4aae2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

50
tests/test_runtime_provider_resolution.py
View file

@ -328,10 +328,10 @@ def test_resolve_requested_provider_precedence(monkeypatch):
assert rp.resolve_requested_provider() == "auto"
# ── api_mode override tests ─────────────────────────────────────────────
# ── api_mode config override tests ──────────────────────────────────────
def test_custom_endpoint_api_mode_from_config(monkeypatch):
def test_model_config_api_mode(monkeypatch):
"""model.api_mode in config.yaml should override the default chat_completions."""
monkeypatch.setattr(rp, "resolve_provider", lambda *a, **k: "openrouter")
monkeypatch.setattr(
@ -346,7 +346,6 @@ def test_custom_endpoint_api_mode_from_config(monkeypatch):
monkeypatch.setenv("OPENAI_API_KEY", "test-key")
monkeypatch.delenv("OPENROUTER_BASE_URL", raising=False)
monkeypatch.delenv("OPENROUTER_API_KEY", raising=False)
monkeypatch.delenv("HERMES_API_MODE", raising=False)
resolved = rp.resolve_runtime_provider(requested="custom")
@ -354,28 +353,12 @@ def test_custom_endpoint_api_mode_from_config(monkeypatch):
assert resolved["base_url"] == "http://127.0.0.1:9208/v1"
def test_env_api_mode_overrides_config(monkeypatch):
"""HERMES_API_MODE env var takes precedence over config."""
monkeypatch.setattr(rp, "resolve_provider", lambda *a, **k: "openrouter")
monkeypatch.setattr(rp, "_get_model_config", lambda: {"api_mode": "chat_completions"})
monkeypatch.setenv("OPENAI_BASE_URL", "http://127.0.0.1:9208/v1")
monkeypatch.setenv("OPENAI_API_KEY", "test-key")
monkeypatch.setenv("HERMES_API_MODE", "codex_responses")
monkeypatch.delenv("OPENROUTER_BASE_URL", raising=False)
monkeypatch.delenv("OPENROUTER_API_KEY", raising=False)
resolved = rp.resolve_runtime_provider(requested="custom")
assert resolved["api_mode"] == "codex_responses"
def test_invalid_api_mode_ignored(monkeypatch):
"""Invalid api_mode values should fall back to chat_completions."""
monkeypatch.setattr(rp, "resolve_provider", lambda *a, **k: "openrouter")
monkeypatch.setattr(rp, "_get_model_config", lambda: {"api_mode": "bogus_mode"})
monkeypatch.setenv("OPENAI_BASE_URL", "http://127.0.0.1:9208/v1")
monkeypatch.setenv("OPENAI_API_KEY", "test-key")
monkeypatch.delenv("HERMES_API_MODE", raising=False)
monkeypatch.delenv("OPENROUTER_BASE_URL", raising=False)
monkeypatch.delenv("OPENROUTER_API_KEY", raising=False)
@ -384,16 +367,37 @@ def test_invalid_api_mode_ignored(monkeypatch):
assert resolved["api_mode"] == "chat_completions"
def test_named_custom_provider_respects_api_mode(monkeypatch):
"""Named custom providers should also pick up api_mode overrides."""
def test_named_custom_provider_api_mode(monkeypatch):
"""custom_providers entries with api_mode should use it."""
monkeypatch.setattr(rp, "resolve_provider", lambda *a, **k: "my-server")
monkeypatch.setattr(
rp, "_get_named_custom_provider",
lambda p: {"name": "my-server", "base_url": "http://localhost:8000/v1", "api_key": "sk-test"},
lambda p: {
"name": "my-server",
"base_url": "http://localhost:8000/v1",
"api_key": "sk-test",
"api_mode": "codex_responses",
},
)
monkeypatch.setenv("HERMES_API_MODE", "codex_responses")
resolved = rp.resolve_runtime_provider(requested="my-server")
assert resolved["api_mode"] == "codex_responses"
assert resolved["base_url"] == "http://localhost:8000/v1"
def test_named_custom_provider_without_api_mode_defaults(monkeypatch):
"""custom_providers entries without api_mode should default to chat_completions."""
monkeypatch.setattr(rp, "resolve_provider", lambda *a, **k: "my-server")
monkeypatch.setattr(
rp, "_get_named_custom_provider",
lambda p: {
"name": "my-server",
"base_url": "http://localhost:8000/v1",
"api_key": "sk-test",
},
)
resolved = rp.resolve_runtime_provider(requested="my-server")
assert resolved["api_mode"] == "chat_completions"