From da277a6ebb850aebd369f6fe97820e028e7aebfe Mon Sep 17 00:00:00 2001 From: Yujong Lee Date: Wed, 23 Sep 2026 20:11:32 -0700 Subject: [PATCH] fix(cost): apply regional uplifts one at a time like generic_cost_per_token Co-Authored-By: Claude Opus 5.5 --- litellm-rust/crates/cost/src/generic_cost.rs | 20 +++++++++------ .../crates/cost/src/regional_uplift.rs | 15 ++++++++--- .../cost/tests/python_regional_uplift.rs | 25 +++++++++++++------ 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/litellm-rust/crates/cost/src/generic_cost.rs b/litellm-rust/crates/cost/src/generic_cost.rs index 1e36255a30a..cc90269e9cb 100644 --- a/litellm-rust/crates/cost/src/generic_cost.rs +++ b/litellm-rust/crates/cost/src/generic_cost.rs @@ -10,7 +10,7 @@ use crate::generic_output::{calculate_output_cost, resolve_reasoning_token_cost} use crate::generic_usage::{ParsedPromptDetails, parse_prompt_tokens_details}; use crate::off_peak::{open_off_peak_block, parse_off_peak_rate}; use crate::provider_cache::apply_provider_cache_read_default; -use crate::regional_uplift::regional_totals_multiplier; +use crate::regional_uplift::apply_regional_totals_uplift; use crate::responses_usage::ChatUsage; #[derive(Clone, Copy, Debug, PartialEq)] @@ -178,14 +178,18 @@ pub fn calculate_generic_cost_from_model_info_with_region( vertex_location: Option<&str>, at: Timestamp, ) -> (f64, f64) { - let multiplier = regional_totals_multiplier(model_info, data_residency, vertex_location); - calculate_generic_cost_from_model_info( - usage, + apply_regional_totals_uplift( + calculate_generic_cost_from_model_info( + usage, + model_info, + service_tier, + threshold_inclusive, + 1.0, + at, + ), model_info, - service_tier, - threshold_inclusive, - multiplier, - at, + data_residency, + vertex_location, ) } diff --git a/litellm-rust/crates/cost/src/regional_uplift.rs b/litellm-rust/crates/cost/src/regional_uplift.rs index 8a73ce6cf78..b68297716f9 100644 --- a/litellm-rust/crates/cost/src/regional_uplift.rs +++ b/litellm-rust/crates/cost/src/regional_uplift.rs @@ -46,13 +46,20 @@ pub fn get_provider_specific_geo_multiplier( .unwrap_or(1.0) } -pub fn regional_totals_multiplier( +pub fn apply_regional_totals_uplift( + (prompt, completion): (f64, f64), model_info: &Value, data_residency: Option<&str>, vertex_location: Option<&str>, -) -> f64 { - get_regional_uplift_multiplier(model_info, data_residency) - * get_vertex_regional_endpoint_uplift(model_info, vertex_location) +) -> (f64, f64) { + [ + get_regional_uplift_multiplier(model_info, data_residency), + get_vertex_regional_endpoint_uplift(model_info, vertex_location), + ] + .into_iter() + .fold((prompt, completion), |(prompt, completion), uplift| { + (prompt * uplift, completion * uplift) + }) } pub fn combined_regional_multiplier( diff --git a/litellm-rust/crates/cost/tests/python_regional_uplift.rs b/litellm-rust/crates/cost/tests/python_regional_uplift.rs index e4a0c7e0d1c..95ba4088dfc 100644 --- a/litellm-rust/crates/cost/tests/python_regional_uplift.rs +++ b/litellm-rust/crates/cost/tests/python_regional_uplift.rs @@ -5,8 +5,8 @@ use jiff::Timestamp; use litellm_cost::generic_cost::calculate_generic_cost_from_model_info_with_region; use litellm_cost::regional_uplift::{ - get_provider_specific_geo_multiplier, get_regional_uplift_multiplier, - get_vertex_regional_endpoint_uplift, regional_totals_multiplier, + apply_regional_totals_uplift, get_provider_specific_geo_multiplier, + get_regional_uplift_multiplier, get_vertex_regional_endpoint_uplift, }; use litellm_cost::usage_dispatch::get_usage_object; use rstest::rstest; @@ -99,11 +99,9 @@ fn calculate_generic_cost_from_model_info_with_region_scales_both_sides() { Some("us-east5"), at, ); - let multiplier = regional_totals_multiplier(&model_info, Some("eu"), Some("us-east5")); - assert!((actual.0 - 100.0 * 2e-6 * multiplier).abs() < 1e-12); - assert!((actual.1 - 50.0 * 4e-6 * multiplier).abs() < 1e-12); - assert!( - (multiplier - 1.2 * 1.3).abs() < 1e-12, + assert_eq!( + actual, + (100.0 * 2e-6 * 1.2 * 1.3, 50.0 * 4e-6 * 1.2 * 1.3), "generic totals exclude the provider-specific geo multiplier; only the anthropic wrapper applies it" ); } @@ -132,3 +130,16 @@ fn uplift_multipliers_are_coerced_like_python_float( expected ); } + +#[rstest] +fn apply_regional_totals_uplift_multiplies_in_python_order() { + let model_info = json!({ + "regional_processing_uplift_multiplier_eu": 1.1, + "regional_endpoint_uplift_multiplier": 1.1 + }); + let prompt = 7.0 * 3e-7; + let (actual, _) = + apply_regional_totals_uplift((prompt, 0.0), &model_info, Some("eu"), Some("us-east5")); + assert_eq!(actual, prompt * 1.1 * 1.1); + assert_ne!(actual, prompt * (1.1 * 1.1)); +}