-
-
-
- {{ t('admin.accounts.quotaLimitToggleHint') }}
-
+
+
+
+
+
+
+
+
+ {{ t('admin.accounts.quotaLimitToggleHint') }}
+
+
-
-
-
-
-
- $
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('admin.accounts.quotaDailyLimitHintFixed', { hour: String(dailyResetHour ?? 0).padStart(2, '0'), timezone: resetTimezone || 'UTC' }) }}
-
-
- {{ t('admin.accounts.quotaDailyLimitHint') }}
-
-
-
+
+
+
+
-
-
-
-
- $
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('admin.accounts.quotaWeeklyLimitHintFixed', { day: t('admin.accounts.dayOfWeek.' + (dayOptions.find(d => d.value === (weeklyResetDay ?? 1))?.key || 'monday')), hour: String(weeklyResetHour ?? 0).padStart(2, '0'), timezone: resetTimezone || 'UTC' }) }}
-
-
- {{ t('admin.accounts.quotaWeeklyLimitHint') }}
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
- $
-
-
-
{{ t('admin.accounts.quotaTotalLimitHint') }}
-
+
+
diff --git a/frontend/src/components/account/QuotaNotifyToggle.vue b/frontend/src/components/account/QuotaNotifyToggle.vue
new file mode 100644
index 00000000..1d78dc02
--- /dev/null
+++ b/frontend/src/components/account/QuotaNotifyToggle.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/admin/usage/UsageTable.vue b/frontend/src/components/admin/usage/UsageTable.vue
index f4494e69..98bb3554 100644
--- a/frontend/src/components/admin/usage/UsageTable.vue
+++ b/frontend/src/components/admin/usage/UsageTable.vue
@@ -87,13 +87,13 @@
- {{ getBillingModeLabel(row.billing_mode) }}
+ {{ getBillingModeLabel(row.billing_mode, t) }}
-
- A ${{ (row.total_cost * row.account_rate_multiplier).toFixed(6) }}
+ A ${{ accountBilled(row).toFixed(6) }}
@@ -279,13 +279,21 @@
{{ t('admin.usage.outputCost') }}
${{ tooltipData.output_cost.toFixed(6) }}
-
- {{ t('usage.inputTokenPrice') }}
- {{ formatTokenPricePerMillion(tooltipData.input_cost, tooltipData.input_tokens) }} {{ t('usage.perMillionTokens') }}
-
-
-
{{ t('usage.outputTokenPrice') }}
-
{{ formatTokenPricePerMillion(tooltipData.output_cost, tooltipData.output_tokens) }} {{ t('usage.perMillionTokens') }}
+
+
+
+ {{ t('usage.inputTokenPrice') }}
+ {{ formatTokenPricePerMillion(tooltipData.input_cost, tooltipData.input_tokens) }} {{ t('usage.perMillionTokens') }}
+
+
+ {{ t('usage.outputTokenPrice') }}
+ {{ formatTokenPricePerMillion(tooltipData.output_cost, tooltipData.output_tokens) }} {{ t('usage.perMillionTokens') }}
+
+
+
+
+ {{ tooltipData.billing_mode === BILLING_MODE_IMAGE ? t('usage.imageUnitPrice') : t('usage.unitPrice') }}
+ ${{ tooltipData.total_cost?.toFixed(6) || '0.000000' }}
{{ t('admin.usage.cacheCreationCost') }}
@@ -305,10 +313,6 @@
{{ t('usage.rate') }}
{{ formatMultiplier(tooltipData?.rate_multiplier || 1) }}x
-
- {{ t('usage.accountMultiplier') }}
- {{ formatMultiplier(tooltipData?.account_rate_multiplier ?? 1) }}x
-
{{ t('usage.original') }}
${{ tooltipData?.total_cost?.toFixed(6) || '0.000000' }}
@@ -317,10 +321,19 @@
{{ t('usage.userBilled') }}
${{ tooltipData?.actual_cost?.toFixed(6) || '0.000000' }}
+
+ {{ t('usage.accountMultiplier') }}
+ {{ formatMultiplier(tooltipData?.account_rate_multiplier ?? 1) }}x
+
+
{{ t('usage.accountBilled') }}
- ${{ (((tooltipData?.total_cost || 0) * (tooltipData?.account_rate_multiplier ?? 1)) || 0).toFixed(6) }}
+ ${{ accountBilled({
+ total_cost: tooltipData?.total_cost,
+ account_stats_cost: tooltipData?.account_stats_cost,
+ account_rate_multiplier: tooltipData?.account_rate_multiplier,
+ }).toFixed(6) }}
@@ -338,6 +351,15 @@ import { formatCacheTokens, formatMultiplier } from '@/utils/formatters'
import { formatTokenPricePerMillion } from '@/utils/usagePricing'
import { getUsageServiceTierLabel } from '@/utils/usageServiceTier'
import { resolveUsageRequestType } from '@/utils/usageRequestType'
+import { getBillingModeLabel, getBillingModeBadgeClass, BILLING_MODE_TOKEN, BILLING_MODE_IMAGE } from '@/utils/billingMode'
+
+/** Compute the account-billed cost for display: (account_stats_cost ?? total_cost) * rate_multiplier */
+function accountBilled(row: { total_cost?: number | null; account_stats_cost?: number | null; account_rate_multiplier?: number | null }): number {
+ const base = row.account_stats_cost != null ? row.account_stats_cost : (row.total_cost ?? 0)
+ const result = base * (row.account_rate_multiplier ?? 1)
+ return Number.isNaN(result) ? 0 : result
+}
+
import DataTable from '@/components/common/DataTable.vue'
import EmptyState from '@/components/common/EmptyState.vue'
import Icon from '@/components/icons/Icon.vue'
@@ -391,17 +413,6 @@ const getRequestTypeBadgeClass = (row: AdminUsageLog): 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 dark:text-blue-200'
- if (mode === 'image') return 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200'
- return 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-200'
-}
const formatUserAgent = (ua: string): string => {
diff --git a/frontend/src/components/payment/PaymentProviderDialog.vue b/frontend/src/components/payment/PaymentProviderDialog.vue
index 9b60cba1..10c1bfea 100644
--- a/frontend/src/components/payment/PaymentProviderDialog.vue
+++ b/frontend/src/components/payment/PaymentProviderDialog.vue
@@ -32,7 +32,8 @@
-
+
+
{{ t('admin.settings.payment.paymentMode') }}
@@ -243,6 +244,7 @@ const emit = defineEmits<{
enabled: boolean
payment_mode: string
refund_enabled: boolean
+ allow_user_refund: boolean
config: Record
limits: string
}]
@@ -258,6 +260,7 @@ const form = reactive({
enabled: true,
payment_mode: PAYMENT_MODE_QRCODE,
refund_enabled: false,
+ allow_user_refund: false,
})
const config = reactive>({})
const limits = reactive>>({})
@@ -433,6 +436,7 @@ function handleSave() {
enabled: form.enabled,
payment_mode: form.provider_key === 'easypay' ? form.payment_mode : '',
refund_enabled: form.refund_enabled,
+ allow_user_refund: form.refund_enabled ? form.allow_user_refund : false,
config: filteredConfig,
limits: serializeLimits(),
})
@@ -452,6 +456,7 @@ function reset(defaultKey: string) {
form.enabled = true
form.payment_mode = defaultKey === 'easypay' ? PAYMENT_MODE_QRCODE : ''
form.refund_enabled = false
+ form.allow_user_refund = false
clearConfig()
applyDefaults()
}
@@ -463,6 +468,7 @@ function loadProvider(provider: ProviderInstance) {
form.enabled = provider.enabled
form.payment_mode = provider.payment_mode || (provider.provider_key === 'easypay' ? PAYMENT_MODE_QRCODE : '')
form.refund_enabled = provider.refund_enabled
+ form.allow_user_refund = provider.allow_user_refund
clearConfig()
// Pre-fill config from API response (non-sensitive in cleartext, sensitive masked as ••••••••)
if (provider.config) {
diff --git a/frontend/src/components/payment/PaymentProviderList.vue b/frontend/src/components/payment/PaymentProviderList.vue
index e942b8c4..49ebc726 100644
--- a/frontend/src/components/payment/PaymentProviderList.vue
+++ b/frontend/src/components/payment/PaymentProviderList.vue
@@ -115,7 +115,7 @@ const emit = defineEmits<{
create: []
edit: [provider: ProviderInstance]
delete: [provider: ProviderInstance]
- toggleField: [provider: ProviderInstance, field: 'enabled' | 'refund_enabled']
+ toggleField: [provider: ProviderInstance, field: 'enabled' | 'refund_enabled' | 'allow_user_refund']
toggleType: [provider: ProviderInstance, type: string]
reorder: [providers: { id: number; sort_order: number }[]]
}>()
diff --git a/frontend/src/components/payment/ProviderCard.vue b/frontend/src/components/payment/ProviderCard.vue
index 9fc3b0ff..aecc8c8a 100644
--- a/frontend/src/components/payment/ProviderCard.vue
+++ b/frontend/src/components/payment/ProviderCard.vue
@@ -46,6 +46,7 @@
+
+
+
+
+
+
+
+
+ {{ t('admin.channels.form.applyPricingToAccountStatsDesc') }}
+
+
+
+
+
@@ -292,9 +310,9 @@
class="h-3 w-3 rounded border-gray-300 text-primary-600 focus:ring-primary-500"
@change="toggleGroupInSection(sIdx, group.id)"
/>
- {{ group.name }}
+ {{ group.name }}
{{ group.rate_multiplier }}x
{{ group.account_count || 0 }}
+
+
+
+
+
+
+ {{ t('admin.channels.form.webSearchEmulationHint') }}
+
+
+
+
+
+
@@ -330,7 +363,7 @@
:value="srcModel"
type="text"
class="input flex-1 text-xs"
- :class="getPlatformTextColor(section.platform)"
+ :class="platformTextClass(section.platform)"
:placeholder="t('admin.channels.form.mappingSource', 'Source model')"
@change="renameMappingKey(sIdx, srcModel, ($event.target as HTMLInputElement).value)"
/>
@@ -339,7 +372,7 @@
:value="section.model_mapping[srcModel]"
type="text"
class="input flex-1 text-xs"
- :class="getPlatformTextColor(section.platform)"
+ :class="platformTextClass(section.platform)"
:placeholder="t('admin.channels.form.mappingTarget', 'Target model')"
@input="section.model_mapping[srcModel] = ($event.target as HTMLInputElement).value"
/>
@@ -379,6 +412,138 @@
/>
+
+
+
+
+
+ {{ t('admin.channels.form.accountStatsPricingRules') }}
+
+
+
+
+
+
+ {{ t('admin.channels.form.noRulesConfigured') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('admin.channels.form.noGroupsInChannel') }}
+
+
+
+
+
+
+
+
+ {{ getRuleAccountLabel(accountId) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('admin.channels.form.ruleAccountsHint') }}
+
+
+
+
+
+
+
+
+
+ {{ t('admin.channels.form.noPricingRules') }}
+
+
+
+
+
@@ -423,12 +588,14 @@
import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
import { useI18n } from 'vue-i18n'
import { useAppStore } from '@/stores/app'
+import { extractApiErrorMessage } from '@/utils/apiError'
import { adminAPI } from '@/api/admin'
-import type { Channel, ChannelModelPricing, CreateChannelRequest, UpdateChannelRequest } from '@/api/admin/channels'
+import type { Channel, ChannelModelPricing, CreateChannelRequest, UpdateChannelRequest, AccountStatsPricingRule } from '@/api/admin/channels'
import type { PricingFormEntry } from '@/components/admin/channel/types'
import { mTokToPerToken, perTokenToMTok, apiIntervalsToForm, formIntervalsToAPI, findModelConflict, validateIntervals } from '@/components/admin/channel/types'
import type { AdminGroup, GroupPlatform } from '@/types'
import type { Column } from '@/components/common/types'
+import { platformTextClass, platformBadgeLightClass } from '@/utils/platformColors'
import AppLayout from '@/components/layout/AppLayout.vue'
import TablePageLayout from '@/components/layout/TablePageLayout.vue'
import DataTable from '@/components/common/DataTable.vue'
@@ -442,10 +609,31 @@ import PlatformIcon from '@/components/common/PlatformIcon.vue'
import Toggle from '@/components/common/Toggle.vue'
import PricingEntryCard from '@/components/admin/channel/PricingEntryCard.vue'
import { getPersistedPageSize } from '@/composables/usePersistedPageSize'
+import { useKeyedDebouncedSearch } from '@/composables/useKeyedDebouncedSearch'
const { t } = useI18n()
const appStore = useAppStore()
+// Web Search global enabled state (loaded once on mount)
+const webSearchGlobalEnabled = ref(false)
+async function loadWebSearchGlobalState() {
+ try {
+ const cfg = await adminAPI.settings.getWebSearchEmulationConfig()
+ webSearchGlobalEnabled.value = cfg?.enabled === true && (cfg?.providers?.length ?? 0) > 0
+ } catch (err: unknown) {
+ console.warn('Failed to load web search global state:', err)
+ webSearchGlobalEnabled.value = false
+ }
+}
+
+// ── Form-level pricing rule type (per-platform) ──
+interface FormPricingRule {
+ name: string
+ group_ids: number[]
+ account_ids: number[]
+ pricing: PricingFormEntry[]
+}
+
// ── Platform Section type ──
interface PlatformSection {
platform: GroupPlatform
@@ -454,6 +642,8 @@ interface PlatformSection {
group_ids: number[]
model_mapping: Record
model_pricing: PricingFormEntry[]
+ web_search_emulation: boolean
+ account_stats_pricing_rules: FormPricingRule[]
}
// ── Table columns ──
@@ -521,7 +711,8 @@ const form = reactive({
status: 'active',
restrict_models: false,
billing_model_source: 'channel_mapped' as string,
- platforms: [] as PlatformSection[]
+ platforms: [] as PlatformSection[],
+ apply_pricing_to_account_stats: false,
})
let abortController: AbortController | null = null
@@ -529,26 +720,6 @@ let abortController: AbortController | null = null
// ── Platform config ──
const platformOrder: GroupPlatform[] = ['anthropic', 'openai', 'gemini', 'antigravity']
-function getPlatformTextColor(platform: string): string {
- switch (platform) {
- case 'anthropic': return 'text-orange-600 dark:text-orange-400'
- case 'openai': return 'text-emerald-600 dark:text-emerald-400'
- case 'gemini': return 'text-blue-600 dark:text-blue-400'
- case 'antigravity': return 'text-purple-600 dark:text-purple-400'
- default: return 'text-gray-600 dark:text-gray-400'
- }
-}
-
-function getRateBadgeClass(platform: string): string {
- switch (platform) {
- case 'anthropic': return 'bg-orange-100 text-orange-700 dark:bg-orange-900/30 dark:text-orange-400'
- case 'openai': return 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/30 dark:text-emerald-400'
- case 'gemini': return 'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400'
- case 'antigravity': return 'bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-400'
- default: return 'bg-gray-100 text-gray-700 dark:bg-gray-900/30 dark:text-gray-400'
- }
-}
-
// ── Helpers ──
function formatDate(value: string): string {
if (!value) return '-'
@@ -565,7 +736,9 @@ function addPlatformSection(platform: GroupPlatform) {
collapsed: false,
group_ids: [],
model_mapping: {},
- model_pricing: []
+ model_pricing: [],
+ web_search_emulation: false,
+ account_stats_pricing_rules: [],
})
}
@@ -678,11 +851,158 @@ function renameMappingKey(sectionIdx: number, oldKey: string, newKey: string) {
mapping[newKey] = value
}
+// ── Account Stats Pricing helpers ──
+function addAccountStatsRule(sectionIdx: number) {
+ form.platforms[sectionIdx].account_stats_pricing_rules.push({
+ name: '',
+ group_ids: [],
+ account_ids: [],
+ pricing: []
+ })
+}
+
+function addRulePricingEntry(sectionIdx: number, ruleIndex: number) {
+ form.platforms[sectionIdx].account_stats_pricing_rules[ruleIndex].pricing.push({
+ models: [],
+ billing_mode: 'token',
+ input_price: null,
+ output_price: null,
+ cache_write_price: null,
+ cache_read_price: null,
+ image_output_price: null,
+ per_request_price: null,
+ intervals: []
+ })
+}
+
+function removeAccountStatsRule(sectionIdx: number, ruleIndex: number) {
+ form.platforms[sectionIdx].account_stats_pricing_rules.splice(ruleIndex, 1)
+ // Clear all search state since indices shift after removal
+ ruleAccountSearchRunner.clearAll()
+ clearAllRuleAccountSearchState()
+}
+
+function removeRulePricingEntry(sectionIdx: number, ruleIndex: number, pricingIndex: number) {
+ form.platforms[sectionIdx].account_stats_pricing_rules[ruleIndex].pricing.splice(pricingIndex, 1)
+}
+
+function getGroupNameById(groupId: number): string {
+ const group = allGroups.value.find(g => g.id === groupId)
+ return group ? group.name : `#${groupId}`
+}
+
+// ── Account search for pricing rules ──
+interface SimpleAccount { id: number; name: string; platform: string }
+
+const ruleAccountSearchKeyword = ref>({})
+const ruleAccountSearchResults = ref>({})
+const showRuleAccountDropdown = ref>({})
+// Cache: account ID → name, populated when search results are selected
+const ruleAccountNameCache = ref>({})
+
+const ruleAccountSearchRunner = useKeyedDebouncedSearch({
+ delay: 300,
+ search: async (keyword, { key, signal }) => {
+ const platform = key.split('-')[0]
+ const res = await adminAPI.accounts.list(1, 20, { platform, search: keyword }, { signal })
+ return res.items.map(a => ({ id: a.id, name: a.name, platform: a.platform }))
+ },
+ onSuccess: (key, result) => { ruleAccountSearchResults.value[key] = result },
+ onError: (key) => { ruleAccountSearchResults.value[key] = [] },
+})
+
+function onRuleAccountSearchInput(platform: string, ruleIndex: number) {
+ const key = `${platform}-${ruleIndex}`
+ showRuleAccountDropdown.value[key] = true
+ ruleAccountSearchRunner.trigger(key, ruleAccountSearchKeyword.value[key] || '')
+}
+
+function onRuleAccountSearchFocus(platform: string, ruleIndex: number) {
+ const key = `${platform}-${ruleIndex}`
+ showRuleAccountDropdown.value[key] = true
+ if (!ruleAccountSearchResults.value[key]?.length) {
+ ruleAccountSearchRunner.trigger(key, ruleAccountSearchKeyword.value[key] || '')
+ }
+}
+
+function selectRuleAccount(
+ rule: { account_ids: number[] },
+ account: SimpleAccount,
+ platform: string,
+ ruleIndex: number,
+) {
+ if (!rule.account_ids.includes(account.id)) {
+ rule.account_ids.push(account.id)
+ ruleAccountNameCache.value[account.id] = account.name
+ }
+ const key = `${platform}-${ruleIndex}`
+ ruleAccountSearchKeyword.value[key] = ''
+ showRuleAccountDropdown.value[key] = false
+}
+
+function removeRuleAccount(rule: { account_ids: number[] }, accountId: number) {
+ const idx = rule.account_ids.indexOf(accountId)
+ if (idx !== -1) rule.account_ids.splice(idx, 1)
+}
+
+function getRuleAccountLabel(accountId: number): string {
+ const name = ruleAccountNameCache.value[accountId]
+ return name ? `${name} #${accountId}` : `#${accountId}`
+}
+
+function handleRuleAccountClickOutside(event: MouseEvent) {
+ const target = event.target as HTMLElement
+ if (!target.closest('.rule-account-search-container')) {
+ Object.keys(showRuleAccountDropdown.value).forEach(key => {
+ showRuleAccountDropdown.value[key] = false
+ })
+ }
+}
+
+function clearAllRuleAccountSearchState() {
+ ruleAccountSearchKeyword.value = {}
+ ruleAccountSearchResults.value = {}
+ showRuleAccountDropdown.value = {}
+}
+
+function accountStatsRulesToAPI(): AccountStatsPricingRule[] {
+ const rules: AccountStatsPricingRule[] = []
+ for (const section of form.platforms) {
+ if (!section.enabled) continue
+ for (const rule of section.account_stats_pricing_rules) {
+ rules.push({
+ name: rule.name,
+ group_ids: rule.group_ids,
+ account_ids: rule.account_ids,
+ pricing: rule.pricing
+ .filter(p => p.models.length > 0)
+ .map(p => ({
+ platform: section.platform,
+ models: p.models,
+ billing_mode: p.billing_mode,
+ input_price: mTokToPerToken(p.input_price),
+ output_price: mTokToPerToken(p.output_price),
+ cache_write_price: mTokToPerToken(p.cache_write_price),
+ cache_read_price: mTokToPerToken(p.cache_read_price),
+ image_output_price: mTokToPerToken(p.image_output_price),
+ per_request_price: p.per_request_price != null && p.per_request_price !== '' ? Number(p.per_request_price) : null,
+ intervals: formIntervalsToAPI(p.intervals || [])
+ }))
+ })
+ }
+ }
+ return rules
+}
+
// ── Form ↔ API conversion ──
-function formToAPI(): { group_ids: number[], model_pricing: ChannelModelPricing[], model_mapping: Record> } {
+function formToAPI(): { group_ids: number[], model_pricing: ChannelModelPricing[], model_mapping: Record>, features_config: Record } {
const group_ids: number[] = []
const model_pricing: ChannelModelPricing[] = []
const model_mapping: Record> = {}
+ // Preserve existing features_config fields not managed by the form
+ const featuresConfig: Record = editingChannel.value?.features_config
+ ? { ...editingChannel.value.features_config }
+ : {}
for (const section of form.platforms) {
if (!section.enabled) continue
@@ -711,7 +1031,23 @@ function formToAPI(): { group_ids: number[], model_pricing: ChannelModelPricing[
}
}
- return { group_ids, model_pricing, model_mapping }
+ // Collect web_search_emulation (only anthropic platform supports it)
+ // Always write the key so that disabling in the UI correctly sets platform to false,
+ // rather than leaving a stale true value from the cloned features_config.
+ const wsEmulation: Record = {}
+ for (const section of form.platforms) {
+ if (!section.enabled) continue
+ if (section.platform === 'anthropic') {
+ wsEmulation[section.platform] = !!section.web_search_emulation
+ }
+ }
+ if (Object.keys(wsEmulation).length > 0) {
+ featuresConfig.web_search_emulation = wsEmulation
+ } else {
+ delete featuresConfig.web_search_emulation
+ }
+
+ return { group_ids, model_pricing, model_mapping, features_config: featuresConfig }
}
function apiToForm(channel: Channel): PlatformSection[] {
@@ -755,13 +1091,20 @@ function apiToForm(channel: Channel): PlatformSection[] {
intervals: apiIntervalsToForm(p.intervals || [])
} as PricingFormEntry))
+ // Read web_search_emulation from features_config
+ const fc = channel.features_config
+ const wsEmulation = fc?.web_search_emulation as Record | undefined
+ const webSearchEnabled = wsEmulation?.[platform] === true
+
sections.push({
platform,
enabled: true,
collapsed: false,
group_ids: groupIds,
model_mapping: { ...mapping },
- model_pricing: pricing
+ model_pricing: pricing,
+ web_search_emulation: webSearchEnabled,
+ account_stats_pricing_rules: [],
})
}
@@ -786,10 +1129,10 @@ async function loadChannels() {
if (ctrl.signal.aborted || abortController !== ctrl) return
channels.value = response.items || []
pagination.total = response.total
- } catch (error: any) {
- if (error?.name === 'AbortError' || error?.code === 'ERR_CANCELED') return
- appStore.showError(t('admin.channels.loadError', 'Failed to load channels'))
- console.error('Error loading channels:', error)
+ } catch (error: unknown) {
+ const e = error as { name?: string; code?: string }
+ if (e?.name === 'AbortError' || e?.code === 'ERR_CANCELED') return
+ appStore.showError(extractApiErrorMessage(error, t('admin.channels.loadError', 'Failed to load channels')))
} finally {
if (abortController === ctrl) {
loading.value = false
@@ -854,7 +1197,11 @@ function resetForm() {
form.restrict_models = false
form.billing_model_source = 'channel_mapped'
form.platforms = []
+ form.apply_pricing_to_account_stats = false
activeTab.value = 'basic'
+ ruleAccountSearchRunner.clearAll()
+ clearAllRuleAccountSearchState()
+ ruleAccountNameCache.value = {}
}
async function openCreateDialog() {
@@ -871,12 +1218,92 @@ async function openEditDialog(channel: Channel) {
form.status = channel.status
form.restrict_models = channel.restrict_models || false
form.billing_model_source = channel.billing_model_source || 'channel_mapped'
+ form.apply_pricing_to_account_stats = channel.apply_pricing_to_account_stats || false
// Must load groups first so apiToForm can map groupID → platform
await Promise.all([loadGroups(), loadAllChannelsForConflict()])
form.platforms = apiToForm(channel)
+
+ // Distribute channel-level rules into per-platform sections
+ distributeRulesToPlatforms(channel.account_stats_pricing_rules || [])
+
+ // Populate ruleAccountNameCache for existing rule accounts
+ await populateRuleAccountNameCache()
+
showDialog.value = true
}
+/** Distribute flat channel-level rules into the matching platform section based on group_ids */
+function distributeRulesToPlatforms(apiRules: AccountStatsPricingRule[]) {
+ // Build groupID → platform lookup
+ const groupPlatformMap = new Map()
+ for (const g of allGroups.value) {
+ groupPlatformMap.set(g.id, g.platform)
+ }
+
+ for (const apiRule of apiRules) {
+ // Infer platform from group_ids
+ const platforms = new Set()
+ for (const gid of apiRule.group_ids || []) {
+ const p = groupPlatformMap.get(gid)
+ if (p) platforms.add(p)
+ }
+ // If pricing has a platform field, use that as fallback
+ if (platforms.size === 0 && apiRule.pricing?.length > 0) {
+ const p = apiRule.pricing[0].platform as GroupPlatform | undefined
+ if (p) platforms.add(p)
+ }
+ const targetPlatform = platforms.size >= 1 ? [...platforms][0] : null
+ if (!targetPlatform) continue
+
+ const section = form.platforms.find(s => s.platform === targetPlatform)
+ if (!section) continue
+
+ const formRule: FormPricingRule = {
+ name: apiRule.name || '',
+ group_ids: [...(apiRule.group_ids || [])],
+ account_ids: [...(apiRule.account_ids || [])],
+ pricing: (apiRule.pricing || []).map(p => ({
+ models: [...(p.models || [])],
+ billing_mode: p.billing_mode,
+ input_price: perTokenToMTok(p.input_price),
+ output_price: perTokenToMTok(p.output_price),
+ cache_write_price: perTokenToMTok(p.cache_write_price),
+ cache_read_price: perTokenToMTok(p.cache_read_price),
+ image_output_price: perTokenToMTok(p.image_output_price),
+ per_request_price: p.per_request_price,
+ intervals: apiIntervalsToForm(p.intervals || [])
+ } as PricingFormEntry))
+ }
+ section.account_stats_pricing_rules.push(formRule)
+ }
+}
+
+/** Populate ruleAccountNameCache by fetching account details for all account_ids in rules */
+async function populateRuleAccountNameCache() {
+ const allAccountIds = new Set()
+ for (const section of form.platforms) {
+ for (const rule of section.account_stats_pricing_rules) {
+ for (const id of rule.account_ids) {
+ allAccountIds.add(id)
+ }
+ }
+ }
+ if (allAccountIds.size === 0) return
+
+ // Fetch account details in parallel (batch of individual getById calls)
+ const ids = [...allAccountIds]
+ const results = await Promise.allSettled(
+ ids.map(id => adminAPI.accounts.getById(id))
+ )
+ for (let i = 0; i < ids.length; i++) {
+ const result = results[i]
+ if (result.status === 'fulfilled') {
+ ruleAccountNameCache.value[ids[i]] = result.value.name
+ }
+ // If rejected, the cache won't have the name, so it'll show "#ID" which is acceptable
+ }
+}
+
function closeDialog() {
showDialog.value = false
editingChannel.value = null
@@ -961,7 +1388,7 @@ async function handleSubmit() {
const intervalErr = validateIntervals(entry.intervals)
if (intervalErr) {
const platformLabel = t('admin.groups.platforms.' + section.platform, section.platform)
- const modelLabel = entry.models.join(', ') || '未命名'
+ const modelLabel = entry.models.join(', ') || t('admin.channels.form.unnamed')
appStore.showError(`${platformLabel} - ${modelLabel}: ${intervalErr}`)
activeTab.value = section.platform
return
@@ -969,7 +1396,7 @@ async function handleSubmit() {
}
}
- const { group_ids, model_pricing, model_mapping } = formToAPI()
+ const { group_ids, model_pricing, model_mapping, features_config } = formToAPI()
submitting.value = true
try {
@@ -982,7 +1409,10 @@ async function handleSubmit() {
model_pricing,
model_mapping: Object.keys(model_mapping).length > 0 ? model_mapping : {},
billing_model_source: form.billing_model_source,
- restrict_models: form.restrict_models
+ restrict_models: form.restrict_models,
+ features_config,
+ apply_pricing_to_account_stats: form.apply_pricing_to_account_stats,
+ account_stats_pricing_rules: accountStatsRulesToAPI()
}
await adminAPI.channels.update(editingChannel.value.id, req)
appStore.showSuccess(t('admin.channels.updateSuccess', 'Channel updated'))
@@ -994,19 +1424,20 @@ async function handleSubmit() {
model_pricing,
model_mapping: Object.keys(model_mapping).length > 0 ? model_mapping : {},
billing_model_source: form.billing_model_source,
- restrict_models: form.restrict_models
+ restrict_models: form.restrict_models,
+ features_config,
+ apply_pricing_to_account_stats: form.apply_pricing_to_account_stats,
+ account_stats_pricing_rules: accountStatsRulesToAPI()
}
await adminAPI.channels.create(req)
appStore.showSuccess(t('admin.channels.createSuccess', 'Channel created'))
}
closeDialog()
loadChannels()
- } catch (error: any) {
- const msg = error.response?.data?.detail || (editingChannel.value
+ } catch (error: unknown) {
+ appStore.showError(extractApiErrorMessage(error, editingChannel.value
? t('admin.channels.updateError', 'Failed to update channel')
- : t('admin.channels.createError', 'Failed to create channel'))
- appStore.showError(msg)
- console.error('Error saving channel:', error)
+ : t('admin.channels.createError', 'Failed to create channel')))
} finally {
submitting.value = false
}
@@ -1044,9 +1475,8 @@ async function confirmDelete() {
showDeleteDialog.value = false
deletingChannel.value = null
loadChannels()
- } catch (error: any) {
- appStore.showError(error.response?.data?.detail || t('admin.channels.deleteError', 'Failed to delete channel'))
- console.error('Error deleting channel:', error)
+ } catch (error: unknown) {
+ appStore.showError(extractApiErrorMessage(error, t('admin.channels.deleteError', 'Failed to delete channel')))
}
}
@@ -1054,11 +1484,16 @@ async function confirmDelete() {
onMounted(() => {
loadChannels()
loadGroups()
+ loadWebSearchGlobalState()
+ document.addEventListener('click', handleRuleAccountClickOutside)
})
onUnmounted(() => {
clearTimeout(searchTimeout)
abortController?.abort()
+ document.removeEventListener('click', handleRuleAccountClickOutside)
+ ruleAccountSearchRunner.clearAll()
+ clearAllRuleAccountSearchState()
})
diff --git a/frontend/src/views/admin/GroupsView.vue b/frontend/src/views/admin/GroupsView.vue
index a85dd269..8ab08b73 100644
--- a/frontend/src/views/admin/GroupsView.vue
+++ b/frontend/src/views/admin/GroupsView.vue
@@ -3253,6 +3253,7 @@ const editForm = reactive({
fallback_group_id_on_invalid_request: null as number | null,
// OpenAI Messages 调度配置（仅 openai 平台使用）
allow_messages_dispatch: false,
+ default_mapped_model: '',
opus_mapped_model: editMessagesDispatchDefaults.opus_mapped_model,
sonnet_mapped_model: editMessagesDispatchDefaults.sonnet_mapped_model,
haiku_mapped_model: editMessagesDispatchDefaults.haiku_mapped_model,
@@ -3732,6 +3733,19 @@ watch(
},
);
+watch(
+ () => editForm.platform,
+ (newVal) => {
+ if (!['anthropic', 'antigravity'].includes(newVal)) {
+ editForm.fallback_group_id_on_invalid_request = null
+ }
+ if (newVal !== 'openai') {
+ editForm.allow_messages_dispatch = false
+ editForm.default_mapped_model = ''
+ }
+ }
+)
+
// 点击外部关闭账号搜索下拉框
const handleClickOutside = (event: MouseEvent) => {
const target = event.target as HTMLElement;
diff --git a/frontend/src/views/admin/ProxiesView.vue b/frontend/src/views/admin/ProxiesView.vue
index 4c91c9c0..1e4df356 100644
--- a/frontend/src/views/admin/ProxiesView.vue
+++ b/frontend/src/views/admin/ProxiesView.vue
@@ -985,7 +985,8 @@ const {
deselect,
clear: clearSelectedProxies,
removeMany: removeSelectedProxies,
- toggleVisible
+ toggleVisible,
+ batchUpdate
} = useTableSelection({
rows: proxies,
getId: (proxy) => proxy.id
@@ -993,7 +994,8 @@ const {
useSwipeSelect(proxyTableRef, {
isSelected,
select,
- deselect
+ deselect,
+ batchUpdate
})
const accountsProxy = ref(null)
const proxyAccounts = ref([])
diff --git a/frontend/src/views/admin/SettingsView.vue b/frontend/src/views/admin/SettingsView.vue
index f6fd96d6..2465fa5e 100644
--- a/frontend/src/views/admin/SettingsView.vue
+++ b/frontend/src/views/admin/SettingsView.vue
@@ -1711,6 +1711,231 @@