Resolve canonical AI targets at their current canvas owner
This commit is contained in:
@@ -14,7 +14,19 @@ func (s *service) startCanvasStep(ctx context.Context, run canvasQueueRun, step
|
||||
return false, err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
_, role, permissionErr := lockMaterial(ctx, tx, run.Project, run.Workspace, step.BoardID, run.Account)
|
||||
if err = lockCanvasAIWorkspace(ctx, tx, run.Project, run.Workspace); err != nil {
|
||||
return false, err
|
||||
}
|
||||
board, identityOK, err := resolveCanvasAITarget(ctx, tx, run.Project, run.Workspace, step)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if !identityOK {
|
||||
tx.Rollback()
|
||||
_, err = s.finishCanvasStep(ctx, run, step, "", "target_removed", false)
|
||||
return false, err
|
||||
}
|
||||
_, role, permissionErr := lockMaterial(ctx, tx, run.Project, run.Workspace, board, run.Account)
|
||||
if permissionErr != nil || role == "viewer" {
|
||||
tx.Rollback()
|
||||
if permissionErr != nil && permissionErr != sql.ErrNoRows {
|
||||
@@ -33,15 +45,11 @@ func (s *service) startCanvasStep(ctx context.Context, run canvasQueueRun, step
|
||||
_, err = s.finishCanvasStep(ctx, run, step, "", "generation_cancelled", false)
|
||||
return false, err
|
||||
}
|
||||
snapshot, err := loadCanvas(queueRequest(ctx), tx, run.Project, run.Workspace, step.BoardID)
|
||||
snapshot, err := loadCanvas(queueRequest(ctx), tx, run.Project, run.Workspace, board)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
data := canvasNodeData(snapshot.Document)[step.NodeID]
|
||||
identityOK, err := canvasAIIdentityMatches(ctx, tx, run.Project, run.Workspace, step)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if !identityOK || data == nil || canvasTargetFingerprint(step.BoardID, step.NodeID, data) != step.Fingerprint {
|
||||
tx.Rollback()
|
||||
_, err = s.finishCanvasStep(ctx, run, step, "", "target_changed", false)
|
||||
@@ -108,7 +116,7 @@ func (s *service) finishCanvasStepOutput(ctx context.Context, run canvasQueueRun
|
||||
status = "skipped"
|
||||
case "target_changed":
|
||||
status = "conflict"
|
||||
case "generation_cancelled":
|
||||
case "generation_cancelled", "target_removed":
|
||||
status = "cancelled"
|
||||
default:
|
||||
if code != "" {
|
||||
@@ -119,6 +127,15 @@ func (s *service) finishCanvasStepOutput(ctx context.Context, run canvasQueueRun
|
||||
status = "cancelled"
|
||||
code = "generation_cancelled"
|
||||
}
|
||||
board, identityOK, err := resolveCanvasAITarget(ctx, tx, run.Project, run.Workspace, step)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
eventBoard := board
|
||||
if !identityOK {
|
||||
eventBoard = step.BoardID
|
||||
}
|
||||
var appliedBoard any
|
||||
var output any
|
||||
var version any
|
||||
if code == "" && started {
|
||||
@@ -141,10 +158,10 @@ func (s *service) finishCanvasStepOutput(ctx context.Context, run canvasQueueRun
|
||||
patch["text"] = generated.Text
|
||||
}
|
||||
|
||||
if err = appendAIEvent(ctx, tx, run.Project, run.Workspace, run.ID, "step.output", response{"step_id": step.ID, "board_id": step.BoardID, "node_id": step.NodeID, "output": output}); err != nil {
|
||||
if err = appendAIEvent(ctx, tx, run.Project, run.Workspace, run.ID, "step.output", response{"step_id": step.ID, "board_id": eventBoard, "origin_board_id": step.BoardID, "canonical_root": step.CanonicalRoot, "target_incarnation": step.TargetIncarnation, "node_id": step.NodeID, "output": output}); err != nil {
|
||||
return "", err
|
||||
}
|
||||
_, role, permissionErr := lockMaterial(ctx, tx, run.Project, run.Workspace, step.BoardID, run.Account)
|
||||
_, role, permissionErr := lockCanvasAIRunRoute(ctx, tx, run.Project, run.Workspace, eventBoard, run.Account)
|
||||
if permissionErr != nil && permissionErr != sql.ErrNoRows {
|
||||
return "", permissionErr
|
||||
}
|
||||
@@ -152,14 +169,15 @@ func (s *service) finishCanvasStepOutput(ctx context.Context, run canvasQueueRun
|
||||
status = "failed"
|
||||
code = "permission_revoked"
|
||||
} else {
|
||||
snapshot, err := loadCanvas(queueRequest(ctx), tx, run.Project, run.Workspace, step.BoardID)
|
||||
snapshot, err := loadCanvas(queueRequest(ctx), tx, run.Project, run.Workspace, eventBoard)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
target := canvasNodeData(snapshot.Document)[step.NodeID]
|
||||
identityOK, err := canvasAIIdentityMatches(ctx, tx, run.Project, run.Workspace, step)
|
||||
if err != nil {
|
||||
return "", err
|
||||
if image, ok := output.(response); ok && image["kind"] == "image" && identityOK {
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO canvas_asset_bindings(project,workspace_id,asset_id,board_id) VALUES($1,$2,$3,$4) ON CONFLICT DO NOTHING`, run.Project, run.Workspace, image["assetId"], eventBoard); err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
if !identityOK || target == nil || canvasTargetFingerprint(step.BoardID, step.NodeID, target) != step.Fingerprint {
|
||||
status, code = "conflict", "target_changed"
|
||||
@@ -175,8 +193,9 @@ func (s *service) finishCanvasStepOutput(ctx context.Context, run canvasQueueRun
|
||||
return "", err
|
||||
}
|
||||
version = change.Snapshot.Version
|
||||
applied := response{"step_id": step.ID, "board_id": step.BoardID, "node_id": step.NodeID, "patch": patch, "canvas_version": change.Snapshot.Version}
|
||||
change.addCanonical(applied)
|
||||
appliedBoard = eventBoard
|
||||
applied := response{"step_id": step.ID, "board_id": eventBoard, "node_id": step.NodeID, "patch": patch, "canvas_version": change.Snapshot.Version}
|
||||
change.addTargetContext(applied, step)
|
||||
if err = appendAIEvent(ctx, tx, run.Project, run.Workspace, run.ID, "step.applied", applied); err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -189,7 +208,7 @@ func (s *service) finishCanvasStepOutput(ctx context.Context, run canvasQueueRun
|
||||
encoded, _ := json.Marshal(output)
|
||||
outputJSON = encoded
|
||||
}
|
||||
_, err = tx.ExecContext(ctx, `UPDATE canvas_ai_steps SET status=$5,output=$6,error_code=NULLIF($7,''),applied_version=$8,completed_at=now() WHERE project=$1 AND workspace_id=$2 AND run_id=$3 AND id=$4`, run.Project, run.Workspace, run.ID, step.ID, status, outputJSON, code, version)
|
||||
_, err = tx.ExecContext(ctx, `UPDATE canvas_ai_steps SET status=$5,output=$6,error_code=NULLIF($7,''),applied_version=$8,applied_board_id=$9,completed_at=now() WHERE project=$1 AND workspace_id=$2 AND run_id=$3 AND id=$4`, run.Project, run.Workspace, run.ID, step.ID, status, outputJSON, code, version, appliedBoard)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user