fix(api): 文本回放 - 增加增量配额与生命周期清理 (#144)

Closes #144
This commit is contained in:
ddCat committed 2026-08-05 16:54:47 +08:00
1 parent 38c4f63e2e
commit 4721c1e97f
11 files changed
+389 -3

No files matched your search

+3
View File
@@ -366,6 +366,9 @@ func (s *Service) DeleteUser(actor *model.User, userID string) error {
if err := s.repo.DeleteUserAuthSessions(user.ID); err != nil {
return err
}
if err := s.repo.DeleteUserTaskTextDeltas(user.ID); err != nil {
return err
}
// 有资金流水后必须保留用户主体,删除入口改为停用并清除全部登录态。
user.Status = model.UserStatusDisabled
user.UpdatedAt = time.Now()
+19
View File
@@ -189,6 +189,7 @@ func New(repo *repository.Repository, dataDir string) *Service {
}
func (s *Service) StartWorker() {
s.startTextReplayCleanup()
go func() {
slots := make(chan struct{}, maxChannelConcurrencyLimit)
dispatch := func() {
@@ -576,6 +577,9 @@ func (s *Service) CancelTask(userID string, id string) (*model.Task, error) {
if task.SessionID != "" {
_ = s.markSessionFailed(*task, "会话任务已取消。")
}
if err := s.finalizeTaskTextReplay(task.ID, model.TaskStatusCancelled); err != nil {
_ = s.log(userID, task.ID, "error", "文本回放草稿归并失败", err.Error())
}
_ = s.log(userID, task.ID, "warn", "任务已取消", "")
return taskForOutput(*task), nil
}
@@ -911,6 +915,9 @@ func (s *Service) processClaimedTask(task *model.Task) error {
_ = s.MarkBillingUncertain(task.BillingOrderID, "任务取消时上游费用状态不明确")
}
_ = s.markSessionFailed(*task, "会话任务已取消。")
if compactErr := s.finalizeTaskTextReplay(task.ID, model.TaskStatusCancelled); compactErr != nil {
_ = s.log(task.UserID, task.ID, "error", "文本回放草稿归并失败", compactErr.Error())
}
_ = s.log(task.UserID, task.ID, "warn", "任务已取消", "")
return nil
}
@@ -922,6 +929,9 @@ func (s *Service) processClaimedTask(task *model.Task) error {
task.Error = taskFailureMessage(err)
task.CompletedAt = ptr(time.Now())
_ = s.repo.Save(task)
if compactErr := s.finalizeTaskTextReplay(task.ID, model.TaskStatusFailed); compactErr != nil {
_ = s.log(task.UserID, task.ID, "error", "文本回放草稿归并失败", compactErr.Error())
}
if providerSucceeded || (!channelSlotFailedBeforeRequest && s.BillingFailureRequiresReview(task.BillingOrderID, task.ID, err)) {
_ = s.MarkBillingUncertain(task.BillingOrderID, task.Error)
} else {
@@ -936,6 +946,9 @@ func (s *Service) processClaimedTask(task *model.Task) error {
return err
}
if latest.Status == model.TaskStatusCancelled {
if compactErr := s.finalizeTaskTextReplay(task.ID, model.TaskStatusCancelled); compactErr != nil {
_ = s.log(task.UserID, task.ID, "error", "文本回放草稿归并失败", compactErr.Error())
}
_ = s.MarkBillingUncertain(task.BillingOrderID, "上游已返回结果,但任务被取消")
_ = s.markSessionFailed(*latest, "会话任务已取消。")
_ = s.log(task.UserID, task.ID, "warn", "任务已取消,丢弃生成结果", "")
@@ -952,11 +965,17 @@ func (s *Service) processClaimedTask(task *model.Task) error {
task.Error = taskFailureMessage(err)
task.CompletedAt = ptr(time.Now())
_ = s.repo.Save(task)
if compactErr := s.finalizeTaskTextReplay(task.ID, model.TaskStatusFailed); compactErr != nil {
_ = s.log(task.UserID, task.ID, "error", "文本回放草稿归并失败", compactErr.Error())
}
_ = s.MarkBillingUncertain(task.BillingOrderID, "上游已成功但任务结果未保存:"+task.Error)
_ = s.markSessionFailed(*task, task.Error)
_ = s.log(task.UserID, task.ID, "error", "任务结果保存失败", task.Error)
return err
}
if compactErr := s.finalizeTaskTextReplay(task.ID, model.TaskStatusSucceeded); compactErr != nil {
_ = s.log(task.UserID, task.ID, "error", "文本回放窗口更新失败", compactErr.Error())
}
if completedTask, fetchErr := s.repo.Task(task.ID); fetchErr == nil {
if registerErr := s.RegisterTaskOutputFromTask(*completedTask); registerErr != nil {
// 任务成功与产物登记分开记账;登记失败保持步骤异常,允许项目页幂等补登记。
+122
View File
@@ -0,0 +1,122 @@
package service
import (
"encoding/json"
"errors"
"log"
"strings"
"time"
"infinite-canvas/backend/internal/model"
"infinite-canvas/backend/internal/repository"
"gorm.io/gorm"
)
const (
textReplayMaxEventBytes = 64 << 10
textReplayMaxTaskBytes = 2 << 20
textReplayMaxUserBytes = 64 << 20
textReplayMaxTaskEvents int64 = 4096
textReplaySuccessRetention = 24 * time.Hour
textReplayDraftRetention = 7 * 24 * time.Hour
)
type TextReplayResult struct {
Deltas []model.TaskTextDelta `json:"deltas"`
TextDraft string `json:"textDraft,omitempty"`
FinalText string `json:"finalText,omitempty"`
Complete bool `json:"complete"`
}
func (s *Service) AppendTaskTextDelta(userID string, taskID string, content string) (*model.TaskTextDelta, error) {
task, err := s.repo.TaskForUser(userID, taskID)
if err != nil {
return nil, err
}
if capabilityFromTaskType(task.Type) != "text" {
return nil, BadAuthRequest("只有文本生成任务支持增量回放")
}
if strings.TrimSpace(content) == "" {
return nil, BadAuthRequest("文本增量不能为空")
}
if len([]byte(content)) > textReplayMaxEventBytes {
return nil, BadAuthRequest("单条文本增量不能超过 64KB")
}
item, err := s.repo.AppendTaskTextDelta(userID, taskID, content, time.Now().Add(textReplayDraftRetention), repository.TextReplayLimits{
MaxTaskBytes: textReplayMaxTaskBytes, MaxUserBytes: textReplayMaxUserBytes, MaxTaskEvents: textReplayMaxTaskEvents,
})
if errors.Is(err, repository.ErrTextReplayQuotaExceeded) {
return nil, BadAuthRequest("文本回放增量已达到配额,请等待任务归并后继续")
}
if errors.Is(err, repository.ErrTextReplayClosed) {
return nil, BadAuthRequest("已结束任务不能继续写入文本增量")
}
return item, err
}
func (s *Service) TaskTextReplay(userID string, taskID string, after int64) (*TextReplayResult, error) {
task, err := s.repo.TaskForUser(userID, taskID)
if err != nil {
return nil, err
}
deltas, err := s.repo.TaskTextDeltas(userID, taskID, after, 1000)
if err != nil {
return nil, err
}
result := &TextReplayResult{Deltas: deltas, TextDraft: task.TextDraft, Complete: task.Status == model.TaskStatusSucceeded || task.Status == model.TaskStatusFailed || task.Status == model.TaskStatusCancelled}
if task.Status == model.TaskStatusSucceeded {
result.FinalText = taskResultText(task.ResultJSON)
}
return result, nil
}
func (s *Service) finalizeTaskTextReplay(taskID string, status model.TaskStatus) error {
keepDraft := status == model.TaskStatusFailed || status == model.TaskStatusCancelled
retention := textReplaySuccessRetention
if keepDraft {
retention = textReplayDraftRetention
}
err := s.repo.CompactTaskTextDeltas(taskID, time.Now().Add(retention), keepDraft)
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil
}
return err
}
func (s *Service) CleanupTaskTextReplay() (int64, error) {
return s.repo.CleanupTaskTextDeltas(time.Now())
}
func (s *Service) AdminTextReplayStats(actor *model.User) (repository.TextReplayStats, error) {
if err := s.RequireAdmin(actor); err != nil {
return repository.TextReplayStats{}, err
}
return s.repo.TextReplayStats()
}
func taskResultText(raw string) string {
var result struct {
Text string `json:"text"`
}
if json.Unmarshal([]byte(raw), &result) != nil {
return ""
}
return result.Text
}
func (s *Service) startTextReplayCleanup() {
cleanup := func() {
if _, err := s.CleanupTaskTextReplay(); err != nil {
log.Printf("text replay cleanup failed: %v", err)
}
}
cleanup()
go func() {
ticker := time.NewTicker(time.Hour)
defer ticker.Stop()
for range ticker.C {
cleanup()
}
}()
}