Fix verified image pricing and settle async image usage

This commit is contained in:
wlx committed 2026-10-13 20:13:21 +08:00
1 parent 4c4f5ad68d
commit 8a13ef9c02
22 files changed
+506 -40

No files matched your search

+3
View File
@@ -36,6 +36,7 @@ export interface CatalogModel {
input?: number
output?: number
cachedInput?: number
imageInput?: number
unit?: string
discount?: number
discountLabel?: string
@@ -48,6 +49,8 @@ export interface CatalogModel {
}
pricingConfigured?: boolean
billingReady?: boolean
billingReason?: string
integrationDeferred?: boolean
priority?: number
maxConcurrency?: number
executionReady?: boolean
+1
View File
@@ -43,6 +43,7 @@ export function summarizeModelCatalog(
for (const route of routes) {
if (route.status !== 'active' || !publishedModelIds.has(route.logicalModelId) || !activeProviderIds.has(route.providerId)) continue
if (route.integrationDeferred) continue
if (route.pricingConfigured !== true) {
unpricedRoutes++
continue
+5 -2
View File
@@ -3,6 +3,7 @@ export interface DisplayPricing {
input?: number
output?: number
cachedInput?: number
imageInput?: number
unit?: string
discount?: number
discountLabel?: string
@@ -81,10 +82,12 @@ export function platformPriceLabel(pricing?: DisplayPricing) {
if (!pricing) return '价格待配置'
if (isTokenUnit(pricing.unit)) {
const unit = pricing.unit === 'CNY / 1M tokens' ? '人民币 / 1M(一百万 Token)' : pricing.unit || '人民币 / 1M(一百万 Token)'
return `${numberLabel(pricing.input)} 输入 / ${numberLabel(pricing.output)} 输出 · ${unit}`
const image = pricing.imageInput === undefined ? '' : ` / ${numberLabel(pricing.imageInput)} 图像输入`
return `${numberLabel(pricing.input)} ${image ? '文字输入' : '输入'}${image} / ${numberLabel(pricing.output)} 输出 · ${unit}`
}
const price = pricing.price ?? pricing.input
return price === undefined ? `计费单位:${unitLabel(pricing.unit)}` : `平台售价 ${numberLabel(price)} / ${unitSuffix(pricing)}`
const suffix = ({ image: '张(单张请求)', task: '任务', generation: '次生成' } as Record<string, string>)[unitSuffix(pricing)] || unitSuffix(pricing)
return price === undefined ? `计费单位:${unitLabel(pricing.unit)}` : `平台售价 ${numberLabel(price)} / ${suffix}`
}
/** Explicit admin action. Settlement still uses saved CNY rates, never applies a second discount. */