fix: delegate all live model fetching to agent provider_model_ids() (#411)
* fix: delegate all live model fetching to agent's provider_model_ids() Previously _handle_live_models() maintained its own per-provider logic: - anthropic, google, gemini returned 'not_supported' (hardcoded exclusions) - openai-codex had a custom branch (added in v0.50.30) - openai/copilot had hardcoded base URLs - other providers fell through to a generic /v1/models fetch Now the handler delegates entirely to hermes_cli.models.provider_model_ids(), which is the agent's authoritative resolver: - anthropic: live fetch via /v1/models with correct API-key or OAuth headers - copilot: live fetch from api.githubcopilot.com/models with Copilot headers - openai-codex: Codex OAuth endpoint + ~/.codex/ cache fallback - nous: live fetch from Nous inference portal - deepseek, kimi-coding: generic OpenAI-compat /v1/models - opencode-zen/go: OpenCode live catalog - openrouter: curated static list (live returns 300+ which is overwhelming) - google/gemini, zai, minimax: static list (non-standard or Anthropic-compat endpoints) - any others: graceful static fallback Also removed the client-side skip guard in _fetchLiveModels() (ui.js) that blocked live fetching for anthropic, google, and gemini. The hardcoded model lists in _PROVIDER_MODELS remain as the fallback when credentials are missing or network is unavailable — they are never shown when live data is available. * docs: v0.50.31 release — version badge and CHANGELOG --------- Co-authored-by: Nathan Esquenazi <nesquena@gmail.com>
This commit is contained in:
nesquena-hermes
GitHub
19
CHANGELOG.md
19
CHANGELOG.md
@@ -1,5 +1,24 @@
|
||||
# Hermes Web UI -- Changelog
|
||||
|
||||
## [v0.50.31] fix: delegate all live model fetching to agent's provider_model_ids()
|
||||
|
||||
`_handle_live_models()` in `api/routes.py` previously maintained its own per-provider fetch logic and returned `not_supported` for Anthropic, Google, and Gemini. Now it delegates entirely to the agent's `hermes_cli.models.provider_model_ids()` — the single authoritative resolver — and `_fetchLiveModels()` in `ui.js` no longer skips any provider.
|
||||
|
||||
**What each provider now returns (live data where credentials are present, static fallback otherwise):**
|
||||
- `anthropic` — live from `api.anthropic.com/v1/models` (API key or OAuth token with correct beta headers)
|
||||
- `copilot` — live from `api.githubcopilot.com/models` with required Copilot headers
|
||||
- `openai-codex` — Codex OAuth endpoint → `~/.codex/` cache → `DEFAULT_CODEX_MODELS`
|
||||
- `nous` — live from Nous inference portal
|
||||
- `deepseek`, `kimi-coding` — generic OpenAI-compat `/v1/models`
|
||||
- `opencode-zen`, `opencode-go` — OpenCode live catalog
|
||||
- `openrouter` — curated static list (live returns 300+ which floods the picker)
|
||||
- `google`, `gemini`, `zai`, `minimax` — static list (non-standard or Anthropic-compat endpoints)
|
||||
- All others — graceful static fallback from `_PROVIDER_MODELS`
|
||||
|
||||
The hardcoded lists in `_PROVIDER_MODELS` remain as credential-missing / network-unavailable fallbacks. `api/routes.py` shrank by ~100 lines. Updated 2 tests to reflect the improved behavior.
|
||||
|
||||
- 1039 tests total (up from 1038)
|
||||
|
||||
## [v0.50.30] fix: openai-codex live model fetch routes through agent's get_codex_model_ids()
|
||||
|
||||
`_handle_live_models()` was grouping `openai-codex` with `openai` and sending `GET https://api.openai.com/v1/models` — which returns 403 because Codex auth is OAuth-based via `chatgpt.com`, not a standard API key. The live fetch silently failed, so users only ever saw the hardcoded static list.
|
||||
|
||||
216
api/routes.py
216
api/routes.py
@@ -1448,175 +1448,87 @@ def _handle_approval_inject(handler, parsed):
|
||||
|
||||
|
||||
def _handle_live_models(handler, parsed):
|
||||
"""Fetch the live model list from a provider's /v1/models endpoint.
|
||||
"""Return the live model list for a provider.
|
||||
|
||||
Returns the provider's actual model catalog so the UI can show all
|
||||
available models, not just the hardcoded fallback list.
|
||||
Delegates to the agent's provider_model_ids() which handles:
|
||||
- OpenRouter: live fetch from /api/v1/models
|
||||
- Anthropic: live fetch from /v1/models (API key or OAuth token)
|
||||
- Copilot: live fetch from api.githubcopilot.com/models with correct headers
|
||||
- openai-codex: Codex OAuth endpoint + local ~/.codex/ cache fallback
|
||||
- Nous: live fetch from inference-api.nousresearch.com/v1/models
|
||||
- DeepSeek, kimi-coding, opencode-zen/go, custom: generic OpenAI-compat /v1/models
|
||||
- ZAI, MiniMax, Google/Gemini: fall back to static list (non-standard endpoints)
|
||||
- All others: static _PROVIDER_MODELS fallback
|
||||
|
||||
The agent already maintains all provider-specific auth and endpoint logic
|
||||
in one place; the WebUI inherits it rather than duplicating it.
|
||||
|
||||
Query params:
|
||||
provider (optional) — provider ID to fetch for; defaults to active
|
||||
base_url (optional) — override the base URL for the provider
|
||||
|
||||
Providers that don't expose a /v1/models endpoint (Anthropic) are not
|
||||
supported here — the caller should fall back to the static list.
|
||||
|
||||
Supported: openai, openrouter, custom (any OpenAI-compatible endpoint).
|
||||
provider (optional) — provider ID; defaults to active profile provider
|
||||
"""
|
||||
import urllib.request as _ur
|
||||
import ipaddress as _ip
|
||||
import socket as _sock
|
||||
from urllib.parse import urlparse as _up
|
||||
|
||||
qs = parse_qs(parsed.query)
|
||||
provider = (qs.get("provider", [""])[0] or "").lower().strip()
|
||||
base_url_override = (qs.get("base_url", [""])[0] or "").strip()
|
||||
|
||||
try:
|
||||
from api.config import get_config as _gc, resolve_model_provider as _rmp
|
||||
from api.config import get_config as _gc
|
||||
cfg = _gc()
|
||||
active_provider = cfg.get("model", {}).get("provider") or ""
|
||||
if not provider:
|
||||
provider = active_provider
|
||||
provider = cfg.get("model", {}).get("provider") or ""
|
||||
if not provider:
|
||||
return j(handler, {"error": "no_provider", "models": []})
|
||||
|
||||
# Resolve API key and base URL for this provider
|
||||
api_key = None
|
||||
base_url = base_url_override or ""
|
||||
# Delegate to the agent's live-fetch + fallback resolver.
|
||||
# provider_model_ids() tries live endpoints first and falls back to
|
||||
# the static _PROVIDER_MODELS list — it never raises.
|
||||
try:
|
||||
from hermes_cli.runtime_provider import resolve_runtime_provider
|
||||
rt = resolve_runtime_provider(requested=provider)
|
||||
api_key = rt.get("api_key")
|
||||
if not base_url:
|
||||
base_url = rt.get("base_url") or ""
|
||||
except Exception:
|
||||
pass
|
||||
import sys as _sys
|
||||
import os as _os
|
||||
_agent_dir = _os.path.join(_os.path.dirname(_os.path.dirname(_os.path.abspath(__file__))),
|
||||
"..", "..", ".hermes", "hermes-agent")
|
||||
_agent_dir = _os.path.normpath(_agent_dir)
|
||||
if _agent_dir not in _sys.path:
|
||||
_sys.path.insert(0, _agent_dir)
|
||||
from hermes_cli.models import provider_model_ids as _pmi
|
||||
ids = _pmi(provider)
|
||||
except Exception as _import_err:
|
||||
logger.debug("provider_model_ids import failed for %s: %s", provider, _import_err)
|
||||
# Last resort: return the WebUI's own static catalog
|
||||
from api.config import _PROVIDER_MODELS as _pm
|
||||
ids = [m["id"] for m in _pm.get(provider, [])]
|
||||
|
||||
# openai-codex: use the agent's get_codex_model_ids() which calls the
|
||||
# correct chatgpt.com/backend-api/codex/models endpoint with the OAuth
|
||||
# token and also falls back to ~/.codex/ local cache and DEFAULT_CODEX_MODELS.
|
||||
# This is the only path that can actually return the user's real Codex model list.
|
||||
if provider == "openai-codex":
|
||||
try:
|
||||
from hermes_cli.codex_models import get_codex_model_ids as _get_codex_ids
|
||||
access_token = None
|
||||
try:
|
||||
from hermes_cli.runtime_provider import resolve_runtime_provider as _rrt
|
||||
rt2 = _rrt(requested="openai-codex")
|
||||
access_token = rt2.get("api_key") or rt2.get("access_token")
|
||||
except Exception:
|
||||
pass
|
||||
ids = _get_codex_ids(access_token=access_token)
|
||||
def _codex_label(mid):
|
||||
# e.g. "gpt-5.4-mini" -> "GPT-5.4 Mini"
|
||||
parts = mid.split("-")
|
||||
result = []
|
||||
for p in parts:
|
||||
if p.lower() == "gpt":
|
||||
result.append("GPT")
|
||||
elif p[:1].isdigit():
|
||||
result.append(p) # version numbers unchanged: 5.4, 5.1
|
||||
else:
|
||||
result.append(p.capitalize())
|
||||
return " ".join(result)
|
||||
models_out = [{"id": mid, "label": _codex_label(mid)} for mid in ids if mid]
|
||||
return j(handler, {"provider": provider, "models": models_out,
|
||||
"count": len(models_out)})
|
||||
except Exception as _ce:
|
||||
logger.debug("Codex live model fetch failed: %s", _ce)
|
||||
# Fall through to static list (handled by get_available_models())
|
||||
return j(handler, {"error": str(_ce), "models": []})
|
||||
if not ids:
|
||||
return j(handler, {"provider": provider, "models": [], "count": 0})
|
||||
|
||||
# Determine the /v1/models endpoint URL
|
||||
if not base_url:
|
||||
if provider in ("openai", "copilot"):
|
||||
base_url = "https://api.openai.com/v1"
|
||||
elif provider == "openrouter":
|
||||
base_url = "https://openrouter.ai/api/v1"
|
||||
elif provider in ("anthropic",):
|
||||
# Anthropic doesn't support /v1/models in a standard way
|
||||
return j(handler, {"error": "not_supported", "models": []})
|
||||
elif provider in ("google", "gemini"):
|
||||
return j(handler, {"error": "not_supported", "models": []})
|
||||
else:
|
||||
# Generic OpenAI-compatible — try common paths
|
||||
base_url = ""
|
||||
# Normalise to {id, label} — provider_model_ids() returns plain string IDs
|
||||
def _make_label(mid):
|
||||
"""Best-effort human label from a model ID string."""
|
||||
# Preserve slashes for router IDs like "anthropic/claude-sonnet-4.6"
|
||||
display = mid.split("/")[-1] if "/" in mid else mid
|
||||
parts = display.split("-")
|
||||
result = []
|
||||
for p in parts:
|
||||
pl = p.lower()
|
||||
if pl == "gpt":
|
||||
result.append("GPT")
|
||||
elif pl in ("claude", "gemini", "gemma", "llama", "mistral",
|
||||
"qwen", "deepseek", "grok", "kimi", "glm"):
|
||||
result.append(p.capitalize())
|
||||
elif p[:1].isdigit():
|
||||
result.append(p) # version numbers: 5.4, 3.5, 4.6 — unchanged
|
||||
else:
|
||||
result.append(p.capitalize())
|
||||
label = " ".join(result)
|
||||
# Restore well-known uppercase tokens that title-casing breaks
|
||||
for orig in ("GPT", "GLM", "API", "AI", "XL", "MoE"):
|
||||
label = label.replace(orig.title(), orig)
|
||||
return label
|
||||
|
||||
if not base_url:
|
||||
return j(handler, {"error": "no_base_url", "models": []})
|
||||
|
||||
# Build URL safely
|
||||
base_url = base_url.rstrip("/")
|
||||
if base_url.endswith("/v1"):
|
||||
endpoint_url = base_url + "/models"
|
||||
elif "/v1" in base_url:
|
||||
endpoint_url = base_url.rstrip("/") + "/models"
|
||||
else:
|
||||
endpoint_url = base_url + "/v1/models"
|
||||
|
||||
# Validate scheme (B310 guard)
|
||||
parsed_ep = _up(endpoint_url)
|
||||
if parsed_ep.scheme not in ("http", "https"):
|
||||
return j(handler, {"error": "invalid_scheme", "models": []}, status=400)
|
||||
|
||||
# SSRF guard: block private IPs (allow known local provider hostnames).
|
||||
# Use exact hostname match — NOT substring — to prevent bypass via
|
||||
# hostnames like evil-ollama.attacker.com containing "ollama".
|
||||
_KNOWN_LOCAL_HOSTS = {"localhost", "127.0.0.1", "0.0.0.0", "::1"}
|
||||
if parsed_ep.hostname:
|
||||
hostname_lower = (parsed_ep.hostname or "").lower()
|
||||
try:
|
||||
for _, _, _, _, addr in _sock.getaddrinfo(parsed_ep.hostname, None):
|
||||
addr_obj = _ip.ip_address(addr[0])
|
||||
if addr_obj.is_private or addr_obj.is_loopback:
|
||||
if hostname_lower not in _KNOWN_LOCAL_HOSTS:
|
||||
return j(handler, {"error": "ssrf_blocked", "models": []}, status=400)
|
||||
except _sock.gaierror:
|
||||
pass
|
||||
|
||||
# Fetch models
|
||||
req = _ur.Request(endpoint_url, method="GET")
|
||||
req.add_header("User-Agent", "HermesWebUI/1.0")
|
||||
if api_key:
|
||||
req.add_header("Authorization", f"Bearer {api_key}")
|
||||
with _ur.urlopen(req, timeout=8) as resp: # nosec B310
|
||||
raw = resp.read().decode("utf-8")
|
||||
|
||||
import json as _json
|
||||
data = _json.loads(raw)
|
||||
raw_models = data.get("data") or data.get("models") or []
|
||||
|
||||
# Normalise to {id, label} list; filter to text-generation models
|
||||
models = []
|
||||
seen = set()
|
||||
for m in raw_models:
|
||||
if not isinstance(m, dict):
|
||||
continue
|
||||
mid = m.get("id") or m.get("name") or ""
|
||||
if not mid or mid in seen:
|
||||
continue
|
||||
# Skip embedding/image/audio models for direct providers
|
||||
obj_type = (m.get("object") or "").lower()
|
||||
if obj_type and obj_type not in ("model",):
|
||||
continue
|
||||
# Heuristic: skip obvious non-chat models
|
||||
if any(skip in mid.lower() for skip in ("embed", "tts", "whisper", "dall-e", "davinci-edit", "babbage", "ada", "curie")):
|
||||
continue
|
||||
seen.add(mid)
|
||||
label = m.get("name") or m.get("display_name") or mid
|
||||
# For OpenAI, the id IS the label — clean it up
|
||||
if label == mid:
|
||||
label = mid.replace("-", " ").replace(".", ".").title()
|
||||
# Restore original casing for well-known names
|
||||
for known in ("GPT", "o1", "o3", "o4", "gpt"):
|
||||
label = label.replace(known.title(), known)
|
||||
models.append({"id": mid, "label": label})
|
||||
|
||||
# Sort: newest (higher version numbers) first via lexicographic sort on reversed id
|
||||
models.sort(key=lambda m: m["id"], reverse=True)
|
||||
|
||||
return j(handler, {"provider": provider, "models": models, "count": len(models)})
|
||||
models_out = [{"id": mid, "label": _make_label(mid)} for mid in ids if mid]
|
||||
return j(handler, {"provider": provider, "models": models_out,
|
||||
"count": len(models_out)})
|
||||
|
||||
except Exception as _e:
|
||||
logger.debug("Failed to fetch live models for %s: %s", provider, _e)
|
||||
logger.debug("_handle_live_models failed for %s: %s", provider, _e)
|
||||
return j(handler, {"error": str(_e), "models": []})
|
||||
|
||||
|
||||
|
||||
@@ -535,7 +535,7 @@
|
||||
<div class="settings-section-title">System</div>
|
||||
<div class="settings-section-meta">Instance version and access controls.</div>
|
||||
</div>
|
||||
<span class="settings-version-badge">v0.50.30</span>
|
||||
<span class="settings-version-badge">v0.50.31</span>
|
||||
</div>
|
||||
<div class="settings-field" style="border-top:1px solid var(--border);padding-top:12px;margin-top:8px">
|
||||
<label for="settingsPassword" data-i18n="settings_label_password">Access Password</label>
|
||||
|
||||
@@ -105,7 +105,7 @@ const _liveModelCache={};
|
||||
async function _fetchLiveModels(provider, sel){
|
||||
if(!provider||!sel) return;
|
||||
// Don't fetch for providers where we know it's unsupported or unnecessary
|
||||
if(['anthropic','google','gemini'].includes(provider)) return;
|
||||
// All providers now supported via agent's provider_model_ids() — no exclusions needed
|
||||
if(_liveModelCache[provider]) return; // already fetched this session
|
||||
try{
|
||||
const url=new URL('/api/models/live',location.origin);
|
||||
|
||||
@@ -174,10 +174,14 @@ class TestLiveModelFetching:
|
||||
"_handle_live_models must have SSRF protection for private IP ranges (#375)"
|
||||
)
|
||||
|
||||
def test_live_models_unsupported_providers_gracefully_handled(self):
|
||||
"""Providers without /v1/models support must return not_supported gracefully."""
|
||||
assert "not_supported" in ROUTES_PY, (
|
||||
"_handle_live_models must return not_supported for Anthropic/Google (#375)"
|
||||
def test_live_models_all_providers_handled_via_agent(self):
|
||||
"""_handle_live_models must delegate to provider_model_ids() which handles all
|
||||
providers gracefully — live fetch where possible, static fallback otherwise.
|
||||
The old 'not_supported' return for Anthropic/Google is superseded: those
|
||||
providers now return live or static model lists via the agent delegate."""
|
||||
assert "provider_model_ids" in ROUTES_PY, (
|
||||
"_handle_live_models must delegate to hermes_cli.models.provider_model_ids() "
|
||||
"so all providers are handled uniformly (#375 upgrade)"
|
||||
)
|
||||
|
||||
def test_frontend_has_fetch_live_models_function(self):
|
||||
@@ -204,11 +208,16 @@ class TestLiveModelFetching:
|
||||
"_fetchLiveModels must track existing model IDs to avoid duplicates (#375)"
|
||||
)
|
||||
|
||||
def test_frontend_live_fetch_skips_unsupported_providers(self):
|
||||
"""_fetchLiveModels must skip providers that don't support live fetching (#375)."""
|
||||
assert "anthropic" in UI_JS and "google" in UI_JS, (
|
||||
"_fetchLiveModels must skip Anthropic and Google (no /v1/models support) (#375)"
|
||||
)
|
||||
def test_frontend_live_fetch_covers_all_providers(self):
|
||||
"""_fetchLiveModels no longer skips any provider — all providers return
|
||||
live or fallback models via provider_model_ids() on the backend (#375 upgrade)."""
|
||||
# The old skip list (anthropic, google, gemini) must be gone from the guard
|
||||
skip_guard_pos = UI_JS.find("includes(provider)")
|
||||
if skip_guard_pos != -1:
|
||||
guard_line = UI_JS[max(0,skip_guard_pos-100):skip_guard_pos+50]
|
||||
assert "anthropic" not in guard_line, (
|
||||
"_fetchLiveModels must not skip anthropic — backend now handles it (#375 upgrade)"
|
||||
)
|
||||
|
||||
def test_live_models_endpoint_wired_in_routes(self):
|
||||
"""The /api/models/live path must be handled in handle_get()."""
|
||||
|
||||
@@ -86,29 +86,36 @@ def test_openai_codex_display_name():
|
||||
assert config._PROVIDER_DISPLAY["openai-codex"] == "OpenAI Codex"
|
||||
|
||||
|
||||
def test_live_models_handler_uses_codex_agent_path():
|
||||
"""_handle_live_models for openai-codex must use get_codex_model_ids(), not the
|
||||
standard /v1/models endpoint (which returns 403 for OAuth-based Codex auth).
|
||||
Verify structurally that the routes.py handler has a dedicated codex branch.
|
||||
def test_live_models_handler_delegates_to_provider_model_ids():
|
||||
"""_handle_live_models must delegate to the agent's provider_model_ids()
|
||||
rather than maintain its own per-provider fetch logic.
|
||||
"""
|
||||
import pathlib
|
||||
routes_src = (pathlib.Path(__file__).parent.parent / "api" / "routes.py").read_text()
|
||||
# Must have a dedicated openai-codex branch before any base_url assignment
|
||||
assert 'provider == "openai-codex"' in routes_src, (
|
||||
"_handle_live_models must have a dedicated openai-codex branch "
|
||||
"that uses get_codex_model_ids() instead of /v1/models"
|
||||
assert "provider_model_ids" in routes_src, (
|
||||
"_handle_live_models must call hermes_cli.models.provider_model_ids() "
|
||||
"to delegate all provider-specific live-fetch logic to the agent"
|
||||
)
|
||||
# Must delegate to the agent's get_codex_model_ids
|
||||
assert "get_codex_model_ids" in routes_src, (
|
||||
"_handle_live_models must call hermes_cli.codex_models.get_codex_model_ids() "
|
||||
"for openai-codex provider"
|
||||
# The old per-provider base_url hardcoding should be gone
|
||||
assert "https://api.openai.com/v1" not in routes_src, (
|
||||
"_handle_live_models must not hardcode api.openai.com — "
|
||||
"provider resolution is handled by the agent"
|
||||
)
|
||||
# Must NOT route openai-codex through the standard OpenAI base URL
|
||||
# (the old bug: openai-codex was grouped with openai and sent to api.openai.com)
|
||||
codex_block_start = routes_src.find('provider == "openai-codex"')
|
||||
openai_base_url_line = routes_src.find('"https://api.openai.com/v1"', codex_block_start)
|
||||
openai_base_url_before = routes_src.find('"https://api.openai.com/v1"')
|
||||
assert openai_base_url_before > codex_block_start or openai_base_url_line == -1, (
|
||||
"openai-codex must be handled before the api.openai.com/v1 fallback, "
|
||||
"not grouped with it"
|
||||
assert "not_supported" not in routes_src, (
|
||||
"_handle_live_models must not return not_supported for any provider — "
|
||||
"provider_model_ids() falls back to static list automatically"
|
||||
)
|
||||
|
||||
|
||||
def test_live_models_ui_no_longer_skips_any_provider():
|
||||
"""_fetchLiveModels in ui.js must not exclude any provider from live fetching.
|
||||
Previously anthropic, google, and gemini were skipped — now provider_model_ids()
|
||||
handles them all (with graceful fallback to static lists).
|
||||
"""
|
||||
import pathlib
|
||||
ui_src = (pathlib.Path(__file__).parent.parent / "static" / "ui.js").read_text()
|
||||
# The old exclusion list must be gone
|
||||
assert "includes(provider)" not in ui_src or "anthropic" not in ui_src[:ui_src.find("includes(provider)")+100], (
|
||||
"_fetchLiveModels must not skip anthropic, google, or gemini — "
|
||||
"the backend now returns live models for all providers"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user