tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(assets): 素材删除 - 排除已结束任务的生成历史引用

Browse Source
This commit is contained in:
MasterChiefCN
2026-09-16 13:45:31 +08:00
parent 9868f5e8b8
commit ae9b42a452
4 changed files with 101 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/internal/app/resource_delete.go
View File

@@ -83,6 +83,17 @@ func (s *Service) deleteUserAssetWithResources(userID string, assetID string) er
}
}
for _, document := range snapshot.Documents {
// 已结束任务的输出和日志仅记录生成历史，不构成素材占用。
// 仅在素材删除时放行；孤儿清理仍保留尚未入库的任务产物。
switch document.TaskStatus {
case model.TaskStatusSucceeded, model.TaskStatusFailed, model.TaskStatusCancelled:
if document.Kind == "任务日志" || document.Kind == "任务结果" {
continue
}
if document.Kind == "任务" {
document.SecondaryJSON = ""
}
}
referencedIDs := documentReferencedResourceIDs(document.PrimaryJSON, ownedIDSet)
for resourceID := range documentReferencedResourceIDs(document.SecondaryJSON, ownedIDSet) {
referencedIDs[resourceID] = struct{}{}

74
backend/internal/app/resource_delete_test.go
View File

@@ -225,6 +225,80 @@ func TestDeleteAssetStillRejectsLiveCanvasResourceReference(t *testing.T) {
}
}
func TestDeleteGeneratedAssetTaskReferences(t *testing.T) {
for _, tc := range []struct {
name string
status model.TaskStatus
input bool
canvas bool
block bool
}{
{name: "completed output", status: model.TaskStatusSucceeded},
{name: "failed output", status: model.TaskStatusFailed},
{name: "cancelled output", status: model.TaskStatusCancelled},
{name: "running output", status: model.TaskStatusRunning, block: true},
{name: "queued output", status: model.TaskStatusQueued, block: true},
{name: "unknown status", block: true},
{name: "completed input", status: model.TaskStatusSucceeded, input: true, block: true},
{name: "completed output on canvas", status: model.TaskStatusSucceeded, canvas: true, block: true},
} {
t.Run(tc.name, func(t *testing.T) {
svc, db, _ := newResourceDeletionTestService(t)
payload := `{"url":"/api/resources/generated-resource/file"}`
resource := model.Resource{ID: "generated-resource", UserID: "user-1", Provider: "unsupported-test-provider", ObjectKey: "generated.png", Status: model.ResourceStatusReady}
asset := model.Asset{ID: "generated-asset", UserID: "user-1", Title: "生成图片", PayloadJSON: payload}
task := model.Task{ID: "generation-task", UserID: "user-1", Prompt: "生成图片", Status: tc.status, InputJSON: `{}`, ResultJSON: payload}
if tc.input {
task.InputJSON = payload
}
items := []any{&resource, &asset, &task,
&model.TaskLog{ID: "generation-log", UserID: "user-1", TaskID: task.ID, Payload: payload},
&model.Result{ID: "generation-result", UserID: "user-1", TaskID: task.ID, URL: "/api/resources/generated-resource/file", Payload: payload},
}
if tc.canvas {
items = append(items, &model.CanvasProject{ID: "canvas", UserID: "user-1", Title: "使用中的画布", PayloadJSON: payload})
}
for _, item := range items {
if err := db.Create(item).Error; err != nil {
t.Fatal(err)
}
}
// 自动孤儿清理仍须保留生成历史中的产物，不能扩大为自动删除。
if err := svc.cleanupDetachedUserResources("user-1", []model.Resource{resource}); err != nil {
t.Fatal(err)
}
remaining, err := svc.repo.ResourcesForUserIDs("user-1", []string{resource.ID})
if err != nil || len(remaining) != 1 {
t.Fatalf("automatic cleanup must keep task output: resources=%v, error=%v", remaining, err)
}
err = svc.DeleteUserAsset("user-1", asset.ID)
if (err != nil) != tc.block {
t.Fatalf("DeleteUserAsset() = %v, want blocked=%v", err, tc.block)
}
wantRemaining, wantJobs := int64(0), int64(1)
if tc.block {
wantRemaining, wantJobs = 1, 0
}
for _, check := range []struct {
model any
want int64
}{
{&model.Asset{}, wantRemaining}, {&model.Resource{}, wantRemaining},
{&model.ResourceDeletionJob{}, wantJobs},
{&model.Task{}, 1}, {&model.TaskLog{}, 1}, {&model.Result{}, 1},
} {
var count int64
if err := db.Model(check.model).Count(&count).Error; err != nil {
t.Fatal(err)
}
if count != check.want {
t.Fatalf("%T count=%d, want %d", check.model, count, check.want)
}
}
})
}
}
func TestResourceDeletionWorkerRemovesObjectAndCompletesOutbox(t *testing.T) {
svc, db, dataDir := newResourceDeletionTestService(t)
objectKey := "users/user-1/image/queued.png"

15
backend/internal/repository/resource_reference.go
View File

@@ -17,6 +17,7 @@ type ResourceReferenceDocument struct {
Title string
PrimaryJSON string
SecondaryJSON string
TaskStatus model.TaskStatus
}
type ResourceDirectReference struct {
@@ -104,11 +105,13 @@ func (r *Repository) ResourceReferenceSnapshot(userID string, excludingAssetID s
}
var tasks []model.Task
if err := r.db.Select("id", "prompt", "input_json", "result_json").Where("user_id = ?", userID).Find(&tasks).Error; err != nil {
if err := r.db.Select("id", "prompt", "status", "input_json", "result_json").Where("user_id = ?", userID).Find(&tasks).Error; err != nil {
return snapshot, err
}
taskStatuses := make(map[string]model.TaskStatus, len(tasks))
for _, task := range tasks {
snapshot.Documents = append(snapshot.Documents, ResourceReferenceDocument{Kind: "任务", ID: task.ID, Title: task.Prompt, PrimaryJSON: task.InputJSON, SecondaryJSON: task.ResultJSON})
taskStatuses[task.ID] = task.Status
snapshot.Documents = append(snapshot.Documents, ResourceReferenceDocument{Kind: "任务", ID: task.ID, Title: task.Prompt, PrimaryJSON: task.InputJSON, SecondaryJSON: task.ResultJSON, TaskStatus: task.Status})
}
var runs []model.CreationRun
@@ -127,19 +130,19 @@ func (r *Repository) ResourceReferenceSnapshot(userID string, excludingAssetID s
}
var taskLogs []model.TaskLog
if err := r.db.Select("id", "message", "payload").Where("user_id = ?", userID).Find(&taskLogs).Error; err != nil {
if err := r.db.Select("id", "task_id", "message", "payload").Where("user_id = ?", userID).Find(&taskLogs).Error; err != nil {
return snapshot, err
}
for _, taskLog := range taskLogs {
snapshot.Documents = append(snapshot.Documents, ResourceReferenceDocument{Kind: "任务日志", ID: taskLog.ID, Title: taskLog.Message, PrimaryJSON: taskLog.Payload})
snapshot.Documents = append(snapshot.Documents, ResourceReferenceDocument{Kind: "任务日志", ID: taskLog.ID, Title: taskLog.Message, PrimaryJSON: taskLog.Payload, TaskStatus: taskStatuses[taskLog.TaskID]})
}
var results []model.Result
if err := r.db.Select("id", "kind", "url", "payload").Where("user_id = ?", userID).Find(&results).Error; err != nil {
if err := r.db.Select("id", "task_id", "kind", "url", "payload").Where("user_id = ?", userID).Find(&results).Error; err != nil {
return snapshot, err
}
for _, result := range results {
snapshot.Documents = append(snapshot.Documents, ResourceReferenceDocument{Kind: "任务结果", ID: result.ID, Title: result.Kind, PrimaryJSON: result.URL, SecondaryJSON: result.Payload})
snapshot.Documents = append(snapshot.Documents, ResourceReferenceDocument{Kind: "任务结果", ID: result.ID, Title: result.Kind, PrimaryJSON: result.URL, SecondaryJSON: result.Payload, TaskStatus: taskStatuses[result.TaskID]})
}
var projects []model.Project