Files
routstr-core/routstr/upstream/anthropic.py
redshift 543b2bf9ac fix(messages): preserve output_config.effort and validate it consistently
Modern Anthropic clients send the thinking level as
`output_config: {effort: "high"}` instead of the OpenAI-shaped
`reasoning_effort`. Two paths got it wrong:

litellm /v1/messages dispatch (routstr/upstream/reasoning_effort.py)
  `output_config` is not in ALLOWED_MESSAGES_REQUEST_FIELDS, so it is
  pruned before the upstream call. `extract_requested_effort` did not read
  `output_config.effort` and `_request_mentions_reasoning` did not see the
  key, so `apply_reasoning_effort` returned early and the requested effort
  was dropped entirely. The effort is now extracted (precedence
  `reasoning.effort` > `reasoning_effort` > `thinking.effort` >
  `output_config.effort`) and, for the litellm adapter, lifted onto
  `reasoning_effort` by the existing drop_thinking branch. `output_config`
  itself is still stripped by the allowlist prune.

Native Anthropic provider (routstr/upstream/anthropic.py)
  `_apply_reasoning_effort` validated `reasoning_effort` /
  `reasoning.effort` against {low, medium, high, xhigh, max} but forwarded
  `output_config.effort` unvalidated, so "none"/"minimal"/"banana" reached
  Anthropic. All three spellings now share one allowlist constant, are
  rejected with the same 400 `Unsupported Anthropic effort`, must agree
  (400 `Conflicting Anthropic effort`), and other `output_config` keys are
  preserved.
2026-10-19 08:15:34 +00:00

242 lines
9.5 KiB
Python

import json
from typing import TYPE_CHECKING
import httpx
from ..core.exceptions import UpstreamError
from ..payment.models import Model, async_fetch_openrouter_models
from .base import BaseUpstreamProvider
if TYPE_CHECKING:
from ..core.db import UpstreamProviderRow
# Effort levels Anthropic's native Messages API accepts in
# ``output_config.effort``. Everything else (``none``, ``minimal``, unknown
# strings, non-strings) is rejected with a 400 rather than forwarded.
ANTHROPIC_SUPPORTED_EFFORTS: frozenset[str] = frozenset(
{"low", "medium", "high", "xhigh", "max"}
)
class AnthropicUpstreamProvider(BaseUpstreamProvider):
"""Upstream provider specifically configured for Anthropic API."""
provider_type = "anthropic"
default_base_url = "https://api.anthropic.com/v1"
platform_url = "https://console.anthropic.com/settings/keys"
supports_anthropic_messages = True
litellm_provider_prefix = "anthropic/"
def __init__(
self,
api_key: str,
provider_fee: float = 1.01,
workspace_id: str | None = None,
):
super().__init__(
base_url=self.default_base_url,
api_key=api_key,
provider_fee=provider_fee,
)
self.workspace_id = workspace_id.strip() if workspace_id else None
self._native_model_names: dict[str, str] = {}
@classmethod
def _build_from_row(
cls, provider_row: "UpstreamProviderRow"
) -> "AnthropicUpstreamProvider":
try:
settings = json.loads(provider_row.provider_settings or "{}")
except (TypeError, ValueError):
settings = {}
workspace_id = (
settings.get("workspace_id") if isinstance(settings, dict) else None
)
return cls(
api_key=provider_row.api_key,
provider_fee=provider_row.provider_fee,
workspace_id=workspace_id if isinstance(workspace_id, str) else None,
)
@classmethod
def get_provider_metadata(cls) -> dict[str, object]:
return {
"id": cls.provider_type,
"name": "Anthropic",
"default_base_url": cls.default_base_url,
"fixed_base_url": True,
"platform_url": cls.platform_url,
}
def transform_model_name(self, model_id: str) -> str:
"""Strip 'anthropic/' prefix for Anthropic API compatibility and transform model names."""
if model_id.startswith("anthropic/"):
model_id = model_id[len("anthropic/") :]
if model_id in self._native_model_names:
return self._native_model_names[model_id]
if model_id in self._native_model_names.values():
return model_id
fixed_transforms = {
"claude-haiku-4.5": "claude-haiku-4-5-20251001",
"claude-sonnet-4.5": "claude-sonnet-4-5-20250929",
"claude-opus-4.1": "claude-opus-4-1-20250805",
"claude-opus-4": "claude-opus-4-20250514",
"claude-sonnet-4": "claude-sonnet-4-20250514",
"claude-3.5-haiku": "claude-3-5-haiku-20241022",
"claude-3-haiku": "claude-3-haiku-20240307",
"claude-haiku-4-5": "claude-haiku-4-5-20251001",
"claude-sonnet-4-5": "claude-sonnet-4-5-20250929",
"claude-opus-4-1": "claude-opus-4-1-20250805",
"claude-3-5-haiku": "claude-3-5-haiku-20241022",
}
if model_id in fixed_transforms:
model_id = fixed_transforms[model_id]
return model_id
def prepare_request_body(
self,
body: bytes | None,
model_obj: Model,
include_stream_usage: bool = False,
) -> bytes | None:
body = super().prepare_request_body(body, model_obj, include_stream_usage)
if not body:
return body
try:
data = json.loads(body)
except ValueError:
return body
# Anthropic 400s when both caps are set. Keep the larger, matching the
# cap the reservation was priced against.
if (
isinstance(data, dict)
and "messages" in data
and data.get("max_tokens") is not None
and data.get("max_completion_tokens") is not None
):
caps = [data.pop("max_tokens"), data.pop("max_completion_tokens")]
try:
data["max_tokens"] = max(caps, key=int)
except (TypeError, ValueError):
data["max_tokens"] = caps[0]
return json.dumps(data).encode()
return body
def prepare_headers(self, request_headers: dict) -> dict:
headers = super().prepare_headers(request_headers)
# Match Anthropic's SDK default API version while preserving client overrides.
if not any(name.lower() == "anthropic-version" for name in headers):
headers["anthropic-version"] = "2023-06-01"
if self.workspace_id:
# The configured upstream workspace takes precedence over client headers.
headers = {
name: value
for name, value in headers.items()
if name.lower() != "anthropic-workspace-id"
}
headers["anthropic-workspace-id"] = self.workspace_id
return headers
def _apply_reasoning_effort(self, data: dict, model_obj: Model) -> bool:
# Anthropic accepts effort spelled three ways: OpenAI-compatible
# ``reasoning_effort``, Anthropic ``reasoning.effort``, and the newer
# native ``output_config.effort``. Normalize all of them onto
# ``output_config.effort`` and validate them identically, so a client
# cannot smuggle an illegal level in through the native spelling.
# Anthropic defaults are independent of OpenRouter's mandatory metadata.
config = data.get("output_config")
if config is None:
config = {}
elif not isinstance(config, dict):
raise UpstreamError(
"Anthropic output_config must be an object", status_code=400
)
native_effort = config.get("effort")
if (
"reasoning_effort" not in data
and "reasoning" not in data
and native_effort is None
):
return False
reasoning = data.get("reasoning")
if reasoning is None:
reasoning = {}
if not isinstance(reasoning, dict) or set(reasoning) - {"effort"}:
raise UpstreamError(
"For Anthropic, reasoning must contain only effort",
status_code=400,
)
efforts: list[str] = []
for value in (
data.get("reasoning_effort"),
reasoning.get("effort"),
native_effort,
):
if value is None:
continue
if not isinstance(value, str) or value not in ANTHROPIC_SUPPORTED_EFFORTS:
raise UpstreamError("Unsupported Anthropic effort", status_code=400)
efforts.append(value)
if efforts:
if any(value != efforts[0] for value in efforts):
raise UpstreamError("Conflicting Anthropic effort", status_code=400)
# Preserve sibling keys (``format``, future extensions).
data["output_config"] = {**config, "effort": efforts[0]}
data.pop("reasoning_effort", None)
data.pop("reasoning", None)
return True
async def _fetch_native_model_ids(self) -> set[str]:
native_ids: set[str] = set()
params: dict[str, str | int] = {"limit": 1000}
seen_cursors: set[str] = set()
async with httpx.AsyncClient(timeout=20.0) as client:
while True:
response = await client.get(
f"{self.base_url}/models",
headers=self.prepare_headers({}),
params=params,
)
response.raise_for_status()
page = response.json()
data = page["data"]
if not isinstance(data, list):
raise ValueError("Invalid Anthropic models response")
native_ids.update(model["id"] for model in data)
if not page.get("has_more"):
return native_ids
cursor = page.get("last_id")
if not isinstance(cursor, str) or not cursor or cursor in seen_cursors:
raise ValueError("Invalid Anthropic models pagination cursor")
seen_cursors.add(cursor)
params["after_id"] = cursor
async def fetch_models(self) -> list[Model]:
# Native IDs are authoritative; OpenRouter supplies pricing, not API names.
# Models keep their catalog ID so saved overrides stay keyed as before;
# the native ID is only an alias and the name sent upstream.
# A discovery failure raises so refresh_models_cache retains its last cache.
native_ids = await self._fetch_native_model_ids()
models_data = await async_fetch_openrouter_models(source_filter="anthropic")
models: list[Model] = []
mappings: dict[str, str] = {}
for data in models_data:
model = Model(**data)
candidates = (
self.transform_model_name(model.id),
model.id,
model.id.replace(".", "-"),
)
native_id = next((name for name in candidates if name in native_ids), None)
if native_id is None:
continue
mappings[model.id] = native_id
model.alias_ids = [native_id]
models.append(model)
self._native_model_names = mappings
return models