After the legacy session-key path was removed, two parameters became dead surface on the Nous runtime-resolution chain: - min_key_ttl_seconds: del'd inside refresh_nous_oauth_pure and pass-through / telemetry-only in refresh_nous_oauth_from_state, _try_import_shared_nous_state, _nous_device_code_login, and resolve_nous_runtime_credentials. It controlled the now-deleted agent-key mint TTL and drives no behavior. - inference_auth_mode: with the legacy mode gone, AUTO and FRESH are behaviorally identical; the value only fed _normalize_nous_inference_auth_mode validation and oauth trace output, never a branch. Removing inference_auth_mode orphaned its whole supporting cluster (NOUS_INFERENCE_AUTH_MODE_AUTO/FRESH, NOUS_INFERENCE_AUTH_MODES, _normalize_nous_inference_auth_mode), and dropping min_key_ttl_seconds orphaned DEFAULT_AGENT_KEY_MIN_TTL_SECONDS — all deleted here. Updated every caller (run_agent, auxiliary_client, credential_pool, proxy adapter, runtime_provider, web_server, main, auth_commands, setup) and pruned the matching test kwargs. Deleted two tests that exercised the removed surface (test_legacy_auth_mode_is_rejected, test_try_refresh_..._accepts_explicit_auth_mode). No behavior change: net -134 LOC of dead code.
190 lines
6.2 KiB
Python
190 lines
6.2 KiB
Python
"""Nous Portal upstream adapter.
|
|
|
|
Reads the user's Nous OAuth state from ``~/.hermes/auth.json`` through the
|
|
shared runtime resolver, validates or refreshes the inference JWT, then exposes
|
|
the upstream base URL plus bearer for the proxy server to forward to.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import threading
|
|
from typing import Any, Dict, FrozenSet, Optional
|
|
|
|
from hermes_cli.auth import (
|
|
AuthError,
|
|
DEFAULT_NOUS_INFERENCE_URL,
|
|
_load_auth_store,
|
|
_auth_store_lock,
|
|
_is_terminal_nous_refresh_error,
|
|
_quarantine_nous_oauth_state,
|
|
_quarantine_nous_pool_entries,
|
|
_save_auth_store,
|
|
_validate_nous_inference_url_from_network,
|
|
_write_shared_nous_state,
|
|
resolve_nous_runtime_credentials,
|
|
)
|
|
from hermes_cli.proxy.adapters.base import UpstreamAdapter, UpstreamCredential
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Endpoints inference-api.nousresearch.com actually serves. Anything else
|
|
# the proxy will reject with 404 — keeps stray clients from leaking weird
|
|
# requests to the upstream.
|
|
_ALLOWED_PATHS: FrozenSet[str] = frozenset(
|
|
{
|
|
"/chat/completions",
|
|
"/completions",
|
|
"/embeddings",
|
|
"/models",
|
|
}
|
|
)
|
|
|
|
|
|
class NousPortalAdapter(UpstreamAdapter):
|
|
"""Proxy upstream for the Nous Portal inference API."""
|
|
|
|
def __init__(self) -> None:
|
|
# Serialize proxy requests in this process; cross-process token refresh
|
|
# and persistence are handled by resolve_nous_runtime_credentials().
|
|
self._lock = threading.Lock()
|
|
|
|
@property
|
|
def name(self) -> str:
|
|
return "nous"
|
|
|
|
@property
|
|
def display_name(self) -> str:
|
|
return "Nous Portal"
|
|
|
|
@property
|
|
def allowed_paths(self) -> FrozenSet[str]:
|
|
return _ALLOWED_PATHS
|
|
|
|
def is_authenticated(self) -> bool:
|
|
state = self._read_state()
|
|
if state is None:
|
|
return False
|
|
# We need either a usable inference JWT OR (refresh_token + access_token)
|
|
# to recover. The refresh helper validates and refreshes as needed.
|
|
return bool(
|
|
state.get("agent_key")
|
|
or (state.get("refresh_token") and state.get("access_token"))
|
|
)
|
|
|
|
def get_credential(self) -> UpstreamCredential:
|
|
return self._get_credential()
|
|
|
|
def get_retry_credential(
|
|
self,
|
|
*,
|
|
failed_credential: UpstreamCredential,
|
|
status_code: int,
|
|
) -> Optional[UpstreamCredential]:
|
|
_ = failed_credential
|
|
if status_code != 401:
|
|
return None
|
|
logger.info("proxy: Nous upstream rejected bearer; force-refreshing invoke JWT")
|
|
return self._get_credential(
|
|
force_refresh=True,
|
|
)
|
|
|
|
def _get_credential(
|
|
self,
|
|
*,
|
|
force_refresh: bool = False,
|
|
) -> UpstreamCredential:
|
|
with self._lock:
|
|
state = self._read_state()
|
|
if state is None:
|
|
raise RuntimeError(
|
|
"Not logged into Nous Portal. Run `hermes auth add nous` first."
|
|
)
|
|
|
|
try:
|
|
refreshed = resolve_nous_runtime_credentials(
|
|
force_refresh=force_refresh,
|
|
)
|
|
except AuthError as exc:
|
|
if _is_terminal_nous_refresh_error(exc):
|
|
_quarantine_nous_oauth_state(
|
|
state,
|
|
exc,
|
|
reason="proxy_refresh_failure",
|
|
)
|
|
self._save_state(
|
|
state,
|
|
quarantine_error=exc,
|
|
quarantine_reason="proxy_refresh_failure",
|
|
)
|
|
raise RuntimeError(
|
|
f"Failed to refresh Nous Portal credentials: {exc}"
|
|
) from exc
|
|
except Exception as exc:
|
|
raise RuntimeError(
|
|
f"Failed to refresh Nous Portal credentials: {exc}"
|
|
) from exc
|
|
|
|
runtime_key = refreshed.get("api_key")
|
|
if not runtime_key:
|
|
raise RuntimeError(
|
|
"Nous Portal refresh did not return a usable inference JWT. "
|
|
"Try `hermes auth add nous` to re-authenticate."
|
|
)
|
|
|
|
base_url = (
|
|
_validate_nous_inference_url_from_network(refreshed.get("base_url"))
|
|
or DEFAULT_NOUS_INFERENCE_URL
|
|
)
|
|
base_url = base_url.rstrip("/")
|
|
|
|
return UpstreamCredential(
|
|
bearer=runtime_key,
|
|
base_url=base_url,
|
|
expires_at=refreshed.get("expires_at"),
|
|
)
|
|
|
|
# ------------------------------------------------------------------
|
|
# Internal helpers — auth.json access. Kept local rather than added
|
|
# to hermes_cli.auth to avoid expanding that module's public surface.
|
|
# ------------------------------------------------------------------
|
|
|
|
def _read_state(self) -> Optional[Dict[str, Any]]:
|
|
try:
|
|
with _auth_store_lock():
|
|
store = _load_auth_store()
|
|
except Exception as exc:
|
|
logger.warning("proxy: failed to load auth store: %s", exc)
|
|
return None
|
|
providers = store.get("providers") or {}
|
|
state = providers.get("nous")
|
|
if not isinstance(state, dict):
|
|
return None
|
|
return dict(state) # copy so the refresh helper can mutate freely
|
|
|
|
def _save_state(
|
|
self,
|
|
state: Dict[str, Any],
|
|
*,
|
|
quarantine_error: Optional[AuthError] = None,
|
|
quarantine_reason: Optional[str] = None,
|
|
) -> None:
|
|
try:
|
|
with _auth_store_lock():
|
|
store = _load_auth_store()
|
|
if quarantine_error is not None and quarantine_reason:
|
|
_quarantine_nous_pool_entries(
|
|
store,
|
|
quarantine_error,
|
|
reason=quarantine_reason,
|
|
)
|
|
providers = store.setdefault("providers", {})
|
|
providers["nous"] = state
|
|
_save_auth_store(store)
|
|
_write_shared_nous_state(state)
|
|
except Exception as exc:
|
|
logger.warning("proxy: failed to persist Nous quarantine state: %s", exc)
|
|
|
|
|
|
__all__ = ["NousPortalAdapter"]
|