diff --git a/docs/20-media-pricing-completion.md b/docs/20-media-pricing-completion.md index ba90c36..1c6e550 100644 --- a/docs/20-media-pricing-completion.md +++ b/docs/20-media-pricing-completion.md @@ -2,6 +2,12 @@ ## 本轮范围 +### 系统页面补齐 + +模型广场、详情、试用提示及 Key 分组授权统一展示报价待核实、用量计费待核实、执行接口待接入、暂不接入与可调用状态。筛选和状态标识一致,暂不接入不会显示为价格待配置。 + +管理端价格表按真实计费单位展示人民币 Token/张/任务/生成单价;分组编辑器补充固定单价和图像输入 Token 价。金额最多 8 位小数,保存保留报价来源与异步计费参数,不隐式换汇或再打折。新增 3 项回归覆盖暂缓接入优先级、固定价格编辑、图像输入价与单位切换。本次无数据库迁移或价格数据变更。 + 用户指出目录中仍有大量“价格待配置”“异步按任务计费待配置”。核对发现:无报价、无采购折扣、异步 Token 计费未实现、媒体原生协议不匹配是不同问题。保持现有平台结构,补齐已核实的配置和结算。 用户确认 Spark、Step、MiMo、Midjourney、Suno、Veo/Lyria、通义万相暂不接入。V43 为相应未定价路由记录 integrationDeferred;网关拒绝调用,目录显示“暂不接入”。保留原有目录、Key 授权和启用状态,管理统计不再把它们计入本期待配置价格数量。 diff --git a/prototype/src/components/CatalogAdmin.vue b/prototype/src/components/CatalogAdmin.vue index 8f90b5b..73c7ad0 100644 --- a/prototype/src/components/CatalogAdmin.vue +++ b/prototype/src/components/CatalogAdmin.vue @@ -5,7 +5,9 @@ import { catalogClient, type CatalogProvider, type CatalogModel, type LogicalMod import UiModal from './UiModal.vue' import ListPagination from './ListPagination.vue' import { usePagination } from '../composables/usePagination' -import { calculateTokenRetailPricing } from '../services/pricing' +import { calculateTokenRetailPricing, editRetailAmounts, platformPriceLabel, standardPriceLabel } from '../services/pricing' + +import { routeReadinessLabel, routeReadinessReason } from '../services/model-catalog' const props = defineProps<{ section: 'models' | 'channels' }>() const emit = defineEmits<{ notify: [message: string] }>() @@ -30,7 +32,7 @@ async function remove() { } const channel = reactive({ code: '', name: '', protocol: 'openai-compatible' as CatalogProvider['protocol'], sourceType: 'relay' as CatalogProvider['sourceType'], baseUrl: '', credentialType: 'api-key' as NonNullable, credentialSecret: '', description: '', status: 'active' as CatalogProvider['status'] }) const model = reactive({ publicName: '', modelKey: '', vendorName: '', type: 'text' as LogicalModel['type'], mode: 'sync' as LogicalModel['mode'], description: '', inputTypes: 'text', outputTypes: 'text', status: 'active' as LogicalModel['status'] }) -const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', cachedInput: '', unit: 'CNY / 1M tokens', discount: '', discountLabel: '', exchangeRate: '', priceSource: '', listPriceInput: '', listPriceOutput: '', listPriceCachedInput: '', priority: '100', maxConcurrency: '0', status: 'active' as CatalogModel['status'] }) +const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', cachedInput: '', imageInput: '', price: '', unit: 'CNY / 1M tokens', discount: '', discountLabel: '', exchangeRate: '', priceSource: '', listPriceInput: '', listPriceOutput: '', listPriceCachedInput: '', priority: '100', maxConcurrency: '0', status: 'active' as CatalogModel['status'] }) const listCurrency = ref<'USD' | 'CNY'>('USD') const originalPricing = ref() const shownModels = computed(() => models.value.filter(item => `${item.publicName} ${item.vendorName || ''} ${item.modelKey || ''}`.toLowerCase().includes(query.value.toLowerCase()))) @@ -70,6 +72,8 @@ function editGroup(parent: LogicalModel, item?: CatalogModel) { originalPricing.value = item?.pricing listCurrency.value = item?.pricing?.listPriceCny ? 'CNY' : 'USD' Object.assign(group, { logicalModelId: parent.id, providerId: item?.providerId || '', sourceLabel: item?.sourceLabel || '', upstreamModel: item?.upstreamModel || '', input: item?.pricing?.input?.toString() || '', output: item?.pricing?.output?.toString() || '', cachedInput: item?.pricing?.cachedInput?.toString() || '', unit: item?.pricing?.unit || 'CNY / 1M tokens', discount: item?.pricing?.discount?.toString() || '', discountLabel: item?.pricing?.discountLabel || '', exchangeRate: item?.pricing?.exchangeRate?.toString() || '', priceSource: item?.pricing?.priceSource || '', listPriceInput: item?.pricing?.listPriceUsd?.input?.toString() || '', listPriceOutput: item?.pricing?.listPriceUsd?.output?.toString() || '', listPriceCachedInput: item?.pricing?.listPriceUsd?.cachedInput?.toString() || '', priority: String(item?.priority ?? 100), maxConcurrency: String(item?.maxConcurrency ?? 0), status: item?.status || 'active' }) + group.price = item?.pricing?.price?.toString() ?? '' + group.imageInput = item?.pricing?.imageInput?.toString() ?? '' const list = item?.pricing?.listPriceCny || item?.pricing?.listPriceUsd group.listPriceInput = list?.input?.toString() ?? '' group.listPriceOutput = list?.output?.toString() ?? '' @@ -87,8 +91,10 @@ function calculateRetail() { } function groupPricing(): CatalogModel['pricing'] { + if (!originalPricing.value && [group.input, group.output, group.cachedInput, group.imageInput, group.price].every(value => value === '')) return undefined + const amounts = editRetailAmounts(originalPricing.value, group.unit, group) const list = group.listPriceInput === '' && group.listPriceOutput === '' && group.listPriceCachedInput === '' ? undefined : {input:group.listPriceInput === '' ? undefined : Number(group.listPriceInput),output:group.listPriceOutput === '' ? undefined : Number(group.listPriceOutput),cachedInput:group.listPriceCachedInput === '' ? undefined : Number(group.listPriceCachedInput)} - return {...originalPricing.value,input:group.input === '' ? undefined : Number(group.input),output:group.output === '' ? undefined : Number(group.output),cachedInput:group.cachedInput === '' ? undefined : Number(group.cachedInput),unit:group.unit,discount:group.discount === '' ? undefined : Number(group.discount),discountLabel:group.discountLabel.trim() || undefined,exchangeRate:listCurrency.value === 'CNY' && list ? 1 : group.exchangeRate === '' ? undefined : Number(group.exchangeRate),priceSource:group.priceSource.trim() || undefined,listPriceUsd:listCurrency.value === 'USD' ? list : undefined,listPriceCny:listCurrency.value === 'CNY' ? list : undefined} + return {...amounts,discount:group.discount === '' ? undefined : Number(group.discount),discountLabel:group.discountLabel.trim() || undefined,exchangeRate:listCurrency.value === 'CNY' && list ? 1 : group.exchangeRate === '' ? undefined : Number(group.exchangeRate),priceSource:group.priceSource.trim() || undefined,listPriceUsd:group.unit === 'CNY / 1M tokens' ? (listCurrency.value === 'USD' ? list : undefined) : originalPricing.value?.listPriceUsd,listPriceCny:group.unit === 'CNY / 1M tokens' ? (listCurrency.value === 'CNY' ? list : undefined) : originalPricing.value?.listPriceCny} } async function save() { if (saving.value) return @@ -139,7 +145,7 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider

{{ item.publicName }}

{{ item.vendorName || '未标注厂商' }} · {{ item.modelKey || item.id }} · {{ item.type }} · {{ item.mode }}

{{ item.description }}

-
分组名称渠道上游模型输入 / 输出价格对外折扣并发状态操作
{{ route.sourceLabel }}{{ channelName(route.providerId) }}{{ route.upstreamModel }}{{ route.pricing?.input ?? '—' }} / {{ route.pricing?.output ?? '—' }}{{ route.pricing?.unit }}{{ route.pricing?.discountLabel || '—' }}{{ route.maxConcurrency === undefined || route.maxConcurrency === null || route.maxConcurrency === 0 ? '不限(由渠道限流)' : route.maxConcurrency }}
暂无分组
+
分组名称渠道上游模型人民币售价 / 计费单位对外折扣并发状态操作
{{ route.sourceLabel }}{{ channelName(route.providerId) }}{{ route.upstreamModel }}{{ route.pricingConfigured ? platformPriceLabel(route.pricing) : routeReadinessLabel(route) }}{{ routeReadinessReason(route) }}{{ route.pricing?.discountLabel || '—' }}{{ route.maxConcurrency === undefined || route.maxConcurrency === null || route.maxConcurrency === 0 ? '不限(由渠道限流)' : route.maxConcurrency }}{{ routeReadinessLabel(route) }}
暂无分组

暂无模型

@@ -172,17 +178,23 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider - + + + + 1M Token=1,000,000 Token=一百万 Token。人民币原价不乘汇率;美元原价仅换算一次。采购 4.6 折加 1 个折扣点,对外填 5.6。 - 输入、输出价格是实际扣费值,单位为 CNY / 1M tokens。折扣只用于向用户展示,不会替代人民币售价;留空表示不展示折扣。 + 上方人民币售价是实际扣费值。折扣和汇率仅在点击换算时参与计算,保存不会再次打折或换汇。留空不代表免费,也不会自动开放尚未完成计费或执行接口接入的模型。 diff --git a/prototype/src/components/ModelGroupPermissions.vue b/prototype/src/components/ModelGroupPermissions.vue index a80fb1d..d5a0253 100644 --- a/prototype/src/components/ModelGroupPermissions.vue +++ b/prototype/src/components/ModelGroupPermissions.vue @@ -1,7 +1,7 @@