feat(channel): 同步 vivid 最新渠道设计 — 手动全量同步端点/并发0=不限/同名别名报错

对齐 vivid 6039423/5802749/a1f808f/cfb6d49/aba8474/b01636f:
- 新增 POST /channels/sync-models:已保存渠道手动全量同步,上游不可达/
  空清单直接报错(保存路径仍降级为告警);渠道行按钮不再弹勾选框,
  表单内对已保存渠道同样直同步,新渠道保持预览+勾选即绑定
- 渠道并发 0 = 不限制(原 0=默认5),上限放开到 int32,槽位 Lua 本就
  max=0 放行
- 别名与上游模型同名提交即报错「留空即同名」,前后端双校验
- 渠道列表去掉上游地址与模型两列(同 vivid),状态徽章悬浮显示失败原因

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
2026-10-19 01:43:30 +08:00
co-authored by Devin
parent 5226e11cfc
commit 72d4eec203
7 changed files with 118 additions and 49 deletions
@@ -88,6 +88,25 @@ func (h *ChannelAdminHandler) FetchModels(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"data": items}) c.JSON(http.StatusOK, gin.H{"data": items})
} }
// SyncModels manually re-runs the full upstream model sync on a saved channel
// (new models bound, disappeared ones unbound, orphans deleted). Fetch
// failures are errors here — unlike the save path which degrades to a warning.
func (h *ChannelAdminHandler) SyncModels(c *gin.Context) {
var body struct {
ID string `json:"id"`
}
if err := c.ShouldBindJSON(&body); err != nil || strings.TrimSpace(body.ID) == "" {
c.JSON(http.StatusBadRequest, gin.H{"detail": "channel id required"})
return
}
msg, err := h.channels.SyncModels(c.Request.Context(), body.ID)
if err != nil {
writeUpstreamErr(c, err)
return
}
c.JSON(http.StatusOK, gin.H{"ok": true, "message": msg})
}
// ImportModels binds the ticked upstream models to the channel (creating local // ImportModels binds the ticked upstream models to the channel (creating local
// model rows on first import). // model rows on first import).
func (h *ChannelAdminHandler) ImportModels(c *gin.Context) { func (h *ChannelAdminHandler) ImportModels(c *gin.Context) {
+1
View File
@@ -146,6 +146,7 @@ func New(cfg *config.Config, auth *service.AuthService, handlers Handlers) *gin.
authed.POST("/channels", handlers.ChannelAdmin.Save) authed.POST("/channels", handlers.ChannelAdmin.Save)
authed.POST("/channels/delete", handlers.ChannelAdmin.Delete) authed.POST("/channels/delete", handlers.ChannelAdmin.Delete)
authed.POST("/channels/fetch-models", handlers.ChannelAdmin.FetchModels) authed.POST("/channels/fetch-models", handlers.ChannelAdmin.FetchModels)
authed.POST("/channels/sync-models", handlers.ChannelAdmin.SyncModels)
authed.POST("/channels/import-models", handlers.ChannelAdmin.ImportModels) authed.POST("/channels/import-models", handlers.ChannelAdmin.ImportModels)
authed.POST("/channels/unbind-model", handlers.ChannelAdmin.UnbindModel) authed.POST("/channels/unbind-model", handlers.ChannelAdmin.UnbindModel)
authed.GET("/providers", handlers.AdminRead.Providers) authed.GET("/providers", handlers.AdminRead.Providers)
+1 -1
View File
@@ -194,7 +194,7 @@ type Channel struct {
BaseURL string `gorm:"size:500;not null"` BaseURL string `gorm:"size:500;not null"`
APIKeyEnc string `gorm:"type:text;not null"` // AES-GCM encrypted upstream API key APIKeyEnc string `gorm:"type:text;not null"` // AES-GCM encrypted upstream API key
Enabled bool `gorm:"not null;default:true;index"` Enabled bool `gorm:"not null;default:true;index"`
// Concurrency caps simultaneous in-flight jobs on this channel. 0 = default. // Concurrency caps simultaneous in-flight jobs on this channel. 0 = unlimited.
Concurrency int `gorm:"not null;default:0"` Concurrency int `gorm:"not null;default:0"`
// Weight biases weighted-random channel order: weight 2 is picked first at // Weight biases weighted-random channel order: weight 2 is picked first at
// roughly 2x the rate of weight 1. // roughly 2x the rate of weight 1.
+52 -17
View File
@@ -11,6 +11,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"math"
"strings" "strings"
"sync" "sync"
"time" "time"
@@ -132,6 +133,9 @@ func (s *ChannelService) Save(ctx context.Context, d SaveChannelDto) (*model.Cha
if !strings.HasPrefix(base, "http://") && !strings.HasPrefix(base, "https://") { if !strings.HasPrefix(base, "http://") && !strings.HasPrefix(base, "https://") {
return nil, "", errors.New("base_url must start with http:// or https://") return nil, "", errors.New("base_url must start with http:// or https://")
} }
if d.Concurrency < 0 || d.Concurrency > math.MaxInt32 {
return nil, "", errors.New("并发数需在 0-2147483647 之间(0 = 不限制)")
}
weight := d.Weight weight := d.Weight
if weight < 1 { if weight < 1 {
weight = 1 weight = 1
@@ -159,7 +163,7 @@ func (s *ChannelService) Save(ctx context.Context, d SaveChannelDto) (*model.Cha
if err := s.channels.Create(ctx, ch); err != nil { if err := s.channels.Create(ctx, ch); err != nil {
return nil, "", err return nil, "", err
} }
return ch, s.syncChannelModels(ctx, ch.ID), nil return ch, syncWarn(s.syncChannelModels(ctx, ch.ID)), nil
} }
patch := map[string]any{ patch := map[string]any{
"name": name, "name": name,
@@ -179,31 +183,58 @@ func (s *ChannelService) Save(ctx context.Context, d SaveChannelDto) (*model.Cha
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
return ch, s.syncChannelModels(ctx, d.ID), nil return ch, syncWarn(s.syncChannelModels(ctx, d.ID)), nil
}
// syncWarn folds the sync error into the save-path warning (vivid parity: a
// failed upstream fetch degrades to a non-fatal warning instead of blocking
// the channel save).
func syncWarn(warn string, err error) string {
if err != nil {
return err.Error()
}
return warn
}
// SyncModels manually triggers a full upstream-model sync for a saved channel
// (same truth semantics as the save path). Unlike Save, an unreachable upstream
// or empty model list is a hard error, not a warning.
func (s *ChannelService) SyncModels(ctx context.Context, channelID string) (string, error) {
if _, err := s.channels.Get(ctx, strings.TrimSpace(channelID)); err != nil {
return "", err
}
warn, err := s.syncChannelModels(ctx, channelID)
if err != nil {
return "", err
}
if warn != "" {
return warn, nil
}
return "已同步上游模型", nil
} }
// syncChannelModels runs after Save: upstream /v1/models is the truth — every // syncChannelModels runs after Save: upstream /v1/models is the truth — every
// sellable upstream model is upserted locally (alias = upstream id) and bound; // sellable upstream model is upserted locally (alias = upstream id) and bound;
// bindings on this channel not in the upstream list are removed, and orphan // bindings on this channel not in the upstream list are removed, and orphan
// local models are deleted. An unreachable upstream or empty/anomalous list // local models are deleted. An unreachable upstream or empty list is an error
// only produces a warning — the DB is left untouched. // (the save path degrades it to a warning); warn carries non-fatal skips.
func (s *ChannelService) syncChannelModels(ctx context.Context, channelID string) string { func (s *ChannelService) syncChannelModels(ctx context.Context, channelID string) (string, error) {
ch, err := s.channels.Get(ctx, channelID) ch, err := s.channels.Get(ctx, channelID)
if err != nil { if err != nil {
return "模型自动同步失败:" + err.Error() return "", fmt.Errorf("模型同步失败:%w", err)
} }
key := s.decrypt(ch.APIKeyEnc) key := s.decrypt(ch.APIKeyEnc)
if key == "" { if key == "" {
return "模型自动同步失败:无法解密上游密钥" return "", errors.New("模型同步失败:无法解密上游密钥")
} }
fctx, cancel := context.WithTimeout(ctx, 20*time.Second) fctx, cancel := context.WithTimeout(ctx, 20*time.Second)
defer cancel() defer cancel()
models, err := s.up.Models(fctx, ch.BaseURL, key) models, err := s.up.Models(fctx, ch.BaseURL, key)
if err != nil { if err != nil {
return "模型自动同步失败:" + err.Error() return "", fmt.Errorf("模型同步失败:%w", err)
} }
if len(models) == 0 { if len(models) == 0 {
return "上游未返回任何模型,已跳过同步" return "", errors.New("上游未返回任何模型,已跳过同步")
} }
specs := make([]ChannelModelSpec, 0, len(models)) specs := make([]ChannelModelSpec, 0, len(models))
upstreamIDs := make([]string, 0, len(models)) upstreamIDs := make([]string, 0, len(models))
@@ -218,13 +249,13 @@ func (s *ChannelService) syncChannelModels(ctx context.Context, channelID string
upstreamIDs = append(upstreamIDs, spec.ID) upstreamIDs = append(upstreamIDs, spec.ID)
} }
if len(upstreamIDs) == 0 { if len(upstreamIDs) == 0 {
return fmt.Sprintf("上游模型均规格异常,已跳过同步:%s", strings.Join(skipped, ";")) return "", fmt.Errorf("上游模型均规格异常,已跳过同步:%s", strings.Join(skipped, ";"))
} }
if err := s.ImportModels(ctx, channelID, specs); err != nil { if err := s.ImportModels(ctx, channelID, specs); err != nil {
return "模型自动同步失败:" + err.Error() return "", fmt.Errorf("模型同步失败:%w", err)
} }
if err := s.channels.UnbindExcept(ctx, channelID, upstreamIDs); err != nil { if err := s.channels.UnbindExcept(ctx, channelID, upstreamIDs); err != nil {
return "模型自动同步失败:" + err.Error() return "", fmt.Errorf("模型同步失败:%w", err)
} }
if orphans, oerr := s.channels.OrphanModelIDs(ctx); oerr == nil { if orphans, oerr := s.channels.OrphanModelIDs(ctx); oerr == nil {
for _, mid := range orphans { for _, mid := range orphans {
@@ -232,9 +263,9 @@ func (s *ChannelService) syncChannelModels(ctx context.Context, channelID string
} }
} }
if len(skipped) > 0 { if len(skipped) > 0 {
return fmt.Sprintf("已同步上游模型,跳过 %d 个异常项:%s", len(skipped), strings.Join(skipped, ";")) return fmt.Sprintf("已同步上游模型,跳过 %d 个异常项:%s", len(skipped), strings.Join(skipped, ";")), nil
} }
return "" return "", nil
} }
// normalizeRemoteModel validates an upstream /v1/models item into an import // normalizeRemoteModel validates an upstream /v1/models item into an import
@@ -419,7 +450,11 @@ func (s *ChannelService) ImportModels(ctx context.Context, channelID string, spe
if upID == "" { if upID == "" {
continue continue
} }
localID := strings.TrimSpace(spec.Alias) alias := strings.TrimSpace(spec.Alias)
if alias == upID {
return fmt.Errorf("「%s」别名不能与上游模型同名,留空即可", upID)
}
localID := alias
if localID == "" { if localID == "" {
localID = upID localID = upID
} }
@@ -459,8 +494,8 @@ func (s *ChannelService) ImportModels(ctx context.Context, channelID string, spe
} }
// modelPatchFromSpec maps an upstream model spec onto model_configs columns. // modelPatchFromSpec maps an upstream model spec onto model_configs columns.
// Prices/enabled/alias are intentionally untouched on update so admin pricing // Prices/alias are intentionally untouched on update so admin pricing survives
// survives re-import. // re-import.
func modelPatchFromSpec(spec ChannelModelSpec, existing *model.ModelConfig) map[string]any { func modelPatchFromSpec(spec ChannelModelSpec, existing *model.ModelConfig) map[string]any {
patch := map[string]any{ patch := map[string]any{
"type": spec.Kind, "type": spec.Kind,
+5 -5
View File
@@ -64,8 +64,8 @@ const videoGenBudget = 30 * time.Minute
// imageGenBudget caps one image generation end-to-end. // imageGenBudget caps one image generation end-to-end.
const imageGenBudget = 8 * time.Minute const imageGenBudget = 8 * time.Minute
// defaultChannelConcurrency applies when a channel's Concurrency is 0. // Channel concurrency semantics: 0 = unlimited (the Lua slot script passes
const defaultChannelConcurrency = 5 // max=0 straight through), matching vivid's channel design.
// maxChannelFailover caps how many channels one request may burn on // maxChannelFailover caps how many channels one request may burn on
// retryable/temporary errors before giving up, so an upstream-wide blip can't // retryable/temporary errors before giving up, so an upstream-wide blip can't
@@ -100,11 +100,11 @@ type V1Service struct {
conc *ConcurrencyService conc *ConcurrencyService
} }
// chanAcquire takes one per-channel slot (capped at max; 0 = default), tagged // chanAcquire takes one per-channel slot (capped at max; 0 = unlimited), tagged
// with the generation's eventID. // with the generation's eventID.
func (s *V1Service) chanAcquire(ctx context.Context, channelID, eventID string, max int) bool { func (s *V1Service) chanAcquire(ctx context.Context, channelID, eventID string, max int) bool {
if max < 1 { if max < 0 {
max = defaultChannelConcurrency max = 0
} }
return s.conc.Acquire(ctx, "conc:c:"+channelID, max, eventID) return s.conc.Acquire(ctx, "conc:c:"+channelID, max, eventID)
} }
+39 -25
View File
@@ -10,6 +10,8 @@ const channels = ref([])
const loading = ref(false) const loading = ref(false)
const err = ref('') const err = ref('')
const warn = ref('') // 保存后自动同步的非致命告警 const warn = ref('') // 保存后自动同步的非致命告警
const okMsg = ref('') // 手动同步成功提示
const syncing = ref(false)
// create/edit form // create/edit form
const form = ref(null) const form = ref(null)
@@ -31,12 +33,6 @@ async function load() {
loading.value = false loading.value = false
} }
function modelSummary(c) {
const names = c.models || []
if (!names.length) return ''
return names.length <= 2 ? names.join('、') : `${names[0]}、${names[1]} 等`
}
function openAdd() { function openAdd() {
formErr.value = '' formErr.value = ''
form.value = { id: '', name: '', base_url: '', api_key: '', concurrency: 5, weight: 1, enabled: true } form.value = { id: '', name: '', base_url: '', api_key: '', concurrency: 5, weight: 1, enabled: true }
@@ -54,6 +50,7 @@ async function save() {
if (saving.value) return if (saving.value) return
saving.value = true saving.value = true
formErr.value = '' formErr.value = ''
okMsg.value = ''
const r = await api('/channels', jsonBody('POST', { const r = await api('/channels', jsonBody('POST', {
id: f.id, name: f.name, base_url: f.base_url, api_key: f.api_key, id: f.id, name: f.name, base_url: f.base_url, api_key: f.api_key,
enabled: !!f.enabled, concurrency: f.concurrency || 0, weight: f.weight || 1, enabled: !!f.enabled, concurrency: f.concurrency || 0, weight: f.weight || 1,
@@ -83,13 +80,34 @@ async function del(c) {
channels.value = channels.value.filter((x) => x.id !== c.id) channels.value = channels.value.filter((x) => x.id !== c.id)
} }
// 表单内拉模型:编辑态走库内渠道(密钥不用重填);新渠道用表单里的地址+key 预览。 // 已保存渠道手动「同步上游模型」:直接全量同步(新模型入库绑定,上游消失的
// 解绑/清孤儿),拉取失败直接报错;新渠道则只用表单地址+key 预览不落库。
async function syncModels(c) {
if (syncing.value) return
syncing.value = true
err.value = ''
warn.value = ''
okMsg.value = ''
try {
const r = await api('/channels/sync-models', jsonBody('POST', { id: c.id }))
if (!r.ok) { err.value = r.data?.detail || '同步失败'; return }
const msg = r.data?.message || '已同步上游模型'
if (msg === '已同步上游模型') okMsg.value = msg
else warn.value = msg
load()
} finally {
syncing.value = false
}
}
// 表单内拉模型:编辑态直接全量同步;新渠道用表单里的地址+key 预览(导入时自动保存)。
function fetchFromForm() { function fetchFromForm() {
const f = form.value const f = form.value
if (!f) return if (!f) return
if (f.id) { syncModels(f); return }
if (!/^https?:\/\/\S+$/.test((f.base_url || '').trim())) { formErr.value = '上游地址需以 http(s):// 开头'; return } if (!/^https?:\/\/\S+$/.test((f.base_url || '').trim())) { formErr.value = '上游地址需以 http(s):// 开头'; return }
if (!f.id && !f.api_key) { formErr.value = '请填写 API Key'; return } if (!f.api_key) { formErr.value = '请填写 API Key'; return }
openFetch({ id: f.id || '', name: f.name || f.base_url, base_url: f.base_url, api_key: f.api_key, concurrency: f.concurrency, weight: f.weight, enabled: !!f.enabled }) openFetch({ id: '', name: f.name || f.base_url, base_url: f.base_url, api_key: f.api_key, concurrency: f.concurrency, weight: f.weight, enabled: !!f.enabled })
} }
async function openFetch(c) { async function openFetch(c) {
@@ -109,6 +127,10 @@ async function openFetch(c) {
// 新渠道尚未入库时,第一次勾选会先自动保存渠道再绑定。 // 新渠道尚未入库时,第一次勾选会先自动保存渠道再绑定。
async function toggleBind(s) { async function toggleBind(s) {
if (s.busy) return if (s.busy) return
if (!s.bound && s.alias && s.alias === s.id) {
fetchErr.value = `「${s.id}」别名不能与上游模型同名,留空即可`
return
}
s.busy = true s.busy = true
fetchErr.value = '' fetchErr.value = ''
try { try {
@@ -172,6 +194,7 @@ onMounted(load)
<p v-if="err" class="text-xs text-rose-300">{{ err }}</p> <p v-if="err" class="text-xs text-rose-300">{{ err }}</p>
<p v-if="warn" class="text-xs text-amber-300">{{ warn }}</p> <p v-if="warn" class="text-xs text-amber-300">{{ warn }}</p>
<p v-if="okMsg" class="text-xs text-emerald-300">{{ okMsg }}</p>
<div class="card overflow-hidden"> <div class="card overflow-hidden">
<div class="overflow-x-auto"> <div class="overflow-x-auto">
@@ -179,8 +202,6 @@ onMounted(load)
<thead> <thead>
<tr> <tr>
<th>渠道</th> <th>渠道</th>
<th>上游地址</th>
<th>模型</th>
<th>并发</th> <th>并发</th>
<th>配比</th> <th>配比</th>
<th class="text-right">成功调用</th> <th class="text-right">成功调用</th>
@@ -197,14 +218,7 @@ onMounted(load)
<div class="font-medium text-white/85">{{ c.name }}</div> <div class="font-medium text-white/85">{{ c.name }}</div>
<div class="text-[11px] text-white/35 font-mono">{{ c.id }}</div> <div class="text-[11px] text-white/35 font-mono">{{ c.id }}</div>
</td> </td>
<td> <td class="tabular-nums">{{ c.concurrency || '不限' }}</td>
<div class="max-w-[240px] truncate font-mono text-xs text-white/55" :title="c.base_url">{{ c.base_url }}</div>
</td>
<td>
<div class="tabular-nums text-white/80">{{ (c.models || []).length }}</div>
<div class="text-[11px] text-white/35 max-w-[180px] truncate" :title="(c.models || []).join('、')">{{ modelSummary(c) }}</div>
</td>
<td class="tabular-nums">{{ c.concurrency || '默认' }}</td>
<td class="tabular-nums">{{ c.weight || 1 }}</td> <td class="tabular-nums">{{ c.weight || 1 }}</td>
<td class="text-right tabular-nums">{{ (c.success_total || 0).toLocaleString() }}</td> <td class="text-right tabular-nums">{{ (c.success_total || 0).toLocaleString() }}</td>
<td class="text-right tabular-nums">{{ (c.used_credits || 0).toLocaleString() }}</td> <td class="text-right tabular-nums">{{ (c.used_credits || 0).toLocaleString() }}</td>
@@ -218,13 +232,13 @@ onMounted(load)
</td> </td>
<td class="text-xs text-white/45 whitespace-nowrap">{{ c.last_used_at ? fmtTs(c.last_used_at) : '-' }}</td> <td class="text-xs text-white/45 whitespace-nowrap">{{ c.last_used_at ? fmtTs(c.last_used_at) : '-' }}</td>
<td class="text-right whitespace-nowrap"> <td class="text-right whitespace-nowrap">
<button @click="openFetch(c)" class="op" title="拉取上游模型"><Icon name="spark" class="w-3.5 h-3.5" /></button> <button @click="syncModels(c)" :disabled="syncing" class="op" title="同步上游模型"><Icon name="spark" class="w-3.5 h-3.5" /></button>
<button @click="openEdit(c)" class="op" title="编辑"><Icon name="config" class="w-3.5 h-3.5" /></button> <button @click="openEdit(c)" class="op" title="编辑"><Icon name="config" class="w-3.5 h-3.5" /></button>
<button @click="del(c)" class="op danger" title="删除"><Icon name="trash" class="w-3.5 h-3.5" /></button> <button @click="del(c)" class="op danger" title="删除"><Icon name="trash" class="w-3.5 h-3.5" /></button>
</td> </td>
</tr> </tr>
<tr v-if="loading"><td colspan="11" class="py-10 text-center text-white/40 text-sm">正在加载渠道…</td></tr> <tr v-if="loading"><td colspan="9" class="py-10 text-center text-white/40 text-sm">正在加载渠道…</td></tr>
<tr v-else-if="!channels.length"><td colspan="11" class="py-10 text-center text-white/40 text-sm">没有渠道,点右上角「添加渠道」接入上游实例</td></tr> <tr v-else-if="!channels.length"><td colspan="9" class="py-10 text-center text-white/40 text-sm">没有渠道,点右上角「添加渠道」接入上游实例</td></tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -255,8 +269,8 @@ onMounted(load)
<div class="grid grid-cols-2 gap-3"> <div class="grid grid-cols-2 gap-3">
<div> <div>
<label class="lbl">并发数</label> <label class="lbl">并发数</label>
<input v-model.number="form.concurrency" type="number" min="0" max="100" class="field" /> <input v-model.number="form.concurrency" type="number" min="0" max="2147483647" class="field" />
<p class="mt-1 text-[11px] text-white/35">0 = 默认 5</p> <p class="mt-1 text-[11px] text-white/35">0 = 不限</p>
</div> </div>
<div> <div>
<label class="lbl">配比</label> <label class="lbl">配比</label>
@@ -276,7 +290,7 @@ onMounted(load)
<button type="button" @click="fetchFromForm" :disabled="fetching" class="btn-ghost text-xs"> <button type="button" @click="fetchFromForm" :disabled="fetching" class="btn-ghost text-xs">
{{ fetching ? '拉取中…' : '获取模型列表' }} {{ fetching ? '拉取中…' : '获取模型列表' }}
</button> </button>
<span class="text-[11px] text-white/35">{{ form.id ? '用已保存的地址与密钥拉取' : '用上方的地址与 API Key 拉取;导入时会先自动保存渠道' }}</span> <span class="text-[11px] text-white/35">{{ form.id ? '直接全量同步上游模型到模型列表' : '用上方的地址与 API Key 预览;导入时会先自动保存渠道' }}</span>
</div> </div>
<p v-if="formErr" class="text-xs text-rose-300">{{ formErr }}</p> <p v-if="formErr" class="text-xs text-rose-300">{{ formErr }}</p>
</div> </div>
+1 -1
View File
@@ -278,7 +278,7 @@ const sourcePill = (s) => ({
<span v-else class="text-white/25">—</span> <span v-else class="text-white/25">—</span>
</td> </td>
<td class="px-3 py-3.5 align-middle"> <td class="px-3 py-3.5 align-middle">
<span class="chip ring-1" :class="statusPill(e.status)"> <span class="chip ring-1" :class="statusPill(e.status)" :title="e.error || ''">
<span class="w-1.5 h-1.5 rounded-full" :class="statusDot(e.status)"></span> <span class="w-1.5 h-1.5 rounded-full" :class="statusDot(e.status)"></span>
{{ statusLabel(e.status) }} {{ statusLabel(e.status) }}
</span> </span>