('/sora/storage-status')
- return data
-}
-
-const soraAPI = {
- generate,
- listGenerations,
- getGeneration,
- deleteGeneration,
- cancelGeneration,
- saveToStorage,
- getQuota,
- getModels,
- getStorageStatus
-}
-
-export default soraAPI
diff --git a/frontend/src/components/account/AccountTestModal.vue b/frontend/src/components/account/AccountTestModal.vue
index dcaef15d..87b7ff0a 100644
--- a/frontend/src/components/account/AccountTestModal.vue
+++ b/frontend/src/components/account/AccountTestModal.vue
@@ -41,7 +41,7 @@
-
+
{{ t('admin.accounts.selectTestModel') }}
@@ -54,12 +54,6 @@
:placeholder="loadingModels ? t('common.loading') + '...' : t('admin.accounts.selectTestModel')"
/>
-
- {{ t('admin.accounts.soraTestHint') }}
-
-
- {{ t(getOAuthKey('sessionTokenRawHint')) }}
-
-
-
- {{ t(getOAuthKey('openSessionUrl')) }}
-
-
- {{ t(getOAuthKey('copySessionUrl')) }}
-
-
-
- {{ soraSessionUrl }}
-
-
- {{ t(getOAuthKey('sessionUrlHint')) }}
-
-
- {{ t('admin.accounts.oauth.batchCreateAccounts', { count: parsedSessionTokenCount }) }}
-
-
-
-
-
-
- {{ t(getOAuthKey('parsedSessionTokensLabel')) }}
-
- {{ parsedSessionTokenCount }}
-
-
-
-
- {{ t(getOAuthKey('parsedSessionTokensEmpty')) }}
-
-
-
-
-
- {{ t(getOAuthKey('parsedAccessTokensLabel')) }}
-
- {{ parsedAccessTokenFromSessionInputCount }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('admin.accounts.oauth.openai.accessTokenDesc', '直接粘贴 Access Token 创建账号，无需 OAuth 授权流程。支持批量导入（每行一个）。') }}
-
-
-
-
-
- {{ t('admin.accounts.oauth.keysCount', { count: parsedAccessTokenCount }) }}
-
-
-
-
- {{ t('admin.accounts.oauth.batchCreateAccounts', { count: parsedAccessTokenCount }) }}
-
-
-
-
-
-
-
-
-
props.platform === 'openai' || props.platform === 'sora')
+const isOpenAI = computed(() => props.platform === 'openai')
// Get translation key based on platform
const getOAuthKey = (key: string) => {
- if (props.platform === 'openai' || props.platform === 'sora') return `admin.accounts.oauth.openai.${key}`
+ if (props.platform === 'openai') return `admin.accounts.oauth.openai.${key}`
if (props.platform === 'gemini') return `admin.accounts.oauth.gemini.${key}`
if (props.platform === 'antigravity') return `admin.accounts.oauth.antigravity.${key}`
return `admin.accounts.oauth.${key}`
@@ -831,7 +619,7 @@ const oauthAuthCode = computed(() => t(getOAuthKey('authCode')))
const oauthAuthCodePlaceholder = computed(() => t(getOAuthKey('authCodePlaceholder')))
const oauthAuthCodeHint = computed(() => t(getOAuthKey('authCodeHint')))
const oauthImportantNotice = computed(() => {
- if (props.platform === 'openai' || props.platform === 'sora') return t('admin.accounts.oauth.openai.importantNotice')
+ if (props.platform === 'openai') return t('admin.accounts.oauth.openai.importantNotice')
if (props.platform === 'antigravity') return t('admin.accounts.oauth.antigravity.importantNotice')
return ''
})
@@ -842,7 +630,6 @@ const authCodeInput = ref('')
const sessionKeyInput = ref('')
const refreshTokenInput = ref('')
const sessionTokenInput = ref('')
-const accessTokenInput = ref('')
const showHelpDialog = ref(false)
const oauthState = ref('')
const projectId = ref('')
@@ -869,33 +656,6 @@ const parsedRefreshTokenCount = computed(() => {
.filter((rt) => rt).length
})
-const parsedSoraRawTokens = computed(() => parseSoraRawTokens(sessionTokenInput.value))
-
-const parsedSessionTokenCount = computed(() => {
- return parsedSoraRawTokens.value.sessionTokens.length
-})
-
-const parsedSessionTokensText = computed(() => {
- return parsedSoraRawTokens.value.sessionTokens.join('\n')
-})
-
-const parsedAccessTokenFromSessionInputCount = computed(() => {
- return parsedSoraRawTokens.value.accessTokens.length
-})
-
-const parsedAccessTokensText = computed(() => {
- return parsedSoraRawTokens.value.accessTokens.join('\n')
-})
-
-const soraSessionUrl = 'https://sora.chatgpt.com/api/auth/session'
-
-const parsedAccessTokenCount = computed(() => {
- return accessTokenInput.value
- .split('\n')
- .map((at) => at.trim())
- .filter((at) => at).length
-})
-
// Watchers
watch(inputMethod, (newVal) => {
emit('update:inputMethod', newVal)
@@ -904,7 +664,7 @@ watch(inputMethod, (newVal) => {
// Auto-extract code from callback URL (OpenAI/Gemini/Antigravity)
// e.g., http://localhost:8085/callback?code=xxx...&state=...
watch(authCodeInput, (newVal) => {
- if (props.platform !== 'openai' && props.platform !== 'gemini' && props.platform !== 'antigravity' && props.platform !== 'sora') return
+ if (props.platform !== 'openai' && props.platform !== 'gemini' && props.platform !== 'antigravity') return
const trimmed = newVal.trim()
// Check if it looks like a URL with code parameter
@@ -914,7 +674,7 @@ watch(authCodeInput, (newVal) => {
const url = new URL(trimmed)
const code = url.searchParams.get('code')
const stateParam = url.searchParams.get('state')
- if ((props.platform === 'openai' || props.platform === 'sora' || props.platform === 'gemini' || props.platform === 'antigravity') && stateParam) {
+ if ((props.platform === 'openai' || props.platform === 'gemini' || props.platform === 'antigravity') && stateParam) {
oauthState.value = stateParam
}
if (code && code !== trimmed) {
@@ -925,7 +685,7 @@ watch(authCodeInput, (newVal) => {
// If URL parsing fails, try regex extraction
const match = trimmed.match(/[?&]code=([^&]+)/)
const stateMatch = trimmed.match(/[?&]state=([^&]+)/)
- if ((props.platform === 'openai' || props.platform === 'sora' || props.platform === 'gemini' || props.platform === 'antigravity') && stateMatch && stateMatch[1]) {
+ if ((props.platform === 'openai' || props.platform === 'gemini' || props.platform === 'antigravity') && stateMatch && stateMatch[1]) {
oauthState.value = stateMatch[1]
}
if (match && match[1] && match[1] !== trimmed) {
@@ -967,26 +727,6 @@ const handleValidateRefreshToken = () => {
}
}
-const handleValidateSessionToken = () => {
- if (parsedSessionTokenCount.value > 0) {
- emit('validate-session-token', parsedSessionTokensText.value)
- }
-}
-
-const handleOpenSoraSessionUrl = () => {
- window.open(soraSessionUrl, '_blank', 'noopener,noreferrer')
-}
-
-const handleCopySoraSessionUrl = () => {
- copyToClipboard(soraSessionUrl, 'URL copied to clipboard')
-}
-
-const handleImportAccessToken = () => {
- if (accessTokenInput.value.trim()) {
- emit('import-access-token', accessTokenInput.value.trim())
- }
-}
-
// Expose methods and state
defineExpose({
authCode: authCodeInput,
diff --git a/frontend/src/components/account/ReAuthAccountModal.vue b/frontend/src/components/account/ReAuthAccountModal.vue
index aab0fe7d..c9c6d2db 100644
--- a/frontend/src/components/account/ReAuthAccountModal.vue
+++ b/frontend/src/components/account/ReAuthAccountModal.vue
@@ -33,8 +33,6 @@
{{
isOpenAI
? t('admin.accounts.openaiAccount')
- : isSora
- ? t('admin.accounts.soraAccount')
: isGemini
? t('admin.accounts.geminiAccount')
: isAntigravity
@@ -130,7 +128,7 @@
:show-cookie-option="isAnthropic"
:allow-multiple="false"
:method-label="t('admin.accounts.inputMethod')"
- :platform="isOpenAI ? 'openai' : isSora ? 'sora' : isGemini ? 'gemini' : isAntigravity ? 'antigravity' : 'anthropic'"
+ :platform="isOpenAI ? 'openai' : isGemini ? 'gemini' : isAntigravity ? 'antigravity' : 'anthropic'"
:show-project-id="isGemini && geminiOAuthType === 'code_assist'"
@generate-url="handleGenerateUrl"
@cookie-auth="handleCookieAuth"
@@ -226,8 +224,7 @@ const { t } = useI18n()
// OAuth composables
const claudeOAuth = useAccountOAuth()
-const openaiOAuth = useOpenAIOAuth({ platform: 'openai' })
-const soraOAuth = useOpenAIOAuth({ platform: 'sora' })
+const openaiOAuth = useOpenAIOAuth()
const geminiOAuth = useGeminiOAuth()
const antigravityOAuth = useAntigravityOAuth()
@@ -240,34 +237,32 @@ const geminiOAuthType = ref<'code_assist' | 'google_one' | 'ai_studio'>('code_as
// Computed - check platform
const isOpenAI = computed(() => props.account?.platform === 'openai')
-const isSora = computed(() => props.account?.platform === 'sora')
-const isOpenAILike = computed(() => isOpenAI.value || isSora.value)
+const isOpenAILike = computed(() => isOpenAI.value)
const isGemini = computed(() => props.account?.platform === 'gemini')
const isAnthropic = computed(() => props.account?.platform === 'anthropic')
const isAntigravity = computed(() => props.account?.platform === 'antigravity')
-const activeOpenAIOAuth = computed(() => (isSora.value ? soraOAuth : openaiOAuth))
// Computed - current OAuth state based on platform
const currentAuthUrl = computed(() => {
- if (isOpenAILike.value) return activeOpenAIOAuth.value.authUrl.value
+ if (isOpenAILike.value) return openaiOAuth.authUrl.value
if (isGemini.value) return geminiOAuth.authUrl.value
if (isAntigravity.value) return antigravityOAuth.authUrl.value
return claudeOAuth.authUrl.value
})
const currentSessionId = computed(() => {
- if (isOpenAILike.value) return activeOpenAIOAuth.value.sessionId.value
+ if (isOpenAILike.value) return openaiOAuth.sessionId.value
if (isGemini.value) return geminiOAuth.sessionId.value
if (isAntigravity.value) return antigravityOAuth.sessionId.value
return claudeOAuth.sessionId.value
})
const currentLoading = computed(() => {
- if (isOpenAILike.value) return activeOpenAIOAuth.value.loading.value
+ if (isOpenAILike.value) return openaiOAuth.loading.value
if (isGemini.value) return geminiOAuth.loading.value
if (isAntigravity.value) return antigravityOAuth.loading.value
return claudeOAuth.loading.value
})
const currentError = computed(() => {
- if (isOpenAILike.value) return activeOpenAIOAuth.value.error.value
+ if (isOpenAILike.value) return openaiOAuth.error.value
if (isGemini.value) return geminiOAuth.error.value
if (isAntigravity.value) return antigravityOAuth.error.value
return claudeOAuth.error.value
@@ -275,7 +270,7 @@ const currentError = computed(() => {
// Computed
const isManualInputMethod = computed(() => {
- // OpenAI/Sora/Gemini/Antigravity always use manual input (no cookie auth option)
+ // OpenAI/Gemini/Antigravity always use manual input (no cookie auth option)
return isOpenAILike.value || isGemini.value || isAntigravity.value || oauthFlowRef.value?.inputMethod === 'manual'
})
@@ -319,7 +314,6 @@ const resetState = () => {
geminiOAuthType.value = 'code_assist'
claudeOAuth.resetState()
openaiOAuth.resetState()
- soraOAuth.resetState()
geminiOAuth.resetState()
antigravityOAuth.resetState()
oauthFlowRef.value?.reset()
@@ -333,7 +327,7 @@ const handleGenerateUrl = async () => {
if (!props.account) return
if (isOpenAILike.value) {
- await activeOpenAIOAuth.value.generateAuthUrl(props.account.proxy_id)
+ await openaiOAuth.generateAuthUrl(props.account.proxy_id)
} else if (isGemini.value) {
const creds = (props.account.credentials || {}) as Record
const tierId = typeof creds.tier_id === 'string' ? creds.tier_id : undefined
@@ -354,7 +348,7 @@ const handleExchangeCode = async () => {
if (isOpenAILike.value) {
// OpenAI OAuth flow
- const oauthClient = activeOpenAIOAuth.value
+ const oauthClient = openaiOAuth
const sessionId = oauthClient.sessionId.value
if (!sessionId) return
const stateToUse = (oauthFlowRef.value?.oauthState || oauthClient.oauthState.value || '').trim()
diff --git a/frontend/src/components/admin/account/AccountTableFilters.vue b/frontend/src/components/admin/account/AccountTableFilters.vue
index 43e703ec..6b474183 100644
--- a/frontend/src/components/admin/account/AccountTableFilters.vue
+++ b/frontend/src/components/admin/account/AccountTableFilters.vue
@@ -25,7 +25,7 @@ const updateType = (value: string | number | boolean | null) => { emit('update:f
const updateStatus = (value: string | number | boolean | null) => { emit('update:filters', { ...props.filters, status: value }) }
const updatePrivacyMode = (value: string | number | boolean | null) => { emit('update:filters', { ...props.filters, privacy_mode: value }) }
const updateGroup = (value: string | number | boolean | null) => { emit('update:filters', { ...props.filters, group: value }) }
-const pOpts = computed(() => [{ value: '', label: t('admin.accounts.allPlatforms') }, { value: 'anthropic', label: 'Anthropic' }, { value: 'openai', label: 'OpenAI' }, { value: 'gemini', label: 'Gemini' }, { value: 'antigravity', label: 'Antigravity' }, { value: 'sora', label: 'Sora' }])
+const pOpts = computed(() => [{ value: '', label: t('admin.accounts.allPlatforms') }, { value: 'anthropic', label: 'Anthropic' }, { value: 'openai', label: 'OpenAI' }, { value: 'gemini', label: 'Gemini' }, { value: 'antigravity', label: 'Antigravity' }])
const tOpts = computed(() => [{ value: '', label: t('admin.accounts.allTypes') }, { value: 'oauth', label: t('admin.accounts.oauthType') }, { value: 'setup-token', label: t('admin.accounts.setupToken') }, { value: 'apikey', label: t('admin.accounts.apiKey') }, { value: 'bedrock', label: 'AWS Bedrock' }])
const sOpts = computed(() => [{ value: '', label: t('admin.accounts.allStatus') }, { value: 'active', label: t('admin.accounts.status.active') }, { value: 'inactive', label: t('admin.accounts.status.inactive') }, { value: 'error', label: t('admin.accounts.status.error') }, { value: 'rate_limited', label: t('admin.accounts.status.rateLimited') }, { value: 'temp_unschedulable', label: t('admin.accounts.status.tempUnschedulable') }])
const privacyOpts = computed(() => [
diff --git a/frontend/src/components/admin/account/AccountTestModal.vue b/frontend/src/components/admin/account/AccountTestModal.vue
index dcaef15d..87b7ff0a 100644
--- a/frontend/src/components/admin/account/AccountTestModal.vue
+++ b/frontend/src/components/admin/account/AccountTestModal.vue
@@ -41,7 +41,7 @@
-
+
{{ t('admin.accounts.selectTestModel') }}
@@ -54,12 +54,6 @@
:placeholder="loadingModels ? t('common.loading') + '...' : t('admin.accounts.selectTestModel')"
/>
-
- {{ t('admin.accounts.soraTestHint') }}
-
+
+
+
+ {{ t('admin.channels.form.status', 'Status') }}
+
+
+
+
+
+ {{ t('admin.channels.form.restrictModels', 'Restrict Models') }}
+
+
+ {{ t('admin.channels.form.restrictModelsHint', 'When enabled, only models in the pricing list are allowed. Others will be rejected.') }}
+
+
+
+
+
+
{{ t('admin.channels.form.billingModelSource', 'Billing Basis') }}
+
+
+ {{ t('admin.channels.form.billingModelSourceHint', 'Controls which model name is used for pricing lookup') }}
+
+
+
+
+
+
{{ t('admin.channels.form.platformConfig', '平台配置') }}
+
+
+
+
+
+
+
+
+
+ {{ t('admin.channels.form.groups', 'Associated Groups') }} *
+
+ ({{ t('admin.channels.form.selectedCount', { count: section.group_ids.length }, `已选 ${section.group_ids.length} 个`) }})
+
+
+
+
+ {{ t('common.loading', 'Loading...') }}
+
+
+ {{ t('admin.channels.form.noGroupsAvailable', 'No groups available') }}
+
+
+
+ {{ group.name }}
+ {{ group.rate_multiplier }}x
+ {{ group.account_count || 0 }}
+ {{ getGroupInOtherChannelLabel(group.id) }}
+
+
+
+
+
+
+
+
+ {{ t('admin.channels.form.modelMapping', 'Model Mapping') }}
+
+ + {{ t('common.add', 'Add') }}
+
+
+
+ {{ t('admin.channels.form.noMappingRules', 'No mapping rules. Click "Add" to create one.') }}
+
+
+
+
+
+
+
+ {{ t('admin.channels.form.modelPricing', 'Model Pricing') }}
+
+ + {{ t('common.add', 'Add') }}
+
+
+
+ {{ t('admin.channels.form.noPricingRules', 'No pricing rules yet. Click "Add" to create one.') }}
+
+
+
+
+
+
+
+
+
+
+ {{ t('common.cancel', 'Cancel') }}
+
+
+ {{ submitting
+ ? t('common.submitting', 'Submitting...')
+ : editingChannel
+ ? t('common.update', 'Update')
+ : t('common.create', 'Create')
+ }}
+
+
+
+
+
+
+
+ {{ t('common.refresh') }}
+
{{ t('admin.dashboard.granularity') }}:
-
-
-
-
-
- {{ t('admin.settings.soraS3.title') }}
-
-
- {{ t('admin.settings.soraS3.description') }}
-
-
-
-
- {{ t('admin.settings.soraS3.newProfile') }}
-
-
- {{ loadingSoraProfiles ? t('common.loading') : t('admin.settings.soraS3.reloadProfiles') }}
-
-
-
-
-
-
-
-
- {{ t('admin.settings.soraS3.columns.profile') }}
- {{ t('admin.settings.soraS3.columns.active') }}
- {{ t('admin.settings.soraS3.columns.endpoint') }}
- {{ t('admin.settings.soraS3.columns.bucket') }}
- {{ t('admin.settings.soraS3.columns.quota') }}
- {{ t('admin.settings.soraS3.columns.updatedAt') }}
- {{ t('admin.settings.soraS3.columns.actions') }}
-
-
-
-
-
- {{ profile.profile_id }}
- {{ profile.name }}
-
-
-
- {{ profile.is_active ? t('common.enabled') : t('common.disabled') }}
-
-
-
- {{ profile.endpoint || '-' }}
- {{ profile.region || '-' }}
-
- {{ profile.bucket || '-' }}
- {{ formatStorageQuotaGB(profile.default_storage_quota_bytes) }}
- {{ formatDate(profile.updated_at) }}
-
-
-
- {{ t('common.edit') }}
-
-
- {{ t('admin.settings.soraS3.activateProfile') }}
-
-
- {{ t('common.delete') }}
-
-
-
-
-
-
- {{ t('admin.settings.soraS3.empty') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ creatingSoraProfile ? t('admin.settings.soraS3.createTitle') : t('admin.settings.soraS3.editTitle') }}
-
-
- ✕
-
-
-
-
-
-
-
- {{ t('common.cancel') }}
-
-
- {{ testingSoraProfile ? t('common.loading') : t('admin.settings.soraS3.testConnection') }}
-
-
- {{ savingSoraProfile ? t('common.loading') : t('admin.settings.soraS3.saveProfile') }}
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/views/admin/GroupsView.vue b/frontend/src/views/admin/GroupsView.vue
index a7c1a10d..5bfe62c3 100644
--- a/frontend/src/views/admin/GroupsView.vue
+++ b/frontend/src/views/admin/GroupsView.vue
@@ -522,80 +522,7 @@
-
-
-
- {{ t('admin.groups.soraPricing.title') }}
-
-
- {{ t('admin.groups.soraPricing.description') }}
-
-
-
-
-
{{ t('admin.groups.soraPricing.storageQuota') }}
-
- GB
-
-
- {{ t('admin.groups.soraPricing.storageQuotaHint') }}
-
-
-
@@ -792,6 +719,61 @@
+
+
+
账号过滤控制
+
+
+
+
+
仅允许 OAuth 账号
+
+ {{ createForm.require_oauth_only ? '已启用 — 排除 API Key 类型账号' : '未启用' }}
+
+
+
+
+
+
+
+
+
+
仅允许隐私保护已设置的账号
+
+ {{ createForm.require_privacy_set ? '已启用 — Privacy 未设置的账号将被排除' : '未启用' }}
+
+
+
+
+
+
-
-
-
- {{ t('admin.groups.soraPricing.title') }}
-
-
- {{ t('admin.groups.soraPricing.description') }}
-
-
-
-
-
{{ t('admin.groups.soraPricing.storageQuota') }}
-
- GB
-
-
- {{ t('admin.groups.soraPricing.storageQuotaHint') }}
-
-
-
@@ -1527,6 +1436,61 @@
+
+
+
账号过滤控制
+
+
+
+
+
仅允许 OAuth 账号
+
+ {{ editForm.require_oauth_only ? '已启用 — 排除 API Key 类型账号' : '未启用' }}
+
+
+
+
+
+
+
+
+
+
仅允许隐私保护已设置的账号
+
+ {{ editForm.require_privacy_set ? '已启用 — Privacy 未设置的账号将被排除' : '未启用' }}
+
+
+
+
+
+
[
{ value: 'anthropic', label: 'Anthropic' },
{ value: 'openai', label: 'OpenAI' },
{ value: 'gemini', label: 'Gemini' },
- { value: 'antigravity', label: 'Antigravity' },
- { value: 'sora', label: 'Sora' }
+ { value: 'antigravity', label: 'Antigravity' }
])
const platformFilterOptions = computed(() => [
@@ -1900,8 +1863,7 @@ const platformFilterOptions = computed(() => [
{ value: 'anthropic', label: 'Anthropic' },
{ value: 'openai', label: 'OpenAI' },
{ value: 'gemini', label: 'Gemini' },
- { value: 'antigravity', label: 'Antigravity' },
- { value: 'sora', label: 'Sora' }
+ { value: 'antigravity', label: 'Antigravity' }
])
const editStatusOptions = computed(() => [
@@ -2050,12 +2012,6 @@ const createForm = reactive({
image_price_1k: null as number | null,
image_price_2k: null as number | null,
image_price_4k: null as number | null,
- // Sora 按次计费配置
- sora_image_price_360: null as number | null,
- sora_image_price_540: null as number | null,
- sora_video_price_per_request: null as number | null,
- sora_video_price_per_request_hd: null as number | null,
- sora_storage_quota_gb: null as number | null,
// Claude Code 客户端限制（仅 anthropic 平台使用）
claude_code_only: false,
fallback_group_id: null as number | null,
@@ -2063,6 +2019,9 @@ const createForm = reactive({
// OpenAI Messages 调度配置（仅 openai 平台使用）
allow_messages_dispatch: false,
default_mapped_model: 'gpt-5.4',
+ // 账号过滤控制（OpenAI/Antigravity 平台）
+ require_oauth_only: false,
+ require_privacy_set: false,
// 模型路由开关
model_routing_enabled: false,
// 支持的模型系列（仅 antigravity 平台）
@@ -2294,12 +2253,6 @@ const editForm = reactive({
image_price_1k: null as number | null,
image_price_2k: null as number | null,
image_price_4k: null as number | null,
- // Sora 按次计费配置
- sora_image_price_360: null as number | null,
- sora_image_price_540: null as number | null,
- sora_video_price_per_request: null as number | null,
- sora_video_price_per_request_hd: null as number | null,
- sora_storage_quota_gb: null as number | null,
// Claude Code 客户端限制（仅 anthropic 平台使用）
claude_code_only: false,
fallback_group_id: null as number | null,
@@ -2307,6 +2260,9 @@ const editForm = reactive({
// OpenAI Messages 调度配置（仅 openai 平台使用）
allow_messages_dispatch: false,
default_mapped_model: '',
+ // 账号过滤控制（OpenAI/Antigravity 平台）
+ require_oauth_only: false,
+ require_privacy_set: false,
// 模型路由开关
model_routing_enabled: false,
// 支持的模型系列（仅 antigravity 平台）
@@ -2443,15 +2399,12 @@ const closeCreateModal = () => {
createForm.image_price_1k = null
createForm.image_price_2k = null
createForm.image_price_4k = null
- createForm.sora_image_price_360 = null
- createForm.sora_image_price_540 = null
- createForm.sora_video_price_per_request = null
- createForm.sora_video_price_per_request_hd = null
- createForm.sora_storage_quota_gb = null
createForm.claude_code_only = false
createForm.fallback_group_id = null
createForm.fallback_group_id_on_invalid_request = null
createForm.allow_messages_dispatch = false
+ createForm.require_oauth_only = false
+ createForm.require_privacy_set = false
createForm.default_mapped_model = 'gpt-5.4'
createForm.supported_model_scopes = ['claude', 'gemini_text', 'gemini_image']
createForm.mcp_xml_inject = true
@@ -2484,13 +2437,11 @@ const handleCreateGroup = async () => {
submitting.value = true
try {
// 构建请求数据，包含模型路由配置
- const { sora_storage_quota_gb: createQuotaGb, ...createRest } = createForm
const requestData = {
- ...createRest,
+ ...createForm,
daily_limit_usd: normalizeOptionalLimit(createForm.daily_limit_usd as number | string | null),
weekly_limit_usd: normalizeOptionalLimit(createForm.weekly_limit_usd as number | string | null),
monthly_limit_usd: normalizeOptionalLimit(createForm.monthly_limit_usd as number | string | null),
- sora_storage_quota_bytes: createQuotaGb ? Math.round(createQuotaGb * 1024 * 1024 * 1024) : 0,
model_routing: convertRoutingRulesToApiFormat(createModelRoutingRules.value)
}
// v-model.number 清空输入框时产生 ""，转为 null 让后端设为无限制
@@ -2530,15 +2481,12 @@ const handleEdit = async (group: AdminGroup) => {
editForm.image_price_1k = group.image_price_1k
editForm.image_price_2k = group.image_price_2k
editForm.image_price_4k = group.image_price_4k
- editForm.sora_image_price_360 = group.sora_image_price_360
- editForm.sora_image_price_540 = group.sora_image_price_540
- editForm.sora_video_price_per_request = group.sora_video_price_per_request
- editForm.sora_video_price_per_request_hd = group.sora_video_price_per_request_hd
- editForm.sora_storage_quota_gb = group.sora_storage_quota_bytes ? Number((group.sora_storage_quota_bytes / (1024 * 1024 * 1024)).toFixed(2)) : null
editForm.claude_code_only = group.claude_code_only || false
editForm.fallback_group_id = group.fallback_group_id
editForm.fallback_group_id_on_invalid_request = group.fallback_group_id_on_invalid_request
editForm.allow_messages_dispatch = group.allow_messages_dispatch || false
+ editForm.require_oauth_only = group.require_oauth_only ?? false
+ editForm.require_privacy_set = group.require_privacy_set ?? false
editForm.default_mapped_model = group.default_mapped_model || ''
editForm.model_routing_enabled = group.model_routing_enabled || false
editForm.supported_model_scopes = group.supported_model_scopes || ['claude', 'gemini_text', 'gemini_image']
@@ -2570,13 +2518,11 @@ const handleUpdateGroup = async () => {
submitting.value = true
try {
// 转换 fallback_group_id: null -> 0 (后端使用 0 表示清除)
- const { sora_storage_quota_gb: editQuotaGb, ...editRest } = editForm
const payload = {
- ...editRest,
+ ...editForm,
daily_limit_usd: normalizeOptionalLimit(editForm.daily_limit_usd as number | string | null),
weekly_limit_usd: normalizeOptionalLimit(editForm.weekly_limit_usd as number | string | null),
monthly_limit_usd: normalizeOptionalLimit(editForm.monthly_limit_usd as number | string | null),
- sora_storage_quota_bytes: editQuotaGb ? Math.round(editQuotaGb * 1024 * 1024 * 1024) : 0,
fallback_group_id: editForm.fallback_group_id === null ? 0 : editForm.fallback_group_id,
fallback_group_id_on_invalid_request:
editForm.fallback_group_id_on_invalid_request === null
@@ -2647,6 +2593,10 @@ watch(
createForm.allow_messages_dispatch = false
createForm.default_mapped_model = ''
}
+ if (!['openai', 'antigravity', 'anthropic', 'gemini'].includes(newVal)) {
+ createForm.require_oauth_only = false
+ createForm.require_privacy_set = false
+ }
}
)
diff --git a/frontend/src/views/admin/ProxiesView.vue b/frontend/src/views/admin/ProxiesView.vue
index 032a0a2f..b0292b2d 100644
--- a/frontend/src/views/admin/ProxiesView.vue
+++ b/frontend/src/views/admin/ProxiesView.vue
@@ -1563,8 +1563,6 @@ const qualityTargetLabel = (target: string) => {
return 'Anthropic'
case 'gemini':
return 'Gemini'
- case 'sora':
- return 'Sora'
default:
return target
}
diff --git a/frontend/src/views/admin/SettingsView.vue b/frontend/src/views/admin/SettingsView.vue
index 198d484b..9ae40aeb 100644
--- a/frontend/src/views/admin/SettingsView.vue
+++ b/frontend/src/views/admin/SettingsView.vue
@@ -630,6 +630,108 @@
{{ t('admin.settings.betaPolicy.errorMessageHint') }}
+
+
+
+
+ {{ t('admin.settings.betaPolicy.quickPresets') }}
+
+
+
+ {{ preset.label }}
+
+
+
+
+ {{ t('admin.settings.betaPolicy.modelWhitelist') }}
+
+
+ {{ t('admin.settings.betaPolicy.modelWhitelistHint') }}
+
+
+
+
+
+
+
+ {{ t('admin.settings.betaPolicy.addModelPattern') }}
+
+
+
+ {{ t('admin.settings.betaPolicy.commonPatterns') }}:
+
+ {{ pattern }}
+
+
+
+
+ {{ t('admin.settings.betaPolicy.fallbackAction') }}
+
+
+
+ {{ t('admin.settings.betaPolicy.fallbackActionHint') }}
+
+
+
+
+
+ {{ t('admin.settings.betaPolicy.errorMessageHint') }}
+
+
+
-
-
- {{ t('admin.settings.soraClient.title') }}
-
-
- {{ t('admin.settings.soraClient.description') }}
-
-
-
-
-
-
{{
- t('admin.settings.soraClient.enabled')
- }}
-
- {{ t('admin.settings.soraClient.enabledHint') }}
-
-
-
-
-
-
@@ -1956,13 +2033,8 @@
-
-
-
-
-
+
('general')
const settingsTabs = [
{ key: 'general' as SettingsTab, icon: 'home' as const },
@@ -2029,7 +2100,6 @@ const settingsTabs = [
{ key: 'gateway' as SettingsTab, icon: 'server' as const },
{ key: 'email' as SettingsTab, icon: 'mail' as const },
{ key: 'backup' as SettingsTab, icon: 'database' as const },
- { key: 'data' as SettingsTab, icon: 'cube' as const },
]
const { copyToClipboard } = useClipboard()
@@ -2090,6 +2160,9 @@ const betaPolicyForm = reactive({
action: 'pass' | 'filter' | 'block'
scope: 'all' | 'oauth' | 'apikey' | 'bedrock'
error_message?: string
+ model_whitelist?: string[]
+ fallback_action?: 'pass' | 'filter' | 'block'
+ fallback_error_message?: string
}>
})
@@ -2132,7 +2205,6 @@ const form = reactive({
hide_ccs_import_button: false,
purchase_subscription_enabled: false,
purchase_subscription_url: '',
- sora_client_enabled: false,
custom_menu_items: [] as Array<{id: string; label: string; icon_svg: string; url: string; visibility: 'user' | 'admin'; sort_order: number}>,
custom_endpoints: [] as Array<{name: string; endpoint: string; description: string}>,
frontend_url: '',
@@ -2456,7 +2528,6 @@ async function saveSettings() {
hide_ccs_import_button: form.hide_ccs_import_button,
purchase_subscription_enabled: form.purchase_subscription_enabled,
purchase_subscription_url: form.purchase_subscription_url,
- sora_client_enabled: form.sora_client_enabled,
custom_menu_items: form.custom_menu_items,
custom_endpoints: form.custom_endpoints,
frontend_url: form.frontend_url,
@@ -2750,10 +2821,48 @@ const betaDisplayNames: Record = {
'context-1m-2025-08-07': 'Context 1M'
}
+// 快捷预设：按 beta_token 定义预设方案
+const betaPresets: Record> = {
+ 'context-1m-2025-08-07': [
+ {
+ label: t('admin.settings.betaPolicy.presetOpusOnly'),
+ description: t('admin.settings.betaPolicy.presetOpusOnlyDesc'),
+ action: 'pass',
+ model_whitelist: ['claude-opus-4-6'],
+ fallback_action: 'filter',
+ },
+ ],
+}
+
+// 常用模型模式（具体 ID + 通配符示例）
+const commonModelPatterns = ['claude-opus-4-6', 'claude-sonnet-4-6', 'claude-opus-*', 'claude-sonnet-*']
+
function getBetaDisplayName(token: string): string {
return betaDisplayNames[token] || token
}
+function applyBetaPreset(
+ rule: (typeof betaPolicyForm.rules)[number],
+ preset: { action: 'pass' | 'filter' | 'block'; model_whitelist: string[]; fallback_action: 'pass' | 'filter' | 'block' }
+) {
+ rule.action = preset.action
+ rule.model_whitelist = [...preset.model_whitelist]
+ rule.fallback_action = preset.fallback_action
+}
+
+function addQuickPattern(rule: (typeof betaPolicyForm.rules)[number], pattern: string) {
+ if (!rule.model_whitelist) rule.model_whitelist = []
+ if (!rule.model_whitelist.includes(pattern)) {
+ rule.model_whitelist.push(pattern)
+ }
+}
+
async function loadBetaPolicySettings() {
betaPolicyLoading.value = true
try {
@@ -2769,8 +2878,22 @@ async function loadBetaPolicySettings() {
async function saveBetaPolicySettings() {
betaPolicySaving.value = true
try {
+ // Clean up empty patterns before saving
+ const cleanedRules = betaPolicyForm.rules.map(rule => {
+ const whitelist = rule.model_whitelist?.filter(p => p.trim() !== '')
+ const hasWhitelist = whitelist && whitelist.length > 0
+ return {
+ beta_token: rule.beta_token,
+ action: rule.action,
+ scope: rule.scope,
+ error_message: rule.error_message,
+ model_whitelist: hasWhitelist ? whitelist : undefined,
+ fallback_action: hasWhitelist ? (rule.fallback_action || 'pass') : undefined,
+ fallback_error_message: hasWhitelist && rule.fallback_action === 'block' ? rule.fallback_error_message : undefined,
+ }
+ })
const updated = await adminAPI.settings.updateBetaPolicySettings({
- rules: betaPolicyForm.rules
+ rules: cleanedRules
})
betaPolicyForm.rules = updated.rules
appStore.showSuccess(t('admin.settings.betaPolicy.saved'))
diff --git a/frontend/src/views/admin/SubscriptionsView.vue b/frontend/src/views/admin/SubscriptionsView.vue
index bb9b5d9a..0363236c 100644
--- a/frontend/src/views/admin/SubscriptionsView.vue
+++ b/frontend/src/views/admin/SubscriptionsView.vue
@@ -965,8 +965,7 @@ const platformFilterOptions = computed(() => [
{ value: 'anthropic', label: 'Anthropic' },
{ value: 'openai', label: 'OpenAI' },
{ value: 'gemini', label: 'Gemini' },
- { value: 'antigravity', label: 'Antigravity' },
- { value: 'sora', label: 'Sora' }
+ { value: 'antigravity', label: 'Antigravity' }
])
// Group options for assign (only subscription type groups)
diff --git a/frontend/src/views/admin/UsageView.vue b/frontend/src/views/admin/UsageView.vue
index 4911f7b3..50de8feb 100644
--- a/frontend/src/views/admin/UsageView.vue
+++ b/frontend/src/views/admin/UsageView.vue
@@ -34,6 +34,7 @@
:show-metric-toggle="true"
:start-date="startDate"
:end-date="endDate"
+ :filters="breakdownFilters"
/>
@@ -57,6 +59,7 @@
:title="t('usage.endpointDistribution')"
:start-date="startDate"
:end-date="endDate"
+ :filters="breakdownFilters"
/>
@@ -169,6 +172,17 @@ const cleanupDialogVisible = ref(false)
const showBalanceHistoryModal = ref(false)
const balanceHistoryUser = ref
(null)
+const breakdownFilters = computed(() => {
+ const f: Record = {}
+ if (filters.value.user_id) f.user_id = filters.value.user_id
+ if (filters.value.api_key_id) f.api_key_id = filters.value.api_key_id
+ if (filters.value.account_id) f.account_id = filters.value.account_id
+ if (filters.value.group_id) f.group_id = filters.value.group_id
+ if (filters.value.request_type != null) f.request_type = filters.value.request_type
+ if (filters.value.billing_type != null) f.billing_type = filters.value.billing_type
+ return f
+})
+
const handleUserClick = async (userId: number) => {
try {
const user = await adminAPI.users.getById(userId)
@@ -392,7 +406,7 @@ const resetFilters = () => {
const range = getLast24HoursRangeDates()
startDate.value = range.start
endDate.value = range.end
- filters.value = { start_date: startDate.value, end_date: endDate.value, request_type: undefined, billing_type: null }
+ filters.value = { start_date: startDate.value, end_date: endDate.value, request_type: undefined, billing_type: null, billing_mode: undefined }
granularity.value = getGranularityForRange(startDate.value, endDate.value)
applyFilters()
}
@@ -440,7 +454,7 @@ const exportToExcel = async () => {
log.input_tokens, log.output_tokens, log.cache_read_tokens, log.cache_creation_tokens,
log.input_cost?.toFixed(6) || '0.000000', log.output_cost?.toFixed(6) || '0.000000',
log.cache_read_cost?.toFixed(6) || '0.000000', log.cache_creation_cost?.toFixed(6) || '0.000000',
- log.rate_multiplier?.toFixed(2) || '1.00', (log.account_rate_multiplier ?? 1).toFixed(2),
+ log.rate_multiplier?.toPrecision(4) || '1.00', (log.account_rate_multiplier ?? 1).toPrecision(4),
log.total_cost?.toFixed(6) || '0.000000', log.actual_cost?.toFixed(6) || '0.000000',
(log.total_cost * (log.account_rate_multiplier ?? 1)).toFixed(6), log.first_token_ms ?? '', log.duration_ms,
log.request_id || '', log.user_agent || '', log.ip_address || ''
@@ -477,6 +491,7 @@ const allColumns = computed(() => [
{ key: 'endpoint', label: t('usage.endpoint'), sortable: false },
{ key: 'group', label: t('admin.usage.group'), sortable: false },
{ key: 'stream', label: t('usage.type'), sortable: false },
+ { key: 'billing_mode', label: t('admin.usage.billingMode'), sortable: false },
{ key: 'tokens', label: t('usage.tokens'), sortable: false },
{ key: 'cost', label: t('usage.cost'), sortable: false },
{ key: 'first_token', label: t('usage.firstToken'), sortable: false },
diff --git a/frontend/src/views/user/DashboardView.vue b/frontend/src/views/user/DashboardView.vue
index 55bbc66b..3b97c7a0 100644
--- a/frontend/src/views/user/DashboardView.vue
+++ b/frontend/src/views/user/DashboardView.vue
@@ -4,7 +4,7 @@
@@ -31,6 +31,7 @@ const startDate = ref(formatLD(new Date(Date.now() - 6 * 86400000))); const endD
const loadStats = async () => { loading.value = true; try { await authStore.refreshUser(); stats.value = await usageAPI.getDashboardStats() } catch (error) { console.error('Failed to load dashboard stats:', error) } finally { loading.value = false } }
const loadCharts = async () => { loadingCharts.value = true; try { const res = await Promise.all([usageAPI.getDashboardTrend({ start_date: startDate.value, end_date: endDate.value, granularity: granularity.value as any }), usageAPI.getDashboardModels({ start_date: startDate.value, end_date: endDate.value })]); trendData.value = res[0].trend || []; modelStats.value = res[1].models || [] } catch (error) { console.error('Failed to load charts:', error) } finally { loadingCharts.value = false } }
const loadRecent = async () => { loadingUsage.value = true; try { const res = await usageAPI.getByDateRange(startDate.value, endDate.value); recentUsage.value = res.items.slice(0, 5) } catch (error) { console.error('Failed to load recent usage:', error) } finally { loadingUsage.value = false } }
+const refreshAll = () => { loadStats(); loadCharts(); loadRecent() }
-onMounted(() => { loadStats(); loadCharts(); loadRecent() })
+onMounted(() => { refreshAll() })
diff --git a/frontend/src/views/user/SoraView.vue b/frontend/src/views/user/SoraView.vue
deleted file mode 100644
index 0ebea5b0..00000000
--- a/frontend/src/views/user/SoraView.vue
+++ /dev/null
@@ -1,369 +0,0 @@
-
-
-
-
-
-
-
-
-
{{ t('sora.notEnabled') }}
-
{{ t('sora.notEnabledDesc') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/views/user/UsageView.vue b/frontend/src/views/user/UsageView.vue
index 3b8ef2e0..401ec3f9 100644
--- a/frontend/src/views/user/UsageView.vue
+++ b/frontend/src/views/user/UsageView.vue
@@ -181,9 +181,16 @@
+
+
+ {{ getBillingModeLabel(row.billing_mode) }}
+
+
+
-
-
+
+
{{ t('usage.rate') }}
{{ (tooltipData?.rate_multiplier || 1).toFixed(2) }}x {{ formatMultiplier(tooltipData?.rate_multiplier || 1) }}x
@@ -497,6 +504,7 @@ import type { UsageLog, ApiKey, UsageQueryParams, UsageStatsResponse } from '@/t
import type { Column } from '@/components/common/types'
import { formatDateTime, formatReasoningEffort } from '@/utils/format'
import { getPersistedPageSize } from '@/composables/usePersistedPageSize'
+import { formatCacheTokens, formatMultiplier } from '@/utils/formatters'
import { formatTokenPricePerMillion } from '@/utils/usagePricing'
import { getUsageServiceTierLabel } from '@/utils/usageServiceTier'
import { resolveUsageRequestType } from '@/utils/usageRequestType'
@@ -525,6 +533,7 @@ const columns = computed(() => [
{ key: 'reasoning_effort', label: t('usage.reasoningEffort'), sortable: false },
{ key: 'endpoint', label: t('usage.endpoint'), sortable: false },
{ key: 'stream', label: t('usage.type'), sortable: false },
+ { key: 'billing_mode', label: t('admin.usage.billingMode'), sortable: false },
{ key: 'tokens', label: t('usage.tokens'), sortable: false },
{ key: 'cost', label: t('usage.cost'), sortable: false },
{ key: 'first_token', label: t('usage.firstToken'), sortable: false },
@@ -615,6 +624,18 @@ const getRequestTypeBadgeClass = (log: UsageLog): string => {
return 'bg-amber-100 text-amber-800 dark:bg-amber-900 dark:text-amber-200'
}
+const getBillingModeLabel = (mode: string | null | undefined): string => {
+ if (mode === 'per_request') return t('admin.usage.billingModePerRequest')
+ if (mode === 'image') return t('admin.usage.billingModeImage')
+ return t('admin.usage.billingModeToken')
+}
+
+const getBillingModeBadgeClass = (mode: string | null | undefined): string => {
+ if (mode === 'per_request') return 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-200'
+ if (mode === 'image') return 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200'
+ return 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300'
+}
+
const getRequestTypeExportText = (log: UsageLog): string => {
const requestType = resolveUsageRequestType(log)
if (requestType === 'ws_v2') return 'WS'
@@ -639,15 +660,6 @@ const formatTokens = (value: number): string => {
return value.toLocaleString()
}
-// Compact format for cache tokens in table cells
-const formatCacheTokens = (value: number): string => {
- if (value >= 1_000_000) {
- return `${(value / 1_000_000).toFixed(1)}M`
- } else if (value >= 1_000) {
- return `${(value / 1_000).toFixed(1)}K`
- }
- return value.toLocaleString()
-}
const loadUsageLogs = async () => {
if (abortController) {
@@ -804,6 +816,7 @@ const exportToCSV = async () => {
'Reasoning Effort',
'Inbound Endpoint',
'Type',
+ 'Billing Mode',
'Input Tokens',
'Output Tokens',
'Cache Read Tokens',
@@ -822,6 +835,7 @@ const exportToCSV = async () => {
formatReasoningEffort(log.reasoning_effort),
log.inbound_endpoint || '',
getRequestTypeExportText(log),
+ getBillingModeLabel(log.billing_mode),
log.input_tokens,
log.output_tokens,
log.cache_read_tokens,
