github/new-api
1
0
Fork 0
mirror of https://github.com/QuantumNous/new-api.git synced 2026-05-05 12:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ feat(sync): multi-language sync wizard, backend locale support, and conflict modal UX improvements

Browse Source 
Frontend (web)
- ModelsActions.jsx
  - Replace “Sync Official” with “Sync” and open a new two-step SyncWizard.
  - Pass selected locale through to preview, sync, and overwrite flows.
  - Keep conflict resolution flow; inject locale into overwrite submission.

- New: models/modals/SyncWizardModal.jsx
  - Two-step wizard: (1) method selection (config-sync disabled for now), (2) language selection (en/zh/ja).
  - Horizontal, centered Radio cards; returns { option, locale } via onConfirm.

- UpstreamConflictModal.jsx
  - Add search input (model fuzzy search) and native pagination.
  - Column header checkbox now only applies to rows in the current filtered result.
  - Fix “Cannot access ‘filteredDataSource’ before initialization”.
  - Refactor with useMemo/useCallback; extract helpers to remove duplicated logic:
    - getPresentRowsForField, getHeaderState, applyHeaderChange
  - Minor code cleanups and stability improvements.

- i18n (en.json)
  - Add strings for the sync wizard and related actions (Sync, Sync Wizard, Select method/source/language, etc.).
  - Adjust minor translations.

Hooks
- useModelsData.jsx
  - Extend previewUpstreamDiff, syncUpstream, applyUpstreamOverwrite to accept options with locale.
  - Send locale via query/body accordingly.

Backend (Go)
- controller/model_sync.go
  - Accept locale from query/body and resolve i18n upstream URLs.
  - Add SYNC_UPSTREAM_BASE for upstream base override (default: https://basellm.github.io/llm-metadata).
  - Make HTTP timeouts/retries/limits configurable:
    - SYNC_HTTP_TIMEOUT_SECONDS, SYNC_HTTP_RETRY, SYNC_HTTP_MAX_MB
  - Add ETag-based caching and support both envelope and pure array JSON formats.
  - Concurrently fetch vendors and models; improve error responses with locale and source URLs.
  - Include source meta (locale, models_url, vendors_url) in success payloads.

Notes
- No breaking changes expected.
- Lint passes for touched files.
This commit is contained in:
t0ng7u
2025-09-02 18:49:37 +08:00
parent d9f37d16f7
commit 8c65264474
9 changed files with 856 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

915
controller/model_sync.go
View File

@@ -1,463 +1,604 @@
package controller package controller
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
"io" "fmt"
"net" "io"
"net/http" "math/rand"
"strings" "net"
"time" "net/http"
"strings"
"sync"
"time"
"one-api/model" "one-api/common"
"one-api/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gorm.io/gorm" "gorm.io/gorm"
) )
// 上游地址 // 上游地址
const ( const (
upstreamModelsURL = "https://basellm.github.io/llm-metadata/api/newapi/models.json" upstreamModelsURL = "https://basellm.github.io/llm-metadata/api/newapi/models.json"
upstreamVendorsURL = "https://basellm.github.io/llm-metadata/api/newapi/vendors.json" upstreamVendorsURL = "https://basellm.github.io/llm-metadata/api/newapi/vendors.json"
) )
func normalizeLocale(locale string) (string, bool) {
l := strings.ToLower(strings.TrimSpace(locale))
switch l {
case "en", "zh", "ja":
return l, true
default:
return "", false
}
}
func getUpstreamBase() string {
return common.GetEnvOrDefaultString("SYNC_UPSTREAM_BASE", "https://basellm.github.io/llm-metadata")
}
func getUpstreamURLs(locale string) (modelsURL, vendorsURL string) {
base := strings.TrimRight(getUpstreamBase(), "/")
if l, ok := normalizeLocale(locale); ok && l != "" {
return fmt.Sprintf("%s/api/i18n/%s/newapi/models.json", base, l),
fmt.Sprintf("%s/api/i18n/%s/newapi/vendors.json", base, l)
}
return fmt.Sprintf("%s/api/newapi/models.json", base), fmt.Sprintf("%s/api/newapi/vendors.json", base)
}
type upstreamEnvelope[T any] struct { type upstreamEnvelope[T any] struct {
Success bool `json:"success"` Success bool `json:"success"`
Message string `json:"message"` Message string `json:"message"`
Data []T `json:"data"` Data []T `json:"data"`
} }
type upstreamModel struct { type upstreamModel struct {
Description string `json:"description"` Description string `json:"description"`
Endpoints json.RawMessage `json:"endpoints"` Endpoints json.RawMessage `json:"endpoints"`
Icon string `json:"icon"` Icon string `json:"icon"`
ModelName string `json:"model_name"` ModelName string `json:"model_name"`
NameRule int `json:"name_rule"` NameRule int `json:"name_rule"`
Status int `json:"status"` Status int `json:"status"`
Tags string `json:"tags"` Tags string `json:"tags"`
VendorName string `json:"vendor_name"` VendorName string `json:"vendor_name"`
} }
type upstreamVendor struct { type upstreamVendor struct {
Description string `json:"description"` Description string `json:"description"`
Icon string `json:"icon"` Icon string `json:"icon"`
Name string `json:"name"` Name string `json:"name"`
Status int `json:"status"` Status int `json:"status"`
} }
var (
etagCache = make(map[string]string)
bodyCache = make(map[string][]byte)
cacheMutex sync.RWMutex
)
type overwriteField struct { type overwriteField struct {
ModelName string `json:"model_name"` ModelName string `json:"model_name"`
Fields []string `json:"fields"` Fields []string `json:"fields"`
} }
type syncRequest struct { type syncRequest struct {
Overwrite []overwriteField `json:"overwrite"` Overwrite []overwriteField `json:"overwrite"`
Locale string `json:"locale"`
} }
func newHTTPClient() *http.Client { func newHTTPClient() *http.Client {
dialer := &net.Dialer{Timeout: 10 * time.Second} timeoutSec := common.GetEnvOrDefault("SYNC_HTTP_TIMEOUT_SECONDS", 10)
transport := &http.Transport{ dialer := &net.Dialer{Timeout: time.Duration(timeoutSec) * time.Second}
MaxIdleConns: 100, transport := &http.Transport{
IdleConnTimeout: 90 * time.Second, MaxIdleConns: 100,
TLSHandshakeTimeout: 10 * time.Second, IdleConnTimeout: 90 * time.Second,
ExpectContinueTimeout: 1 * time.Second, TLSHandshakeTimeout: time.Duration(timeoutSec) * time.Second,
ResponseHeaderTimeout: 10 * time.Second, ExpectContinueTimeout: 1 * time.Second,
} ResponseHeaderTimeout: time.Duration(timeoutSec) * time.Second,
transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) { }
host, _, err := net.SplitHostPort(addr) transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
if err != nil { host, _, err := net.SplitHostPort(addr)
host = addr if err != nil {
} host = addr
if strings.HasSuffix(host, "github.io") { }
if conn, err := dialer.DialContext(ctx, "tcp4", addr); err == nil { if strings.HasSuffix(host, "github.io") {
return conn, nil if conn, err := dialer.DialContext(ctx, "tcp4", addr); err == nil {
} return conn, nil
return dialer.DialContext(ctx, "tcp6", addr) }
} return dialer.DialContext(ctx, "tcp6", addr)
return dialer.DialContext(ctx, network, addr) }
} return dialer.DialContext(ctx, network, addr)
return &http.Client{Transport: transport} }
return &http.Client{Transport: transport}
} }
var httpClient = newHTTPClient() var httpClient = newHTTPClient()
func fetchJSON[T any](ctx context.Context, url string, out *upstreamEnvelope[T]) error { func fetchJSON[T any](ctx context.Context, url string, out *upstreamEnvelope[T]) error {
var lastErr error var lastErr error
for attempt := 0; attempt < 3; attempt++ { attempts := common.GetEnvOrDefault("SYNC_HTTP_RETRY", 3)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) if attempts < 1 {
if err != nil { attempts = 1
return err }
} baseDelay := 200 * time.Millisecond
resp, err := httpClient.Do(req) maxMB := common.GetEnvOrDefault("SYNC_HTTP_MAX_MB", 10)
if err != nil { maxBytes := int64(maxMB) << 20
lastErr = err for attempt := 0; attempt < attempts; attempt++ {
time.Sleep(time.Duration(200*(1<<attempt)) * time.Millisecond) req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
continue if err != nil {
} return err
func() { }
defer resp.Body.Close() // ETag conditional request
if resp.StatusCode != http.StatusOK { cacheMutex.RLock()
lastErr = errors.New(resp.Status) if et := etagCache[url]; et != "" {
return req.Header.Set("If-None-Match", et)
} }
limited := io.LimitReader(resp.Body, 10<<20) cacheMutex.RUnlock()
if err := json.NewDecoder(limited).Decode(out); err != nil {
lastErr = err resp, err := httpClient.Do(req)
return if err != nil {
} lastErr = err
if !out.Success && len(out.Data) == 0 && out.Message == "" { // backoff with jitter
out.Success = true sleep := baseDelay * time.Duration(1<<attempt)
} jitter := time.Duration(rand.Intn(150)) * time.Millisecond
lastErr = nil time.Sleep(sleep + jitter)
}() continue
if lastErr == nil { }
return nil func() {
} defer resp.Body.Close()
time.Sleep(time.Duration(200*(1<<attempt)) * time.Millisecond) switch resp.StatusCode {
} case http.StatusOK:
return lastErr // read body into buffer for caching and flexible decode
limited := io.LimitReader(resp.Body, maxBytes)
buf, err := io.ReadAll(limited)
if err != nil {
lastErr = err
return
}
// cache body and ETag
cacheMutex.Lock()
if et := resp.Header.Get("ETag"); et != "" {
etagCache[url] = et
}
bodyCache[url] = buf
cacheMutex.Unlock()
// Try decode as envelope first
if err := json.Unmarshal(buf, out); err != nil {
// Try decode as pure array
var arr []T
if err2 := json.Unmarshal(buf, &arr); err2 != nil {
lastErr = err
return
}
out.Success = true
out.Data = arr
out.Message = ""
} else {
if !out.Success && len(out.Data) == 0 && out.Message == "" {
out.Success = true
}
}
lastErr = nil
case http.StatusNotModified:
// use cache
cacheMutex.RLock()
buf := bodyCache[url]
cacheMutex.RUnlock()
if len(buf) == 0 {
lastErr = errors.New("cache miss for 304 response")
return
}
if err := json.Unmarshal(buf, out); err != nil {
var arr []T
if err2 := json.Unmarshal(buf, &arr); err2 != nil {
lastErr = err
return
}
out.Success = true
out.Data = arr
out.Message = ""
} else {
if !out.Success && len(out.Data) == 0 && out.Message == "" {
out.Success = true
}
}
lastErr = nil
default:
lastErr = errors.New(resp.Status)
}
}()
if lastErr == nil {
return nil
}
sleep := baseDelay * time.Duration(1<<attempt)
jitter := time.Duration(rand.Intn(150)) * time.Millisecond
time.Sleep(sleep + jitter)
}
return lastErr
} }
func ensureVendorID(vendorName string, vendorByName map[string]upstreamVendor, vendorIDCache map[string]int, createdVendors *int) int { func ensureVendorID(vendorName string, vendorByName map[string]upstreamVendor, vendorIDCache map[string]int, createdVendors *int) int {
if vendorName == "" { if vendorName == "" {
return 0 return 0
} }
if id, ok := vendorIDCache[vendorName]; ok { if id, ok := vendorIDCache[vendorName]; ok {
return id return id
} }
var existing model.Vendor var existing model.Vendor
if err := model.DB.Where("name = ?", vendorName).First(&existing).Error; err == nil { if err := model.DB.Where("name = ?", vendorName).First(&existing).Error; err == nil {
vendorIDCache[vendorName] = existing.Id vendorIDCache[vendorName] = existing.Id
return existing.Id return existing.Id
} }
uv := vendorByName[vendorName] uv := vendorByName[vendorName]
v := &model.Vendor{ v := &model.Vendor{
Name: vendorName, Name: vendorName,
Description: uv.Description, Description: uv.Description,
Icon: coalesce(uv.Icon, ""), Icon: coalesce(uv.Icon, ""),
Status: chooseStatus(uv.Status, 1), Status: chooseStatus(uv.Status, 1),
} }
if err := v.Insert(); err == nil { if err := v.Insert(); err == nil {
*createdVendors++ *createdVendors++
vendorIDCache[vendorName] = v.Id vendorIDCache[vendorName] = v.Id
return v.Id return v.Id
} }
vendorIDCache[vendorName] = 0 vendorIDCache[vendorName] = 0
return 0 return 0
} }
// SyncUpstreamModels 同步上游模型与供应商，仅对「未配置模型」生效 // SyncUpstreamModels 同步上游模型与供应商，仅对「未配置模型」生效
func SyncUpstreamModels(c *gin.Context) { func SyncUpstreamModels(c *gin.Context) {
var req syncRequest var req syncRequest
// 允许空体 // 允许空体
_ = c.ShouldBindJSON(&req) _ = c.ShouldBindJSON(&req)
// 1) 获取未配置模型列表 // 1) 获取未配置模型列表
missing, err := model.GetMissingModels() missing, err := model.GetMissingModels()
if err != nil { if err != nil {
c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()}) c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
return return
} }
if len(missing) == 0 { if len(missing) == 0 {
c.JSON(http.StatusOK, gin.H{"success": true, "data": gin.H{ c.JSON(http.StatusOK, gin.H{"success": true, "data": gin.H{
"created_models": 0, "created_models": 0,
"created_vendors": 0, "created_vendors": 0,
"skipped_models": []string{}, "skipped_models": []string{},
}}) }})
return return
} }
// 2) 拉取上游 vendors 与 models // 2) 拉取上游 vendors 与 models
ctx, cancel := context.WithTimeout(c.Request.Context(), 15*time.Second) timeoutSec := common.GetEnvOrDefault("SYNC_HTTP_TIMEOUT_SECONDS", 15)
defer cancel() ctx, cancel := context.WithTimeout(c.Request.Context(), time.Duration(timeoutSec)*time.Second)
defer cancel()
var vendorsEnv upstreamEnvelope[upstreamVendor] modelsURL, vendorsURL := getUpstreamURLs(req.Locale)
_ = fetchJSON(ctx, upstreamVendorsURL, &vendorsEnv) // 若失败不拦截，后续降级 var vendorsEnv upstreamEnvelope[upstreamVendor]
var modelsEnv upstreamEnvelope[upstreamModel]
var fetchErr error
var wg sync.WaitGroup
wg.Add(2)
go func() {
defer wg.Done()
// vendor 失败不拦截
_ = fetchJSON(ctx, vendorsURL, &vendorsEnv)
}()
go func() {
defer wg.Done()
if err := fetchJSON(ctx, modelsURL, &modelsEnv); err != nil {
fetchErr = err
}
}()
wg.Wait()
if fetchErr != nil {
c.JSON(http.StatusOK, gin.H{"success": false, "message": "获取上游模型失败: " + fetchErr.Error(), "locale": req.Locale, "source_urls": gin.H{"models_url": modelsURL, "vendors_url": vendorsURL}})
return
}
var modelsEnv upstreamEnvelope[upstreamModel] // 建立映射
if err := fetchJSON(ctx, upstreamModelsURL, &modelsEnv); err != nil { vendorByName := make(map[string]upstreamVendor)
c.JSON(http.StatusOK, gin.H{"success": false, "message": "获取上游模型失败: " + err.Error()}) for _, v := range vendorsEnv.Data {
return if v.Name != "" {
} vendorByName[v.Name] = v
}
}
modelByName := make(map[string]upstreamModel)
for _, m := range modelsEnv.Data {
if m.ModelName != "" {
modelByName[m.ModelName] = m
}
}
// 建立映射 // 3) 执行同步：仅创建缺失模型；若上游缺失该模型则跳过
vendorByName := make(map[string]upstreamVendor) createdModels := 0
for _, v := range vendorsEnv.Data { createdVendors := 0
if v.Name != "" { updatedModels := 0
vendorByName[v.Name] = v var skipped []string
} var createdList []string
} var updatedList []string
modelByName := make(map[string]upstreamModel)
for _, m := range modelsEnv.Data {
if m.ModelName != "" {
modelByName[m.ModelName] = m
}
}
// 3) 执行同步：仅创建缺失模型；若上游缺失该模型则跳过 // 本地缓存：vendorName -> id
createdModels := 0 vendorIDCache := make(map[string]int)
createdVendors := 0
updatedModels := 0
var skipped []string
var createdList []string
var updatedList []string
// 本地缓存：vendorName -> id for _, name := range missing {
vendorIDCache := make(map[string]int) up, ok := modelByName[name]
if !ok {
skipped = append(skipped, name)
continue
}
for _, name := range missing { // 若本地已存在且设置为不同步，则跳过（极端情况：缺失列表与本地状态不同步时）
up, ok := modelByName[name] var existing model.Model
if !ok { if err := model.DB.Where("model_name = ?", name).First(&existing).Error; err == nil {
skipped = append(skipped, name) if existing.SyncOfficial == 0 {
continue skipped = append(skipped, name)
} continue
}
}
// 若本地已存在且设置为不同步，则跳过（极端情况：缺失列表与本地状态不同步时） // 确保 vendor 存在
var existing model.Model vendorID := ensureVendorID(up.VendorName, vendorByName, vendorIDCache, &createdVendors)
if err := model.DB.Where("model_name = ?", name).First(&existing).Error; err == nil {
if existing.SyncOfficial == 0 {
skipped = append(skipped, name)
continue
}
}
// 确保 vendor 存在 // 创建模型
vendorID := ensureVendorID(up.VendorName, vendorByName, vendorIDCache, &createdVendors) mi := &model.Model{
ModelName: name,
Description: up.Description,
Icon: up.Icon,
Tags: up.Tags,
VendorID: vendorID,
Status: chooseStatus(up.Status, 1),
NameRule: up.NameRule,
}
if err := mi.Insert(); err == nil {
createdModels++
createdList = append(createdList, name)
} else {
skipped = append(skipped, name)
}
}
// 创建模型 // 4) 处理可选覆盖（更新本地已有模型的差异字段）
mi := &model.Model{ if len(req.Overwrite) > 0 {
ModelName: name, // vendorIDCache 已用于创建阶段，可复用
Description: up.Description, for _, ow := range req.Overwrite {
Icon: up.Icon, up, ok := modelByName[ow.ModelName]
Tags: up.Tags, if !ok {
VendorID: vendorID, continue
Status: chooseStatus(up.Status, 1), }
NameRule: up.NameRule, var local model.Model
} if err := model.DB.Where("model_name = ?", ow.ModelName).First(&local).Error; err != nil {
if err := mi.Insert(); err == nil { continue
createdModels++ }
createdList = append(createdList, name)
} else {
skipped = append(skipped, name)
}
}
// 4) 处理可选覆盖（更新本地已有模型的差异字段） // 跳过被禁用官方同步的模型
if len(req.Overwrite) > 0 { if local.SyncOfficial == 0 {
// vendorIDCache 已用于创建阶段，可复用 continue
for _, ow := range req.Overwrite { }
up, ok := modelByName[ow.ModelName]
if !ok {
continue
}
var local model.Model
if err := model.DB.Where("model_name = ?", ow.ModelName).First(&local).Error; err != nil {
continue
}
// 跳过被禁用官方同步的模型 // 映射 vendor
if local.SyncOfficial == 0 { newVendorID := ensureVendorID(up.VendorName, vendorByName, vendorIDCache, &createdVendors)
continue
}
// 映射 vendor // 应用字段覆盖（事务）
newVendorID := ensureVendorID(up.VendorName, vendorByName, vendorIDCache, &createdVendors) _ = model.DB.Transaction(func(tx *gorm.DB) error {
needUpdate := false
if containsField(ow.Fields, "description") {
local.Description = up.Description
needUpdate = true
}
if containsField(ow.Fields, "icon") {
local.Icon = up.Icon
needUpdate = true
}
if containsField(ow.Fields, "tags") {
local.Tags = up.Tags
needUpdate = true
}
if containsField(ow.Fields, "vendor") {
local.VendorID = newVendorID
needUpdate = true
}
if containsField(ow.Fields, "name_rule") {
local.NameRule = up.NameRule
needUpdate = true
}
if containsField(ow.Fields, "status") {
local.Status = chooseStatus(up.Status, local.Status)
needUpdate = true
}
if !needUpdate {
return nil
}
if err := tx.Save(&local).Error; err != nil {
return err
}
updatedModels++
updatedList = append(updatedList, ow.ModelName)
return nil
})
}
}
// 应用字段覆盖（事务） c.JSON(http.StatusOK, gin.H{
_ = model.DB.Transaction(func(tx *gorm.DB) error { "success": true,
needUpdate := false "data": gin.H{
if containsField(ow.Fields, "description") { "created_models": createdModels,
local.Description = up.Description "created_vendors": createdVendors,
needUpdate = true "updated_models": updatedModels,
} "skipped_models": skipped,
if containsField(ow.Fields, "icon") { "created_list": createdList,
local.Icon = up.Icon "updated_list": updatedList,
needUpdate = true "source": gin.H{
} "locale": req.Locale,
if containsField(ow.Fields, "tags") { "models_url": modelsURL,
local.Tags = up.Tags "vendors_url": vendorsURL,
needUpdate = true },
} },
if containsField(ow.Fields, "vendor") { })
local.VendorID = newVendorID
needUpdate = true
}
if containsField(ow.Fields, "name_rule") {
local.NameRule = up.NameRule
needUpdate = true
}
if containsField(ow.Fields, "status") {
local.Status = chooseStatus(up.Status, local.Status)
needUpdate = true
}
if !needUpdate {
return nil
}
if err := tx.Save(&local).Error; err != nil {
return err
}
updatedModels++
updatedList = append(updatedList, ow.ModelName)
return nil
})
}
}
c.JSON(http.StatusOK, gin.H{
"success": true,
"data": gin.H{
"created_models": createdModels,
"created_vendors": createdVendors,
"updated_models": updatedModels,
"skipped_models": skipped,
"created_list": createdList,
"updated_list": updatedList,
},
})
} }
func containsField(fields []string, key string) bool { func containsField(fields []string, key string) bool {
key = strings.ToLower(strings.TrimSpace(key)) key = strings.ToLower(strings.TrimSpace(key))
for _, f := range fields { for _, f := range fields {
if strings.ToLower(strings.TrimSpace(f)) == key { if strings.ToLower(strings.TrimSpace(f)) == key {
return true return true
} }
} }
return false return false
} }
func coalesce(a, b string) string { func coalesce(a, b string) string {
if strings.TrimSpace(a) != "" { if strings.TrimSpace(a) != "" {
return a return a
} }
return b return b
} }
func chooseStatus(primary, fallback int) int { func chooseStatus(primary, fallback int) int {
if primary == 0 && fallback != 0 { if primary == 0 && fallback != 0 {
return fallback return fallback
} }
if primary != 0 { if primary != 0 {
return primary return primary
} }
return 1 return 1
} }
// SyncUpstreamPreview 预览上游与本地的差异（仅用于弹窗选择） // SyncUpstreamPreview 预览上游与本地的差异（仅用于弹窗选择）
func SyncUpstreamPreview(c *gin.Context) { func SyncUpstreamPreview(c *gin.Context) {
// 1) 拉取上游数据 // 1) 拉取上游数据
ctx, cancel := context.WithTimeout(c.Request.Context(), 15*time.Second) timeoutSec := common.GetEnvOrDefault("SYNC_HTTP_TIMEOUT_SECONDS", 15)
defer cancel() ctx, cancel := context.WithTimeout(c.Request.Context(), time.Duration(timeoutSec)*time.Second)
defer cancel()
var vendorsEnv upstreamEnvelope[upstreamVendor] locale := c.Query("locale")
_ = fetchJSON(ctx, upstreamVendorsURL, &vendorsEnv) modelsURL, vendorsURL := getUpstreamURLs(locale)
var modelsEnv upstreamEnvelope[upstreamModel] var vendorsEnv upstreamEnvelope[upstreamVendor]
if err := fetchJSON(ctx, upstreamModelsURL, &modelsEnv); err != nil { var modelsEnv upstreamEnvelope[upstreamModel]
c.JSON(http.StatusOK, gin.H{"success": false, "message": "获取上游模型失败: " + err.Error()}) var fetchErr error
return var wg sync.WaitGroup
} wg.Add(2)
go func() {
defer wg.Done()
_ = fetchJSON(ctx, vendorsURL, &vendorsEnv)
}()
go func() {
defer wg.Done()
if err := fetchJSON(ctx, modelsURL, &modelsEnv); err != nil {
fetchErr = err
}
}()
wg.Wait()
if fetchErr != nil {
c.JSON(http.StatusOK, gin.H{"success": false, "message": "获取上游模型失败: " + fetchErr.Error(), "locale": locale, "source_urls": gin.H{"models_url": modelsURL, "vendors_url": vendorsURL}})
return
}
vendorByName := make(map[string]upstreamVendor) vendorByName := make(map[string]upstreamVendor)
for _, v := range vendorsEnv.Data { for _, v := range vendorsEnv.Data {
if v.Name != "" { if v.Name != "" {
vendorByName[v.Name] = v vendorByName[v.Name] = v
} }
} }
modelByName := make(map[string]upstreamModel) modelByName := make(map[string]upstreamModel)
upstreamNames := make([]string, 0, len(modelsEnv.Data)) upstreamNames := make([]string, 0, len(modelsEnv.Data))
for _, m := range modelsEnv.Data { for _, m := range modelsEnv.Data {
if m.ModelName != "" { if m.ModelName != "" {
modelByName[m.ModelName] = m modelByName[m.ModelName] = m
upstreamNames = append(upstreamNames, m.ModelName) upstreamNames = append(upstreamNames, m.ModelName)
} }
} }
// 2) 本地已有模型 // 2) 本地已有模型
var locals []model.Model var locals []model.Model
if len(upstreamNames) > 0 { if len(upstreamNames) > 0 {
_ = model.DB.Where("model_name IN ? AND sync_official <> 0", upstreamNames).Find(&locals).Error _ = model.DB.Where("model_name IN ? AND sync_official <> 0", upstreamNames).Find(&locals).Error
} }
// 本地 vendor 名称映射 // 本地 vendor 名称映射
vendorIdSet := make(map[int]struct{}) vendorIdSet := make(map[int]struct{})
for _, m := range locals { for _, m := range locals {
if m.VendorID != 0 { if m.VendorID != 0 {
vendorIdSet[m.VendorID] = struct{}{} vendorIdSet[m.VendorID] = struct{}{}
} }
} }
vendorIDs := make([]int, 0, len(vendorIdSet)) vendorIDs := make([]int, 0, len(vendorIdSet))
for id := range vendorIdSet { for id := range vendorIdSet {
vendorIDs = append(vendorIDs, id) vendorIDs = append(vendorIDs, id)
} }
idToVendorName := make(map[int]string) idToVendorName := make(map[int]string)
if len(vendorIDs) > 0 { if len(vendorIDs) > 0 {
var dbVendors []model.Vendor var dbVendors []model.Vendor
_ = model.DB.Where("id IN ?", vendorIDs).Find(&dbVendors).Error _ = model.DB.Where("id IN ?", vendorIDs).Find(&dbVendors).Error
for _, v := range dbVendors { for _, v := range dbVendors {
idToVendorName[v.Id] = v.Name idToVendorName[v.Id] = v.Name
} }
} }
// 3) 缺失且上游存在的模型 // 3) 缺失且上游存在的模型
missingList, _ := model.GetMissingModels() missingList, _ := model.GetMissingModels()
var missing []string var missing []string
for _, name := range missingList { for _, name := range missingList {
if _, ok := modelByName[name]; ok { if _, ok := modelByName[name]; ok {
missing = append(missing, name) missing = append(missing, name)
} }
} }
// 4) 计算冲突字段 // 4) 计算冲突字段
type conflictField struct { type conflictField struct {
Field string `json:"field"` Field string `json:"field"`
Local interface{} `json:"local"` Local interface{} `json:"local"`
Upstream interface{} `json:"upstream"` Upstream interface{} `json:"upstream"`
} }
type conflictItem struct { type conflictItem struct {
ModelName string `json:"model_name"` ModelName string `json:"model_name"`
Fields []conflictField `json:"fields"` Fields []conflictField `json:"fields"`
} }
var conflicts []conflictItem var conflicts []conflictItem
for _, local := range locals { for _, local := range locals {
up, ok := modelByName[local.ModelName] up, ok := modelByName[local.ModelName]
if !ok { if !ok {
continue continue
} }
fields := make([]conflictField, 0, 6) fields := make([]conflictField, 0, 6)
if strings.TrimSpace(local.Description) != strings.TrimSpace(up.Description) { if strings.TrimSpace(local.Description) != strings.TrimSpace(up.Description) {
fields = append(fields, conflictField{Field: "description", Local: local.Description, Upstream: up.Description}) fields = append(fields, conflictField{Field: "description", Local: local.Description, Upstream: up.Description})
} }
if strings.TrimSpace(local.Icon) != strings.TrimSpace(up.Icon) { if strings.TrimSpace(local.Icon) != strings.TrimSpace(up.Icon) {
fields = append(fields, conflictField{Field: "icon", Local: local.Icon, Upstream: up.Icon}) fields = append(fields, conflictField{Field: "icon", Local: local.Icon, Upstream: up.Icon})
} }
if strings.TrimSpace(local.Tags) != strings.TrimSpace(up.Tags) { if strings.TrimSpace(local.Tags) != strings.TrimSpace(up.Tags) {
fields = append(fields, conflictField{Field: "tags", Local: local.Tags, Upstream: up.Tags}) fields = append(fields, conflictField{Field: "tags", Local: local.Tags, Upstream: up.Tags})
} }
// vendor 对比使用名称 // vendor 对比使用名称
localVendor := idToVendorName[local.VendorID] localVendor := idToVendorName[local.VendorID]
if strings.TrimSpace(localVendor) != strings.TrimSpace(up.VendorName) { if strings.TrimSpace(localVendor) != strings.TrimSpace(up.VendorName) {
fields = append(fields, conflictField{Field: "vendor", Local: localVendor, Upstream: up.VendorName}) fields = append(fields, conflictField{Field: "vendor", Local: localVendor, Upstream: up.VendorName})
} }
if local.NameRule != up.NameRule { if local.NameRule != up.NameRule {
fields = append(fields, conflictField{Field: "name_rule", Local: local.NameRule, Upstream: up.NameRule}) fields = append(fields, conflictField{Field: "name_rule", Local: local.NameRule, Upstream: up.NameRule})
} }
if local.Status != chooseStatus(up.Status, local.Status) { if local.Status != chooseStatus(up.Status, local.Status) {
fields = append(fields, conflictField{Field: "status", Local: local.Status, Upstream: up.Status}) fields = append(fields, conflictField{Field: "status", Local: local.Status, Upstream: up.Status})
} }
if len(fields) > 0 { if len(fields) > 0 {
conflicts = append(conflicts, conflictItem{ModelName: local.ModelName, Fields: fields}) conflicts = append(conflicts, conflictItem{ModelName: local.ModelName, Fields: fields})
} }
} }
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"success": true, "success": true,
"data": gin.H{ "data": gin.H{
"missing": missing, "missing": missing,
"conflicts": conflicts, "conflicts": conflicts,
}, "source": gin.H{
}) "locale": locale,
"models_url": modelsURL,
"vendors_url": vendorsURL,
},
},
})
} }

24
model/model_meta.go
View File

@@ -20,18 +20,18 @@ type BoundChannel struct {
} }
type Model struct { type Model struct {
Id int `json:"id"` Id int `json:"id"`
ModelName string `json:"model_name" gorm:"size:128;not null;uniqueIndex:uk_model_name_delete_at,priority:1"` ModelName string `json:"model_name" gorm:"size:128;not null;uniqueIndex:uk_model_name_delete_at,priority:1"`
Description string `json:"description,omitempty" gorm:"type:text"` Description string `json:"description,omitempty" gorm:"type:text"`
Icon string `json:"icon,omitempty" gorm:"type:varchar(128)"` Icon string `json:"icon,omitempty" gorm:"type:varchar(128)"`
Tags string `json:"tags,omitempty" gorm:"type:varchar(255)"` Tags string `json:"tags,omitempty" gorm:"type:varchar(255)"`
VendorID int `json:"vendor_id,omitempty" gorm:"index"` VendorID int `json:"vendor_id,omitempty" gorm:"index"`
Endpoints string `json:"endpoints,omitempty" gorm:"type:text"` Endpoints string `json:"endpoints,omitempty" gorm:"type:text"`
Status int `json:"status" gorm:"default:1"` Status int `json:"status" gorm:"default:1"`
SyncOfficial int `json:"sync_official" gorm:"default:1"` SyncOfficial int `json:"sync_official" gorm:"default:1"`
CreatedTime int64 `json:"created_time" gorm:"bigint"` CreatedTime int64 `json:"created_time" gorm:"bigint"`
UpdatedTime int64 `json:"updated_time" gorm:"bigint"` UpdatedTime int64 `json:"updated_time" gorm:"bigint"`
DeletedAt gorm.DeletedAt `json:"-" gorm:"index;uniqueIndex:uk_model_name_delete_at,priority:2"` DeletedAt gorm.DeletedAt `json:"-" gorm:"index;uniqueIndex:uk_model_name_delete_at,priority:2"`
BoundChannels []BoundChannel `json:"bound_channels,omitempty" gorm:"-"` BoundChannels []BoundChannel `json:"bound_channels,omitempty" gorm:"-"`
EnableGroups []string `json:"enable_groups,omitempty" gorm:"-"` EnableGroups []string `json:"enable_groups,omitempty" gorm:"-"`

2
web/src/components/dashboard/ApiInfoPanel.jsx
View File

@@ -100,7 +100,7 @@ const ApiInfoPanel = ({
</React.Fragment> </React.Fragment>
)) ))
) : ( ) : (
<div className='flex justify-center items-center py-8'> <div className='flex justify-center items-center min-h-[20rem] w-full'>
<Empty <Empty
image={<IllustrationConstruction style={ILLUSTRATION_SIZE} />} image={<IllustrationConstruction style={ILLUSTRATION_SIZE} />}
darkModeImage={ darkModeImage={

37
web/src/components/table/models/ModelsActions.jsx
View File

@@ -21,11 +21,12 @@ import React, { useState } from 'react';
import MissingModelsModal from './modals/MissingModelsModal'; import MissingModelsModal from './modals/MissingModelsModal';
import PrefillGroupManagement from './modals/PrefillGroupManagement'; import PrefillGroupManagement from './modals/PrefillGroupManagement';
import EditPrefillGroupModal from './modals/EditPrefillGroupModal'; import EditPrefillGroupModal from './modals/EditPrefillGroupModal';
import { Button, Modal, Popover } from '@douyinfe/semi-ui'; import { Button, Modal, Popover, RadioGroup, Radio } from '@douyinfe/semi-ui';
import { showSuccess, showError, copy } from '../../../helpers'; import { showSuccess, showError, copy } from '../../../helpers';
import CompactModeToggle from '../../common/ui/CompactModeToggle'; import CompactModeToggle from '../../common/ui/CompactModeToggle';
import SelectionNotification from './components/SelectionNotification'; import SelectionNotification from './components/SelectionNotification';
import UpstreamConflictModal from './modals/UpstreamConflictModal'; import UpstreamConflictModal from './modals/UpstreamConflictModal';
import SyncWizardModal from './modals/SyncWizardModal';
const ModelsActions = ({ const ModelsActions = ({
selectedKeys, selectedKeys,
@@ -50,10 +51,12 @@ const ModelsActions = ({
const [prefillInit, setPrefillInit] = useState({ id: undefined }); const [prefillInit, setPrefillInit] = useState({ id: undefined });
const [showConflict, setShowConflict] = useState(false); const [showConflict, setShowConflict] = useState(false);
const [conflicts, setConflicts] = useState([]); const [conflicts, setConflicts] = useState([]);
const [showSyncModal, setShowSyncModal] = useState(false);
const [syncLocale, setSyncLocale] = useState('zh');
const handleSyncUpstream = async () => { const handleSyncUpstream = async (locale) => {
// 先预览 // 先预览
const data = await previewUpstreamDiff?.(); const data = await previewUpstreamDiff?.({ locale });
const conflictItems = data?.conflicts || []; const conflictItems = data?.conflicts || [];
if (conflictItems.length > 0) { if (conflictItems.length > 0) {
setConflicts(conflictItems); setConflicts(conflictItems);
@@ -61,7 +64,7 @@ const ModelsActions = ({
return; return;
} }
// 无冲突，直接同步缺失 // 无冲突，直接同步缺失
await syncUpstream?.(); await syncUpstream?.({ locale });
}; };
// Handle delete selected models with confirmation // Handle delete selected models with confirmation
@@ -151,9 +154,12 @@ const ModelsActions = ({
className='flex-1 md:flex-initial' className='flex-1 md:flex-initial'
size='small' size='small'
loading={syncing || previewing} loading={syncing || previewing}
onClick={handleSyncUpstream} onClick={() => {
setSyncLocale('zh');
setShowSyncModal(true);
}}
> >
{t('同步官方')} {t('同步')}
</Button> </Button>
</Popover> </Popover>
@@ -196,6 +202,20 @@ const ModelsActions = ({
</div> </div>
</Modal> </Modal>
<SyncWizardModal
visible={showSyncModal}
onClose={() => setShowSyncModal(false)}
loading={syncing || previewing}
t={t}
onConfirm={async ({ option, locale }) => {
setSyncLocale(locale);
if (option === 'official') {
await handleSyncUpstream(locale);
}
setShowSyncModal(false);
}}
/>
<MissingModelsModal <MissingModelsModal
visible={showMissingModal} visible={showMissingModal}
onClose={() => setShowMissingModal(false)} onClose={() => setShowMissingModal(false)}
@@ -224,7 +244,10 @@ const ModelsActions = ({
onClose={() => setShowConflict(false)} onClose={() => setShowConflict(false)}
conflicts={conflicts} conflicts={conflicts}
onSubmit={async (payload) => { onSubmit={async (payload) => {
return await applyUpstreamOverwrite?.(payload); return await applyUpstreamOverwrite?.({
...payload,
locale: syncLocale,
});
}} }}
t={t} t={t}
loading={syncing} loading={syncing}

2
web/src/components/table/models/modals/MissingModelsModal.jsx
View File

@@ -96,7 +96,7 @@ const MissingModelsModal = ({ visible, onClose, onConfigureModel, t }) => {
title: '', title: '',
dataIndex: 'operate', dataIndex: 'operate',
fixed: 'right', fixed: 'right',
width: 100, width: 120,
render: (text, record) => ( render: (text, record) => (
<Button <Button
type='primary' type='primary'

132
web/src/components/table/models/modals/SyncWizardModal.jsx Normal file
View File

@@ -0,0 +1,132 @@
/*
Copyright (C) 2025 QuantumNous
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
For commercial licensing, please contact support@quantumnous.com
*/
import React, { useEffect, useState } from 'react';
import { Modal, RadioGroup, Radio, Steps, Button } from '@douyinfe/semi-ui';
import { useIsMobile } from '../../../../hooks/common/useIsMobile';
const SyncWizardModal = ({ visible, onClose, onConfirm, loading, t }) => {
const [step, setStep] = useState(0);
const [option, setOption] = useState('official');
const [locale, setLocale] = useState('zh');
const isMobile = useIsMobile();
useEffect(() => {
if (visible) {
setStep(0);
setOption('official');
setLocale('zh');
}
}, [visible]);
return (
<Modal
title={t('同步向导')}
visible={visible}
onCancel={onClose}
footer={
<div className='flex justify-end'>
{step === 1 && (
<Button onClick={() => setStep(0)}>{t('上一步')}</Button>
)}
<Button onClick={onClose}>{t('取消')}</Button>
{step === 0 && (
<Button
type='primary'
onClick={() => setStep(1)}
disabled={option !== 'official'}
>
{t('下一步')}
</Button>
)}
{step === 1 && (
<Button
type='primary'
theme='solid'
loading={loading}
onClick={async () => {
await onConfirm?.({ option, locale });
}}
>
{t('开始同步')}
</Button>
)}
</div>
}
width={isMobile ? '100%' : 'small'}
>
<div className='mb-3'>
<Steps type='basic' current={step} size='small'>
<Steps.Step title={t('选择方式')} description={t('选择同步来源')} />
<Steps.Step title={t('选择语言')} description={t('选择同步语言')} />
</Steps>
</div>
{step === 0 && (
<div className='mt-2 flex justify-center'>
<RadioGroup
value={option}
onChange={(e) => setOption(e?.target?.value ?? e)}
type='card'
direction='horizontal'
aria-label='同步方式选择'
name='sync-mode-selection'
>
<Radio value='official' extra={t('从官方模型库同步')}>
{t('官方模型同步')}
</Radio>
<Radio value='config' extra={t('从配置文件同步')} disabled>
{t('配置文件同步')}
</Radio>
</RadioGroup>
</div>
)}
{step === 1 && (
<div className='mt-2'>
<div className='mb-2 text-[var(--semi-color-text-2)]'>
{t('请选择同步语言')}
</div>
<div className='flex justify-center'>
<RadioGroup
value={locale}
onChange={(e) => setLocale(e?.target?.value ?? e)}
type='card'
direction='horizontal'
aria-label='语言选择'
name='sync-locale-selection'
>
<Radio value='en' extra='English'>
EN
</Radio>
<Radio value='zh' extra='中文'>
ZH
</Radio>
<Radio value='ja' extra='日本語'>
JA
</Radio>
</RadioGroup>
</div>
</div>
)}
</Modal>
);
};
export default SyncWizardModal;

169
web/src/components/table/models/modals/UpstreamConflictModal.jsx
View File

@@ -17,7 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
For commercial licensing, please contact support@quantumnous.com For commercial licensing, please contact support@quantumnous.com
*/ */
import React, { useEffect, useMemo, useState } from 'react'; import React, { useEffect, useMemo, useState, useCallback } from 'react';
import { import {
Modal, Modal,
Table, Table,
@@ -26,9 +26,12 @@ import {
Empty, Empty,
Tag, Tag,
Popover, Popover,
Input,
} from '@douyinfe/semi-ui'; } from '@douyinfe/semi-ui';
import { MousePointerClick } from 'lucide-react'; import { MousePointerClick } from 'lucide-react';
import { useIsMobile } from '../../../../hooks/common/useIsMobile'; import { useIsMobile } from '../../../../hooks/common/useIsMobile';
import { MODEL_TABLE_PAGE_SIZE } from '../../../../constants';
import { IconSearch } from '@douyinfe/semi-icons';
const { Text } = Typography; const { Text } = Typography;
@@ -52,6 +55,8 @@ const UpstreamConflictModal = ({
}) => { }) => {
const [selections, setSelections] = useState({}); const [selections, setSelections] = useState({});
const isMobile = useIsMobile(); const isMobile = useIsMobile();
const [currentPage, setCurrentPage] = useState(1);
const [searchKeyword, setSearchKeyword] = useState('');
const formatValue = (v) => { const formatValue = (v) => {
if (v === null || v === undefined) return '-'; if (v === null || v === undefined) return '-';
@@ -70,12 +75,14 @@ const UpstreamConflictModal = ({
init[item.model_name] = new Set(); init[item.model_name] = new Set();
}); });
setSelections(init); setSelections(init);
setCurrentPage(1);
setSearchKeyword('');
} else { } else {
setSelections({}); setSelections({});
} }
}, [visible, conflicts]); }, [visible, conflicts]);
const toggleField = (modelName, field, checked) => { const toggleField = useCallback((modelName, field, checked) => {
setSelections((prev) => { setSelections((prev) => {
const next = { ...prev }; const next = { ...prev };
const set = new Set(next[modelName] || []); const set = new Set(next[modelName] || []);
@@ -84,7 +91,67 @@ const UpstreamConflictModal = ({
next[modelName] = set; next[modelName] = set;
return next; return next;
}); });
}; }, []);
// 构造数据源与过滤后的数据源
const dataSource = useMemo(
() =>
(conflicts || []).map((c) => ({
key: c.model_name,
model_name: c.model_name,
fields: c.fields || [],
})),
[conflicts],
);
const filteredDataSource = useMemo(() => {
const kw = (searchKeyword || '').toLowerCase();
if (!kw) return dataSource;
return dataSource.filter((item) =>
(item.model_name || '').toLowerCase().includes(kw),
);
}, [dataSource, searchKeyword]);
// 列头工具：当前过滤范围内可操作的行集合/勾选状态/批量设置
const getPresentRowsForField = useCallback(
(fieldKey) =>
(filteredDataSource || []).filter((row) =>
(row.fields || []).some((f) => f.field === fieldKey),
),
[filteredDataSource],
);
const getHeaderState = useCallback(
(fieldKey) => {
const presentRows = getPresentRowsForField(fieldKey);
const selectedCount = presentRows.filter((row) =>
selections[row.model_name]?.has(fieldKey),
).length;
const allCount = presentRows.length;
return {
headerChecked: allCount > 0 && selectedCount === allCount,
headerIndeterminate: selectedCount > 0 && selectedCount < allCount,
hasAny: allCount > 0,
};
},
[getPresentRowsForField, selections],
);
const applyHeaderChange = useCallback(
(fieldKey, checked) => {
setSelections((prev) => {
const next = { ...prev };
getPresentRowsForField(fieldKey).forEach((row) => {
const set = new Set(next[row.model_name] || []);
if (checked) set.add(fieldKey);
else set.delete(fieldKey);
next[row.model_name] = set;
});
return next;
});
},
[getPresentRowsForField],
);
const columns = useMemo(() => { const columns = useMemo(() => {
const base = [ const base = [
@@ -100,37 +167,11 @@ const UpstreamConflictModal = ({
const rawLabel = FIELD_LABELS[fieldKey] || fieldKey; const rawLabel = FIELD_LABELS[fieldKey] || fieldKey;
const label = t(rawLabel); const label = t(rawLabel);
// 统计列头复选框状态（仅统计存在该字段冲突的行） const { headerChecked, headerIndeterminate, hasAny } =
const presentRows = (conflicts || []).filter((row) => getHeaderState(fieldKey);
(row.fields || []).some((f) => f.field === fieldKey), if (!hasAny) return null;
); const onHeaderChange = (e) =>
const selectedCount = presentRows.filter((row) => applyHeaderChange(fieldKey, e?.target?.checked);
selections[row.model_name]?.has(fieldKey),
).length;
const allCount = presentRows.length;
if (allCount === 0) {
return null; // 若此字段在所有行中都不存在，则不展示该列
}
const headerChecked = allCount > 0 && selectedCount === allCount;
const headerIndeterminate = selectedCount > 0 && selectedCount < allCount;
const onHeaderChange = (e) => {
const checked = e?.target?.checked;
setSelections((prev) => {
const next = { ...prev };
(conflicts || []).forEach((row) => {
const hasField = (row.fields || []).some(
(f) => f.field === fieldKey,
);
if (!hasField) return;
const set = new Set(next[row.model_name] || []);
if (checked) set.add(fieldKey);
else set.delete(fieldKey);
next[row.model_name] = set;
});
return next;
});
};
return { return {
title: ( title: (
@@ -194,13 +235,20 @@ const UpstreamConflictModal = ({
}); });
return [...base, ...cols.filter(Boolean)]; return [...base, ...cols.filter(Boolean)];
}, [t, selections, conflicts]); }, [
t,
selections,
filteredDataSource,
getHeaderState,
applyHeaderChange,
toggleField,
]);
const dataSource = conflicts.map((c) => ({ const pagedDataSource = useMemo(() => {
key: c.model_name, const start = (currentPage - 1) * MODEL_TABLE_PAGE_SIZE;
model_name: c.model_name, const end = start + MODEL_TABLE_PAGE_SIZE;
fields: c.fields || [], return filteredDataSource.slice(start, end);
})); }, [filteredDataSource, currentPage]);
const handleOk = async () => { const handleOk = async () => {
const payload = Object.entries(selections) const payload = Object.entries(selections)
@@ -236,12 +284,41 @@ const UpstreamConflictModal = ({
<div className='mb-3 text-[var(--semi-color-text-2)]'> <div className='mb-3 text-[var(--semi-color-text-2)]'>
{t('仅会覆盖你勾选的字段，未勾选的字段保持本地不变。')} {t('仅会覆盖你勾选的字段，未勾选的字段保持本地不变。')}
</div> </div>
<Table {/* 搜索框 */}
columns={columns} <div className='flex items-center justify-end gap-2 w-full mb-4'>
dataSource={dataSource} <Input
pagination={false} placeholder={t('搜索模型...')}
scroll={{ x: 'max-content' }} value={searchKeyword}
/> onChange={(v) => {
setSearchKeyword(v);
setCurrentPage(1);
}}
className='!w-full'
prefix={<IconSearch />}
showClear
/>
</div>
{filteredDataSource.length > 0 ? (
<Table
columns={columns}
dataSource={pagedDataSource}
pagination={{
currentPage: currentPage,
pageSize: MODEL_TABLE_PAGE_SIZE,
total: filteredDataSource.length,
showSizeChanger: false,
onPageChange: (page) => setCurrentPage(page),
}}
scroll={{ x: 'max-content' }}
/>
) : (
<Empty
description={
searchKeyword ? t('未找到匹配的模型') : t('无冲突项')
}
className='p-6'
/>
)}
</> </>
)} )}
</Modal> </Modal>

22
web/src/hooks/models/useModelsData.jsx
View File

@@ -166,10 +166,13 @@ export const useModelsData = () => {
}; };
// Sync upstream models/vendors for missing models only // Sync upstream models/vendors for missing models only
const syncUpstream = async () => { const syncUpstream = async (opts = {}) => {
const locale = opts?.locale;
setSyncing(true); setSyncing(true);
try { try {
const res = await API.post('/api/models/sync_upstream'); const body = {};
if (locale) body.locale = locale;
const res = await API.post('/api/models/sync_upstream', body);
const { success, message, data } = res.data || {}; const { success, message, data } = res.data || {};
if (success) { if (success) {
const createdModels = data?.created_models || 0; const createdModels = data?.created_models || 0;
@@ -192,10 +195,12 @@ export const useModelsData = () => {
}; };
// Preview upstream differences // Preview upstream differences
const previewUpstreamDiff = async () => { const previewUpstreamDiff = async (opts = {}) => {
const locale = opts?.locale;
setPreviewing(true); setPreviewing(true);
try { try {
const res = await API.get('/api/models/sync_upstream/preview'); const url = `/api/models/sync_upstream/preview${locale ? `?locale=${locale}` : ''}`;
const res = await API.get(url);
const { success, message, data } = res.data || {}; const { success, message, data } = res.data || {};
if (success) { if (success) {
return data || { missing: [], conflicts: [] }; return data || { missing: [], conflicts: [] };
@@ -211,10 +216,15 @@ export const useModelsData = () => {
}; };
// Apply selected overwrite // Apply selected overwrite
const applyUpstreamOverwrite = async (overwrite = []) => { const applyUpstreamOverwrite = async (payloadOrArray = []) => {
const isArray = Array.isArray(payloadOrArray);
const overwrite = isArray ? payloadOrArray : payloadOrArray.overwrite || [];
const locale = isArray ? undefined : payloadOrArray.locale;
setSyncing(true); setSyncing(true);
try { try {
const res = await API.post('/api/models/sync_upstream', { overwrite }); const body = { overwrite };
if (locale) body.locale = locale;
const res = await API.post('/api/models/sync_upstream', body);
const { success, message, data } = res.data || {}; const { success, message, data } = res.data || {};
if (success) { if (success) {
const createdModels = data?.created_models || 0; const createdModels = data?.created_models || 0;

15
web/src/i18n/locales/en.json
View File

@@ -1801,7 +1801,7 @@
"已绑定渠道": "Bound channels", "已绑定渠道": "Bound channels",
"更新时间": "Update time", "更新时间": "Update time",
"未配置模型": "No model configured", "未配置模型": "No model configured",
"预填组管理": "Pre-filled group management", "预填组管理": "Pre-filled group",
"搜索供应商": "Search vendor", "搜索供应商": "Search vendor",
"新增供应商": "Add vendor", "新增供应商": "Add vendor",
"创建新的模型": "Create new model", "创建新的模型": "Create new model",
@@ -2057,9 +2057,20 @@
"侧边栏设置保存成功": "Sidebar settings saved successfully", "侧边栏设置保存成功": "Sidebar settings saved successfully",
"需要登录访问": "Require Login", "需要登录访问": "Require Login",
"开启后未登录用户无法访问模型广场": "When enabled, unauthenticated users cannot access the model marketplace", "开启后未登录用户无法访问模型广场": "When enabled, unauthenticated users cannot access the model marketplace",
"同步官方": "Sync official",
"参与官方同步": "Participate in official sync", "参与官方同步": "Participate in official sync",
"关闭后，此模型将不会被“同步官方”自动覆盖或创建": "When turned off, this model will be skipped by Sync official (no auto create/overwrite)", "关闭后，此模型将不会被“同步官方”自动覆盖或创建": "When turned off, this model will be skipped by Sync official (no auto create/overwrite)",
"同步": "Sync",
"同步向导": "Sync Wizard",
"选择方式": "Select method",
"选择同步来源": "Select sync source",
"选择语言": "Select language",
"选择同步语言": "Select sync language",
"请选择同步语言": "Please select sync language",
"从官方模型库同步": "Sync from official model library",
"官方模型同步": "Official models sync",
"从配置文件同步": "Sync from config file",
"配置文件同步": "Config file sync",
"开始同步": "Start sync",
"选择要覆盖的冲突项": "Select conflict items to overwrite", "选择要覆盖的冲突项": "Select conflict items to overwrite",
"点击查看差异": "Click to view differences", "点击查看差异": "Click to view differences",
"无冲突项": "No conflict items", "无冲突项": "No conflict items",