Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 55 additions & 14 deletions hermes_cli/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,42 @@ def _register_plugin_provider(pp: Any) -> None:
PROVIDER_REGISTRY.setdefault(alias, pconfig)


def _provider_profile_config(provider_id: str) -> Optional[ProviderConfig]:
"""Current profile's plugin-declared provider config, without global mutation."""
try:
from providers import get_provider_profile

pp = get_provider_profile(provider_id)
except Exception:
return None
if pp is None or pp.name in _REGISTRY_PLUGIN_SKIP:
return None
if pp.auth_type == "external_process":
return ProviderConfig(
pp.name, pp.display_name or pp.name, "external_process",
inference_base_url=pp.base_url)
if pp.auth_type != "api_key" or not pp.env_vars:
return None
is_url = lambda value: value.endswith("_BASE_URL") or value.endswith("_URL") # noqa: E731
return _api_key_provider(
pp.name, pp.display_name or pp.name, pp.base_url,
tuple(value for value in pp.env_vars if not is_url(value)) or pp.env_vars,
next((value for value in pp.env_vars if is_url(value)), None) or "")


def get_provider_config(provider_id: str) -> Optional[ProviderConfig]:
"""Profile-aware provider config; static Core rows remain authoritative."""
normalized = (provider_id or "").strip().lower()
return PROVIDER_REGISTRY.get(normalized) or _provider_profile_config(normalized)


try:
from providers import list_providers as _list_providers_for_registry
for _pp in _list_providers_for_registry():
if _pp.name not in PROVIDER_REGISTRY:
_register_plugin_provider(_pp)
from agent.secret_scope import is_multiplex_active as _provider_multiplex_active
if not _provider_multiplex_active():
from providers import list_providers as _list_providers_for_registry
for _pp in _list_providers_for_registry():
if _pp.name not in PROVIDER_REGISTRY:
_register_plugin_provider(_pp)
except Exception:
pass

Expand Down Expand Up @@ -831,13 +862,14 @@ def mark_provider_active_if_unset(provider_id: str) -> None:

def is_known_auth_provider(provider_id: str) -> bool:
normalized = (provider_id or "").strip().lower()
return normalized in PROVIDER_REGISTRY or normalized in SERVICE_PROVIDER_NAMES
return get_provider_config(normalized) is not None or normalized in SERVICE_PROVIDER_NAMES


def get_auth_provider_display_name(provider_id: str) -> str:
normalized = (provider_id or "").strip().lower()
if normalized in PROVIDER_REGISTRY:
return PROVIDER_REGISTRY[normalized].name
pconfig = get_provider_config(normalized)
if pconfig is not None:
return pconfig.name
return SERVICE_PROVIDER_NAMES.get(normalized, provider_id)


Expand Down Expand Up @@ -1376,7 +1408,7 @@ def _config_model_provider() -> Tuple[Any, Optional[str]]:
provider = _plugin_aliases().get(provider, provider)
if provider == "custom" or provider.startswith("custom:"):
return model_cfg, "custom"
if provider in PROVIDER_REGISTRY:
if get_provider_config(provider) is not None:
return model_cfg, provider
# No provider pin but a base_url the bare-custom runtime rung would honour (a loopback
# llama.cpp/vLLM/ollama server) — same explicit intent, spelled by URL.
Expand All @@ -1402,7 +1434,16 @@ def _env_key_auto_detected(
scoped_key_env: Callable[[str], str], oauth_active: Optional[str]) -> Optional[str]:
"""First registry api_key provider (registry order) with a usable env key, warning when it
preempts a logged-in OAuth provider so a stale key in ~/.hermes/.env never switches silently."""
for pid, pconfig in PROVIDER_REGISTRY.items():
configs = dict(PROVIDER_REGISTRY)
try:
from providers import list_providers
for profile in list_providers():
configs.setdefault(profile.name, get_provider_config(profile.name))
except Exception:
pass
for pid, pconfig in configs.items():
if pconfig is None:
continue
if pconfig.auth_type != "api_key" or pid in _NO_AUTO_DETECT_PROVIDERS:
continue
for env_var in pconfig.api_key_env_vars:
Expand Down Expand Up @@ -1445,7 +1486,7 @@ def resolve_provider(
normalized = (requested or "auto").strip().lower()
normalized = _plugin_aliases().get(normalized, normalized)

if normalized in ("openrouter", "custom") or normalized in PROVIDER_REGISTRY:
if normalized in ("openrouter", "custom") or get_provider_config(normalized) is not None:
return normalized
if normalized != "auto":
hint = _get_config_hint_for_unknown_provider(normalized)
Expand Down Expand Up @@ -1851,7 +1892,7 @@ def _provider_is_keyless(provider_id: str) -> bool:

def get_api_key_provider_status(provider_id: str) -> Dict[str, Any]:
"""Status snapshot for API-key providers (z.ai, Kimi, MiniMax)."""
pconfig = PROVIDER_REGISTRY.get(provider_id)
pconfig = get_provider_config(provider_id)
if not pconfig or pconfig.auth_type != "api_key":
return {"configured": False}
status = {
Expand Down Expand Up @@ -1947,7 +1988,7 @@ def get_external_process_provider_status(provider_id: str) -> Dict[str, Any]:

``configured``/``logged_in`` are structural (executable resolves or TCP endpoint set): the
subprocess owns real auth. ``auth_verified``/``auth_source`` carry positive evidence only."""
pconfig = PROVIDER_REGISTRY.get(provider_id)
pconfig = get_provider_config(provider_id)
if not pconfig or pconfig.auth_type != "external_process":
return {"configured": False}
command, args, base_url, resolved_command, _ = _external_process_spec(pconfig)
Expand Down Expand Up @@ -2079,7 +2120,7 @@ def _copilot_runtime_base_url(api_key: str, default: str, env_url: str) -> str:

def resolve_api_key_provider_credentials(provider_id: str) -> Dict[str, Any]:
"""Resolve API key and base URL for an API-key provider."""
pconfig = PROVIDER_REGISTRY.get(provider_id)
pconfig = get_provider_config(provider_id)
if not pconfig or pconfig.auth_type != "api_key":
raise AuthError(
f"Provider '{provider_id}' is not an API-key provider.",
Expand Down Expand Up @@ -2110,7 +2151,7 @@ def resolve_api_key_provider_credentials(provider_id: str) -> Dict[str, Any]:

def resolve_external_process_provider_credentials(provider_id: str) -> Dict[str, Any]:
"""Resolve runtime details for local subprocess-backed providers."""
pconfig = PROVIDER_REGISTRY.get(provider_id)
pconfig = get_provider_config(provider_id)
if not pconfig or pconfig.auth_type != "external_process":
raise AuthError(
f"Provider '{provider_id}' is not an external-process provider.",
Expand Down
8 changes: 4 additions & 4 deletions hermes_cli/runtime_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ def _pool_entry_mode_and_url(provider, entry, model_cfg, effective_model, base_u
return api_mode, (re.sub(r"/v1/?$", "", base_url) if api_mode == "anthropic_messages" else base_url)
# Honour model.base_url only when the pool entry carries no explicit base_url (i.e. it fell
# back to the registry default). Env var overrides win.
pconfig = PROVIDER_REGISTRY.get(provider)
pconfig = auth_mod.get_provider_config(provider)
if pconfig and base_url.rstrip("/") == pconfig.inference_base_url.rstrip("/"):
base_url = _config_base_url_for_provider(model_cfg, provider) or base_url
return _configured_or_fallback_api_mode(provider, model_cfg, base_url, effective_model, opencode_by_model=True), base_url
Expand Down Expand Up @@ -639,7 +639,7 @@ def _resolve_explicit_runtime(*, provider: str, requested_provider: str, model_c
resolver = _EXPLICIT_RESOLVERS.get(provider)
if resolver is not None:
return resolver(requested_provider, model_cfg, explicit_api_key, explicit_base_url, target_model)
pconfig = PROVIDER_REGISTRY.get(provider)
pconfig = auth_mod.get_provider_config(provider)
if not (pconfig and pconfig.auth_type == "api_key"):
return None
return _explicit_api_key_provider(provider, pconfig, requested_provider, model_cfg, explicit_api_key, explicit_base_url, target_model)
Expand Down Expand Up @@ -693,7 +693,7 @@ def _resolve_oauth_runtime(provider, requested_provider, model_cfg, target_model


def _minimax_oauth_runtime(provider, requested_provider) -> Optional[Dict[str, Any]]:
pconfig = PROVIDER_REGISTRY.get(provider)
pconfig = auth_mod.get_provider_config(provider)
if not (pconfig and pconfig.auth_type == "oauth_minimax"):
return None
creds = auth_mod.resolve_minimax_oauth_runtime_credentials()
Expand Down Expand Up @@ -914,7 +914,7 @@ def _ladder_rungs(requested_provider, explicit_api_key, explicit_base_url, targe
yield _anthropic_env_runtime(requested_provider, model_cfg)
if provider == "bedrock":
yield _resolve_bedrock_runtime(requested_provider, model_cfg, target_model)
pconfig = PROVIDER_REGISTRY.get(provider)
pconfig = auth_mod.get_provider_config(provider)
if pconfig and pconfig.auth_type == "api_key":
yield _api_key_provider_runtime(provider, pconfig, requested_provider, model_cfg, target_model)
yield _openrouter_fallback(requested_provider, explicit_api_key, explicit_base_url)
Expand Down
Loading