i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-05 00:47:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(billing): add image quality pricing and usage tracking

Browse Source
This commit is contained in:
ZheFox
2026-05-18 00:11:30 +08:00
parent 680b617b00
commit c024c782e4
13 changed files with 559 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-billing/src/default_rule.rs
+145 -2
View File
@@ -23,14 +23,23 @@ impl DefaultBillingRuleGenerator {
pricing: &BillingModelPricingSnapshot,
task_type: &str,
) -> Option<VirtualBillingRule> {
let pricing_config = pricing.effective_tiered_pricing();
let tiers = pricing
.effective_tiered_pricing()
.and_then(|value| value.get("tiers"))
.and_then(Value::as_array)
.cloned()
.unwrap_or_default();
let image_output_price_entries = explicit_image_output_price_entries(pricing_config)
.filter(|entries| !entries.is_empty())
.unwrap_or_default();
let image_output_price_default =
explicit_image_output_price_default(pricing_config).unwrap_or(0.0);
if tiers.is_empty() && pricing.effective_price_per_request().is_none() {
if tiers.is_empty()
&& pricing.effective_price_per_request().is_none()
&& image_output_price_entries.is_empty()
{
return None;
}
@@ -63,6 +72,10 @@ impl DefaultBillingRuleGenerator {
json!(base_cache_read_price),
);
variables.insert("price_per_request".to_string(), json!(base_request_price));
variables.insert(
"image_output_price_per_image".to_string(),
json!(image_output_price_default),
);
let mut dimension_mappings = BTreeMap::new();
for (name, key, default) in [
@@ -87,6 +100,8 @@ impl DefaultBillingRuleGenerator {
("cache_read_tokens", "cache_read_tokens", json!(0)),
("request_count", "request_count", json!(1)),
("image_count", "image_count", json!(0)),
("image_count_unmetered", "image_count_unmetered", json!(0)),
("image_price_key", "image_price_key", json!("default")),
] {
dimension_mappings.insert(
name.to_string(),
@@ -122,6 +137,10 @@ impl DefaultBillingRuleGenerator {
"cache_read_cost",
"cache_read_tokens * cache_read_price_per_1m / 1000000",
),
(
"image_output_cost",
"image_count_unmetered * image_output_price_per_image",
),
("request_cost", "request_count * price_per_request"),
] {
dimension_mappings.insert(
@@ -135,6 +154,18 @@ impl DefaultBillingRuleGenerator {
);
}
if !image_output_price_entries.is_empty() {
dimension_mappings.insert(
"image_output_price_per_image".to_string(),
json!({
"source": "matrix",
"key": "image_price_key",
"entries": image_output_price_entries,
"default": image_output_price_default,
}),
);
}
if !tiers.is_empty() {
dimension_mappings.insert(
"input_price_per_1m".to_string(),
@@ -210,7 +241,7 @@ impl DefaultBillingRuleGenerator {
id: "__default__".to_string(),
name: format!("Default rule for {}", pricing.global_model_name),
task_type: normalize_task_type(task_type).to_string(),
expression: "input_cost + output_cost + cache_creation_uncategorized_cost + cache_creation_ephemeral_5m_cost + cache_creation_ephemeral_1h_cost + cache_read_cost + request_cost".to_string(),
expression: "input_cost + output_cost + cache_creation_uncategorized_cost + cache_creation_ephemeral_5m_cost + cache_creation_ephemeral_1h_cost + cache_read_cost + image_output_cost + request_cost".to_string(),
variables,
dimension_mappings,
scope: "default".to_string(),
@@ -268,3 +299,115 @@ fn build_tier_entries(
})
.collect()
}
fn explicit_image_output_price_entries(
pricing_config: Option<&Value>,
) -> Option<BTreeMap<String, Value>> {
let pricing_config = pricing_config?;
let mut entries = BTreeMap::new();
for key in [
"image_output_prices",
"image_output_price_per_image",
"image_output_price_matrix",
"image_prices",
] {
if let Some(value) = pricing_config.get(key) {
collect_image_output_price_entries(value, &mut entries);
}
}
Some(entries)
}
fn explicit_image_output_price_default(pricing_config: Option<&Value>) -> Option<f64> {
let pricing_config = pricing_config?;
pricing_config
.get("image_output_price_default")
.or_else(|| pricing_config.get("image_price_default"))
.or_else(|| {
pricing_config
.get("image_output_prices")
.and_then(|value| value.get("default"))
})
.and_then(Value::as_f64)
}
fn collect_image_output_price_entries(value: &Value, entries: &mut BTreeMap<String, Value>) {
if let Some(object) = value.as_object() {
for (key, value) in object {
if key.eq_ignore_ascii_case("default") {
continue;
}
if let Some(price) = value.as_f64() {
entries.insert(normalize_image_price_key(key), json!(price));
continue;
}
let Some(nested) = value.as_object() else {
continue;
};
let key_is_quality = matches_quality_key(key);
for (nested_key, nested_value) in nested {
let Some(price) = nested_value.as_f64() else {
continue;
};
let (size, quality) = if key_is_quality {
(nested_key.as_str(), key.as_str())
} else {
(key.as_str(), nested_key.as_str())
};
entries.insert(image_price_key(size, quality), json!(price));
}
}
return;
}
if let Some(items) = value.as_array() {
for item in items.iter().filter_map(Value::as_object) {
let Some(size) = item.get("size").and_then(Value::as_str) else {
continue;
};
let quality = item
.get("quality")
.and_then(Value::as_str)
.unwrap_or("medium");
let Some(price) = item
.get("price_per_image")
.or_else(|| item.get("price"))
.or_else(|| item.get("cost"))
.and_then(Value::as_f64)
else {
continue;
};
entries.insert(image_price_key(size, quality), json!(price));
}
}
}
fn normalize_image_price_key(value: &str) -> String {
if let Some((size, quality)) = value.split_once(':').or_else(|| value.split_once('|')) {
return image_price_key(size, quality);
}
value.trim().to_ascii_lowercase().replace(' ', "")
}
fn image_price_key(size: &str, quality: &str) -> String {
format!(
"{}:{}",
normalize_image_size(size),
normalize_image_quality(quality)
)
}
fn normalize_image_size(value: &str) -> String {
value.trim().to_ascii_lowercase().replace(' ', "")
}
fn normalize_image_quality(value: &str) -> String {
value.trim().to_ascii_lowercase()
}
fn matches_quality_key(value: &str) -> bool {
matches!(
normalize_image_quality(value).as_str(),
"low" | "medium" | "high"
)
}