mirror of
https://github.com/affaan-m/everything-claude-code.git
synced 2026-06-30 19:00:57 +08:00
fix(llm): align Claude provider with current Anthropic API (#2133)
Replace invalid default model IDs (e.g. claude-sonnet-4-7) with current claude-sonnet-4-6, claude-opus-4-8, and claude-haiku-4-5. Route system messages to the API system field, enable ephemeral prompt caching, omit temperature for Opus 4.7/4.8, and surface cache usage metrics. Update the CLI model picker to match. Co-authored-by: Vladimir Đuranović <vlada@MacBook-Pro.local> Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
85dfb07576
commit
8973d0f6c5
@ -105,9 +105,9 @@ def interactive_select(
|
||||
if models_per_provider is None:
|
||||
models_per_provider = {
|
||||
"claude": [
|
||||
("claude-opus-4-5", "Claude Opus 4.5 - Most capable"),
|
||||
("claude-sonnet-4-7", "Claude Sonnet 4.7 - Balanced"),
|
||||
("claude-haiku-4-7", "Claude Haiku 4.7 - Fast"),
|
||||
("claude-opus-4-8", "Claude Opus 4.8 - Most capable"),
|
||||
("claude-sonnet-4-6", "Claude Sonnet 4.6 - Balanced"),
|
||||
("claude-haiku-4-5", "Claude Haiku 4.5 - Fast"),
|
||||
],
|
||||
"openai": [
|
||||
("gpt-4o", "GPT-4o - Most capable"),
|
||||
|
||||
@ -13,7 +13,14 @@ from llm.core.interface import (
|
||||
LLMProvider,
|
||||
RateLimitError,
|
||||
)
|
||||
from llm.core.types import LLMInput, LLMOutput, Message, ModelInfo, ProviderType, ToolCall
|
||||
from llm.core.types import LLMInput, LLMOutput, ModelInfo, ProviderType, Role, ToolCall
|
||||
|
||||
_DEFAULT_MODEL = "claude-sonnet-4-6"
|
||||
_OPUS_ADAPTIVE_ONLY_PREFIXES = ("claude-opus-4-7", "claude-opus-4-8")
|
||||
|
||||
|
||||
def _uses_adaptive_thinking_only(model: str) -> bool:
|
||||
return any(model.startswith(prefix) for prefix in _OPUS_ADAPTIVE_ONLY_PREFIXES)
|
||||
|
||||
|
||||
class ClaudeProvider(LLMProvider):
|
||||
@ -23,44 +30,53 @@ class ClaudeProvider(LLMProvider):
|
||||
self.client = Anthropic(api_key=api_key or os.environ.get("ANTHROPIC_API_KEY"), base_url=base_url)
|
||||
self._models = [
|
||||
ModelInfo(
|
||||
name="claude-opus-4-5",
|
||||
name="claude-opus-4-8",
|
||||
provider=ProviderType.CLAUDE,
|
||||
supports_tools=True,
|
||||
supports_vision=True,
|
||||
max_tokens=8192,
|
||||
context_window=200000,
|
||||
max_tokens=64000,
|
||||
context_window=1_000_000,
|
||||
),
|
||||
ModelInfo(
|
||||
name="claude-sonnet-4-7",
|
||||
name="claude-sonnet-4-6",
|
||||
provider=ProviderType.CLAUDE,
|
||||
supports_tools=True,
|
||||
supports_vision=True,
|
||||
max_tokens=8192,
|
||||
context_window=200000,
|
||||
max_tokens=64000,
|
||||
context_window=1_000_000,
|
||||
),
|
||||
ModelInfo(
|
||||
name="claude-haiku-4-7",
|
||||
name="claude-haiku-4-5",
|
||||
provider=ProviderType.CLAUDE,
|
||||
supports_tools=True,
|
||||
supports_vision=False,
|
||||
max_tokens=4096,
|
||||
context_window=200000,
|
||||
supports_vision=True,
|
||||
max_tokens=16000,
|
||||
context_window=200_000,
|
||||
),
|
||||
]
|
||||
|
||||
def generate(self, input: LLMInput) -> LLMOutput:
|
||||
try:
|
||||
model = input.model or _DEFAULT_MODEL
|
||||
system_parts = [msg.content for msg in input.messages if msg.role == Role.SYSTEM]
|
||||
api_messages = [
|
||||
msg.to_dict() for msg in input.messages if msg.role not in (Role.SYSTEM,)
|
||||
]
|
||||
|
||||
params: dict[str, Any] = {
|
||||
"model": input.model or "claude-sonnet-4-7",
|
||||
"messages": [msg.to_dict() for msg in input.messages],
|
||||
"temperature": input.temperature,
|
||||
"model": model,
|
||||
"messages": api_messages,
|
||||
"max_tokens": input.max_tokens if input.max_tokens else 16000,
|
||||
"cache_control": {"type": "ephemeral"},
|
||||
}
|
||||
if input.max_tokens:
|
||||
params["max_tokens"] = input.max_tokens
|
||||
else:
|
||||
params["max_tokens"] = 8192 # required by Anthropic API
|
||||
if system_parts:
|
||||
params["system"] = "\n\n".join(system_parts)
|
||||
if input.tools:
|
||||
params["tools"] = [tool.to_anthropic_tool() for tool in input.tools]
|
||||
if not _uses_adaptive_thinking_only(model):
|
||||
params["temperature"] = input.temperature
|
||||
if _uses_adaptive_thinking_only(model):
|
||||
params["thinking"] = {"type": "adaptive"}
|
||||
|
||||
response = self.client.messages.create(**params)
|
||||
|
||||
@ -94,6 +110,10 @@ class ClaudeProvider(LLMProvider):
|
||||
usage={
|
||||
"input_tokens": response.usage.input_tokens,
|
||||
"output_tokens": response.usage.output_tokens,
|
||||
"cache_creation_input_tokens": getattr(
|
||||
response.usage, "cache_creation_input_tokens", 0
|
||||
),
|
||||
"cache_read_input_tokens": getattr(response.usage, "cache_read_input_tokens", 0),
|
||||
},
|
||||
stop_reason=response.stop_reason,
|
||||
)
|
||||
@ -114,4 +134,4 @@ class ClaudeProvider(LLMProvider):
|
||||
return bool(self.client.api_key)
|
||||
|
||||
def get_default_model(self) -> str:
|
||||
return "claude-sonnet-4-7"
|
||||
return _DEFAULT_MODEL
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user