feat(cloud-agent): 云端 Agent - 完善运行时与资源持久化
This commit is contained in:
1 parent
4613cca38c
commit
f4480b129b
40 files changed
+1739
-440
No files matched your search
@@ -83,8 +83,19 @@ func agentMediaRun(t *testing.T, s *Service, a cloudAgentMediaArgs, permission s
|
||||
func approveAgentMediaDraft(t *testing.T, s *Service, runID string) {
|
||||
t.Helper()
|
||||
run, err := s.CloudAgentRun("user", runID)
|
||||
if err != nil || run.Approval == nil || run.Status != "waiting_approval" {
|
||||
t.Fatalf("media must wait for approval even in auto mode: %v", err)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if run.Status != "waiting_approval" || run.Approval == nil {
|
||||
stored, loadErr := s.repo.CloudAgent("user", runID)
|
||||
state, decodeErr := cloudAgentDecode(stored)
|
||||
if loadErr != nil {
|
||||
decodeErr = loadErr
|
||||
}
|
||||
if decodeErr != nil || state.MediaTaskID == "" {
|
||||
t.Fatalf("media generation was neither approved nor auto-submitted: status=%s task=%s err=%v", run.Status, state.MediaTaskID, decodeErr)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err := s.DecideCloudAgentApproval("user", runID, run.Approval.ID, "approve", ""); err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -196,7 +207,6 @@ func TestCloudAgentMediaReferenceAndSnapshotGuards(t *testing.T) {
|
||||
{"existing node", func(v *cloudAgentMediaArgs) { v.NodeID = "cat" }},
|
||||
{"mixed selection", func(v *cloudAgentMediaArgs) { v.LogicalModelID = "made-up" }},
|
||||
{"duration budget", func(v *cloudAgentMediaArgs) { v.Duration = 25 }},
|
||||
{"missing aspect ratio", func(v *cloudAgentMediaArgs) { v.Size = "" }},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
bad := a
|
||||
@@ -234,7 +244,7 @@ func TestCloudAgentImageCreatesReferencedNode(t *testing.T) {
|
||||
a.Mode, a.ChannelModelKey, a.Duration, a.VideoGenerateAudio = "image", "grok-image", 0, nil
|
||||
a.Size, a.Quality, a.NodeID = "1:1", "2k", "image-shot-1"
|
||||
a.ReferenceNodeIDs = []string{"cat"}
|
||||
run, _ := agentMediaRun(t, s, a, "auto")
|
||||
run, _ := agentMediaRun(t, s, a, "request_approval")
|
||||
if err := s.advanceCloudAgentByID("user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -399,7 +409,7 @@ func TestCloudAgentMediaFillsMissingSnapshotHash(t *testing.T) {
|
||||
|
||||
func TestCloudAgentMediaFailedTaskUpdatesNode(t *testing.T) {
|
||||
s, db, a := agentMediaFixture(t)
|
||||
run, _ := agentMediaRun(t, s, a, "auto")
|
||||
run, _ := agentMediaRun(t, s, a, "request_approval")
|
||||
if err := s.advanceCloudAgentByID("user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -545,7 +555,7 @@ func TestCloudAgentMediaDraftReuseLifecycle(t *testing.T) {
|
||||
|
||||
func TestCloudAgentMediaPreviousDraftRequiresNewApproval(t *testing.T) {
|
||||
s, db, a := agentMediaFixture(t)
|
||||
run, state := agentMediaRun(t, s, a, "auto")
|
||||
run, state := agentMediaRun(t, s, a, "request_approval")
|
||||
if err := s.advanceCloudAgentTool(run, &state); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -564,7 +574,7 @@ func TestCloudAgentMediaPreviousDraftRequiresNewApproval(t *testing.T) {
|
||||
}
|
||||
a.SnapshotHash = cloudAgentCanvasHash(doc)
|
||||
a.ReferenceNodeIDs = []string{"hero"}
|
||||
next, nextState := agentMediaRun(t, s, a, "auto", "resume-draft-next-turn")
|
||||
next, nextState := agentMediaRun(t, s, a, "request_approval", "resume-draft-next-turn")
|
||||
if next.ID == run.ID {
|
||||
t.Fatal("expected a distinct run")
|
||||
}
|
||||
@@ -605,74 +615,130 @@ func TestCloudAgentMediaPreviousDraftRequiresNewApproval(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestCloudAgentAutoMediaDraftRequiresExplicitApproval(t *testing.T) {
|
||||
for _, decision := range []string{"approve", "reject", "cancel"} {
|
||||
t.Run(decision, func(t *testing.T) {
|
||||
s, db, a := agentMediaFixture(t)
|
||||
run, _ := agentMediaRun(t, s, a, "auto")
|
||||
var ordersBefore int64
|
||||
db.Model(&model.BillingOrder{}).Count(&ordersBefore)
|
||||
if err := s.advanceCloudAgentByID("user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run, _ = s.repo.CloudAgent("user", run.ID)
|
||||
state, _ := cloudAgentDecode(run)
|
||||
if run.Status != "waiting_approval" || state.Approval == nil || state.Approval.ModelName != "视频测试" || state.MediaTaskID != "" {
|
||||
t.Fatal("auto mode bypassed approval or omitted selected model")
|
||||
}
|
||||
canvas, _ := s.repo.CanvasProjectForUser("user", "agent-canvas")
|
||||
doc, _ := creationDocument(canvas.PayloadJSON)
|
||||
nodes, _ := creationObjects(doc["nodes"])
|
||||
meta, _ := nodes[a.NodeID]["metadata"].(map[string]any)
|
||||
if meta["status"] != "idle" || meta["taskId"] != nil || meta["size"] != "9:16" || meta["agentDraftRunId"] != run.ID || len(creationMaps(doc["connections"])) != 3 {
|
||||
t.Fatalf("missing uncharged draft with references: %+v", meta)
|
||||
}
|
||||
// Re-entering the tool while awaiting a decision must remain a no-op.
|
||||
if err := s.advanceCloudAgentTool(run, &state); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var count, orders int64
|
||||
db.Model(&model.Task{}).Where("type = ?", "canvas_video").Count(&count)
|
||||
db.Model(&model.BillingOrder{}).Count(&orders)
|
||||
if count != 0 || orders != ordersBefore {
|
||||
t.Fatal("draft created a task or charge")
|
||||
}
|
||||
// Another run may not take over this draft, even with the latest snapshot.
|
||||
foreign := a
|
||||
foreign.DraftRunID, foreign.SnapshotHash = "another-run", cloudAgentCanvasHash(doc)
|
||||
if _, _, _, err := cloudAgentMediaDocument(s.repo, "user", "agent-canvas", foreign); err == nil {
|
||||
t.Fatal("foreign draft overwrite accepted")
|
||||
}
|
||||
if decision == "cancel" {
|
||||
if err := s.CancelCloudAgent(context.Background(), "user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
} else {
|
||||
// A local focus/zoom autosave cannot change the approved content.
|
||||
doc["viewport"], doc["updatedAt"] = map[string]any{"x": -900, "y": -500, "k": 0.8}, "later"
|
||||
raw, _ := json.Marshal(doc)
|
||||
if err := db.Model(&model.CanvasProject{}).Where("id = ?", "agent-canvas").Update("payload_json", string(raw)).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for range 2 {
|
||||
if err := s.DecideCloudAgentApproval("user", run.ID, state.Approval.ID, decision, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if err := s.advanceCloudAgentByID("user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
db.Model(&model.Task{}).Where("type = ?", "canvas_video").Count(&count)
|
||||
db.Model(&model.BillingOrder{}).Count(&orders)
|
||||
if decision == "approve" {
|
||||
if count != 1 {
|
||||
t.Fatal("explicit approval did not create exactly one task")
|
||||
}
|
||||
} else if count != 0 || orders != ordersBefore {
|
||||
t.Fatal("reject/cancel submitted generation")
|
||||
}
|
||||
})
|
||||
func TestCloudAgentAutoMediaSubmitsWithoutApproval(t *testing.T) {
|
||||
s, db, a := agentMediaFixture(t)
|
||||
// Omitted size and duration should be filled by the selected model's catalog
|
||||
// defaults during admission instead of producing a repair turn.
|
||||
a.Size = ""
|
||||
a.Duration = 0
|
||||
run, _ := agentMediaRun(t, s, a, "auto")
|
||||
var ordersBefore int64
|
||||
if err := db.Model(&model.BillingOrder{}).Count(&ordersBefore).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.advanceCloudAgentByID("user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run, _ = s.repo.CloudAgent("user", run.ID)
|
||||
state, err := cloudAgentDecode(run)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if run.Status == "waiting_approval" || state.Approval != nil {
|
||||
t.Fatalf("auto mode unexpectedly requested approval: status=%s approval=%+v", run.Status, state.Approval)
|
||||
}
|
||||
if state.MediaTaskID == "" {
|
||||
t.Fatalf("auto mode did not submit a media task: %+v", state.Events)
|
||||
}
|
||||
for _, event := range state.Events {
|
||||
if event.Type == "approval_requested" {
|
||||
t.Fatal("auto mode emitted an approval event")
|
||||
}
|
||||
}
|
||||
task, err := s.repo.TaskForUser("user", state.MediaTaskID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var input canvasGenerationInput
|
||||
if err := json.Unmarshal([]byte(task.InputJSON), &input); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if input.Config.Size == "" || input.Config.VideoSeconds == "" {
|
||||
t.Fatalf("model defaults were not resolved: %+v", input.Config)
|
||||
}
|
||||
canvas, _ := s.repo.CanvasProjectForUser("user", "agent-canvas")
|
||||
doc, _ := creationDocument(canvas.PayloadJSON)
|
||||
nodes, _ := creationObjects(doc["nodes"])
|
||||
meta, _ := nodes[a.NodeID]["metadata"].(map[string]any)
|
||||
if meta["status"] != "loading" || meta["taskId"] != task.ID || meta["agentDraftRunId"] != nil {
|
||||
t.Fatalf("auto submission did not finalize the draft: %+v", meta)
|
||||
}
|
||||
var tasks, orders int64
|
||||
if err := db.Model(&model.Task{}).Where("type = ?", "canvas_video").Count(&tasks).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Model(&model.BillingOrder{}).Count(&orders).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if tasks != 1 || orders != ordersBefore+1 {
|
||||
t.Fatalf("auto submission created unexpected records: tasks=%d orders=%d before=%d", tasks, orders, ordersBefore)
|
||||
}
|
||||
// Re-entering a submitted call is idempotent and must not reserve/submit a
|
||||
// second generation.
|
||||
if err := s.advanceCloudAgentByID("user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Model(&model.Task{}).Where("type = ?", "canvas_video").Count(&tasks).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if tasks != 1 {
|
||||
t.Fatalf("re-entering auto media duplicated task: %d", tasks)
|
||||
}
|
||||
|
||||
// Admission failures are still non-billed tool failures and do not create an
|
||||
// approval or a draft task.
|
||||
invalidService, invalidDB, invalidArgs := agentMediaFixture(t)
|
||||
invalidArgs.ChannelModelKey = "removed-model"
|
||||
invalidRun, _ := agentMediaRun(t, invalidService, invalidArgs, "auto")
|
||||
var invalidOrdersBefore int64
|
||||
if err := invalidDB.Model(&model.BillingOrder{}).Count(&invalidOrdersBefore).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := invalidService.advanceCloudAgentByID("user", invalidRun.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
invalidRun, _ = invalidService.repo.CloudAgent("user", invalidRun.ID)
|
||||
invalidState, err := cloudAgentDecode(invalidRun)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var invalidTasks, invalidOrders int64
|
||||
if err := invalidDB.Model(&model.Task{}).Where("type = ?", "canvas_video").Count(&invalidTasks).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := invalidDB.Model(&model.BillingOrder{}).Count(&invalidOrders).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if invalidTasks != 0 || invalidOrders != invalidOrdersBefore || invalidState.Approval != nil {
|
||||
t.Fatalf("invalid auto admission created side effects: tasks=%d orders=%d before=%d approval=%+v", invalidTasks, invalidOrders, invalidOrdersBefore, invalidState.Approval)
|
||||
}
|
||||
|
||||
approvalService, approvalDB, approvalArgs := agentMediaFixture(t)
|
||||
approvalRun, _ := agentMediaRun(t, approvalService, approvalArgs, "request_approval")
|
||||
var approvalOrdersBefore int64
|
||||
if err := approvalDB.Model(&model.BillingOrder{}).Count(&approvalOrdersBefore).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := approvalService.advanceCloudAgentByID("user", approvalRun.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
approvalRun, _ = approvalService.repo.CloudAgent("user", approvalRun.ID)
|
||||
approvalState, err := cloudAgentDecode(approvalRun)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if approvalRun.Status != "waiting_approval" || approvalState.Approval == nil {
|
||||
t.Fatalf("request_approval stopped bypassing approval: status=%s approval=%+v", approvalRun.Status, approvalState.Approval)
|
||||
}
|
||||
var approvalTasks, approvalOrders int64
|
||||
if err := approvalDB.Model(&model.Task{}).Where("type = ?", "canvas_video").Count(&approvalTasks).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := approvalDB.Model(&model.BillingOrder{}).Count(&approvalOrders).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if approvalTasks != 0 || approvalOrders != approvalOrdersBefore {
|
||||
t.Fatalf("request_approval submitted before decision: tasks=%d orders=%d before=%d", approvalTasks, approvalOrders, approvalOrdersBefore)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -692,7 +758,7 @@ func TestCloudAgentMediaPromptCountsUnicodeCharacters(t *testing.T) {
|
||||
|
||||
func TestCloudAgentMediaCancellationUpdatesNode(t *testing.T) {
|
||||
s, _, a := agentMediaFixture(t)
|
||||
run, _ := agentMediaRun(t, s, a, "auto")
|
||||
run, _ := agentMediaRun(t, s, a, "request_approval")
|
||||
if err := s.advanceCloudAgentByID("user", run.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user