feat: separate api key and upstream concurrency
This commit is contained in:
1 parent
281849ceb8
commit
f5f855c751
13 files changed
+74
-8
No files matched your search
@@ -108,7 +108,7 @@ 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 选择该分组。并发上限按分组生效,填 1 才是串行,填 4 表示同一分组最多同时处理 4 个请求。</p>
|
||||
<p v-if="props.section === 'models'" class="catalog-secondary">启用模型后会显示在用户端模型广场。模型厂商表示模型的实际研发方,渠道表示请求经过的中转站或官方接口;分组与所属渠道也启用后,用户才能为 API Key 选择该分组。平台 API Key 并发和上游渠道/模型并发是两层独立限制:前者限制同一个 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="渠道分页" />
|
||||
@@ -153,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 /><small>1 为串行;建议按该渠道限额填写,4 表示最多同时处理 4 个请求。</small></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 为串行;按渠道实际额度填写。</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>
|
||||
|
||||
@@ -213,3 +213,5 @@ td strong{font-size:12px}
|
||||
@media(min-width:1151px){.model-filter-grid{grid-template-columns:minmax(220px,1.7fr) repeat(5,minmax(125px,1fr))}}
|
||||
/* Usage audit console */
|
||||
.usage-filter{display:flex;align-items:center;gap:10px;flex-wrap:wrap}.usage-filter .search-input{min-width:260px;flex:1}.usage-filter select{min-width:120px}.button.danger{color:#fff;border-color:#d94b62;background:#d94b62}.button.danger:hover{background:#bd354d}.danger-icon{color:#c43d55}.usage-table th:first-child,.usage-table td:first-child{width:36px}.usage-table input[type=checkbox]{width:15px;height:15px;accent-color:#6351df}.usage-table code{font-size:10px}.usage-detail-list{margin-bottom:18px}.usage-payload{max-height:180px;overflow:auto;margin:6px 0 15px;padding:11px;border:1px solid var(--border);border-radius:8px;color:#344054;font:11px/1.55 "DM Mono",monospace;white-space:pre-wrap;word-break:break-word;background:#f7f8fb}.table-pagination{display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-top:1px solid var(--border);color:var(--muted);font-size:11px}.table-pagination>div{display:flex;gap:6px}.rotate-90{transform:rotate(90deg)}.rotate--90{transform:rotate(-90deg)}
|
||||
.docs-guide-extra{padding:24px 28px}.docs-guide-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:14px}.docs-guide-grid article{display:flex;gap:12px;min-height:112px;padding:15px;border:1px solid var(--border);border-radius:10px;background:var(--soft)}.docs-guide-grid article>b{display:grid;flex:0 0 30px;width:30px;height:30px;place-items:center;border:1px solid #d8d0fb;border-radius:8px;color:var(--primary);font-family:"DM Mono",monospace;font-size:10px;background:var(--primary-soft)}.docs-guide-grid h4{margin:1px 0 7px;font-size:13px}.docs-guide-grid p{margin:0;color:var(--text-soft);font-size:11px;line-height:1.65}.docs-guide-grid code{padding:2px 4px;border-radius:4px;color:var(--primary);font-family:"DM Mono",monospace;background:var(--primary-soft)}
|
||||
@media(max-width:700px){.docs-guide-extra{padding:20px 16px}.docs-guide-grid{grid-template-columns:1fr}}
|
||||
@@ -640,7 +640,19 @@ MOYI_MODEL=<model-id></code></pre></div></section><section><b>02</b><div><
|
||||
-H "Authorization: Bearer $MOYI_API_KEY" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{ "model": "<model-id>", "messages": [...] }'</code></pre></div></section><div class="docs-note"><Info :size="18" /><p><strong>保持开放与兼容。</strong>具体模型支持的协议和参数以模型详情与版本化 API 文档为准。</p></div></article></section>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
<section v-if="view === 'docs'" class="panel docs-guide-extra">
|
||||
<header class="panel-header"><div><span>USER GUIDE</span><h3>从模型广场到第一次调用</h3></div><span class="select-button static">按步骤操作</span></header>
|
||||
<div class="docs-guide-grid">
|
||||
<article><b>01</b><div><h4>选择模型与来源</h4><p>模型广场先按模型厂商筛选,例如 OpenAI、智谱、月之暗面或字节跳动;进入详情后再选择可用的渠道分组。模型 ID 使用详情里的“调用模型 ID”。</p></div></article>
|
||||
<article><b>02</b><div><h4>创建并授权 API Key</h4><p>在 API Keys 中创建 Key,授权窗口可以同时勾选多个模型和多个分组。密钥只在创建时完整显示,请立即保存;停用后的 Key 可重新启用。</p></div></article>
|
||||
<article><b>03</b><div><h4>在线调试</h4><p>在线调试直接选择已有的启用状态 API Key,再选择模型和分组;无需为每次调试重新创建 Key。调试结果和请求会保留在历史记录中。</p></div></article>
|
||||
<article><b>04</b><div><h4>接入应用</h4><p>将 Base URL、Key 和模型调用 ID 配置到 SDK 或程序中。统一地址为 <code>{{ platformApiBaseUrl }}</code>,聊天接口是 <code>/chat/completions</code>,请求头使用 Bearer Key。</p></div></article>
|
||||
<article><b>05</b><div><h4>查看用量与任务</h4><p>使用记录展示模型、分组、Token、费用和耗时;任务中心展示异步任务状态和结果。额度不足、模型停用或分组并发已满时,请先查看错误提示和重试时间。</p></div></article>
|
||||
<article><b>06</b><div><h4>理解两层并发</h4><p>同一个 API Key 有独立的并发上限;上游分组还有一个可供多个用户共享的并发上限。一次请求必须同时取得两类额度,任一达到上限都会稍后重试。</p></div></article>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<SlidePanel v-if="selectedModel" :title="selectedModel.name" eyebrow="MODEL DETAILS" @close="selectedModel = null">
|
||||
<div class="drawer-model-head"><span class="model-icon" :class="selectedModel.accent"><component :is="selectedModel.icon" :size="22" /></span><div><small>{{ selectedModel.vendorName || '未标注厂商' }}</small><strong>{{ selectedModel.type }} · {{ selectedModel.mode }}调用</strong><small>渠道:{{ selectedModel.provider }}</small></div></div>
|
||||
|
||||
Reference in new issue
Block a user