@@ -2811,6 +2811,7 @@ import {
} from '@/components/account/credentialsBuilder'
import { formatDateTime, formatDateTimeLocalInput, parseDateTimeLocalInput } from '@/utils/format'
import { createStableObjectKeyResolver } from '@/utils/stableObjectKey'
+import { allSelectedGroupsEnableLongContextPricing } from '@/components/account/longContextBilling'
import { VERTEX_LOCATION_OPTIONS } from '@/constants/account'
import {
OPENAI_WS_MODE_CTX_POOL,
@@ -2851,6 +2852,10 @@ const authStore = useAuthStore()
// 故隐藏代理选择器。
const isSparkShadow = computed(() => props.account?.parent_account_id != null)
+const hideAccountLongContextBilling = computed(() => {
+ return allSelectedGroupsEnableLongContextPricing(form.group_ids, props.groups)
+})
+
const handleOllamaCloudUsageUpdated = (state: OllamaCloudUsageState) => {
if (props.account) emit('updated', { ...props.account, ollama_cloud_usage: state })
}
diff --git a/frontend/src/components/account/__tests__/CreateAccountModal.spec.ts b/frontend/src/components/account/__tests__/CreateAccountModal.spec.ts
index d70e7ec6d2..552998802f 100644
--- a/frontend/src/components/account/__tests__/CreateAccountModal.spec.ts
+++ b/frontend/src/components/account/__tests__/CreateAccountModal.spec.ts
@@ -7,11 +7,13 @@ const {
probeUpstreamBillingMock,
importCodexSessionMock,
createOpenAICodexPATMock,
+ authIsSimpleMode,
} = vi.hoisted(() => ({
createAccountMock: vi.fn(),
probeUpstreamBillingMock: vi.fn(),
importCodexSessionMock: vi.fn(),
createOpenAICodexPATMock: vi.fn(),
+ authIsSimpleMode: { value: true },
}))
vi.mock('@/stores/app', () => ({
@@ -23,7 +25,11 @@ vi.mock('@/stores/app', () => ({
}))
vi.mock('@/stores/auth', () => ({
- useAuthStore: () => ({ isSimpleMode: true }),
+ useAuthStore: () => ({
+ get isSimpleMode() {
+ return authIsSimpleMode.value
+ },
+ }),
}))
vi.mock('@/api/admin', () => ({
@@ -84,9 +90,29 @@ const OAuthAuthorizationFlowStub = defineComponent({
`,
})
-function mountModal() {
+const GroupSelectorStub = defineComponent({
+ name: 'GroupSelector',
+ props: {
+ modelValue: {
+ type: Array,
+ default: () => [],
+ },
+ },
+ emits: ['update:modelValue'],
+ template: `
+
+ `,
+})
+
+function mountModal(groups: any[] = []) {
return mount(CreateAccountModal, {
- props: { show: true, proxies: [], groups: [] },
+ props: { show: true, proxies: [], groups },
global: {
stubs: {
BaseDialog: BaseDialogStub,
@@ -97,7 +123,7 @@ function mountModal() {
PlatformIcon: true,
ProxySelector: true,
ProxyAdBanner: true,
- GroupSelector: true,
+ GroupSelector: GroupSelectorStub,
ModelWhitelistSelector: true,
QuotaLimitCard: true,
},
@@ -147,6 +173,7 @@ async function openCodexImportStep(toggleClicks = 0) {
describe('CreateAccountModal OpenAI long-context billing', () => {
beforeEach(() => {
+ authIsSimpleMode.value = true
createAccountMock.mockReset().mockResolvedValue({ id: 42, platform: 'openai', type: 'apikey' })
probeUpstreamBillingMock.mockReset().mockResolvedValue({})
importCodexSessionMock.mockReset().mockResolvedValue({
@@ -160,6 +187,34 @@ describe('CreateAccountModal OpenAI long-context billing', () => {
createOpenAICodexPATMock.mockReset().mockResolvedValue({})
})
+ it('hides only the redundant account toggle when every selected group enables tier pricing', async () => {
+ authIsSimpleMode.value = false
+ const wrapper = mountModal([
+ { id: 1, long_context_pricing_enabled: true },
+ { id: 2, long_context_pricing_enabled: true },
+ ])
+
+ await selectButtonByText(wrapper, 'OpenAI')
+ await wrapper.get('[data-testid="select-pricing-groups"]').trigger('click')
+
+ expect(wrapper.find('[data-testid="openai-long-context-billing-toggle"]').exists()).toBe(false)
+ expect(wrapper.find('[data-testid="create-openai-ws-mode"]').exists()).toBe(true)
+ })
+
+ it('keeps the account toggle when any selected group disables tier pricing', async () => {
+ authIsSimpleMode.value = false
+ const wrapper = mountModal([
+ { id: 1, long_context_pricing_enabled: true },
+ { id: 2, long_context_pricing_enabled: false },
+ ])
+
+ await selectButtonByText(wrapper, 'OpenAI')
+ await wrapper.get('[data-testid="select-pricing-groups"]').trigger('click')
+
+ expect(wrapper.find('[data-testid="openai-long-context-billing-toggle"]').exists()).toBe(true)
+ expect(wrapper.find('[data-testid="create-openai-ws-mode"]').exists()).toBe(true)
+ })
+
it('sends false explicitly for normal OpenAI account creation by default', async () => {
await submitApiKeyAccount('openai')
diff --git a/frontend/src/components/account/__tests__/longContextBilling.spec.ts b/frontend/src/components/account/__tests__/longContextBilling.spec.ts
new file mode 100644
index 0000000000..70e2c55695
--- /dev/null
+++ b/frontend/src/components/account/__tests__/longContextBilling.spec.ts
@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest'
+
+import { allSelectedGroupsEnableLongContextPricing } from '../longContextBilling'
+
+const group = (id: number, enabled: boolean) => ({
+ id,
+ long_context_pricing_enabled: enabled,
+}) as any
+
+describe('allSelectedGroupsEnableLongContextPricing', () => {
+ it('hides the account override when every selected group enables tier pricing', () => {
+ expect(allSelectedGroupsEnableLongContextPricing(
+ [1, 2],
+ [group(1, true), group(2, true)]
+ )).toBe(true)
+ })
+
+ it('keeps the account override when any selected group disables tier pricing', () => {
+ expect(allSelectedGroupsEnableLongContextPricing(
+ [1, 2],
+ [group(1, true), group(2, false)]
+ )).toBe(false)
+ })
+
+ it('keeps the account override when selection is empty or group data is incomplete', () => {
+ expect(allSelectedGroupsEnableLongContextPricing([], [group(1, true)])).toBe(false)
+ expect(allSelectedGroupsEnableLongContextPricing([1, 2], [group(1, true)])).toBe(false)
+ })
+})
diff --git a/frontend/src/components/account/longContextBilling.ts b/frontend/src/components/account/longContextBilling.ts
new file mode 100644
index 0000000000..38c64391b5
--- /dev/null
+++ b/frontend/src/components/account/longContextBilling.ts
@@ -0,0 +1,11 @@
+import type { AdminGroup } from '@/types'
+
+export function allSelectedGroupsEnableLongContextPricing(
+ groupIds: number[],
+ groups: AdminGroup[]
+): boolean {
+ if (groupIds.length === 0) return false
+ const selectedGroups = groups.filter(group => groupIds.includes(group.id))
+ return selectedGroups.length === groupIds.length &&
+ selectedGroups.every(group => group.long_context_pricing_enabled === true)
+}
diff --git a/frontend/src/components/admin/channel/IntervalRow.vue b/frontend/src/components/admin/channel/IntervalRow.vue
index 7036a82986..0166e510a6 100644
--- a/frontend/src/components/admin/channel/IntervalRow.vue
+++ b/frontend/src/components/admin/channel/IntervalRow.vue
@@ -3,35 +3,59 @@
:class="isEmpty ? 'border-red-400 bg-red-50 dark:border-red-500 dark:bg-red-950/20' : 'border-gray-200 bg-white dark:border-dark-500 dark:bg-dark-700'">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -79,6 +103,7 @@ const { t } = useI18n()
const props = defineProps<{
interval: IntervalFormEntry
mode: BillingMode
+ enableMultipliers?: boolean
}>()
const emit = defineEmits<{
@@ -93,6 +118,10 @@ const isEmpty = computed(() => {
(iv.output_price == null || iv.output_price === '') &&
(iv.cache_write_price == null || iv.cache_write_price === '') &&
(iv.cache_read_price == null || iv.cache_read_price === '') &&
+ (iv.input_multiplier == null || iv.input_multiplier === '') &&
+ (iv.output_multiplier == null || iv.output_multiplier === '') &&
+ (iv.cache_write_multiplier == null || iv.cache_write_multiplier === '') &&
+ (iv.cache_read_multiplier == null || iv.cache_read_multiplier === '') &&
(iv.per_request_price == null || iv.per_request_price === '')
})
diff --git a/frontend/src/components/admin/channel/PricingEntryCard.vue b/frontend/src/components/admin/channel/PricingEntryCard.vue
index f2a0d6502b..58151455c4 100644
--- a/frontend/src/components/admin/channel/PricingEntryCard.vue
+++ b/frontend/src/components/admin/channel/PricingEntryCard.vue
@@ -139,7 +139,20 @@