功能:完善渠道模型批量操作
支持模型管理批量删除,并在拉取模型时提供全选、取消全选和选择数量提示。 同时保持首屏品牌中立,补充后端原子删除与管理员界面回归测试。
This commit is contained in:
1 parent
df94c3bdf1
commit
2ce443731d
9 files changed
+361
-39
No files matched your search
@@ -6,6 +6,7 @@ import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
"infinite-canvas/backend/internal/model"
|
||||
@@ -275,6 +276,109 @@ func TestSaveAdminChannelModelRejectsActiveDuplicateKey(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteAdminChannelModelsDeletesSelectionAtomically(t *testing.T) {
|
||||
svc, db := newChannelModelTestService(t)
|
||||
admin := &model.User{ID: "admin", Role: model.UserRoleAdmin}
|
||||
channel := model.ModelChannel{ID: "channel-1", UserID: admin.ID, Scope: model.ChannelScopeSystem, Enabled: true, Name: "Test", BaseURL: "https://example.com/v1", APIKey: "key", APIFormat: "openai", ModelsJSON: `["model-a","model-b","model-c"]`}
|
||||
items := []model.ChannelModel{
|
||||
{ID: "model-a", ChannelID: channel.ID, ModelKey: "model-a", DisplayName: "Model A", Enabled: true, PriceVersion: 1},
|
||||
{ID: "model-b", ChannelID: channel.ID, ModelKey: "model-b", DisplayName: "Model B", Enabled: true, PriceVersion: 1},
|
||||
{ID: "model-c", ChannelID: channel.ID, ModelKey: "model-c", DisplayName: "Model C", Enabled: true, PriceVersion: 1},
|
||||
}
|
||||
if err := db.Create(&channel).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Create(&items).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
deleted, err := svc.DeleteAdminChannelModels(admin, channel.ID, []string{" model-a ", "model-b", "model-a"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if deleted != 2 {
|
||||
t.Fatalf("deleted = %d, want 2", deleted)
|
||||
}
|
||||
var storedChannel model.ModelChannel
|
||||
if err := db.First(&storedChannel, "id = ?", channel.ID).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if storedChannel.ModelsJSON != `["model-c"]` {
|
||||
t.Fatalf("ModelsJSON = %s, want model-c only", storedChannel.ModelsJSON)
|
||||
}
|
||||
var active []model.ChannelModel
|
||||
if err := db.Where("channel_id = ?", channel.ID).Find(&active).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(active) != 1 || active[0].ID != "model-c" {
|
||||
t.Fatalf("active models = %#v, want model-c", active)
|
||||
}
|
||||
var removed []model.ChannelModel
|
||||
if err := db.Unscoped().Where("channel_id = ? AND id IN ?", channel.ID, []string{"model-a", "model-b"}).Find(&removed).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(removed) != 2 {
|
||||
t.Fatalf("removed models = %#v, want two", removed)
|
||||
}
|
||||
for _, item := range removed {
|
||||
if item.Enabled || item.PriceVersion != 2 || !item.DeletedAt.Valid {
|
||||
t.Fatalf("removed model state = %#v", item)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeleteAdminChannelModelsRejectsWholeSelectionWhenOneModelIsInUse(t *testing.T) {
|
||||
svc, db := newChannelModelTestService(t)
|
||||
admin := &model.User{ID: "admin", Role: model.UserRoleAdmin}
|
||||
channel := model.ModelChannel{ID: "channel-1", UserID: admin.ID, Scope: model.ChannelScopeSystem, Enabled: true, Name: "Test", BaseURL: "https://example.com/v1", APIKey: "key", APIFormat: "openai", ModelsJSON: `["model-a","model-b"]`}
|
||||
items := []model.ChannelModel{
|
||||
{ID: "model-a", ChannelID: channel.ID, ModelKey: "model-a", DisplayName: "Model A", Enabled: true, PriceVersion: 1},
|
||||
{ID: "model-b", ChannelID: channel.ID, ModelKey: "model-b", DisplayName: "Model B", Enabled: true, PriceVersion: 1},
|
||||
}
|
||||
if err := db.Create(&channel).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Create(&items).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Create(&model.Task{ID: "task-running", ChannelModelID: "model-b", Status: model.TaskStatusRunning}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
deleted, err := svc.DeleteAdminChannelModels(admin, channel.ID, []string{"model-a", "model-b"})
|
||||
var authErr *AuthError
|
||||
if !errors.As(err, &authErr) || authErr.Message != "所选渠道模型中有模型仍被前台模型供应线路或进行中任务使用,本次未删除任何模型" {
|
||||
t.Fatalf("DeleteAdminChannelModels() deleted = %d, error = %#v", deleted, err)
|
||||
}
|
||||
var active int64
|
||||
if err := db.Model(&model.ChannelModel{}).Where("channel_id = ?", channel.ID).Count(&active).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if active != 2 {
|
||||
t.Fatalf("active models = %d, want 2 after atomic rejection", active)
|
||||
}
|
||||
var storedChannel model.ModelChannel
|
||||
if err := db.First(&storedChannel, "id = ?", channel.ID).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if storedChannel.ModelsJSON != channel.ModelsJSON {
|
||||
t.Fatalf("ModelsJSON changed after rejected batch: %s", storedChannel.ModelsJSON)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNormalizeAdminChannelModelDeleteIDsRequiresBoundedSelection(t *testing.T) {
|
||||
if _, err := normalizeAdminChannelModelDeleteIDs([]string{"", " "}); err == nil {
|
||||
t.Fatal("empty selection should be rejected")
|
||||
}
|
||||
values := make([]string, 101)
|
||||
for index := range values {
|
||||
values[index] = "model-" + strconv.Itoa(index)
|
||||
}
|
||||
if _, err := normalizeAdminChannelModelDeleteIDs(values); err == nil {
|
||||
t.Fatal("selection above 100 models should be rejected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveProviderConfigMapsSKUToProviderModel(t *testing.T) {
|
||||
svc, db := newChannelModelTestService(t)
|
||||
svc.dataDir = t.TempDir()
|
||||
@@ -344,7 +448,7 @@ func newChannelModelTestService(t *testing.T) (*Service, *gorm.DB) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.AutoMigrate(&model.ModelChannel{}, &model.ChannelModel{}, &model.ChannelModelPriceTier{}, &model.IDSequence{}); err != nil {
|
||||
if err := db.AutoMigrate(&model.ModelChannel{}, &model.ChannelModel{}, &model.ChannelModelPriceTier{}, &model.LogicalModel{}, &model.LogicalModelRevision{}, &model.LogicalModelRoute{}, &model.Task{}, &model.IDSequence{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return &Service{repo: repository.New(db)}, db
|
||||
|
||||
@@ -35,6 +35,8 @@ type ChannelModelRequest struct {
|
||||
PriceTiers []ChannelModelPriceTierRequest `json:"priceTiers"`
|
||||
}
|
||||
|
||||
const maxAdminChannelModelBatchDeleteCount = 100
|
||||
|
||||
// ChannelModelPriceTierRequest 是系统渠道内某个规格的上游 SKU 与结算价格。
|
||||
// Resolution="*"、VideoSeconds=0 分别表示任意分辨率和任意时长。
|
||||
type ChannelModelPriceTierRequest struct {
|
||||
@@ -826,47 +828,86 @@ func normalizeChannelModelContractWithRegistry(registry *protocol.Registry, chan
|
||||
}
|
||||
|
||||
func (s *Service) DeleteAdminChannelModel(actor *model.User, channelID string, id string) error {
|
||||
_, err := s.DeleteAdminChannelModels(actor, channelID, []string{id})
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteAdminChannelModels validates the complete selection before asking the
|
||||
// repository to remove it atomically. This deliberately rejects partial success:
|
||||
// administrators can safely correct an in-use model and retry the same selection.
|
||||
func (s *Service) DeleteAdminChannelModels(actor *model.User, channelID string, ids []string) (int64, error) {
|
||||
if err := s.RequireAdmin(actor); err != nil {
|
||||
return err
|
||||
return 0, err
|
||||
}
|
||||
if _, err := s.repo.AdminSystemChannel(channelID); err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return BadAuthRequest("系统渠道不存在或已删除")
|
||||
return 0, BadAuthRequest("系统渠道不存在或已删除")
|
||||
}
|
||||
return err
|
||||
return 0, err
|
||||
}
|
||||
if _, err := s.repo.ChannelModelByID(channelID, id); err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return BadAuthRequest("渠道模型不存在或已删除")
|
||||
}
|
||||
return err
|
||||
}
|
||||
items, err := s.repo.ChannelModels(channelID, false)
|
||||
modelIDs, err := normalizeAdminChannelModelDeleteIDs(ids)
|
||||
if err != nil {
|
||||
return err
|
||||
return 0, err
|
||||
}
|
||||
items, err := s.repo.ChannelModels(channelID, true)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
selected := make(map[string]bool, len(modelIDs))
|
||||
for _, id := range modelIDs {
|
||||
selected[id] = true
|
||||
}
|
||||
found := 0
|
||||
for _, item := range items {
|
||||
if selected[item.ID] {
|
||||
found++
|
||||
}
|
||||
}
|
||||
if found != len(modelIDs) {
|
||||
return 0, BadAuthRequest("所选渠道模型中存在已删除或不属于当前渠道的记录,请刷新后重试")
|
||||
}
|
||||
names := make([]string, 0, len(items))
|
||||
for _, item := range items {
|
||||
if item.ID != id {
|
||||
if item.Enabled && !selected[item.ID] {
|
||||
names = append(names, item.ModelKey)
|
||||
}
|
||||
}
|
||||
encoded, err := json.Marshal(names)
|
||||
if err != nil {
|
||||
return err
|
||||
return 0, err
|
||||
}
|
||||
// 删除模型与渠道的兼容模型清单必须同事务提交,避免接口报错但列表已部分变化。
|
||||
err = s.repo.DeleteChannelModel(channelID, id, string(encoded), time.Now())
|
||||
deleted, err := s.repo.DeleteChannelModels(channelID, modelIDs, string(encoded), time.Now())
|
||||
if errors.Is(err, repository.ErrChannelModelInUse) {
|
||||
return BadAuthRequest("渠道模型仍被前台模型供应线路或进行中任务使用,请先移除线路并等待任务结束")
|
||||
return 0, BadAuthRequest("所选渠道模型中有模型仍被前台模型供应线路或进行中任务使用,本次未删除任何模型")
|
||||
}
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return BadAuthRequest("渠道模型不存在或已删除")
|
||||
return 0, BadAuthRequest("所选渠道模型中存在已删除或不属于当前渠道的记录,请刷新后重试")
|
||||
}
|
||||
if err == nil {
|
||||
s.invalidateRouteCatalog()
|
||||
}
|
||||
return err
|
||||
return deleted, err
|
||||
}
|
||||
|
||||
func normalizeAdminChannelModelDeleteIDs(values []string) ([]string, error) {
|
||||
result := make([]string, 0, len(values))
|
||||
seen := make(map[string]bool, len(values))
|
||||
for _, value := range values {
|
||||
id := strings.TrimSpace(value)
|
||||
if id == "" || seen[id] {
|
||||
continue
|
||||
}
|
||||
seen[id] = true
|
||||
result = append(result, id)
|
||||
}
|
||||
if len(result) == 0 {
|
||||
return nil, BadAuthRequest("请至少选择一个要删除的渠道模型")
|
||||
}
|
||||
if len(result) > maxAdminChannelModelBatchDeleteCount {
|
||||
return nil, BadAuthRequest("单次最多删除 100 个渠道模型")
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (s *Service) syncInitialChannelModels(channel *model.ModelChannel, names []string) error {
|
||||
|
||||
Reference in new issue
Block a user