feat(platform): 模型管理与后台能力 - 新增逻辑模型路由和响应拦截
This commit is contained in:
1 parent
0002cdd2cb
commit
8c5f56a551
89 files changed
+21451
-1170
No files matched your search
@@ -211,8 +211,9 @@ func (r *Repository) CreateTaskWithActiveLimit(task *model.Task, activeTaskLimit
|
||||
})
|
||||
}
|
||||
|
||||
func (r *Repository) RetryTaskWithBilling(userID string, taskID string, order *model.BillingOrder, activeTaskLimit int) (*model.Task, error) {
|
||||
func (r *Repository) RetryTaskWithBilling(userID string, prepared *model.Task, order *model.BillingOrder, activeTaskLimit int) (*model.Task, error) {
|
||||
var task model.Task
|
||||
taskID := prepared.ID
|
||||
err := r.db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := enforceActiveTaskLimit(tx, userID, activeTaskLimit); err != nil {
|
||||
return err
|
||||
@@ -228,6 +229,10 @@ func (r *Repository) RetryTaskWithBilling(userID string, taskID string, order *m
|
||||
"provider_request_id": "", "poll_stage": "", "next_poll_at": nil,
|
||||
"provider_cancel_status": "", "provider_cancel_error": "", "provider_cancel_attempts": 0,
|
||||
"provider_cancel_requested_at": nil, "provider_cancelled_at": nil, "provider_cancel_next_check_at": nil,
|
||||
"route_run": gorm.Expr("route_run + ?", 1),
|
||||
"logical_model_revision_id": prepared.LogicalModelRevisionID, "route_id": prepared.RouteID,
|
||||
"physical_variant_id": prepared.PhysicalVariantID, "input_json": prepared.InputJSON,
|
||||
"model": prepared.Model, "provider": prepared.Provider,
|
||||
"lease_owner": "", "lease_expires_at": nil, "updated_at": time.Now(),
|
||||
}
|
||||
if order != nil {
|
||||
|
||||
@@ -0,0 +1,519 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"infinite-canvas/backend/internal/model"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type LogicalModelGraph struct {
|
||||
Model model.LogicalModel
|
||||
Revision *model.LogicalModelRevision
|
||||
Routes []model.LogicalModelRoute
|
||||
Variants []model.PhysicalCapabilityVariant
|
||||
ChannelModels []model.ChannelModel
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModels(includeDisabled bool) ([]model.LogicalModel, error) {
|
||||
var items []model.LogicalModel
|
||||
query := r.db.Order("sort_order asc, created_at asc")
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ?", true)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModel(id string) (*model.LogicalModel, error) {
|
||||
var item model.LogicalModel
|
||||
if err := r.db.First(&item, "id = ?", id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelRevision(id string) (*model.LogicalModelRevision, error) {
|
||||
var item model.LogicalModelRevision
|
||||
if err := r.db.First(&item, "id = ?", id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelRevisions(logicalModelID string) ([]model.LogicalModelRevision, error) {
|
||||
var items []model.LogicalModelRevision
|
||||
return items, r.db.Where("logical_model_id = ?", logicalModelID).Order("version desc").Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelRoutes(revisionID string, includeDisabled bool) ([]model.LogicalModelRoute, error) {
|
||||
var items []model.LogicalModelRoute
|
||||
query := r.db.Where("logical_model_revision_id = ?", revisionID).Order("priority desc, created_at asc")
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ? AND weight > ?", true, 0)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelRoute(id string) (*model.LogicalModelRoute, error) {
|
||||
var item model.LogicalModelRoute
|
||||
if err := r.db.First(&item, "id = ?", id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
func (r *Repository) PhysicalVariants(channelModelIDs []string, includeDisabled bool) ([]model.PhysicalCapabilityVariant, error) {
|
||||
var items []model.PhysicalCapabilityVariant
|
||||
if len(channelModelIDs) == 0 {
|
||||
return items, nil
|
||||
}
|
||||
query := r.db.Where("channel_model_id IN ?", channelModelIDs).Order("created_at asc")
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ?", true)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) PhysicalVariant(id string) (*model.PhysicalCapabilityVariant, error) {
|
||||
var item model.PhysicalCapabilityVariant
|
||||
if err := r.db.First(&item, "id = ?", id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
func (r *Repository) AllPhysicalVariants(includeDisabled bool) ([]model.PhysicalCapabilityVariant, error) {
|
||||
var items []model.PhysicalCapabilityVariant
|
||||
query := r.db.Order("created_at asc")
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ?", true)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) PhysicalVariantRouteCounts(ids []string) (map[string]int64, error) {
|
||||
counts := make(map[string]int64, len(ids))
|
||||
if len(ids) == 0 {
|
||||
return counts, nil
|
||||
}
|
||||
type row struct {
|
||||
PhysicalVariantID string `gorm:"column:physical_variant_id"`
|
||||
Count int64 `gorm:"column:count"`
|
||||
}
|
||||
var rows []row
|
||||
if err := r.db.Model(&model.LogicalModelRoute{}).
|
||||
Select("physical_variant_id, COUNT(*) AS count").
|
||||
Where("physical_variant_id IN ?", uniqueStrings(ids)).
|
||||
Group("physical_variant_id").
|
||||
Scan(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, item := range rows {
|
||||
counts[item.PhysicalVariantID] = item.Count
|
||||
}
|
||||
return counts, nil
|
||||
}
|
||||
|
||||
func (r *Repository) ChannelModelsByIDs(ids []string) ([]model.ChannelModel, error) {
|
||||
var items []model.ChannelModel
|
||||
if len(ids) == 0 {
|
||||
return items, nil
|
||||
}
|
||||
return items, r.db.Where("id IN ?", ids).Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) SystemChannelsByIDs(ids []string, includeDisabled bool) ([]model.ModelChannel, error) {
|
||||
var items []model.ModelChannel
|
||||
if len(ids) == 0 {
|
||||
return items, nil
|
||||
}
|
||||
query := r.db.Where("id IN ? AND scope = ?", uniqueStrings(ids), model.ChannelScopeSystem)
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ?", true)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) ChannelModel(id string) (*model.ChannelModel, error) {
|
||||
var item model.ChannelModel
|
||||
if err := r.db.First(&item, "id = ?", id).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
func (r *Repository) LogicalModelGraph(id string, includeDisabled bool) (*LogicalModelGraph, error) {
|
||||
item, err := r.LogicalModel(id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !includeDisabled && !item.Enabled {
|
||||
return nil, gorm.ErrRecordNotFound
|
||||
}
|
||||
graphs, err := r.LogicalModelGraphs([]model.LogicalModel{*item}, includeDisabled)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return graphs[item.ID], nil
|
||||
}
|
||||
|
||||
// LogicalModelGraphs 批量加载前台模型的当前 revision、供应线路、可用配置和渠道模型。
|
||||
// 管理列表与路由目录都需要同一张关系图,集中按 IN 查询避免逐模型 N+1。
|
||||
func (r *Repository) LogicalModelGraphs(items []model.LogicalModel, includeDisabled bool) (map[string]*LogicalModelGraph, error) {
|
||||
graphs := make(map[string]*LogicalModelGraph, len(items))
|
||||
if len(items) == 0 {
|
||||
return graphs, nil
|
||||
}
|
||||
|
||||
revisionIDs := make([]string, 0, len(items))
|
||||
for _, item := range items {
|
||||
graphs[item.ID] = &LogicalModelGraph{Model: item}
|
||||
if item.ActiveRevisionID != "" {
|
||||
revisionIDs = append(revisionIDs, item.ActiveRevisionID)
|
||||
}
|
||||
}
|
||||
if len(revisionIDs) == 0 {
|
||||
return graphs, nil
|
||||
}
|
||||
|
||||
var revisions []model.LogicalModelRevision
|
||||
if err := r.db.Where("id IN ?", uniqueStrings(revisionIDs)).Find(&revisions).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
revisionByID := make(map[string]model.LogicalModelRevision, len(revisions))
|
||||
for _, revision := range revisions {
|
||||
revisionByID[revision.ID] = revision
|
||||
}
|
||||
|
||||
routeRevisionIDs := make([]string, 0, len(revisions))
|
||||
for _, item := range items {
|
||||
graph := graphs[item.ID]
|
||||
revision, ok := revisionByID[item.ActiveRevisionID]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
r := revision
|
||||
graph.Revision = &r
|
||||
routeRevisionIDs = append(routeRevisionIDs, revision.ID)
|
||||
}
|
||||
|
||||
var routes []model.LogicalModelRoute
|
||||
if len(routeRevisionIDs) > 0 {
|
||||
query := r.db.Where("logical_model_revision_id IN ?", uniqueStrings(routeRevisionIDs)).Order("priority desc, created_at asc")
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ? AND weight > ?", true, 0)
|
||||
}
|
||||
if err := query.Find(&routes).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
routesByRevision := make(map[string][]model.LogicalModelRoute, len(routeRevisionIDs))
|
||||
variantIDs := make([]string, 0, len(routes))
|
||||
for _, route := range routes {
|
||||
routesByRevision[route.LogicalModelRevisionID] = append(routesByRevision[route.LogicalModelRevisionID], route)
|
||||
variantIDs = append(variantIDs, route.PhysicalVariantID)
|
||||
}
|
||||
|
||||
variants, err := r.PhysicalVariantsByIDs(uniqueStrings(variantIDs), includeDisabled)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
variantByID := make(map[string]model.PhysicalCapabilityVariant, len(variants))
|
||||
channelModelIDs := make([]string, 0, len(variants))
|
||||
for _, variant := range variants {
|
||||
variantByID[variant.ID] = variant
|
||||
channelModelIDs = append(channelModelIDs, variant.ChannelModelID)
|
||||
}
|
||||
channelModels, err := r.ChannelModelsByIDs(uniqueStrings(channelModelIDs))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
channelModelByID := make(map[string]model.ChannelModel, len(channelModels))
|
||||
for _, channelModel := range channelModels {
|
||||
channelModelByID[channelModel.ID] = channelModel
|
||||
}
|
||||
|
||||
for _, item := range items {
|
||||
graph := graphs[item.ID]
|
||||
if graph.Revision == nil {
|
||||
continue
|
||||
}
|
||||
graph.Routes = routesByRevision[graph.Revision.ID]
|
||||
graph.Variants = make([]model.PhysicalCapabilityVariant, 0, len(graph.Routes))
|
||||
graph.ChannelModels = make([]model.ChannelModel, 0, len(graph.Routes))
|
||||
seenVariants := make(map[string]bool, len(graph.Routes))
|
||||
seenChannelModels := make(map[string]bool, len(graph.Routes))
|
||||
for _, route := range graph.Routes {
|
||||
variant, variantOK := variantByID[route.PhysicalVariantID]
|
||||
if !variantOK {
|
||||
continue
|
||||
}
|
||||
if !seenVariants[variant.ID] {
|
||||
seenVariants[variant.ID] = true
|
||||
graph.Variants = append(graph.Variants, variant)
|
||||
}
|
||||
if channelModel, channelOK := channelModelByID[variant.ChannelModelID]; channelOK && !seenChannelModels[channelModel.ID] {
|
||||
seenChannelModels[channelModel.ID] = true
|
||||
graph.ChannelModels = append(graph.ChannelModels, channelModel)
|
||||
}
|
||||
}
|
||||
}
|
||||
return graphs, nil
|
||||
}
|
||||
|
||||
func (r *Repository) PhysicalVariantsByIDs(ids []string, includeDisabled bool) ([]model.PhysicalCapabilityVariant, error) {
|
||||
var items []model.PhysicalCapabilityVariant
|
||||
if len(ids) == 0 {
|
||||
return items, nil
|
||||
}
|
||||
query := r.db.Where("id IN ?", ids).Order("created_at asc")
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ?", true)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func uniqueStrings(values []string) []string {
|
||||
result := make([]string, 0, len(values))
|
||||
seen := make(map[string]bool, len(values))
|
||||
for _, value := range values {
|
||||
if value == "" || seen[value] {
|
||||
continue
|
||||
}
|
||||
seen[value] = true
|
||||
result = append(result, value)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (r *Repository) PhysicalVariantsForRoutes(routes []model.LogicalModelRoute, includeDisabled bool) ([]model.PhysicalCapabilityVariant, error) {
|
||||
ids := make([]string, 0, len(routes))
|
||||
for _, route := range routes {
|
||||
ids = append(ids, route.PhysicalVariantID)
|
||||
}
|
||||
var items []model.PhysicalCapabilityVariant
|
||||
if len(ids) == 0 {
|
||||
return items, nil
|
||||
}
|
||||
query := r.db.Where("id IN ?", ids)
|
||||
if !includeDisabled {
|
||||
query = query.Where("enabled = ?", true)
|
||||
}
|
||||
return items, query.Find(&items).Error
|
||||
}
|
||||
|
||||
func (r *Repository) SaveLogicalModel(item *model.LogicalModel) error { return r.db.Save(item).Error }
|
||||
func (r *Repository) CreateLogicalModel(item *model.LogicalModel) error {
|
||||
return r.db.Create(item).Error
|
||||
}
|
||||
func (r *Repository) CreateLogicalModelRevision(item *model.LogicalModelRevision) error {
|
||||
return r.db.Create(item).Error
|
||||
}
|
||||
func (r *Repository) SaveLogicalModelRevision(item *model.LogicalModelRevision) error {
|
||||
return r.db.Save(item).Error
|
||||
}
|
||||
func (r *Repository) CreatePhysicalVariant(item *model.PhysicalCapabilityVariant) error {
|
||||
return r.db.Create(item).Error
|
||||
}
|
||||
func (r *Repository) SavePhysicalVariant(item *model.PhysicalCapabilityVariant) error {
|
||||
return r.db.Save(item).Error
|
||||
}
|
||||
func (r *Repository) CreateLogicalModelRoute(item *model.LogicalModelRoute) error {
|
||||
return r.db.Create(item).Error
|
||||
}
|
||||
func (r *Repository) SaveLogicalModelRoute(item *model.LogicalModelRoute) error {
|
||||
return r.db.Save(item).Error
|
||||
}
|
||||
func (r *Repository) CreateRouteAttempt(item *model.RouteAttempt) error {
|
||||
return r.db.Create(item).Error
|
||||
}
|
||||
func (r *Repository) SaveRouteAttempt(item *model.RouteAttempt) error { return r.db.Save(item).Error }
|
||||
|
||||
func (r *Repository) LatestRouteAttempt(taskID string) (*model.RouteAttempt, error) {
|
||||
var item model.RouteAttempt
|
||||
if err := r.db.Where("task_id = ?", taskID).Order("route_run desc, attempt_number desc").First(&item).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &item, nil
|
||||
}
|
||||
|
||||
func (r *Repository) PhysicalVariantRouteCount(id string) (int64, error) {
|
||||
var count int64
|
||||
err := r.db.Model(&model.LogicalModelRoute{}).Where("physical_variant_id = ?", id).Count(&count).Error
|
||||
return count, err
|
||||
}
|
||||
|
||||
func (r *Repository) RouteAttempts(taskID string, routeRun int) ([]model.RouteAttempt, error) {
|
||||
var items []model.RouteAttempt
|
||||
query := r.db.Where("task_id = ? AND route_run = ?", taskID, routeRun)
|
||||
return items, query.Order("attempt_number asc").Find(&items).Error
|
||||
}
|
||||
|
||||
// SwitchTaskLogicalRoute 同时更新任务执行目标和账单。跟随供应价格时会原子调整预留积分,
|
||||
// 保证明确未创建上游任务后的故障切线不会沿用上一条线路的价格快照。
|
||||
func (r *Repository) SwitchTaskLogicalRoute(taskID string, expectedRouteID string, routeID string, variantID string, inputJSON string, billingOrderID string, channelID string, channelModelID string, replacement *model.BillingOrder) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
updated := tx.Model(&model.Task{}).
|
||||
Where("id = ? AND status = ? AND route_id = ?", taskID, model.TaskStatusRunning, expectedRouteID).
|
||||
Updates(map[string]any{"route_id": routeID, "physical_variant_id": variantID, "input_json": inputJSON, "updated_at": time.Now()})
|
||||
if updated.Error != nil {
|
||||
return updated.Error
|
||||
}
|
||||
if updated.RowsAffected != 1 {
|
||||
return ErrTaskStateConflict
|
||||
}
|
||||
if billingOrderID == "" {
|
||||
return nil
|
||||
}
|
||||
var order model.BillingOrder
|
||||
if err := tx.First(&order, "id = ? AND task_id = ? AND status IN ?", billingOrderID, taskID, []model.BillingStatus{model.BillingStatusReserved, model.BillingStatusRunning}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
now := time.Now()
|
||||
updates := map[string]any{"channel_id": channelID, "channel_model_id": channelModelID, "updated_at": now}
|
||||
if replacement != nil {
|
||||
if replacement.UserID != order.UserID || replacement.TaskID != taskID || replacement.AmountMicrocredits <= 0 {
|
||||
return ErrBillingStateConflict
|
||||
}
|
||||
reserved := order.ReservedAmountMicrocredits
|
||||
if reserved <= 0 {
|
||||
reserved = order.AmountMicrocredits
|
||||
}
|
||||
delta := replacement.AmountMicrocredits - reserved
|
||||
accountUpdates := map[string]any{"version": gorm.Expr("version + 1"), "updated_at": now}
|
||||
accountQuery := tx.Model(&model.CreditAccount{}).Where("user_id = ?", order.UserID)
|
||||
if delta > 0 {
|
||||
accountQuery = accountQuery.Where("available_microcredits >= ?", delta)
|
||||
accountUpdates["available_microcredits"] = gorm.Expr("available_microcredits - ?", delta)
|
||||
accountUpdates["reserved_microcredits"] = gorm.Expr("reserved_microcredits + ?", delta)
|
||||
} else if delta < 0 {
|
||||
release := -delta
|
||||
accountQuery = accountQuery.Where("reserved_microcredits >= ?", release)
|
||||
accountUpdates["available_microcredits"] = gorm.Expr("available_microcredits + ?", release)
|
||||
accountUpdates["reserved_microcredits"] = gorm.Expr("reserved_microcredits - ?", release)
|
||||
}
|
||||
if delta != 0 {
|
||||
accountUpdated := accountQuery.Updates(accountUpdates)
|
||||
if accountUpdated.Error != nil {
|
||||
return accountUpdated.Error
|
||||
}
|
||||
if accountUpdated.RowsAffected != 1 {
|
||||
if delta > 0 {
|
||||
return ErrInsufficientCredits
|
||||
}
|
||||
return errors.New("reserved credit balance is inconsistent")
|
||||
}
|
||||
var account model.CreditAccount
|
||||
if err := tx.First(&account, "user_id = ?", order.UserID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
entryType := model.CreditLedgerReserve
|
||||
if delta < 0 {
|
||||
entryType = model.CreditLedgerRefund
|
||||
}
|
||||
if err := tx.Create(&model.CreditLedgerEntry{
|
||||
ID: newRepositoryID(), UserID: order.UserID, Type: entryType,
|
||||
AvailableDeltaMicrocredits: -delta, ReservedDeltaMicrocredits: delta,
|
||||
AvailableAfterMicrocredits: account.AvailableMicrocredits, ReservedAfterMicrocredits: account.ReservedMicrocredits,
|
||||
BillingOrderID: order.ID, Model: order.Model, ChannelID: channelID, Scene: order.Scene,
|
||||
Note: "备用供应线路价格调整",
|
||||
}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
updates["billing_mode"] = replacement.BillingMode
|
||||
updates["price_version"] = replacement.PriceVersion
|
||||
updates["unit_price_microcredits"] = replacement.UnitPriceMicrocredits
|
||||
updates["multiplier_basis_points"] = replacement.MultiplierBasisPoints
|
||||
updates["quantity"] = replacement.Quantity
|
||||
updates["amount_microcredits"] = replacement.AmountMicrocredits
|
||||
updates["reserved_amount_microcredits"] = replacement.AmountMicrocredits
|
||||
updates["input_token_price_microcredits"] = replacement.InputTokenPriceMicrocredits
|
||||
updates["output_token_price_microcredits"] = replacement.OutputTokenPriceMicrocredits
|
||||
updates["cached_token_price_microcredits"] = replacement.CachedTokenPriceMicrocredits
|
||||
}
|
||||
billingUpdated := tx.Model(&model.BillingOrder{}).
|
||||
Where("id = ? AND task_id = ? AND status IN ?", billingOrderID, taskID, []model.BillingStatus{model.BillingStatusReserved, model.BillingStatusRunning}).
|
||||
Updates(updates)
|
||||
if billingUpdated.Error != nil {
|
||||
return billingUpdated.Error
|
||||
}
|
||||
if billingUpdated.RowsAffected != 1 {
|
||||
return ErrBillingStateConflict
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (r *Repository) SaveLogicalModelBundle(item *model.LogicalModel, revision *model.LogicalModelRevision, routes []model.LogicalModelRoute, creating bool) error {
|
||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||
if creating {
|
||||
if err := tx.Create(item).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
result := tx.Model(&model.LogicalModel{}).Where("id = ?", item.ID).Updates(map[string]any{
|
||||
"code": item.Code,
|
||||
"name": item.Name,
|
||||
"icon": item.Icon,
|
||||
"description": item.Description,
|
||||
"capability": item.Capability,
|
||||
"enabled": item.Enabled,
|
||||
"sort_order": item.SortOrder,
|
||||
"price_policy": item.PricePolicy,
|
||||
"billing_mode": item.BillingMode,
|
||||
"unit_price_microcredits": item.UnitPriceMicrocredits,
|
||||
"input_price_microcredits": item.InputPriceMicrocredits,
|
||||
"output_price_microcredits": item.OutputPriceMicrocredits,
|
||||
"cached_price_microcredits": item.CachedPriceMicrocredits,
|
||||
"updated_at": item.UpdatedAt,
|
||||
})
|
||||
if result.Error != nil {
|
||||
return result.Error
|
||||
}
|
||||
if result.RowsAffected != 1 {
|
||||
return gorm.ErrRecordNotFound
|
||||
}
|
||||
}
|
||||
|
||||
// 版本号必须由模型行原子递增。MAX(version)+1 会让两个并发事务分配同一版本。
|
||||
result := tx.Model(&model.LogicalModel{}).
|
||||
Where("id = ?", item.ID).
|
||||
UpdateColumn("revision_sequence", gorm.Expr("revision_sequence + ?", 1))
|
||||
if result.Error != nil {
|
||||
return result.Error
|
||||
}
|
||||
if result.RowsAffected != 1 {
|
||||
return gorm.ErrRecordNotFound
|
||||
}
|
||||
var sequence struct{ RevisionSequence int }
|
||||
if err := tx.Model(&model.LogicalModel{}).
|
||||
Select("revision_sequence").
|
||||
Where("id = ?", item.ID).
|
||||
Take(&sequence).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
revision.Version = sequence.RevisionSequence
|
||||
if err := tx.Create(revision).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for index := range routes {
|
||||
routes[index].LogicalModelRevisionID = revision.ID
|
||||
if err := tx.Create(&routes[index]).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := tx.Model(&model.LogicalModel{}).Where("id = ?", item.ID).Updates(map[string]any{"active_revision_id": revision.ID, "updated_at": item.UpdatedAt}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
item.ActiveRevisionID = revision.ID
|
||||
item.RevisionSequence = revision.Version
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (r *Repository) DeleteLogicalModelRoute(id string) error {
|
||||
return r.db.Model(&model.LogicalModelRoute{}).Where("id = ?", id).Updates(map[string]any{"enabled": false, "weight": 0, "updated_at": time.Now()}).Error
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"infinite-canvas/backend/internal/model"
|
||||
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func TestSaveLogicalModelBundleAllocatesMonotonicRevisionSequence(t *testing.T) {
|
||||
db, err := gorm.Open(sqlite.Open("file:logical-model-revision-sequence?mode=memory&cache=shared"), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.AutoMigrate(&model.LogicalModel{}, &model.LogicalModelRevision{}, &model.LogicalModelRoute{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
repo := New(db)
|
||||
|
||||
item := &model.LogicalModel{ID: "LMODEL_1", Code: "demo", Name: "Demo", Capability: "text", Enabled: true, PricePolicy: "unified", BillingMode: "fixed_request", CreatedAt: time.Now(), UpdatedAt: time.Now()}
|
||||
first := &model.LogicalModelRevision{ID: "REVISION_1", LogicalModelID: item.ID, CapabilitySpecJSON: `{"version":1,"capability":"text"}`, DefaultOptionsJSON: `{}`, CreatedAt: time.Now()}
|
||||
if err := repo.SaveLogicalModelBundle(item, first, nil, true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var updated model.LogicalModel
|
||||
if err := db.First(&updated, "id = ?", item.ID).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
updated.Name = "Demo 2"
|
||||
updated.UpdatedAt = time.Now()
|
||||
second := &model.LogicalModelRevision{ID: "REVISION_2", LogicalModelID: item.ID, CapabilitySpecJSON: `{"version":1,"capability":"text"}`, DefaultOptionsJSON: `{}`, CreatedAt: time.Now()}
|
||||
if err := repo.SaveLogicalModelBundle(&updated, second, nil, false); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var revisions []model.LogicalModelRevision
|
||||
if err := db.Order("version asc").Find(&revisions).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(revisions) != 2 || revisions[0].Version != 1 || revisions[1].Version != 2 {
|
||||
t.Fatalf("revision versions = %#v, want [1 2]", revisions)
|
||||
}
|
||||
if updated.RevisionSequence != 2 || updated.ActiveRevisionID != "REVISION_2" {
|
||||
t.Fatalf("updated model state = %#v", updated)
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package repository
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -48,6 +49,37 @@ func (r *Repository) Dialect() string {
|
||||
return r.db.Dialector.Name()
|
||||
}
|
||||
|
||||
// NextPrefixedID 在数据库事务中递增序列,避免 UUID/父子字符串拼接导致的不可读和不可排序 ID。
|
||||
// prefix 只决定展示前缀,关联关系仍由独立外键维护。
|
||||
func (r *Repository) NextPrefixedID(prefix string) (string, error) {
|
||||
return r.nextPrefixedID(r.db, prefix)
|
||||
}
|
||||
|
||||
func (r *Repository) nextPrefixedID(db *gorm.DB, prefix string) (string, error) {
|
||||
prefix = strings.ToUpper(strings.TrimSpace(prefix))
|
||||
if prefix == "" || len(prefix) > 16 {
|
||||
return "", errors.New("invalid id prefix")
|
||||
}
|
||||
sequence := "id:" + prefix
|
||||
var item model.IDSequence
|
||||
err := db.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&model.IDSequence{Name: sequence, UpdatedAt: time.Now()}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Model(&model.IDSequence{}).Where("name = ?", sequence).Updates(map[string]any{
|
||||
"value": gorm.Expr("value + ?", 1),
|
||||
"updated_at": time.Now(),
|
||||
}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.First(&item, "name = ?", sequence).Error
|
||||
})
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return fmt.Sprintf("%s_%06d", prefix, item.Value), nil
|
||||
}
|
||||
|
||||
func (r *Repository) UserStorageUsage(userID string) (UserStorageUsage, error) {
|
||||
var usage UserStorageUsage
|
||||
query := `
|
||||
|
||||
Reference in new issue
Block a user