Skip to content

Commit 7862c88

Browse files
committed
fix(pricing): prefer known model before alias lookup
Resolve pricing and context limits from the original model before falling back to CCUSAGE_MODEL_ALIASES. This keeps display-oriented aliases such as claude-opus-4-8=mythos-5 from forcing an unnecessary models.dev lookup while preserving private-slug aliases that map unknown raw models to known pricing entries. Add a regression test covering known original models with unknown display aliases.
1 parent 3b4ff2c commit 7862c88

1 file changed

Lines changed: 36 additions & 8 deletions

File tree

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

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,19 @@ impl PricingMap {
361361
}
362362

363363
pub(crate) fn find(&self, model: &str) -> Option<Pricing> {
364-
let model = crate::model_aliases::resolve_model_name(model);
365-
self.find_entry_or_alias(model.as_ref())
364+
let alias = crate::model_aliases::resolve_model_name(model);
365+
let fallback_model = alias.as_ref();
366+
self.find_entry_or_alias(model)
367+
.or_else(|| {
368+
(fallback_model != model)
369+
.then(|| self.find_entry_or_alias(fallback_model))
370+
.flatten()
371+
})
366372
.or_else(|| {
367373
self.enable_models_dev_fallback
368374
.then(|| {
369375
models_dev_pricing()
370-
.and_then(|pricing| pricing.find_entry_or_alias(model.as_ref()))
376+
.and_then(|pricing| pricing.find_entry_or_alias(fallback_model))
371377
})
372378
.flatten()
373379
})
@@ -376,7 +382,7 @@ impl PricingMap {
376382
// fuzzy alias matching. It works offline, unlike the network source.
377383
.or_else(|| {
378384
self.enable_embedded_models_dev_fallback
379-
.then(|| embedded_models_dev_pricing().find_entry_or_alias(model.as_ref()))
385+
.then(|| embedded_models_dev_pricing().find_entry_or_alias(fallback_model))
380386
.flatten()
381387
})
382388
}
@@ -402,21 +408,27 @@ impl PricingMap {
402408
}
403409

404410
pub(crate) fn context_limit(&self, model: &str) -> Option<u64> {
405-
let model = crate::model_aliases::resolve_model_name(model);
406-
self.context_limit_entry_or_alias(model.as_ref())
411+
let alias = crate::model_aliases::resolve_model_name(model);
412+
let fallback_model = alias.as_ref();
413+
self.context_limit_entry_or_alias(model)
414+
.or_else(|| {
415+
(fallback_model != model)
416+
.then(|| self.context_limit_entry_or_alias(fallback_model))
417+
.flatten()
418+
})
407419
.or_else(|| {
408420
self.enable_models_dev_fallback
409421
.then(|| {
410422
models_dev_pricing().and_then(|pricing| {
411-
pricing.context_limit_entry_or_alias(model.as_ref())
423+
pricing.context_limit_entry_or_alias(fallback_model)
412424
})
413425
})
414426
.flatten()
415427
})
416428
.or_else(|| {
417429
self.enable_embedded_models_dev_fallback
418430
.then(|| {
419-
embedded_models_dev_pricing().context_limit_entry_or_alias(model.as_ref())
431+
embedded_models_dev_pricing().context_limit_entry_or_alias(fallback_model)
420432
})
421433
.flatten()
422434
})
@@ -1806,6 +1818,22 @@ mod tests {
18061818
assert_eq!(pricing.context_limit("private-gpt-55"), Some(1_050_000));
18071819
}
18081820

1821+
#[test]
1822+
fn pricing_lookup_prefers_known_original_model_before_alias() {
1823+
let _aliases =
1824+
crate::model_aliases::set_model_aliases_for_tests([("claude-opus-4-8", "mythos-5")]);
1825+
let pricing = PricingMap::load_embedded();
1826+
1827+
let original = pricing.find_entry("claude-opus-4-8").unwrap();
1828+
let resolved = pricing.find("claude-opus-4-8").unwrap();
1829+
1830+
assert_eq!(resolved.input, original.input);
1831+
assert_eq!(
1832+
pricing.context_limit("claude-opus-4-8"),
1833+
pricing.context_limit_entry("claude-opus-4-8")
1834+
);
1835+
}
1836+
18091837
#[test]
18101838
fn embedded_pricing_includes_codex_priority_multiplier() {
18111839
let pricing = PricingMap::load_embedded();

0 commit comments

Comments
 (0)