+ {{ t('admin.accounts.openai.longContextBillingDesc') }} +
++ {{ t('admin.accounts.bulkEdit.longContextShadowHint') }} +
++ {{ t('admin.accounts.openai.endpointCapabilitiesDesc') }} +
++ {{ t('admin.accounts.openai.responsesModeDesc') }} +
++ {{ t('admin.accounts.openai.responsesModeTextDisabledHint') }} +
+{{ baseUrlHint }}
+ {{ t('admin.accounts.cnProviders.apiProtocol.responsesFallbackDesc') }} +
{{ apiKeyHint }}
{{ t('admin.accounts.selectedModels', { count: allowedModels.length }) }} {{ @@ -1532,7 +1685,7 @@
{{ t('admin.accounts.selectedModels', { count: allowedModels.length }) }} {{ t('admin.accounts.supportsAllModels') }} @@ -2072,7 +2230,12 @@
{{ t('admin.accounts.selectedModels', { count: allowedModels.length }) }}
{{
@@ -2829,6 +2992,7 @@
+ {{ t('admin.accounts.cnProviders.apiProtocol.responsesFallbackDesc') }}
+ {{ t(`admin.accounts.cnProviders.accountMode.${editAccountMode}Desc`) }} {{ t(`admin.accounts.cnProviders.apiProtocol.${cnProtocolDescKey}Desc`) }}
+ {{ t('admin.accounts.autoResetCredit.hint') }}
+ {{ t('admin.accounts.autoResetCredit.thresholdHint') }} {{ t('admin.channelMonitor.form.linkedAccountHint') }}
+ {{ t('admin.channelMonitor.form.openAIQuotaProbeHint') }}
+
+ {{ t('admin.channelMonitor.form.linkedAccountMissing') }}
+
+ {{ t('admin.channelMonitor.form.linkedAccountEmpty') }}
+ {{ editing.api_key_masked }} {{ t('admin.users.form.concurrencyHint') }}
+ {{ t('keys.useKeyModal.codexModelCatalog.description') }}
+
+ {{ codexModelCatalogPath }}
+
+ {{ t('keys.useKeyModal.codexModelCatalog.modelsCount', { count: codexModelManifestModelCount }) }}
+
+ {{ t('keys.useKeyModal.codexModelCatalog.errorDescription') }}
+ {{ t('dashboard.todayTokens') }} {{ formatTokens(stats?.today_tokens || 0) }} {{ t('dashboard.input') }}: {{ formatTokens(stats?.today_input_tokens || 0) }} / {{ t('dashboard.output') }}: {{ formatTokens(stats?.today_output_tokens || 0) }} {{ t('dashboard.input') }}: {{ formatTokens(stats?.today_input_tokens || 0) }} / {{ t('dashboard.output') }}: {{ formatTokens(stats?.today_output_tokens || 0) }} / {{ t('dashboard.cache') }}: {{ formatTokens((stats?.today_cache_creation_tokens || 0) + (stats?.today_cache_read_tokens || 0)) }} {{ t('dashboard.totalTokens') }} {{ formatTokens(stats?.total_tokens || 0) }} {{ t('dashboard.input') }}: {{ formatTokens(stats?.total_input_tokens || 0) }} / {{ t('dashboard.output') }}: {{ formatTokens(stats?.total_output_tokens || 0) }} {{ t('dashboard.input') }}: {{ formatTokens(stats?.total_input_tokens || 0) }} / {{ t('dashboard.output') }}: {{ formatTokens(stats?.total_output_tokens || 0) }} / {{ t('dashboard.cache') }}: {{ formatTokens((stats?.total_cache_creation_tokens || 0) + (stats?.total_cache_read_tokens || 0)) }}
-
+
@@ -2915,9 +3079,9 @@
@@ -3609,13 +3773,20 @@ import ModelWhitelistSelector from '@/components/account/ModelWhitelistSelector.
import QuotaLimitCard from '@/components/account/QuotaLimitCard.vue'
import Toggle from '@/components/common/Toggle.vue'
import GrokBaseUrlPresets from '@/components/account/GrokBaseUrlPresets.vue'
+import CnBaseUrlPresets from '@/components/account/CnBaseUrlPresets.vue'
import HeaderOverrideEditor from '@/components/account/HeaderOverrideEditor.vue'
+import { allSelectedGroupsEnableLongContextPricing } from '@/components/account/longContextBilling'
import {
applyAntigravityProjectID,
applyHeaderOverride,
applyInterceptWarmup,
+ defaultCNAdaptiveBaseUrls,
+ defaultCNBaseUrl,
isHeaderOverrideCapable,
validateHeaderOverrideRows,
+ type CnAccountMode,
+ type CnApiProtocol,
+ type CnNativeApiProtocol,
type HeaderOverrideRow
} from '@/components/account/credentialsBuilder'
import { formatDateTimeLocalInput, parseDateTimeLocalInput } from '@/utils/format'
@@ -3674,6 +3845,42 @@ const apiKeyHint = computed(() => {
return t('admin.accounts.apiKeyHint')
})
+// Base URL / API Key 占位符：国产供应商随账号类型变化。
+const apiKeyBaseUrlPlaceholder = computed(() => {
+ if (isCNPlatform.value) {
+ return defaultCNBaseUrl(form.platform, accountMode.value, apiProtocol.value) || 'https://api.example.com'
+ }
+ switch (form.platform) {
+ case 'openai':
+ return 'https://api.openai.com'
+ case 'gemini':
+ return 'https://generativelanguage.googleapis.com'
+ case 'grok':
+ return 'https://api.x.ai/v1'
+ default:
+ return 'https://api.anthropic.com'
+ }
+})
+
+const apiKeyValuePlaceholder = computed(() => {
+ switch (form.platform) {
+ case 'openai':
+ return 'sk-proj-...'
+ case 'gemini':
+ return 'AIza...'
+ case 'grok':
+ return 'xai-...'
+ case 'kimi':
+ return 'sk-...'
+ case 'zhipu':
+ return '
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -489,7 +554,7 @@
@@ -1915,7 +1980,7 @@
+
@@ -2201,6 +2266,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/account/OpenAIQuotaResetCell.vue b/frontend/src/components/account/OpenAIQuotaResetCell.vue
index cb81bcfd9d..6a3225b8bf 100644
--- a/frontend/src/components/account/OpenAIQuotaResetCell.vue
+++ b/frontend/src/components/account/OpenAIQuotaResetCell.vue
@@ -63,6 +63,32 @@
+
+
+ {{ autoResetStateLabel }}
+
+ {{ autoResetState.trigger_window }}
+
+
+
+ {{ formatResetCreditExpiry(autoResetState.checked_at, 'short') }}
+
+
+ {{ autoResetState.error_code }}
+
+
+
(null)
const showResetConfirm = ref(false)
const showResetCreditDetails = ref(false)
+type AutoResetCreditState = NonNullable
+
+ {{ account.ollama_cloud_usage.snapshot.data.five_hour.used_percent }}'
+ emits: ['updated'],
+ template: ''
},
UsageProgressBar: true,
AccountQuotaInfo: true
@@ -111,6 +112,12 @@ describe('AccountUsageCell', () => {
expect(wrapper.get('[data-test="embedded-ollama"]').text()).toBe('12')
expect(getUsage).not.toHaveBeenCalled()
+
+ await wrapper.get('[data-test="embedded-ollama"]').trigger('click')
+
+ const updatedAccount = wrapper.emitted
+
+ `,
+ }, {
+ global: { stubs: { Select: SelectStub, Icon: true } },
+ })
+
+ const ids = wrapper.findAll('input').map(input => input.attributes('id'))
+ expect(ids).toHaveLength(6)
+ expect(new Set(ids).size).toBe(ids.length)
+ })
+})
diff --git a/frontend/src/components/admin/channel/__tests__/types.spec.ts b/frontend/src/components/admin/channel/__tests__/types.spec.ts
index 04758012f1..58b5724239 100644
--- a/frontend/src/components/admin/channel/__tests__/types.spec.ts
+++ b/frontend/src/components/admin/channel/__tests__/types.spec.ts
@@ -1,5 +1,62 @@
import { describe, expect, it } from 'vitest'
-import { validateIntervals, type IntervalFormEntry } from '../types'
+import {
+ apiIntervalsToForm,
+ apiTimePricingToForm,
+ createDefaultTimePricingForm,
+ formIntervalsToAPI,
+ formTimePricingToAPI,
+ isValidPositiveMultiplier,
+ validateIntervals,
+ validateTimePricing,
+ type IntervalFormEntry,
+ type TimePricingFormEntry,
+ type TimePricingPeriodFormEntry,
+} from '../types'
+
+describe('interval multiplier conversion', () => {
+ it('preserves component multipliers without MTok conversion', () => {
+ const form = apiIntervalsToForm([{
+ min_tokens: 272000,
+ max_tokens: null,
+ tier_label: '',
+ input_price: null,
+ output_price: null,
+ cache_write_price: null,
+ cache_read_price: null,
+ input_multiplier: 2,
+ output_multiplier: 1.5,
+ cache_write_multiplier: 2,
+ cache_read_multiplier: 2,
+ per_request_price: null,
+ sort_order: 0,
+ }])
+
+ expect(form[0].input_multiplier).toBe(2)
+ expect(form[0].output_multiplier).toBe(1.5)
+ expect(formIntervalsToAPI(form)[0]).toMatchObject({
+ input_multiplier: 2,
+ output_multiplier: 1.5,
+ cache_write_multiplier: 2,
+ cache_read_multiplier: 2,
+ })
+ })
+})
+
+describe('positive multiplier validation', () => {
+ it('accepts empty and positive values but rejects zero and negative values', () => {
+ expect(isValidPositiveMultiplier(null)).toBe(true)
+ expect(isValidPositiveMultiplier('')).toBe(true)
+ expect(isValidPositiveMultiplier('0.5')).toBe(true)
+ expect(isValidPositiveMultiplier(0)).toBe(false)
+ expect(isValidPositiveMultiplier(-1)).toBe(false)
+ })
+
+ it('rejects a zero interval multiplier', () => {
+ expect(validateIntervals([
+ makeInterval({ min_tokens: 100, input_multiplier: 0 }),
+ ], 'token', t)).toContain('multiplierPositive')
+ })
+})
function makeInterval(over: Partial
+
+
+
+
+
+
-
@@ -30,7 +51,34 @@
+
+
+
+
+
+
+
+
+
-
+
-
@@ -58,7 +106,7 @@
+
@@ -77,7 +125,7 @@
-
+
+
-
+
-
-
+
+
{{ t('admin.channelMonitor.advanced.section') }}
@@ -197,6 +245,7 @@ import type {
ChannelMonitor,
CreateParams,
APIMode,
+ CheckMode,
Provider,
UpdateParams,
} from '@/api/admin/channelMonitor'
@@ -216,10 +265,20 @@ import {
PROVIDER_ANTHROPIC,
PROVIDER_GEMINI,
PROVIDER_GROK,
+ PROVIDER_ANTIGRAVITY,
+ PROVIDER_KIMI,
+ PROVIDER_ZHIPU,
+ PROVIDER_DEEPSEEK,
API_MODE_CHAT_COMPLETIONS,
API_MODE_RESPONSES,
+ CHECK_MODE_PROBE,
+ CHECK_MODE_QUOTA,
+ CHECK_MODE_QUOTA_PROBE,
DEFAULT_GROK_ENDPOINT,
DEFAULT_GROK_MODEL,
+ DEFAULT_KIMI_ENDPOINT,
+ DEFAULT_ZHIPU_ENDPOINT,
+ DEFAULT_DEEPSEEK_ENDPOINT,
DEFAULT_INTERVAL_SECONDS,
} from '@/constants/channelMonitor'
@@ -259,6 +318,8 @@ interface MonitorForm {
name: string
provider: Provider
api_mode: APIMode
+ check_mode: CheckMode
+ account_id: number | null
endpoint: string
api_key: string
primary_model: string
@@ -278,6 +339,8 @@ const form = reactive
- {{ row.primary_model }}
-
@@ -154,11 +154,16 @@ interface Props {
id?: string
ariaLabel?: string
ariaDescribedby?: string
+ /** 远程搜索模式：输入不在本地过滤 options，而是防抖后 emit('search', query)，由父组件请求数据更新 options */
+ remote?: boolean
+ /** 远程搜索模式下的加载态：options 为空时下拉显示 loading 文案 */
+ loading?: boolean
}
interface Emits {
(e: 'update:modelValue', value: string | number | boolean | null): void
(e: 'change', value: string | number | boolean | null, option: SelectOption | null): void
+ (e: 'search', query: string): void
}
const props = withDefaults(defineProps
+
@@ -60,6 +65,7 @@
import { useI18n } from 'vue-i18n'
import type { ChannelMonitor } from '@/api/admin/channelMonitor'
import HelpTooltip from '@/components/common/HelpTooltip.vue'
+import MonitorQuotaView from '@/components/common/MonitorQuotaView.vue'
import { useChannelMonitorFormat } from '@/composables/useChannelMonitorFormat'
defineProps<{
@@ -67,5 +73,5 @@ defineProps<{
}>()
const { t } = useI18n()
-const { statusLabel, statusBadgeClass, formatLatency } = useChannelMonitorFormat()
+const { statusLabel, statusBadgeClass, formatLatency, formatMonitorModel } = useChannelMonitorFormat()
diff --git a/frontend/src/components/admin/monitor/MonitorRunResultDialog.vue b/frontend/src/components/admin/monitor/MonitorRunResultDialog.vue
index 02fa6e8d05..12dc429209 100644
--- a/frontend/src/components/admin/monitor/MonitorRunResultDialog.vue
+++ b/frontend/src/components/admin/monitor/MonitorRunResultDialog.vue
@@ -12,8 +12,9 @@
class="flex items-center justify-between rounded-lg border border-gray-200 px-3 py-2 text-sm dark:border-dark-600"
>
+
+ {{ formatMonitorModel(row.primary_model) }}
+
+
+
-
- {{ row.primary_model }}
+ {{ formatMonitorModel(row.primary_model) }}
- {{ r.model }}
+ {{ formatMonitorModel(r.model) }}
{{ r.message }}
+
()
const { t } = useI18n()
-const { statusLabel, statusBadgeClass, formatLatency } = useChannelMonitorFormat()
+const { statusLabel, statusBadgeClass, formatLatency, formatMonitorModel } = useChannelMonitorFormat()
diff --git a/frontend/src/components/admin/monitor/MonitorTemplateManagerDialog.vue b/frontend/src/components/admin/monitor/MonitorTemplateManagerDialog.vue
index 63b87db75a..e33b1102fd 100644
--- a/frontend/src/components/admin/monitor/MonitorTemplateManagerDialog.vue
+++ b/frontend/src/components/admin/monitor/MonitorTemplateManagerDialog.vue
@@ -249,6 +249,11 @@ import {
PROVIDER_OPENAI,
PROVIDER_GEMINI,
PROVIDER_GROK,
+ PROVIDER_ANTIGRAVITY,
+ PROVIDER_KIMI,
+ PROVIDER_ZHIPU,
+ PROVIDER_DEEPSEEK,
+ PROVIDERS,
API_MODE_CHAT_COMPLETIONS,
API_MODE_RESPONSES,
} from '@/constants/channelMonitor'
@@ -269,6 +274,10 @@ const providerTabs = computed<{ value: Provider; label: string }[]>(() => [
{ value: PROVIDER_OPENAI, label: t('monitorCommon.providers.openai') },
{ value: PROVIDER_GEMINI, label: t('monitorCommon.providers.gemini') },
{ value: PROVIDER_GROK, label: t('monitorCommon.providers.grok') },
+ { value: PROVIDER_ANTIGRAVITY, label: t('monitorCommon.providers.antigravity') },
+ { value: PROVIDER_KIMI, label: t('monitorCommon.providers.kimi') },
+ { value: PROVIDER_ZHIPU, label: t('monitorCommon.providers.zhipu') },
+ { value: PROVIDER_DEEPSEEK, label: t('monitorCommon.providers.deepseek') },
])
const activeProvider = ref
-
+
@@ -42,7 +43,16 @@
-
+
+
@@ -73,13 +83,14 @@
diff --git a/frontend/src/components/common/PlatformIcon.vue b/frontend/src/components/common/PlatformIcon.vue
index 937990ad75..7a93b28349 100644
--- a/frontend/src/components/common/PlatformIcon.vue
+++ b/frontend/src/components/common/PlatformIcon.vue
@@ -25,6 +25,25 @@
d="M9.27 15.29l7.978-5.897c.391-.29.95-.177 1.137.272.98 2.369.542 5.215-1.41 7.169-1.951 1.954-4.667 2.382-7.149 1.406l-2.711 1.257c3.889 2.661 8.611 2.003 11.562-.953 2.341-2.344 3.066-5.539 2.388-8.42l.006.007c-.983-4.232.242-5.924 2.75-9.383.06-.082.12-.164.179-.248l-3.301 3.305v-.01L9.267 15.292M7.623 16.723c-2.792-2.67-2.31-6.801.071-9.184 1.761-1.763 4.647-2.483 7.166-1.425l2.705-1.25a7.808 7.808 0 00-1.829-1A8.975 8.975 0 005.984 5.83c-2.533 2.536-3.33 6.436-1.962 9.764 1.022 2.487-.653 4.246-2.34 6.022-.599.63-1.199 1.259-1.682 1.925l7.62-6.815"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('keys.useKeyModal.codexModelCatalog.title') }}
+
+
-
+
-
+
-
+
{{ m.name }}
+
+
+ {{
+ t('modelPlaza.table.timePricingWeekdays')
+ }}
+ {{ formatTimeWindow(period) }}
+
+ {{ t('modelPlaza.table.marginalBadge') }}
+
@@ -93,11 +111,11 @@
:key="idx"
class="whitespace-nowrap text-xs leading-5"
>
- {{ tierLabel(iv) }}
- {{ paidPerMillion(iv.input_price) }}
+ {{ tierLabel(iv) }}
+ {{ paidPerMillion(iv.input_price, period) }}
- {{ paidPerMillion(m.pricing?.input_price) }}
+ {{ paidPerMillion(m.pricing?.input_price, period) }}
@@ -105,25 +123,41 @@
v-for="(iv, idx) in tokenIntervals(m)"
:key="idx"
class="whitespace-nowrap text-xs leading-5"
+ :title="tierHint(m)"
>
- {{ tierLabel(iv) }}
- {{ paidPerMillion(iv.output_price) }}
+ {{ paidPerMillion(iv.output_price, period) }}
- {{ paidPerMillion(m.pricing?.output_price) }}
+ {{ paidPerMillion(m.pricing?.output_price, period) }}
+
+
-
+
+
+ {{ t('modelPlaza.table.cacheWriteShort') }}
+ {{ paidPerMillion(iv.cache_write_price, period) }}
+ {{ t('modelPlaza.table.cacheReadShort') }}
+ {{ paidPerMillion(iv.cache_read_price, period) }}
+
+ -
+
+
-
@@ -157,18 +191,54 @@
{{ t('modelPlaza.table.cacheWrite') }}
- {{ paidPerMillion(m.pricing?.cache_write_price) }}
+ {{ paidPerMillion(m.pricing?.cache_write_price, period) }}
{{ t('modelPlaza.table.cacheRead') }}
- {{ paidPerMillion(m.pricing?.cache_read_price) }}
+ {{ paidPerMillion(m.pricing?.cache_read_price, period) }}
- {{ official(m.official_pricing?.input_price) }}
+
+
+ {{ tierLabel(iv) }}
+ {{ official(iv.input_price) }}
+
+
+ {{ official(m.official_pricing?.input_price) }}
- {{ official(m.official_pricing?.output_price) }}
+
+
+ {{ official(iv.output_price) }}
+
+
+ {{ official(m.official_pricing?.output_price) }}
+
+
-
+
+
+ {{ t('modelPlaza.table.cacheWriteShort') }}
+ {{ official(iv.cache_write_price) }}
+ {{ t('modelPlaza.table.cacheReadShort') }}
+ {{ official(iv.cache_read_price) }}
+
+ -
+
+
@@ -187,12 +257,18 @@
-
{{ periodRate(period) }}x
+ {{ requestRate(m) }}x
@@ -218,7 +294,7 @@ import {
BILLING_MODE_IMAGE,
type BillingMode
} from '@/constants/channel'
-import type { PlazaModel } from '@/api/modelPlaza'
+import type { PlazaModel, PlazaTimePricingPeriod } from '@/api/modelPlaza'
import type { UserPricingInterval } from '@/api/channels'
const props = defineProps<{
@@ -232,6 +308,13 @@ const props = defineProps<{
/** 生图独立倍率:true 时图片计费模型的实付倍率取 imageRateMultiplier,不取分组/专属倍率。 */
imageRateIndependent?: boolean
imageRateMultiplier?: number | null
+ /**
+ * 高峰窗口描述(含倍率与服务器时区标注),空串/缺省 = 分组未启用高峰。
+ * 表格所有价格均为不含高峰因子的口径,该窗口仅用于分时时段行的 tooltip 披露:
+ * 与高峰重叠的部分实付还会再乘高峰倍率。
+ */
+ peakWindow?: string
+ peakRateMultiplier?: number | null
}>()
const { t } = useI18n()
@@ -279,10 +362,35 @@ function billingModeLabel(m: PlazaModel): string {
/** 价格统一保底 2 位小数,更长的有效小数原样保留。 */
const MIN_DECIMALS = 2
-/** 实付价 = 渠道单价 × 生效倍率,按 $/1M token 展示。 */
-function paidPerMillion(value: number | null | undefined): string {
+/** 表格行:每个模型一行标准价;配置了分时倍率的模型再按时段各加一行。 */
+interface PlazaRow {
+ model: PlazaModel
+ period: PlazaTimePricingPeriod | null
+ key: string
+}
+
+const rows = computed {{ m.model }}
+ {{ formatMonitorModel(m.model) }}
(null)
const loading = ref(false)
diff --git a/frontend/src/components/user/__tests__/MonitorCard.quota.spec.ts b/frontend/src/components/user/__tests__/MonitorCard.quota.spec.ts
new file mode 100644
index 0000000000..8bc680c64c
--- /dev/null
+++ b/frontend/src/components/user/__tests__/MonitorCard.quota.spec.ts
@@ -0,0 +1,103 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { UserMonitorView } from '@/api/channelMonitor'
+import MonitorCard from '../monitor/MonitorCard.vue'
+
+const { isQuotaVisible } = vi.hoisted(() => ({
+ isQuotaVisible: vi.fn(() => false),
+}))
+
+vi.mock('@/utils/featureFlags', () => ({
+ isChannelMonitorQuotaVisible: () => isQuotaVisible(),
+}))
+
+vi.mock('vue-i18n', async () => {
+ const actual = await vi.importActual
@@ -92,7 +92,7 @@
diff --git a/frontend/src/components/user/monitor/MonitorCard.vue b/frontend/src/components/user/monitor/MonitorCard.vue
index 1b66b1caed..afa711165b 100644
--- a/frontend/src/components/user/monitor/MonitorCard.vue
+++ b/frontend/src/components/user/monitor/MonitorCard.vue
@@ -23,8 +23,9 @@
>
{{ providerLabel(item.provider) }}