Skip to content

Commit 7c25b20

Browse files
fix(model-aliases): apply rustfmt and strip wrapping braces on json fallback
rustfmt wants the multi-line call form for the now-longer add_deduped_event_to_groups call. Also strip the outer { } before falling back to delimited parsing so a malformed JSON value like {a=b} resolves to a sensible alias instead of leaving braces embedded in the keys. Co-authored-by: Codesmith <[email protected]>
1 parent bc43ece commit 7c25b20

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

‎rust/crates/ccusage/src/adapter/codex/aggregate.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,15 @@ fn add_event_to_groups(
241241
if !insert_event_key(event, timestamp, model.as_ref(), kind, seen) {
242242
return Ok(());
243243
}
244-
add_deduped_event_to_groups(event, model.as_ref(), timestamp, kind, timezone, shared, groups)
244+
add_deduped_event_to_groups(
245+
event,
246+
model.as_ref(),
247+
timestamp,
248+
kind,
249+
timezone,
250+
shared,
251+
groups,
252+
)
245253
}
246254

247255
fn add_event_to_groups_local(

‎rust/crates/ccusage/src/model_aliases.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ fn parse_model_aliases(raw: &str) -> BTreeMap<String, String> {
4545
}
4646

4747
trimmed
48+
.trim_start_matches('{')
49+
.trim_end_matches('}')
4850
.split([',', ';', '\n'])
4951
.filter_map(|pair| {
5052
let (from, to) = pair.split_once('=')?;
@@ -122,10 +124,10 @@ mod tests {
122124

123125
#[test]
124126
fn falls_back_to_delimited_parsing_when_json_is_malformed() {
125-
let aliases = parse_model_aliases(r#"{private-alpha=gpt-5.5"#);
127+
let aliases = parse_model_aliases(r#"{private-alpha=gpt-5.5}"#);
126128

127129
assert_eq!(
128-
aliases.get("{private-alpha").map(String::as_str),
130+
aliases.get("private-alpha").map(String::as_str),
129131
Some("gpt-5.5")
130132
);
131133
}

0 commit comments

Comments
 (0)