Resolve canonical AI targets at their current canvas owner
This commit is contained in:
@@ -170,15 +170,54 @@ func bindCanvasAIIdentities(ctx context.Context, tx *sql.Tx, project, workspace
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func canvasAIIdentityMatches(ctx context.Context, tx *sql.Tx, project, workspace string, step canvasAIStepPlan) (bool, error) {
|
||||
root, incarnation, kind, err := canvasAIIdentity(ctx, tx, project, workspace, step.BoardID, step.NodeID)
|
||||
|
||||
// Run URLs remain anchored at their admission board, even after that partition
|
||||
// is archived. Canonical ownership grants are inherited from the same root.
|
||||
func lockCanvasAIRunRoute(ctx context.Context, tx *sql.Tx, project, workspace, board, account string) (string, string, error) {
|
||||
root, err := canonicalRoot(ctx, tx, project, workspace, board)
|
||||
if err != nil {
|
||||
return false, err
|
||||
return "", "", err
|
||||
}
|
||||
if root == "" {
|
||||
return step.CanonicalRoot == "" && step.TargetIncarnation == 0, nil
|
||||
if root != "" {
|
||||
board = root
|
||||
}
|
||||
return lockMaterial(ctx, tx, project, workspace, board, account)
|
||||
}
|
||||
func lockCanvasAIWorkspace(ctx context.Context, tx *sql.Tx, project, workspace string) error {
|
||||
var id string
|
||||
return tx.QueryRowContext(ctx, `SELECT id::text FROM workspaces WHERE project=$1 AND id=$2 FOR UPDATE`, project, workspace).Scan(&id)
|
||||
}
|
||||
|
||||
// Caller holds the workspace lock. Frozen identity is stable; owner is resolved
|
||||
// afresh at execution, hydration and write time, never written into the plan.
|
||||
func resolveCanvasAITarget(ctx context.Context, tx *sql.Tx, project, workspace string, step canvasAIStepPlan) (string, bool, error) {
|
||||
if step.CanonicalRoot == "" {
|
||||
root, err := canonicalRoot(ctx, tx, project, workspace, step.BoardID)
|
||||
return step.BoardID, err == nil && root == "" && step.TargetIncarnation == 0, err
|
||||
}
|
||||
var board, kind string
|
||||
var incarnation, version int64
|
||||
err := tx.QueryRowContext(ctx, `SELECT e.owner_canvas_id::text,e.incarnation,e.record->>'componentId',(e.record->>'dataVersion')::bigint FROM canvas_model_elements e JOIN canvas_model_canvases c ON c.project=e.project AND c.workspace_id=e.workspace_id AND c.canvas_id=e.owner_canvas_id AND c.root_id=e.root_id WHERE e.project=$1 AND e.workspace_id=$2 AND e.root_id=$3 AND e.element_id=$4 AND NOT e.deleted AND NOT c.archived AND e.record->>'structure'='node'`, project, workspace, step.CanonicalRoot, step.NodeID).Scan(&board, &incarnation, &kind, &version)
|
||||
if err == sql.ErrNoRows {
|
||||
return "", false, nil
|
||||
}
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
return board, incarnation == step.TargetIncarnation && incarnation > 0 && kind == step.Kind && version == 1, nil
|
||||
}
|
||||
func canvasAIIdentityMatches(ctx context.Context, tx *sql.Tx, project, workspace string, step canvasAIStepPlan) (bool, error) {
|
||||
_, ok, err := resolveCanvasAITarget(ctx, tx, project, workspace, step)
|
||||
return ok, err
|
||||
}
|
||||
func (change canvasAIChange) addTargetContext(result response, step canvasAIStepPlan) {
|
||||
change.addCanonical(result)
|
||||
if step.CanonicalRoot != "" {
|
||||
result["origin_board_id"], result["canonical_root"] = step.BoardID, step.CanonicalRoot
|
||||
if change.After != nil && change.Snapshot.BoardID != step.BoardID {
|
||||
result["model"] = change.After.view(nil)
|
||||
}
|
||||
}
|
||||
return root == step.CanonicalRoot && incarnation > 0 && incarnation == step.TargetIncarnation && kind == step.Kind, nil
|
||||
}
|
||||
|
||||
// Whole identity transitions cancel old jobs even when delete/restore happens
|
||||
@@ -190,11 +229,30 @@ func invalidateCanonicalAIIdentities(r *http.Request, tx *sql.Tx, project, works
|
||||
continue
|
||||
}
|
||||
next := after.Elements[id]
|
||||
if next != nil && next["ownerCanvasId"] == element["ownerCanvasId"] && modelInt(next["incarnation"]) == modelInt(element["incarnation"]) && next["componentId"] == element["componentId"] && modelInt(next["dataVersion"]) == modelInt(element["dataVersion"]) {
|
||||
if next != nil && modelInt(next["incarnation"]) == modelInt(element["incarnation"]) && next["componentId"] == element["componentId"] && modelInt(next["dataVersion"]) == modelInt(element["dataVersion"]) {
|
||||
continue
|
||||
}
|
||||
board := modelString(element["ownerCanvasId"])
|
||||
removed[board] = append(removed[board], map[string]any{"id": id, "data": map[string]any{"kind": element["componentId"]}})
|
||||
rows, err := tx.QueryContext(r.Context(), `SELECT DISTINCT board_id::text FROM canvas_ai_steps WHERE project=$1 AND workspace_id=$2 AND frozen_input->>'canonical_root'=$3 AND node_id=$4 AND frozen_input->>'target_incarnation'=$5::bigint::text AND status IN('queued','running')`, project, workspace, before.Root, id, modelInt(element["incarnation"]))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
boards := []string{}
|
||||
for rows.Next() {
|
||||
var board string
|
||||
if err = rows.Scan(&board); err != nil {
|
||||
rows.Close()
|
||||
return err
|
||||
}
|
||||
boards = append(boards, board)
|
||||
}
|
||||
err = rows.Err()
|
||||
rows.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, board := range boards {
|
||||
removed[board] = append(removed[board], map[string]any{"id": id, "data": map[string]any{"kind": element["componentId"]}})
|
||||
}
|
||||
}
|
||||
for _, board := range sortedKeys(removed) {
|
||||
raw, err := json.Marshal(map[string]any{"nodes": removed[board]})
|
||||
|
||||
Reference in New Issue
Block a user