Skip to content

fix(rig-1113): calculate_max_tokens assumes known model (anthropic) #1216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshua-mo-143 merged 2 commits into from
Jan 5, 2026
Merged

fix(rig-1113): calculate_max_tokens assumes known model (anthropic) #1216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15ca78e
fix(rig-1113): `calculate_max_tokens` assumes known model (anthropic)
joshua-mo-143 Jan 5, 2026
3179da9
refactor: amendments
joshua-mo-143 Jan 5, 2026
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
36 changes: 26 additions & 10 deletions rig/rig-core/src/providers/anthropic/completion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,20 +715,36 @@ where
/// set or if set too high, the request will fail. The following values are based on the models
/// available at the time of writing.
fn calculate_max_tokens(model: &str) -> Option<u64> {
match model {
CLAUDE_4_OPUS => Some(32_000),
CLAUDE_4_SONNET | CLAUDE_3_7_SONNET => Some(64_000),
CLAUDE_3_5_SONNET | CLAUDE_3_5_HAIKU => Some(8_192),
_ => None,
if model.starts_with("claude-opus-4") {
Some(32000)
} else if model.starts_with("claude-sonnet-4") || model.starts_with("claude-3-7-sonnet") {
Some(64000)
} else if model.starts_with("claude-3-5-sonnet") || model.starts_with("claude-3-5-haiku") {
Some(8192)
} else if model.starts_with("claude-3-opus")
|| model.starts_with("claude-3-sonnet")
|| model.starts_with("claude-3-haiku")
{
Some(4096)
} else {
None
}
}

fn calculate_max_tokens_custom(model: &str) -> u64 {
match model {
"claude-4-opus" => 32_000,
"claude-4-sonnet" | "claude-3.7-sonnet" => 64_000,
"claude-3.5-sonnet" | "claude-3.5-haiku" => 8_192,
_ => 4_096,
if model.starts_with("claude-opus-4") {
32000
} else if model.starts_with("claude-sonnet-4") || model.starts_with("claude-3-7-sonnet") {
64000
} else if model.starts_with("claude-3-5-sonnet") || model.starts_with("claude-3-5-haiku") {
8192
} else if model.starts_with("claude-3-opus")
|| model.starts_with("claude-3-sonnet")
|| model.starts_with("claude-3-haiku")
{
4096
} else {
2048
}
}

Expand Down