Standardize on u64 for token counts (#32869)

Previously we were using a mix of `u32` and `usize`, e.g. `max_tokens:
usize, max_output_tokens: Option<u32>` in the same `struct`.

Although [tiktoken](https://github.com/openai/tiktoken) uses `usize`,
token counts should be consistent across targets (e.g. the same model
doesn't suddenly get a smaller context window if you're compiling for
wasm32), and these token counts could end up getting serialized using a
binary protocol, so `usize` is not the right choice for token counts.

I chose to standardize on `u64` over `u32` because we don't store many
of them (so the extra size should be insignificant) and future models
may exceed `u32::MAX` tokens.

Release Notes:

- N/A
This commit is contained in:
Richard Feldman 2025-06-17 10:43:07 -04:00 committed by GitHub
parent a391d67366
commit 5405c2c2d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 191 additions and 192 deletions

View file

@ -126,7 +126,7 @@ struct ModelLimits {
#[serde(default)]
max_output_tokens: usize,
#[serde(default)]
max_prompt_tokens: usize,
max_prompt_tokens: u64,
}
#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
@ -182,7 +182,7 @@ impl Model {
self.name.as_str()
}
pub fn max_token_count(&self) -> usize {
pub fn max_token_count(&self) -> u64 {
self.capabilities.limits.max_prompt_tokens
}
@ -316,15 +316,15 @@ pub struct ResponseEvent {
#[derive(Deserialize, Debug)]
pub struct Usage {
pub completion_tokens: u32,
pub prompt_tokens: u32,
pub completion_tokens: u64,
pub prompt_tokens: u64,
pub prompt_tokens_details: PromptTokensDetails,
pub total_tokens: u32,
pub total_tokens: u64,
}
#[derive(Deserialize, Debug)]
pub struct PromptTokensDetails {
pub cached_tokens: u32,
pub cached_tokens: u64,
}
#[derive(Debug, Deserialize)]