6f6ed01355
Two gaps for custom providers behind a WAF/CDN:
- `build_anthropic_client` never consulted `custom_providers[].extra_headers`,
so a relay in `anthropic_messages` mode that rejects the SDK User-Agent kept
403ing even with `extra_headers: {User-Agent: ...}` configured, while the
OpenAI-wire clients already applied it. The lookup now lives in
`_new_sdk_client`, the one constructor every builder path goes through
(init, /model switch, rebuild, auxiliary), keyed by the caller's raw route
because entries are keyed by the `/v1` form the normalizer strips.
Salvaged direction of #46002 (@wait4xx). Fixes #24293, #9721.
- `_status_403` classified every non-billing 403 as `auth`, so a WAF's plain
"Your request was blocked." or a Cloudflare browser challenge printed "Your
API key was rejected" and could rotate a healthy credential. A 403 carrying
established block/challenge markers is now `upstream_blocked`: no rotation,
no retry, fallback allowed, WAF/User-Agent guidance on every surface (CLI
loop, chat copy, cli chat error copy, TUI gateway + Ink TUI copy). Generic
403 and all 401 keep the auth verdict. Salvaged direction of #70567
(@ooiuuii) and #53114 (@AgenticSpark). Fixes #53099, #70566.
67 lines
3.6 KiB
Python
67 lines
3.6 KiB
Python
"""Plain-language copy for chat-turn failures shown in the CLI response panel.
|
|
|
|
The chat panel used to echo ``Error: HTTP 401: Invalid API key`` as the assistant's answer. These
|
|
helpers map the classifier verdict (``agent/error_classifier.py``) to WHAT happened + WHAT TO DO,
|
|
and demote the raw provider text to a ``Details:`` line.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
_SUMMARY_LIMIT = 120
|
|
|
|
# FailoverReason.value -> plain copy. ``{provider}`` / ``{model}`` are filled at render time.
|
|
_REASON_COPY: dict[str, str] = {
|
|
"auth": "Your {provider} key was rejected. Run `hermes model` to re-enter it.",
|
|
"auth_permanent": "Your {provider} key was rejected. Run `hermes model` to re-enter it.",
|
|
"billing": "Your {provider} account is out of credit. Top up at the provider, or run /model to switch.",
|
|
"model_not_found": "'{model}' isn't available on {provider}. Run /model to pick a valid model.",
|
|
"rate_limit": "Rate limited by {provider}; wait a minute or /model to switch.",
|
|
"upstream_rate_limit": "Rate limited by {provider}; wait a minute or /model to switch.",
|
|
"upstream_blocked": "A firewall/CDN in front of {provider} blocked the request (not your key). Set a User-Agent via extra_headers, or /model to switch.",
|
|
"overloaded": "{provider} is overloaded right now. Send /retry in a moment, or /model to switch.",
|
|
"server_error": "{provider} had an internal error. Send /retry in a moment, or /model to switch.",
|
|
"timeout": "{provider} did not answer in time. Send /retry, or /model to switch.",
|
|
}
|
|
_UNKNOWN_COPY = "The model request failed. Run /model to switch or `hermes doctor` to check the setup."
|
|
|
|
|
|
def _short(text: str, limit: int = _SUMMARY_LIMIT) -> str:
|
|
first = (text or "").strip().splitlines()[0] if (text or "").strip() else ""
|
|
return first if len(first) <= limit else first[: limit - 1].rstrip() + "…"
|
|
|
|
|
|
def chat_error_response(
|
|
error: Exception | str, *, provider: str = "", model: str = "", failure_reason: str | None = None,
|
|
) -> str:
|
|
"""Two-line panel text: plain sentence with the fix command, then ``Details: <raw>``.
|
|
|
|
``failure_reason`` is the verdict the turn loop already stamped on its result
|
|
(``agent/turn_failure_copy.stamp_failure``). When present it is used as-is instead of
|
|
re-classifying a summarised string (which has no status code and almost always lands on
|
|
'unknown'); for the loop's own site codes the ``error`` text is already the user-facing copy,
|
|
so it is returned verbatim rather than wrapped and demoted to a Details line."""
|
|
reason = str(failure_reason or "").strip()
|
|
if reason:
|
|
from agent.turn_failure_copy import SITE_FAILURE_CODES
|
|
|
|
text = str(error or "").strip()
|
|
if reason in SITE_FAILURE_CODES and text:
|
|
return text
|
|
else:
|
|
from agent.error_classifier import classify_api_error
|
|
|
|
exc = error if isinstance(error, Exception) else Exception(str(error))
|
|
reason = classify_api_error(exc, provider=provider or "", model=model or "").reason.value
|
|
copy = _REASON_COPY.get(reason, _UNKNOWN_COPY)
|
|
lead = copy.format(provider=provider or "the provider", model=model or "the current model")
|
|
return f"{lead}\nDetails: {_short(str(error), 300)}"
|
|
|
|
|
|
def agent_init_failure_message(error: BaseException) -> str:
|
|
"""Copy for a failed AIAgent build on first message: the user's turn was dropped."""
|
|
return (
|
|
f"Hermes couldn't start the model connection: {_short(str(error)) or type(error).__name__}. "
|
|
"Your message was not sent. Run `hermes doctor` to check the setup, "
|
|
"or /model to pick a different provider."
|
|
)
|