Skip to content

Commit 77c063c

Browse files
committed
fix(antigravity): prefer usage model IDs for step costs
Use the model ID carried by each token-bearing usage bucket before falling back to conversation context, so step and retry rows keep their own pricing when model_info is absent. Add an SQLite regression covering distinct step and retry models.
1 parent a3a435b commit 77c063c

2 files changed

Lines changed: 69 additions & 11 deletions

File tree

‎rust/adapters/antigravity/src/loader.rs‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,69 @@ mod tests {
440440
assert_eq!(entries[1].data.message.usage.input_tokens, 11);
441441
}
442442

443+
#[test]
444+
fn attributes_step_and_retry_usage_to_their_token_models() {
445+
let fixture = Fixture::new();
446+
let step_usage = UsageFixture {
447+
model_id: Some(246),
448+
input_tokens: 10,
449+
total_output_tokens: 5,
450+
visible_output_tokens: 5,
451+
response_id: Some("step-pro"),
452+
..UsageFixture::default()
453+
};
454+
let retry_usage = UsageFixture {
455+
model_id: Some(290),
456+
input_tokens: 20,
457+
total_output_tokens: 4,
458+
visible_output_tokens: 4,
459+
response_id: Some("retry-opus"),
460+
..UsageFixture::default()
461+
};
462+
create_database(
463+
&fixture.path("conversations/session.db"),
464+
&[(1, metadata_blob(Some("gemini-2.5-flash"), None, None, &[]))],
465+
&[(
466+
1,
467+
step_metadata_blob(
468+
None,
469+
Some(step_usage),
470+
Some((1_778_400_000, 0)),
471+
&[retry_usage],
472+
None,
473+
),
474+
)],
475+
&[],
476+
);
477+
478+
let _guard = EnvVarsGuard::set_many([(
479+
super::super::paths::ANTIGRAVITY_DATA_DIR_ENV,
480+
Some(OsString::from(fixture.root())),
481+
)]);
482+
let pricing = PricingMap::load_embedded();
483+
let entries = load_entries(&shared(true), &pricing).unwrap();
484+
485+
assert_eq!(entries.len(), 2);
486+
let step = entries
487+
.iter()
488+
.find(|entry| entry.data.message.id.as_deref() == Some("step-pro"))
489+
.unwrap();
490+
let retry = entries
491+
.iter()
492+
.find(|entry| entry.data.message.id.as_deref() == Some("retry-opus"))
493+
.unwrap();
494+
assert_eq!(step.model.as_deref(), Some("gemini-2.5-pro"));
495+
assert_eq!(retry.model.as_deref(), Some("claude-4-opus"));
496+
let step_pricing = pricing.find("gemini-2.5-pro").unwrap();
497+
let retry_pricing = pricing.find("claude-4-opus").unwrap();
498+
let expected_step_cost = 10.0 * step_pricing.input + 5.0 * step_pricing.output;
499+
let expected_retry_cost = 20.0 * retry_pricing.input + 4.0 * retry_pricing.output;
500+
assert!((step.cost - expected_step_cost).abs() < 1e-15);
501+
assert!((retry.cost - expected_retry_cost).abs() < 1e-15);
502+
assert!(step.missing_pricing_model.is_none());
503+
assert!(retry.missing_pricing_model.is_none());
504+
}
505+
443506
#[test]
444507
fn maps_required_aliases_and_keeps_unprovided_models_unprefixed() {
445508
let fixture = Fixture::new();

‎rust/adapters/antigravity/src/parser.rs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -470,15 +470,11 @@ fn append_usage_event(
470470
let reasoning_tokens = usage
471471
.reasoning_tokens
472472
.max(total_output_tokens.saturating_sub(output_tokens));
473-
let model = context
474-
.model
475-
.and_then(normalize_antigravity_model)
476-
.or_else(|| {
477-
usage
478-
.model_id
479-
.map(model_name_from_id)
480-
.and_then(|model| normalize_antigravity_model(&model))
481-
})
473+
let model = usage
474+
.model_id
475+
.map(model_name_from_id)
476+
.and_then(|model| normalize_antigravity_model(&model))
477+
.or_else(|| context.model.and_then(normalize_antigravity_model))
482478
.unwrap_or_else(|| DEFAULT_MODEL.to_string());
483479
let provider = usage.provider.or(context.provider);
484480
let (message_id, message_id_rank) = usage.preferred_message_id();
@@ -1131,8 +1127,7 @@ pub(super) mod test_support {
11311127
let usage_blob = model_usage_blob(usage);
11321128
field_bytes(9, &usage_blob, &mut metadata);
11331129
}
1134-
if model.is_some() || usage.and_then(|value| value.model_id).is_some() || provider.is_some()
1135-
{
1130+
if model.is_some() || provider.is_some() {
11361131
let mut model_info = Vec::new();
11371132
if let Some(usage) = usage
11381133
&& let Some(model_id) = usage.model_id

0 commit comments

Comments
 (0)