Skip to content

Commit 5e5c475

Browse files
ryoppippicaozx169
andauthored
fix(antigravity): report real model names instead of placeholders for new model IDs (ccusage#2071)
Co-authored-by: caozx <[email protected]>
1 parent d06f55b commit 5e5c475

2 files changed

Lines changed: 234 additions & 9 deletions

File tree

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

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,133 @@ mod tests {
954954
insta::assert_json_snapshot!(reports);
955955
}
956956

957+
#[test]
958+
fn prefers_explicit_model_name_over_placeholder_for_unknown_ids() {
959+
let fixture = Fixture::new();
960+
let cases = [
961+
(1401, "claude-opus-5-5-medium", "unknown-opus"),
962+
(1404, "claude-sonnet-5-5-medium", "unknown-sonnet"),
963+
(1427, "gemini-4-carbon", "unknown-carbon-high"),
964+
(1437, "gemini-4-carbon", "unknown-carbon-medium"),
965+
];
966+
let rows = cases
967+
.iter()
968+
.enumerate()
969+
.map(|(idx, (model_id, model, response_id))| {
970+
(
971+
i64::try_from(idx).unwrap(),
972+
metadata_blob(
973+
Some(model),
974+
Some(UsageFixture {
975+
model_id: Some(*model_id),
976+
input_tokens: 60,
977+
total_output_tokens: 10,
978+
cache_read_tokens: 40,
979+
visible_output_tokens: 10,
980+
response_id: Some(response_id),
981+
..UsageFixture::default()
982+
}),
983+
Some((1_781_481_600 + u64::try_from(idx).unwrap(), 0)),
984+
&[UsageFixture {
985+
model_id: Some(1499),
986+
input_tokens: 5,
987+
total_output_tokens: 1,
988+
visible_output_tokens: 1,
989+
response_id: Some("unknown-retry"),
990+
..UsageFixture::default()
991+
}],
992+
),
993+
)
994+
})
995+
.collect::<Vec<_>>();
996+
create_database(&fixture.path("conversations/session.db"), &rows, &[], &[]);
997+
998+
let entries = load_from_fixture(&fixture, true);
999+
1000+
for (_, model, response_id) in cases {
1001+
let entry = entries
1002+
.iter()
1003+
.find(|entry| entry.data.message.id.as_deref() == Some(response_id))
1004+
.unwrap();
1005+
assert_eq!(entry.model.as_deref(), Some(model));
1006+
assert!(entry.cost > 0.0);
1007+
assert!(entry.missing_pricing_model.is_none());
1008+
}
1009+
let retry = entries
1010+
.iter()
1011+
.find(|entry| entry.data.message.id.as_deref() == Some("unknown-retry"))
1012+
.unwrap();
1013+
assert_eq!(retry.model.as_deref(), Some("model_placeholder_m499"));
1014+
}
1015+
1016+
#[test]
1017+
fn keeps_alias_mapped_ids_over_explicit_model_name() {
1018+
let fixture = Fixture::new();
1019+
create_database(
1020+
&fixture.path("conversations/session.db"),
1021+
&[(
1022+
0,
1023+
metadata_blob(
1024+
Some("gemini-3-flash-agent"),
1025+
Some(UsageFixture {
1026+
model_id: Some(1187),
1027+
input_tokens: 60,
1028+
total_output_tokens: 10,
1029+
visible_output_tokens: 10,
1030+
..UsageFixture::default()
1031+
}),
1032+
Some((1_781_481_600, 0)),
1033+
&[],
1034+
),
1035+
)],
1036+
&[],
1037+
&[],
1038+
);
1039+
1040+
let entries = load_from_fixture(&fixture, true);
1041+
1042+
assert_eq!(entries.len(), 1);
1043+
assert_eq!(
1044+
entries[0].model.as_deref(),
1045+
Some("gemini-3.5-flash-extra-low")
1046+
);
1047+
}
1048+
1049+
#[test]
1050+
fn keeps_explicit_model_name_when_merging_unnamed_step_copy() {
1051+
let fixture = Fixture::new();
1052+
let usage = UsageFixture {
1053+
model_id: Some(1401),
1054+
input_tokens: 60,
1055+
total_output_tokens: 10,
1056+
visible_output_tokens: 10,
1057+
response_id: Some("shared-response"),
1058+
..UsageFixture::default()
1059+
};
1060+
create_database(
1061+
&fixture.path("conversations/session.db"),
1062+
&[(
1063+
0,
1064+
metadata_blob(
1065+
Some("claude-opus-5-5-medium"),
1066+
Some(usage),
1067+
Some((1_781_481_600, 0)),
1068+
&[],
1069+
),
1070+
)],
1071+
&[(
1072+
0,
1073+
step_metadata_blob(None, Some(usage), Some((1_781_481_600, 0)), &[], Some(1)),
1074+
)],
1075+
&[],
1076+
);
1077+
1078+
let entries = load_from_fixture(&fixture, true);
1079+
1080+
assert_eq!(entries.len(), 1);
1081+
assert_eq!(entries[0].model.as_deref(), Some("claude-opus-5-5-medium"));
1082+
}
1083+
9571084
#[test]
9581085
fn skips_zero_byte_databases_and_reports_valid_entries() {
9591086
let fixture = Fixture::new();

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

Lines changed: 107 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
218218
usage,
219219
EventContext {
220220
model: model.as_deref(),
221+
model_id: metadata.model_id,
221222
provider: metadata.provider,
222223
timestamp,
223224
trajectory_timestamp,
@@ -234,6 +235,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
234235
usage,
235236
EventContext {
236237
model: model.as_deref(),
238+
model_id: metadata.model_id,
237239
provider: metadata.provider,
238240
timestamp,
239241
trajectory_timestamp,
@@ -285,6 +287,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
285287
usage,
286288
EventContext {
287289
model: model.as_deref(),
290+
model_id: metadata.model_id,
288291
provider: None,
289292
timestamp: metadata.timestamp.map(|timestamp| (timestamp, 3)),
290293
trajectory_timestamp,
@@ -301,6 +304,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
301304
usage,
302305
EventContext {
303306
model: model.as_deref(),
307+
model_id: metadata.model_id,
304308
provider: None,
305309
timestamp: metadata.timestamp.map(|timestamp| (timestamp, 3)),
306310
trajectory_timestamp,
@@ -446,6 +450,7 @@ fn table_exists(connection: &sqlite::Connection, table: &str) -> Result<bool> {
446450
#[derive(Clone, Copy)]
447451
struct EventContext<'a> {
448452
model: Option<&'a str>,
453+
model_id: Option<u64>,
449454
provider: Option<u64>,
450455
timestamp: Option<(TimestampMs, u8)>,
451456
trajectory_timestamp: Option<TimestampMs>,
@@ -487,10 +492,19 @@ fn append_usage_event(
487492
let reasoning_tokens = usage
488493
.reasoning_tokens
489494
.max(total_output_tokens.saturating_sub(output_tokens));
490-
let model = usage
495+
let id_model = usage
491496
.model_id
492497
.map(model_name_from_id)
493-
.and_then(|model| normalize_antigravity_model(&model))
498+
.and_then(|model| normalize_antigravity_model(&model));
499+
let same_model_row = context
500+
.model
501+
.filter(|_| context.model_id == usage.model_id)
502+
.and_then(normalize_antigravity_model);
503+
let model = id_model
504+
.clone()
505+
.filter(|model| is_resolved_model(model))
506+
.or_else(|| same_model_row.filter(|model| is_resolved_model(model)))
507+
.or(id_model)
494508
.or_else(|| context.model.and_then(normalize_antigravity_model))
495509
.unwrap_or_else(|| DEFAULT_MODEL.to_string());
496510
let provider = usage.provider.or(context.provider);
@@ -552,7 +566,7 @@ pub(super) fn merge_usage_event(
552566
.saturating_add(target.cache_creation_tokens)
553567
.saturating_add(target.cache_read_tokens)
554568
.saturating_add(target.total_output_tokens);
555-
if target.model == DEFAULT_MODEL && duplicate.model != DEFAULT_MODEL {
569+
if model_resolution(&duplicate.model) > model_resolution(&target.model) {
556570
target.model = duplicate.model.clone();
557571
}
558572
if target.provider.is_none() {
@@ -888,11 +902,39 @@ fn model_name_from_id(model_id: u64) -> String {
888902
1417..=1419 => "gemini-4-argon".to_string(),
889903
1402 => "claude-opus-5-5".to_string(),
890904
1050 => "gemini-3.1-flash-lite".to_string(),
891-
1_000.. => format!("model_placeholder_m{}", model_id - 1_000),
892-
_ => format!("antigravity-model-{model_id}"),
905+
1_000.. => format!("{UNRESOLVED_PLACEHOLDER_PREFIX}{}", model_id - 1_000),
906+
_ => format!("{UNRESOLVED_ID_PREFIX}{model_id}"),
893907
}
894908
}
895909

910+
const UNRESOLVED_PLACEHOLDER_PREFIX: &str = "model_placeholder_m";
911+
const UNRESOLVED_ID_PREFIX: &str = "antigravity-model-";
912+
913+
#[derive(PartialEq, Eq, PartialOrd, Ord)]
914+
enum ModelResolution {
915+
Default,
916+
Placeholder,
917+
Resolved,
918+
}
919+
920+
// Placeholders that normalization did not map to a real model rank below a
921+
// model name from another field or a duplicate copy, but above the default.
922+
fn model_resolution(model: &str) -> ModelResolution {
923+
if model == DEFAULT_MODEL {
924+
ModelResolution::Default
925+
} else if model.starts_with(UNRESOLVED_PLACEHOLDER_PREFIX)
926+
|| model.starts_with(UNRESOLVED_ID_PREFIX)
927+
{
928+
ModelResolution::Placeholder
929+
} else {
930+
ModelResolution::Resolved
931+
}
932+
}
933+
934+
fn is_resolved_model(model: &str) -> bool {
935+
model_resolution(model) == ModelResolution::Resolved
936+
}
937+
896938
fn normalize_antigravity_model(raw: &str) -> Option<String> {
897939
let trimmed = raw.trim();
898940
if trimmed.is_empty() {
@@ -1407,13 +1449,69 @@ pub(super) mod test_support {
14071449
mod tests {
14081450
use super::test_support::{UsageFixture, metadata_blob_with_steps, step_metadata_blob};
14091451
use super::{
1410-
API_PROVIDER_GOOGLE_GEMINI, ProtoField, ProtoValue, calculate_antigravity_cost,
1411-
field_bytes, field_bytes_all, field_text, field_varint, missing_antigravity_pricing,
1412-
model_candidates, model_name_from_id, normalize_antigravity_model,
1413-
parse_generator_metadata, parse_step_metadata,
1452+
API_PROVIDER_GOOGLE_GEMINI, DEFAULT_MODEL, EventContext, ModelUsage, ProtoField,
1453+
ProtoValue, append_usage_event, calculate_antigravity_cost, field_bytes, field_bytes_all,
1454+
field_text, field_varint, merge_usage_event, missing_antigravity_pricing, model_candidates,
1455+
model_name_from_id, normalize_antigravity_model, parse_generator_metadata,
1456+
parse_step_metadata,
14141457
};
14151458
use crate::{PricingMap, TimestampMs, TokenUsageRaw, cli::CostMode, parse_ts_timestamp};
14161459

1460+
#[test]
1461+
fn merge_prefers_resolved_then_placeholder_then_default_model() {
1462+
let event = |model: Option<&str>| {
1463+
let mut events = Vec::new();
1464+
append_usage_event(
1465+
&mut events,
1466+
&mut std::collections::HashMap::new(),
1467+
ModelUsage {
1468+
input_tokens: 1,
1469+
..ModelUsage::default()
1470+
},
1471+
EventContext {
1472+
model,
1473+
model_id: None,
1474+
provider: None,
1475+
timestamp: None,
1476+
trajectory_timestamp: None,
1477+
fallback_timestamp: TimestampMs::UNIX_EPOCH,
1478+
session_id: "session",
1479+
fallback_identities: &[],
1480+
},
1481+
);
1482+
events.remove(0)
1483+
};
1484+
let merged_model = |target: Option<&str>, duplicate: Option<&str>| {
1485+
let mut target = event(target);
1486+
merge_usage_event(&mut target, event(duplicate));
1487+
target.model
1488+
};
1489+
1490+
assert_eq!(
1491+
merged_model(None, Some("model_placeholder_m401")),
1492+
"model_placeholder_m401"
1493+
);
1494+
assert_eq!(
1495+
merged_model(Some("model_placeholder_m401"), None),
1496+
"model_placeholder_m401"
1497+
);
1498+
assert_eq!(
1499+
merged_model(
1500+
Some("model_placeholder_m401"),
1501+
Some("claude-opus-5-5-medium")
1502+
),
1503+
"claude-opus-5-5-medium"
1504+
);
1505+
assert_eq!(
1506+
merged_model(
1507+
Some("claude-opus-5-5-medium"),
1508+
Some("model_placeholder_m401")
1509+
),
1510+
"claude-opus-5-5-medium"
1511+
);
1512+
assert_eq!(merged_model(None, None), DEFAULT_MODEL);
1513+
}
1514+
14171515
#[test]
14181516
fn protobuf_scalars_use_last_duplicate_and_messages_keep_merge_order() {
14191517
let first_text = b"first";

0 commit comments

Comments
 (0)