Skip to content

Commit bc43ece

Browse files
fix(model-aliases): fall back to delimited parsing on malformed JSON
Previously an env value starting with '{' that failed JSON parsing returned an empty map, silently clearing every configured alias. Try delimited parsing instead so partial misconfiguration is recoverable. Co-authored-by: Codesmith <[email protected]>
1 parent 912dd3e commit bc43ece

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ fn load_model_aliases_from_env() -> BTreeMap<String, String> {
3838

3939
fn parse_model_aliases(raw: &str) -> BTreeMap<String, String> {
4040
let trimmed = raw.trim();
41-
if trimmed.starts_with('{') {
42-
return serde_json::from_str::<BTreeMap<String, String>>(trimmed).unwrap_or_default();
41+
if trimmed.starts_with('{')
42+
&& let Ok(parsed) = serde_json::from_str::<BTreeMap<String, String>>(trimmed)
43+
{
44+
return parsed;
4345
}
4446

4547
trimmed
@@ -118,6 +120,16 @@ mod tests {
118120
);
119121
}
120122

123+
#[test]
124+
fn falls_back_to_delimited_parsing_when_json_is_malformed() {
125+
let aliases = parse_model_aliases(r#"{private-alpha=gpt-5.5"#);
126+
127+
assert_eq!(
128+
aliases.get("{private-alpha").map(String::as_str),
129+
Some("gpt-5.5")
130+
);
131+
}
132+
121133
#[test]
122134
fn resolves_configured_model_alias() {
123135
let _aliases = set_model_aliases_for_tests([("private-alpha", "gpt-5.5")]);

0 commit comments

Comments
 (0)