mirror of
https://gitee.com/wanwujie/sub2api
synced 2026-05-05 05:30:44 +08:00
Follow-up to the available-channels review pass. No behavior change for end users; tightens internals based on three independent code reviews. Backend - service/channel.go: collapse buildPricingLookup + pricedNamesFor into a single platformPricingIndex (byLower + originalCase + ordered names), built once per SupportedModels call. Fixes a casing- consistency bug where the same logical model appeared with mapping case in the exact branch but pricing case in the wildcard branch — pricing's original case now wins everywhere. - service/channel.go: doc that a mapping key of just "*" expands to every priced model on the platform (intentional "passthrough all"). - service/channel_available.go: normalize empty BillingModelSource to channel_mapped at construction time, removing the same fallback duplicated in the admin DTO mapper and the admin Vue template. - handler/admin/available_channel_handler.go: unexport availableChannelToAdminResponse (same-package usage only); mapper is now a pure passthrough. - handler/available_channel_handler.go: drop the middleware2 alias (no name collision in this file). Frontend - utils/pricing.ts: extract formatScaled, used by SupportedModelChip and PricingRow. - api/admin/channels.ts: re-export BillingMode from constants/channel; tighten Channel.status / billing_model_source to ChannelStatus / BillingModelSource (and same for AvailableChannel). - components/channels/AvailableChannelsTable.vue: drop dead withDefaults wrapper (loading is required, both call sites pass it). - views/admin/AvailableChannelsView.vue: drop the redundant || BILLING_MODEL_SOURCE_CHANNEL_MAPPED fallback (now applied in service layer); remove unused import. - i18n zh + en: delete unused tierLabel and tokenRange keys from both availableChannels.pricing and admin.availableChannels.pricing. Tests - New: SupportedModels_ExactKeyUsesPricedCaseWhenAvailable locks the pricing-case-wins rule. - New: SupportedModels_AsteriskOnlyMappingExpandsAllPriced documents the "*" expansion rule. - Admin handler: existing tests adjusted to pass an explicit BillingModelSource (default-fill is now exercised by service tests).
206 lines
5.1 KiB
TypeScript
206 lines
5.1 KiB
TypeScript
/**
|
|
* Admin Channels API endpoints
|
|
* Handles channel management for administrators
|
|
*/
|
|
|
|
import { apiClient } from '../client'
|
|
import type { BillingMode, ChannelStatus, BillingModelSource } from '@/constants/channel'
|
|
|
|
export type { BillingMode } from '@/constants/channel'
|
|
|
|
export interface PricingInterval {
|
|
id?: number
|
|
min_tokens: number
|
|
max_tokens: number | null
|
|
tier_label: string
|
|
input_price: number | null
|
|
output_price: number | null
|
|
cache_write_price: number | null
|
|
cache_read_price: number | null
|
|
per_request_price: number | null
|
|
sort_order: number
|
|
}
|
|
|
|
export interface ChannelModelPricing {
|
|
id?: number
|
|
platform: string
|
|
models: string[]
|
|
billing_mode: BillingMode
|
|
input_price: number | null
|
|
output_price: number | null
|
|
cache_write_price: number | null
|
|
cache_read_price: number | null
|
|
image_output_price: number | null
|
|
per_request_price: number | null
|
|
intervals: PricingInterval[]
|
|
}
|
|
|
|
export interface AccountStatsPricingRule {
|
|
id?: number
|
|
name: string
|
|
group_ids: number[]
|
|
account_ids: number[]
|
|
pricing: ChannelModelPricing[]
|
|
}
|
|
|
|
export interface Channel {
|
|
id: number
|
|
name: string
|
|
description: string
|
|
status: ChannelStatus
|
|
billing_model_source: BillingModelSource
|
|
restrict_models: boolean
|
|
features_config?: Record<string, unknown>
|
|
group_ids: number[]
|
|
model_pricing: ChannelModelPricing[]
|
|
model_mapping: Record<string, Record<string, string>> // platform → {src→dst}
|
|
apply_pricing_to_account_stats: boolean
|
|
account_stats_pricing_rules: AccountStatsPricingRule[]
|
|
created_at: string
|
|
updated_at: string
|
|
}
|
|
|
|
export interface CreateChannelRequest {
|
|
name: string
|
|
description?: string
|
|
group_ids?: number[]
|
|
model_pricing?: ChannelModelPricing[]
|
|
model_mapping?: Record<string, Record<string, string>>
|
|
billing_model_source?: string
|
|
restrict_models?: boolean
|
|
features_config?: Record<string, unknown>
|
|
apply_pricing_to_account_stats?: boolean
|
|
account_stats_pricing_rules?: AccountStatsPricingRule[]
|
|
}
|
|
|
|
export interface UpdateChannelRequest {
|
|
name?: string
|
|
description?: string
|
|
status?: string
|
|
group_ids?: number[]
|
|
model_pricing?: ChannelModelPricing[]
|
|
model_mapping?: Record<string, Record<string, string>>
|
|
billing_model_source?: string
|
|
restrict_models?: boolean
|
|
features_config?: Record<string, unknown>
|
|
apply_pricing_to_account_stats?: boolean
|
|
account_stats_pricing_rules?: AccountStatsPricingRule[]
|
|
}
|
|
|
|
interface PaginatedResponse<T> {
|
|
items: T[]
|
|
total: number
|
|
}
|
|
|
|
/**
|
|
* List channels with pagination
|
|
*/
|
|
export async function list(
|
|
page: number = 1,
|
|
pageSize: number = 20,
|
|
filters?: {
|
|
status?: string
|
|
search?: string
|
|
sort_by?: string
|
|
sort_order?: 'asc' | 'desc'
|
|
},
|
|
options?: { signal?: AbortSignal }
|
|
): Promise<PaginatedResponse<Channel>> {
|
|
const { data } = await apiClient.get<PaginatedResponse<Channel>>('/admin/channels', {
|
|
params: {
|
|
page,
|
|
page_size: pageSize,
|
|
...filters
|
|
},
|
|
signal: options?.signal
|
|
})
|
|
return data
|
|
}
|
|
|
|
/**
|
|
* Get channel by ID
|
|
*/
|
|
export async function getById(id: number): Promise<Channel> {
|
|
const { data } = await apiClient.get<Channel>(`/admin/channels/${id}`)
|
|
return data
|
|
}
|
|
|
|
/**
|
|
* Create a new channel
|
|
*/
|
|
export async function create(req: CreateChannelRequest): Promise<Channel> {
|
|
const { data } = await apiClient.post<Channel>('/admin/channels', req)
|
|
return data
|
|
}
|
|
|
|
/**
|
|
* Update a channel
|
|
*/
|
|
export async function update(id: number, req: UpdateChannelRequest): Promise<Channel> {
|
|
const { data } = await apiClient.put<Channel>(`/admin/channels/${id}`, req)
|
|
return data
|
|
}
|
|
|
|
/**
|
|
* Delete a channel
|
|
*/
|
|
export async function remove(id: number): Promise<void> {
|
|
await apiClient.delete(`/admin/channels/${id}`)
|
|
}
|
|
|
|
export interface ModelDefaultPricing {
|
|
found: boolean
|
|
input_price?: number // per-token price
|
|
output_price?: number
|
|
cache_write_price?: number
|
|
cache_read_price?: number
|
|
image_output_price?: number
|
|
}
|
|
|
|
export async function getModelDefaultPricing(model: string): Promise<ModelDefaultPricing> {
|
|
const { data } = await apiClient.get<ModelDefaultPricing>('/admin/channels/model-pricing', {
|
|
params: { model }
|
|
})
|
|
return data
|
|
}
|
|
|
|
// --- Available channels (聚合视图:渠道 + 分组 + 支持模型) ---
|
|
|
|
export interface AvailableGroupRef {
|
|
id: number
|
|
name: string
|
|
platform: string
|
|
}
|
|
|
|
export interface SupportedModel {
|
|
name: string
|
|
platform: string
|
|
pricing: ChannelModelPricing | null
|
|
}
|
|
|
|
export interface AvailableChannel {
|
|
id: number
|
|
name: string
|
|
description: string
|
|
status: ChannelStatus
|
|
billing_model_source: BillingModelSource
|
|
restrict_models: boolean
|
|
groups: AvailableGroupRef[]
|
|
supported_models: SupportedModel[]
|
|
}
|
|
|
|
interface AvailableChannelsResponse {
|
|
items: AvailableChannel[]
|
|
}
|
|
|
|
/** 列出所有可用渠道(含关联分组与支持模型) */
|
|
export async function listAvailable(options?: { signal?: AbortSignal }): Promise<AvailableChannel[]> {
|
|
const { data } = await apiClient.get<AvailableChannelsResponse>('/admin/channels/available', {
|
|
signal: options?.signal
|
|
})
|
|
return data.items
|
|
}
|
|
|
|
const channelsAPI = { list, getById, create, update, remove, getModelDefaultPricing, listAvailable }
|
|
export default channelsAPI
|