+
{other.reason}
),
@@ -609,7 +631,8 @@ export const useLogsData = () => {
const ss = other.stream_status;
const isOk = ss.status === 'ok';
const statusLabel = isOk ? '✓ ' + t('正常') : '✗ ' + t('异常');
- let streamValue = statusLabel + ' (' + (ss.end_reason || 'unknown') + ')';
+ let streamValue =
+ statusLabel + ' (' + (ss.end_reason || 'unknown') + ')';
if (ss.error_count > 0) {
streamValue += ` [${t('软错误')}: ${ss.error_count}]`;
}
@@ -624,7 +647,14 @@ export const useLogsData = () => {
expandDataLocal.push({
key: t('流错误详情'),
value: (
-
+
{ss.errors.join('\n')}
),
diff --git a/web/src/pages/Setting/Ratio/components/ModelPricingEditor.jsx b/web/src/pages/Setting/Ratio/components/ModelPricingEditor.jsx
index 5028a3ffdbaf..0802120f28d8 100644
--- a/web/src/pages/Setting/Ratio/components/ModelPricingEditor.jsx
+++ b/web/src/pages/Setting/Ratio/components/ModelPricingEditor.jsx
@@ -45,13 +45,62 @@ import {
PAGE_SIZE,
PRICE_SUFFIX,
buildSummaryText,
+ breakpointsFromTiers,
hasValue,
useModelPricingEditorState,
} from '../hooks/useModelPricingEditorState';
import { useIsMobile } from '../../../../hooks/common/useIsMobile';
+import { showError } from '../../../../helpers';
const { Text } = Typography;
const EMPTY_CANDIDATE_MODEL_NAMES = [];
+const EMPTY_TIER_DRAFT = {
+ inputPrice: '',
+ completionPrice: '',
+ cacheReadPrice: '',
+};
+const NUMERIC_INPUT_REGEX = /^(\d+(\.\d*)?|\.\d*)?$/;
+const TOKEN_BOUNDARY_INPUT_REGEX = /^\d*$/;
+
+const hasTierReferenceInputPrice = (model) =>
+ hasValue(model?.tierPricingTiers?.[0]?.inputPrice);
+
+const formatCompactTokenValue = (value) => {
+ if (!hasValue(value)) return null;
+ const num = Number(value);
+ if (!Number.isFinite(num)) return value;
+ if (num >= 1000 && num % 1000 === 0) {
+ return `${num / 1000}k`;
+ }
+ return String(num);
+};
+
+const buildTierRangeText = (tier) => {
+ const minLabel = formatCompactTokenValue(tier?.minTokens) || '0';
+ const maxLabel = formatCompactTokenValue(tier?.maxTokens);
+ if (!maxLabel) {
+ return `>= ${minLabel}`;
+ }
+ return `${minLabel} <= x < ${maxLabel}`;
+};
+
+const buildInitialTierDraft = (model, index) => {
+ const targetTier =
+ index !== null && index !== undefined ? model?.tierPricingTiers?.[index] : null;
+ if (targetTier) {
+ return {
+ inputPrice: targetTier.inputPrice || '',
+ completionPrice: targetTier.completionPrice || '',
+ cacheReadPrice: targetTier.cacheReadPrice || '',
+ };
+ }
+ return {
+ ...EMPTY_TIER_DRAFT,
+ inputPrice: model?.inputPrice || '',
+ completionPrice: model?.completionPrice || '',
+ cacheReadPrice: model?.cachePrice || '',
+ };
+};
const PriceInput = ({
label,
@@ -84,6 +133,30 @@ const PriceInput = ({
);
+const TierInputField = ({
+ label,
+ hint = '',
+ value,
+ placeholder,
+ unitText = '',
+ onChange,
+}) => (
+
+
+
{label}
+ {hint ?
{hint}
: null}
+
+
+ {unitText ? (
+
{unitText}
+ ) : null}
+
+);
+
export default function ModelPricingEditor({
options,
refresh,
@@ -101,6 +174,11 @@ export default function ModelPricingEditor({
const [addVisible, setAddVisible] = useState(false);
const [batchVisible, setBatchVisible] = useState(false);
const [newModelName, setNewModelName] = useState('');
+ const [tierEditorVisible, setTierEditorVisible] = useState(false);
+ const [editingTierIndex, setEditingTierIndex] = useState(null);
+ const [tierDraft, setTierDraft] = useState(EMPTY_TIER_DRAFT);
+ const [breakpointInputVisible, setBreakpointInputVisible] = useState(false);
+ const [breakpointInputValue, setBreakpointInputValue] = useState('');
const {
selectedModel,
@@ -118,9 +196,13 @@ export default function ModelPricingEditor({
filteredModels,
pagedData,
selectedWarnings,
- previewRows,
+ previewSections,
isOptionalFieldEnabled,
handleOptionalFieldToggle,
+ handleTierPricingToggle,
+ handleAddBreakpoint,
+ handleRemoveBreakpoint,
+ handleSaveTierRow,
handleNumericFieldChange,
handleBillingModeChange,
handleSubmit,
@@ -167,6 +249,11 @@ export default function ModelPricingEditor({
{t('矛盾')}
) : null}
+ {record.tierPricingEnabled ? (
+
+ {t('阶梯定价')}
+
+ ) : null}
),
},
@@ -227,6 +314,69 @@ export default function ModelPricingEditor({
onChange: (selectedRowKeys) => setSelectedModelNames(selectedRowKeys),
};
+ const openTierEditor = (index) => {
+ if (!selectedModel) return;
+ setEditingTierIndex(index);
+ setTierDraft(buildInitialTierDraft(selectedModel, index));
+ setTierEditorVisible(true);
+ };
+
+ const handleTierDraftChange = (field, value) => {
+ if (!NUMERIC_INPUT_REGEX.test(value)) {
+ return;
+ }
+ setTierDraft((previous) => ({
+ ...previous,
+ [field]: value,
+ }));
+ };
+
+ const submitTierEditor = () => {
+ if (!selectedModel || editingTierIndex === null) return;
+ if (selectedModel.completionRatioLocked) {
+ showError(t('该模型补全倍率由后端锁定，不支持阶梯定价'));
+ return;
+ }
+ if (!hasValue(tierDraft.inputPrice)) {
+ showError(t('请填写输入价格'));
+ return;
+ }
+ if (!hasValue(tierDraft.completionPrice)) {
+ showError(t('请填写输出价格'));
+ return;
+ }
+ if (
+ Number(tierDraft.inputPrice) === 0 &&
+ ((hasValue(tierDraft.completionPrice) &&
+ Number(tierDraft.completionPrice) !== 0) ||
+ (hasValue(tierDraft.cacheReadPrice) &&
+ Number(tierDraft.cacheReadPrice) !== 0))
+ ) {
+ showError(t('输入价格为 0 时，输出和缓存读取价格也必须为 0'));
+ return;
+ }
+ handleSaveTierRow(editingTierIndex, tierDraft);
+ setTierEditorVisible(false);
+ setEditingTierIndex(null);
+ };
+
+ const submitBreakpoint = () => {
+ if (!breakpointInputValue) return;
+ const num = Number(breakpointInputValue);
+ if (!Number.isInteger(num) || num <= 0) {
+ showError(t('分界点必须是大于 0 的整数'));
+ return;
+ }
+ const existing = breakpointsFromTiers(selectedModel?.tierPricingTiers);
+ if (existing.includes(num)) {
+ showError(t('分界点已存在'));
+ return;
+ }
+ handleAddBreakpoint(num);
+ setBreakpointInputValue('');
+ setBreakpointInputVisible(false);
+ };
+
return (
<>
@@ -424,94 +574,296 @@ export default function ModelPricingEditor({
background: 'var(--semi-color-fill-0)',
}}
>
- {t('基础价格')}
- handleNumericFieldChange('inputPrice', value)}
- />
- {selectedModel.completionRatioLocked ? (
-
+
+
{t('阶梯定价')}
+
+ {selectedModel.completionRatioLocked
+ ? t(
+ '该模型补全倍率由后端锁定，不支持阶梯定价。',
+ )
+ : t(
+ '按输入 tokens 命中不同价格档位。开启后会自动把当前基础价格写入第 1 档，并改为写入 ModelTierPricing。',
+ )}
+
+
+
{t('阶梯价格表')}
+
+ {t(
+ '通过添加分界点来划分价格区间，每个区间可单独设置价格。',
+ )}
+
+
+ {t('分界点')}:
+ {breakpointsFromTiers(selectedModel.tierPricingTiers).map(
+ (bp, bpIndex) => (
+ handleRemoveBreakpoint(bpIndex)}
+ >
+ {formatCompactTokenValue(bp)}
+
+ ),
)}
- disabled={selectedModel.completionRatioLocked}
- onChange={(checked) =>
- handleOptionalFieldToggle('completionPrice', checked)
+ {breakpointInputVisible ? (
+
+ {
+ if (TOKEN_BOUNDARY_INPUT_REGEX.test(value)) {
+ setBreakpointInputValue(value);
+ }
+ }}
+ onEnterPress={submitBreakpoint}
+ autoFocus
+ />
+
+
+
+ ) : (
+ }
+ size='small'
+ theme='borderless'
+ disabled={selectedModel.completionRatioLocked}
+ onClick={() => setBreakpointInputVisible(true)}
+ >
+ {t('添加分界点')}
+
+ )}
+
+
+ {selectedModel.tierPricingTiers.map((tier, index) => (
+
+
+
+
+ {t('第 {{index}} 档', { index: index + 1 })}
+
+
+ {t('命中区间')} {buildTierRangeText(tier)}
+
+
+
+
+
+
+ {t('输入价格')}
+
+
+ {hasValue(tier.inputPrice) ? `$${tier.inputPrice}` : '-'}
+
+
+
+
+ {t('输出价格')}
+
+
+ {hasValue(tier.completionPrice) ? `$${tier.completionPrice}` : '-'}
+
+
+
+
+ {t('缓存读取价格')}
+
+
+ {hasValue(tier.cacheReadPrice)
+ ? `$${tier.cacheReadPrice}`
+ : t('未设置')}
+
+
+
+ ))}
+
{t('基础价格')}
+
+ handleNumericFieldChange('inputPrice', value)
}
/>
- }
- hidden={
- !isOptionalFieldEnabled(selectedModel, 'completionPrice')
- }
- disabled={
- !hasValue(selectedModel.inputPrice) ||
- selectedModel.completionRatioLocked
- }
- extraText={
- selectedModel.completionRatioLocked
- ? t(
- '后端固定倍率：{{ratio}}。该字段仅展示换算后的价格。',
+ {selectedModel.completionRatioLocked ? (
+
+ ) : null}
+
+ handleNumericFieldChange('completionPrice', value)
+ }
+ headerAction={
+
- handleNumericFieldChange('cachePrice', value)}
- headerAction={
-
- handleOptionalFieldToggle('cachePrice', checked)
+ )}
+ disabled={selectedModel.completionRatioLocked}
+ onChange={(checked) =>
+ handleOptionalFieldToggle('completionPrice', checked)
+ }
+ />
+ }
+ hidden={
+ !isOptionalFieldEnabled(
+ selectedModel,
+ 'completionPrice',
+ )
+ }
+ disabled={
+ !hasValue(selectedModel.inputPrice) ||
+ selectedModel.completionRatioLocked
+ }
+ extraText={
+ selectedModel.completionRatioLocked
+ ? t(
+ '后端固定倍率：{{ratio}}。该字段仅展示换算后的价格。',
+ {
+ ratio:
+ selectedModel.lockedCompletionRatio || '-',
+ },
+ )
+ : !isOptionalFieldEnabled(
+ selectedModel,
+ 'completionPrice',
+ )
+ ? t('当前未启用，需要时再打开即可。')
+ : ''
}
/>
- }
- hidden={!isOptionalFieldEnabled(selectedModel, 'cachePrice')}
- disabled={!hasValue(selectedModel.inputPrice)}
- extraText={
- !isOptionalFieldEnabled(selectedModel, 'cachePrice')
- ? t('当前未启用，需要时再打开即可。')
- : ''
- }
- />
+
+ handleNumericFieldChange('cachePrice', value)
+ }
+ headerAction={
+
+ handleOptionalFieldToggle('cachePrice', checked)
+ }
+ />
+ }
+ hidden={!isOptionalFieldEnabled(selectedModel, 'cachePrice')}
+ disabled={!hasValue(selectedModel.inputPrice)}
+ extraText={
+ !isOptionalFieldEnabled(selectedModel, 'cachePrice')
+ ? t('当前未启用，需要时再打开即可。')
+ : ''
+ }
+ />
+
+ )}
+
+
+
+
+
+ {selectedModel.tierPricingEnabled
+ ? t('非阶梯扩展价格')
+ : t('扩展价格')}
+
+
+ {selectedModel.tierPricingEnabled
+ ? t(
+ '这些字段继续写入旧的全局倍率配置，不参与阶梯。它们会以第一档输入价格作为参考换算倍率。',
+ )
+ : t('这些价格都是可选项，不填也可以。')}
+
+
-
{t('扩展价格')}
-
- {t('这些价格都是可选项，不填也可以。')}
-
-