Skip to content

Commit 2f2faa6

Browse files
committed
fix(codex): normalize cache usage deltas
1 parent eae84c7 commit 2f2faa6

4 files changed

Lines changed: 75 additions & 27 deletions

File tree

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

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ fn visit_codex_session_entry(
334334
if let Some(total_usage) = total_usage {
335335
*previous_totals = Some(total_usage);
336336
}
337-
let Some(raw_usage) = raw_usage else {
337+
let Some(raw_usage) = raw_usage.map(normalize_codex_raw_usage) else {
338338
return Ok(());
339339
};
340340
if raw_usage.input_tokens == 0
@@ -439,6 +439,7 @@ fn visit_codex_exec_usage_event(
439439
current_model_is_fallback: &mut bool,
440440
visit: &mut impl FnMut(CodexTokenUsageEvent) -> Result<()>,
441441
) -> Result<()> {
442+
let raw_usage = normalize_codex_raw_usage(raw_usage);
442443
let (model, is_fallback_model) = resolve_codex_usage_model(
443444
parsed_model,
444445
&timestamps.model,
@@ -1026,7 +1027,7 @@ fn normalize_value_timestamp(value: Option<&Value>) -> Option<String> {
10261027
}
10271028

10281029
fn normalize_headless_codex_usage(value: &CodexLogEntry<'_>) -> Option<CodexRawUsage> {
1029-
let usage = usage_from_result(value)?;
1030+
let usage = normalize_codex_raw_usage(usage_from_result(value)?);
10301031
if usage.input_tokens == 0
10311032
&& usage.cached_input_tokens == 0
10321033
&& usage.cache_creation_tokens == 0
@@ -1040,7 +1041,7 @@ fn normalize_headless_codex_usage(value: &CodexLogEntry<'_>) -> Option<CodexRawU
10401041
}
10411042

10421043
fn normalize_headless_codex_usage_value(value: &Value) -> Option<CodexRawUsage> {
1043-
let usage = usage_from_result_value(value)?;
1044+
let usage = normalize_codex_raw_usage(usage_from_result_value(value)?);
10441045
if usage.input_tokens == 0
10451046
&& usage.cached_input_tokens == 0
10461047
&& usage.cache_creation_tokens == 0
@@ -1070,7 +1071,7 @@ fn subtract_codex_raw_usage(
10701071
current: &CodexRawUsage,
10711072
previous: Option<&CodexRawUsage>,
10721073
) -> CodexRawUsage {
1073-
CodexRawUsage {
1074+
normalize_codex_raw_usage(CodexRawUsage {
10741075
input_tokens: current
10751076
.input_tokens
10761077
.saturating_sub(previous.map_or(0, |usage| usage.input_tokens)),
@@ -1089,7 +1090,15 @@ fn subtract_codex_raw_usage(
10891090
total_tokens: current
10901091
.total_tokens
10911092
.saturating_sub(previous.map_or(0, |usage| usage.total_tokens)),
1092-
}
1093+
})
1094+
}
1095+
1096+
fn normalize_codex_raw_usage(mut usage: CodexRawUsage) -> CodexRawUsage {
1097+
usage.cached_input_tokens = usage.cached_input_tokens.min(usage.input_tokens);
1098+
usage.cache_creation_tokens = usage
1099+
.cache_creation_tokens
1100+
.min(usage.input_tokens.saturating_sub(usage.cached_input_tokens));
1101+
usage
10931102
}
10941103

10951104
#[cfg(test)]
@@ -1142,4 +1151,43 @@ mod tests {
11421151
.all(|window| window[0].released_on > window[1].released_on)
11431152
);
11441153
}
1154+
1155+
#[test]
1156+
fn normalizes_cache_usage_after_cumulative_resets_and_series_changes() {
1157+
let reset = subtract_codex_raw_usage(
1158+
&CodexRawUsage {
1159+
input_tokens: 10,
1160+
cached_input_tokens: 10,
1161+
cache_creation_tokens: 0,
1162+
..CodexRawUsage::default()
1163+
},
1164+
Some(&CodexRawUsage {
1165+
input_tokens: 100,
1166+
cached_input_tokens: 0,
1167+
cache_creation_tokens: 100,
1168+
..CodexRawUsage::default()
1169+
}),
1170+
);
1171+
let series_change = subtract_codex_raw_usage(
1172+
&CodexRawUsage {
1173+
input_tokens: 110,
1174+
cached_input_tokens: 0,
1175+
cache_creation_tokens: 110,
1176+
..CodexRawUsage::default()
1177+
},
1178+
Some(&CodexRawUsage {
1179+
input_tokens: 100,
1180+
cached_input_tokens: 100,
1181+
cache_creation_tokens: 0,
1182+
..CodexRawUsage::default()
1183+
}),
1184+
);
1185+
1186+
assert_eq!(reset.input_tokens, 0);
1187+
assert_eq!(reset.cached_input_tokens, 0);
1188+
assert_eq!(reset.cache_creation_tokens, 0);
1189+
assert_eq!(series_change.input_tokens, 10);
1190+
assert_eq!(series_change.cached_input_tokens, 0);
1191+
assert_eq!(series_change.cache_creation_tokens, 10);
1192+
}
11451193
}

‎rust/adapters/codex/src/report.rs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fn group_json(
5656
speed: CodexSpeedPolicy,
5757
) -> Value {
5858
let cost = calculate_group_cost(group, pricing, speed);
59-
let input_tokens = non_cached_codex_input_tokens(
59+
let input_tokens = non_cached_input_tokens(
6060
group.input_tokens,
6161
group.cached_input_tokens,
6262
group.cache_creation_tokens,
@@ -86,24 +86,17 @@ fn group_json(
8686
row
8787
}
8888

89-
pub fn non_cached_input_tokens(input_tokens: u64, cached_input_tokens: u64) -> u64 {
90-
input_tokens.saturating_sub(cached_input_tokens)
91-
}
92-
93-
fn non_cached_codex_input_tokens(
89+
pub fn non_cached_input_tokens(
9490
input_tokens: u64,
9591
cached_input_tokens: u64,
9692
cache_creation_tokens: u64,
9793
) -> u64 {
98-
non_cached_input_tokens(
99-
input_tokens,
100-
cached_input_tokens.saturating_add(cache_creation_tokens),
101-
)
94+
input_tokens.saturating_sub(cached_input_tokens.saturating_add(cache_creation_tokens))
10295
}
10396

10497
fn model_usage_json(usage: &CodexModelUsage) -> Value {
10598
json!({
106-
"inputTokens": non_cached_codex_input_tokens(
99+
"inputTokens": non_cached_input_tokens(
107100
usage.input_tokens,
108101
usage.cached_input_tokens,
109102
usage.cache_creation_tokens,
@@ -130,7 +123,7 @@ fn totals_json<'a>(
130123
let mut total = 0;
131124
let mut cost = 0.0;
132125
for group in groups {
133-
input += non_cached_codex_input_tokens(
126+
input += non_cached_input_tokens(
134127
group.input_tokens,
135128
group.cached_input_tokens,
136129
group.cache_creation_tokens,
@@ -352,7 +345,7 @@ fn codex_table_row(
352345
no_cost: bool,
353346
terminal_width: usize,
354347
) -> (Vec<String>, u64, f64) {
355-
let input_tokens = non_cached_codex_input_tokens(
348+
let input_tokens = non_cached_input_tokens(
356349
group.input_tokens,
357350
group.cached_input_tokens,
358351
group.cache_creation_tokens,
@@ -512,6 +505,12 @@ pub(super) fn print_table_from_groups(
512505
mod tests {
513506
use super::*;
514507

508+
#[test]
509+
fn non_cached_input_tokens_excludes_cache_reads_and_creation() {
510+
assert_eq!(non_cached_input_tokens(100, 60, 30), 10);
511+
assert_eq!(non_cached_input_tokens(100, 90, 20), 0);
512+
}
513+
515514
#[test]
516515
fn table_rows_and_totals_render_cache_creation_tokens() {
517516
let group = CodexGroup {

‎rust/crates/ccusage-adapter-all/src/loader.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -801,9 +801,8 @@ where
801801
.map(|(model, usage)| {
802802
let input = codex::non_cached_input_tokens(
803803
usage.input_tokens,
804-
usage
805-
.cached_input_tokens
806-
.saturating_add(usage.cache_creation_tokens),
804+
usage.cached_input_tokens,
805+
usage.cache_creation_tokens,
807806
);
808807
ModelBreakdown {
809808
model_name: model.clone(),
@@ -824,9 +823,8 @@ where
824823
models_used: group.models.keys().cloned().collect(),
825824
input_tokens: codex::non_cached_input_tokens(
826825
group.input_tokens,
827-
group
828-
.cached_input_tokens
829-
.saturating_add(group.cache_creation_tokens),
826+
group.cached_input_tokens,
827+
group.cache_creation_tokens,
830828
),
831829
output_tokens: group.output_tokens,
832830
cache_creation_tokens: group.cache_creation_tokens,

‎rust/crates/ccusage-adapter-all/src/tests.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,8 @@ fn codex_usage_line(timestamp: &str, model: &str, input_tokens: u64) -> String {
673673
fn uses_non_cached_codex_input_tokens_in_all_rows() {
674674
let mut group = CodexGroup {
675675
input_tokens: 100,
676-
cached_input_tokens: 90,
676+
cached_input_tokens: 70,
677+
cache_creation_tokens: 20,
677678
output_tokens: 5,
678679
total_tokens: 105,
679680
..CodexGroup::default()
@@ -682,7 +683,8 @@ fn uses_non_cached_codex_input_tokens_in_all_rows() {
682683
"gpt-5".to_string(),
683684
CodexModelUsage {
684685
input_tokens: 100,
685-
cached_input_tokens: 90,
686+
cached_input_tokens: 70,
687+
cache_creation_tokens: 20,
686688
output_tokens: 5,
687689
total_tokens: 105,
688690
..CodexModelUsage::default()
@@ -696,7 +698,8 @@ fn uses_non_cached_codex_input_tokens_in_all_rows() {
696698
);
697699

698700
assert_eq!(row.input_tokens, 10);
699-
assert_eq!(row.cache_read_tokens, 90);
701+
assert_eq!(row.cache_creation_tokens, 20);
702+
assert_eq!(row.cache_read_tokens, 70);
700703
assert_eq!(row.total_tokens, 105);
701704
}
702705

0 commit comments

Comments
 (0)