feat: distinguish model vendors and reuse playground keys

This commit is contained in:
wlx committed 2026-09-23 15:39:06 +08:00
1 parent 0a44a0802b
commit 281849ceb8
13 files changed
+222 -46

No files matched your search

+5 -1
View File
@@ -134,10 +134,14 @@ async function copyText(value: string) {
.account-search { max-width: 420px; }
.account-secondary { display: block; margin-top: 5px; color: #687378; }
.wallet-entry { border-bottom: 1px solid #dce3e5; padding: 16px 0; overflow-wrap: anywhere; }
.invitation-panel { margin-top: 24px; }
.invitation-panel { margin-top: 24px; padding: 24px 28px 28px; }
.invitation-panel .panel-header { margin: 0 0 18px; padding: 0; }
.invitation-panel .responsive-table { overflow-x: auto; }
.invitation-panel th, .invitation-panel td { padding-left: 14px; padding-right: 14px; }
.invitation-panel code { overflow-wrap: anywhere; }
.invitation-panel .icon-button { margin-left: 8px; vertical-align: middle; }
.form-hint { color: #687378; font-size: 13px; }
.credit-error { color: #b44837; }
@media(max-width: 700px) { .heading-actions { flex-wrap: wrap; } }
@media(max-width: 700px) { .invitation-panel { padding: 18px 16px 20px; } .invitation-panel .panel-header { margin-bottom: 14px; } }
</style>
+9 -8
View File
@@ -28,9 +28,9 @@ async function remove() {
finally { saving.value = false }
}
const channel = reactive({ code: '', name: '', protocol: 'openai-compatible' as CatalogProvider['protocol'], sourceType: 'relay' as CatalogProvider['sourceType'], baseUrl: '', credentialType: 'api-key' as NonNullable<CatalogProvider['credentialType']>, credentialSecret: '', description: '', status: 'active' as CatalogProvider['status'] })
const model = reactive({ publicName: '', modelKey: '', type: 'text' as LogicalModel['type'], mode: 'sync' as LogicalModel['mode'], description: '', inputTypes: 'text', outputTypes: 'text', status: 'active' as LogicalModel['status'] })
const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', cachedInput: '', unit: 'CNY / 1M tokens', priority: '100', maxConcurrency: '1', status: 'active' as CatalogModel['status'] })
const shownModels = computed(() => models.value.filter(item => `${item.publicName} ${item.modelKey || ''}`.toLowerCase().includes(query.value.toLowerCase())))
const model = reactive({ publicName: '', modelKey: '', vendorName: '', type: 'text' as LogicalModel['type'], mode: 'sync' as LogicalModel['mode'], description: '', inputTypes: 'text', outputTypes: 'text', status: 'active' as LogicalModel['status'] })
const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', cachedInput: '', unit: 'CNY / 1M tokens', priority: '100', maxConcurrency: '4', status: 'active' as CatalogModel['status'] })
const shownModels = computed(() => models.value.filter(item => `${item.publicName} ${item.vendorName || ''} ${item.modelKey || ''}`.toLowerCase().includes(query.value.toLowerCase())))
const shownChannels = computed(() => channels.value.filter(item => `${item.name} ${item.code}`.toLowerCase().includes(query.value.toLowerCase())))
const { page: modelPage, pageSize: modelPageSize, pagedItems: pagedModels } = usePagination(shownModels)
const { page: channelPage, pageSize: channelPageSize, pagedItems: pagedChannels } = usePagination(shownChannels)
@@ -59,12 +59,12 @@ function editChannel(item?: CatalogProvider) {
}
function editModel(item?: LogicalModel) {
editingId.value = item?.id
Object.assign(model, { publicName: '', modelKey: '', type: 'text', mode: 'sync', description: '', status: 'active' }, item || {}, { inputTypes: item?.inputTypes.join(', ') || 'text', outputTypes: item?.outputTypes.join(', ') || 'text' })
Object.assign(model, { publicName: '', modelKey: '', vendorName: '', type: 'text', mode: 'sync', description: '', status: 'active' }, item || {}, { inputTypes: item?.inputTypes.join(', ') || 'text', outputTypes: item?.outputTypes.join(', ') || 'text' })
editor.value = 'model'
}
function editGroup(parent: LogicalModel, item?: CatalogModel) {
editingId.value = item?.id
Object.assign(group, { logicalModelId: parent.id, providerId: item?.providerId || '', sourceLabel: item?.sourceLabel || '', upstreamModel: item?.upstreamModel || '', input: item?.pricing?.input?.toString() || '', output: item?.pricing?.output?.toString() || '', cachedInput: item?.pricing?.cachedInput?.toString() || '', unit: item?.pricing?.unit || 'CNY / 1M tokens', priority: String(item?.priority ?? 100), maxConcurrency: String(item?.maxConcurrency ?? 1), status: item?.status || 'active' })
Object.assign(group, { logicalModelId: parent.id, providerId: item?.providerId || '', sourceLabel: item?.sourceLabel || '', upstreamModel: item?.upstreamModel || '', input: item?.pricing?.input?.toString() || '', output: item?.pricing?.output?.toString() || '', cachedInput: item?.pricing?.cachedInput?.toString() || '', unit: item?.pricing?.unit || 'CNY / 1M tokens', priority: String(item?.priority ?? 100), maxConcurrency: String(item?.maxConcurrency ?? 4), status: item?.status || 'active' })
editor.value = 'group'
}
async function save() {
@@ -108,13 +108,13 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider
<section class="page-heading"><h1>{{ props.section === 'channels' ? '渠道管理' : '模型与分组' }}</h1><div class="heading-actions"><button class="icon-button" title="刷新" :disabled="loading" @click="refresh"><RefreshCcw :size="18" /></button><button class="button primary" @click="props.section === 'channels' ? editChannel() : editModel()"><Plus :size="16" />{{ props.section === 'channels' ? '添加渠道' : '添加模型' }}</button></div></section>
<label class="search-input catalog-search"><Search :size="16" /><input v-model="query" :placeholder="props.section === 'channels' ? '搜索渠道名称或 Code' : '搜索模型名称或标识'" /></label>
<p v-if="error" role="alert">{{ error }}</p>
<p v-if="props.section === 'models'" class="catalog-secondary">启用模型后会显示在用户端模型广场。分组与所属渠道也启用后,用户才能为 API Key 选择该分组;调用前还需完成凭据和计费配置。</p>
<p v-if="props.section === 'models'" class="catalog-secondary">启用模型后会显示在用户端模型广场。模型厂商表示模型的实际研发方,渠道表示请求经过的中转站或官方接口;分组与所属渠道也启用后,用户才能为 API Key 选择该分组。并发上限按分组生效,填 1 才是串行,填 4 表示同一分组最多同时处理 4 个请求。</p>
<p v-if="loading">加载中…</p>
<div v-if="props.section === 'channels'" class="responsive-table"><table><thead><tr><th>渠道</th><th>来源 / 协议</th><th>Base URL</th><th>凭据</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="item in pagedChannels" :key="item.id"><td><strong>{{ item.name }}</strong><small class="catalog-secondary">{{ item.code }}</small></td><td>{{ item.sourceType }}<small class="catalog-secondary">{{ item.protocol }}</small></td><td class="catalog-url">{{ item.baseUrl || '未配置' }}</td><td>{{ item.credentialMasked || '未配置' }}</td><td><label class="catalog-toggle"><input type="checkbox" :checked="item.status === 'active'" :disabled="saving" :aria-label="`${item.name} 启用`" @change="toggle('channel', item)" />{{ item.status === 'active' ? '已启用' : '已停用' }}</label></td><td><button class="icon-button" :title="`编辑渠道 ${item.name}`" @click="editChannel(item)"><Pencil :size="16" /></button><button class="icon-button" :title="`删除渠道 ${item.name}`" :disabled="saving" @click="confirmDelete('channel', item.id, item.name)"><Trash2 :size="16" /></button></td></tr><tr v-if="!shownChannels.length && !loading"><td colspan="6">暂无渠道</td></tr></tbody></table></div>
<ListPagination v-if="props.section === 'channels'" v-model:page="channelPage" v-model:page-size="channelPageSize" :total="shownChannels.length" label="渠道分页" />
<template v-if="props.section === 'models'">
<section v-for="item in pagedModels" :key="item.id" class="model-definition-section">
<header class="panel-header"><div><h3>{{ item.publicName }}</h3><small>{{ item.modelKey || item.id }} · {{ item.type }} · {{ item.mode }}</small></div><div class="heading-actions"><label class="catalog-toggle"><input type="checkbox" :checked="item.status === 'active'" :disabled="saving" :aria-label="`${item.publicName} 启用`" @change="toggle('model', item)" />启用</label><button class="icon-button" :title="`编辑模型 ${item.publicName}`" @click="editModel(item)"><Pencil :size="16" /></button><button class="icon-button" :title="`删除模型 ${item.publicName}`" :disabled="saving" @click="confirmDelete('model', item.id, item.publicName)"><Trash2 :size="16" /></button><button class="button secondary small" @click="editGroup(item)"><Plus :size="15" />添加分组</button></div></header>
<header class="panel-header"><div><h3>{{ item.publicName }}</h3><small>{{ item.vendorName || '未标注厂商' }} · {{ item.modelKey || item.id }} · {{ item.type }} · {{ item.mode }}</small></div><div class="heading-actions"><label class="catalog-toggle"><input type="checkbox" :checked="item.status === 'active'" :disabled="saving" :aria-label="`${item.publicName} 启用`" @change="toggle('model', item)" />启用</label><button class="icon-button" :title="`编辑模型 ${item.publicName}`" @click="editModel(item)"><Pencil :size="16" /></button><button class="icon-button" :title="`删除模型 ${item.publicName}`" :disabled="saving" @click="confirmDelete('model', item.id, item.publicName)"><Trash2 :size="16" /></button><button class="button secondary small" @click="editGroup(item)"><Plus :size="15" />添加分组</button></div></header>
<p v-if="item.description" class="catalog-secondary">{{ item.description }}</p>
<div class="responsive-table"><table><thead><tr><th>分组名称</th><th>渠道</th><th>上游模型</th><th>输入 / 输出价格</th><th>并发</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="route in modelGroups(item.id)" :key="route.id"><td>{{ route.sourceLabel }}</td><td>{{ channelName(route.providerId) }}</td><td><code>{{ route.upstreamModel }}</code></td><td>{{ route.pricing?.input ?? '—' }} / {{ route.pricing?.output ?? '—' }}<small class="catalog-secondary">{{ route.pricing?.unit }}</small></td><td>{{ route.maxConcurrency ?? '默认' }}</td><td><label class="catalog-toggle"><input type="checkbox" :checked="route.status === 'active'" :disabled="saving" :aria-label="`${route.sourceLabel} 启用`" @change="toggle('group', route)" />{{ route.status === 'active' ? '已启用' : '已停用' }}</label></td><td><button class="icon-button" :title="`编辑分组 ${route.sourceLabel}`" @click="editGroup(item, route)"><Pencil :size="16" /></button><button class="icon-button" :title="`删除分组 ${route.sourceLabel}`" :disabled="saving" @click="confirmDelete('group', route.id, route.sourceLabel || '默认分组')"><Trash2 :size="16" /></button></td></tr><tr v-if="!modelGroups(item.id).length"><td colspan="7">暂无分组</td></tr></tbody></table></div>
</section>
@@ -136,6 +136,7 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider
</template>
<template v-else-if="editor === 'model'">
<label class="form-label" for="logical-name">模型名称</label><input id="logical-name" v-model="model.publicName" class="text-input" required maxlength="160" />
<label class="form-label" for="logical-vendor">模型厂商</label><input id="logical-vendor" v-model="model.vendorName" class="text-input" required maxlength="120" placeholder="例如:OpenAI、智谱 AI、月之暗面、字节跳动" />
<label class="form-label" for="logical-key">统一模型标识</label><input id="logical-key" v-model="model.modelKey" class="text-input" maxlength="160" />
<label class="form-label" for="logical-type">模型类型</label><select id="logical-type" v-model="model.type" class="text-input"><option value="text">文本</option><option value="code">代码</option><option value="multimodal">多模态</option><option value="image">图像</option><option value="audio">音频</option><option value="video">视频</option><option value="embedding">向量</option><option value="3d">3D</option></select>
<label class="form-label" for="logical-mode">调用模式</label><select id="logical-mode" v-model="model.mode" class="text-input"><option value="sync">同步</option><option value="stream">流式</option><option value="async">异步</option></select>
@@ -152,7 +153,7 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider
<label class="form-label">缓存命中输入价格(留空按普通输入价格)<input v-model="group.cachedInput" class="text-input" type="number" min="0" step="any" /></label>
<label class="form-label" for="group-unit">价格单位</label><input id="group-unit" v-model="group.unit" class="text-input" required />
<small>文本聊天自动扣费仅支持 CNY / 1M tokens(元/百万 Token)。输入、输出均需填写;填 0 表示免费,留空则禁止调用。请填写平台对用户的售价。</small>
<div class="modal-form-grid"><label><span class="form-label">优先级</span><input v-model="group.priority" class="text-input" type="number" min="0" step="1" required /></label><label><span class="form-label">并发上限</span><input v-model="group.maxConcurrency" class="text-input" type="number" min="1" step="1" required /></label></div>
<div class="modal-form-grid"><label><span class="form-label">优先级</span><input v-model="group.priority" class="text-input" type="number" min="0" step="1" required /></label><label><span class="form-label">并发上限</span><input v-model="group.maxConcurrency" class="text-input" type="number" min="1" step="1" required /><small>1 为串行;建议按该渠道限额填写,4 表示最多同时处理 4 个请求。</small></label></div>
</template>
</form>
<template #footer><button class="button secondary" :disabled="saving" @click="editor = ''">取消</button><button class="button primary" form="catalog-editor" type="submit" :disabled="saving">{{ saving ? '保存中…' : '保存' }}</button></template>
@@ -11,14 +11,14 @@ const query = ref('')
const onlySelected = ref(false)
const expanded = ref<string[]>([])
const models = computed(() => [...new Map(props.groups.map(group => [group.logicalModelId || group.id, group])).entries()].map(([id, model]) => ({
id, name: model.name, modelKey: model.modelKey,
id, name: model.name, vendorName: model.vendorName, modelKey: model.modelKey,
groups: props.groups.filter(group => (group.logicalModelId || group.id) === id),
})))
const selectedGroups = computed(() => props.groups.filter(group => props.modelValue.includes(group.id)))
const selectedCount = computed(() => models.value.filter(model => model.groups.some(group => props.modelValue.includes(group.id))).length)
const unavailable = computed(() => props.modelValue.filter(id => !props.groups.some(group => group.id === id)))
const filtered = computed(() => models.value.filter(model => {
const text = `${model.name} ${model.modelKey || ''} ${model.groups.map(group => `${group.provider} ${group.sourceLabel}`).join(' ')}`.toLowerCase()
const text = `${model.name} ${model.vendorName || ''} ${model.modelKey || ''} ${model.groups.map(group => `${group.provider} ${group.sourceLabel}`).join(' ')}`.toLowerCase()
return text.includes(query.value.trim().toLowerCase()) && (!onlySelected.value || model.groups.some(group => props.modelValue.includes(group.id)))
}))
const { page, pageSize, pagedItems } = usePagination(filtered, 8)
@@ -41,11 +41,11 @@ function clear() { expanded.value = []; emit('update:modelValue', []) }
<strong>已选 {{ selectedCount }} 个模型 · {{ selectedGroups.length }} 个可用分组<span v-if="unavailable.length"> · {{ unavailable.length }} 个暂不可用授权</span></strong>
<div class="selected-tags"><button v-for="group in selectedGroups" :key="group.id" type="button" :disabled="disabled" :aria-label="`移除 ${group.name} / ${group.sourceLabel || '默认分组'}`" @click="toggle([group.id], false)">{{ group.name }} / {{ group.sourceLabel || '默认分组' }} ×</button></div>
</section>
<label class="permission-search">搜索模型或分组<input v-model="query" class="text-input" placeholder="模型名称、标识、渠道或分组" :disabled="disabled" /></label>
<label class="permission-search">搜索模型或分组<input v-model="query" class="text-input" placeholder="模型名称、厂商、渠道或分组" :disabled="disabled" /></label>
<label class="selected-filter"><input v-model="onlySelected" type="checkbox" :disabled="disabled" />仅看已授权模型</label>
<div class="permission-list">
<section v-for="model in pagedItems" :key="model.id" class="permission-model">
<label class="model-choice"><input type="checkbox" :checked="modelChecked(model.id)" :disabled="disabled" @change="selectModel(model.id, ($event.target as HTMLInputElement).checked)" /><span><strong>{{ model.name }}</strong><small>{{ model.groups.filter(group => modelValue.includes(group.id)).length }} / {{ model.groups.length }} 个分组已选</small></span></label>
<label class="model-choice"><input type="checkbox" :checked="modelChecked(model.id)" :disabled="disabled" @change="selectModel(model.id, ($event.target as HTMLInputElement).checked)" /><span><strong>{{ model.name }}</strong><small>{{ model.vendorName || '未标注厂商' }} · {{ model.groups.filter(group => modelValue.includes(group.id)).length }} / {{ model.groups.length }} 个分组已选</small></span></label>
<fieldset v-if="modelChecked(model.id)" :disabled="disabled"><legend>{{ model.name }} 的可调用分组</legend>
<p v-if="!model.groups.some(group => modelValue.includes(group.id))">请选择至少一个分组以授权该模型。</p>
<label v-for="group in model.groups" :key="group.id" class="group-option">