Persist queryable AI action outcomes and zero-effect rejection receipts
This commit is contained in:
@@ -22,12 +22,41 @@ func (s *service) cancelCanvasAIRun(w http.ResponseWriter, r *http.Request, proj
|
||||
reject(w, 413, "context_too_large")
|
||||
return nil
|
||||
}
|
||||
input := map[string]any{}
|
||||
if len(raw) > 0 && (json.Unmarshal(raw, &input) != nil || input == nil || len(input) > 0) {
|
||||
var input struct {
|
||||
ProtocolVersion int `json:"protocol_version,omitempty"`
|
||||
RequestID string `json:"request_id,omitempty"`
|
||||
OperationID string `json:"operation_id,omitempty"`
|
||||
}
|
||||
if len(raw) > 0 && (json.Unmarshal(raw, &input) != nil || string(raw) == "null") {
|
||||
reject(w, 400, "invalid_ai_request")
|
||||
return nil
|
||||
}
|
||||
hash := payloadDigest(input)
|
||||
var fields map[string]any
|
||||
if len(raw) > 0 {
|
||||
if json.Unmarshal(raw, &fields) != nil || fields == nil {
|
||||
reject(w, 400, "invalid_ai_request")
|
||||
return nil
|
||||
}
|
||||
for key := range fields {
|
||||
if key != "protocol_version" && key != "request_id" && key != "operation_id" {
|
||||
reject(w, 400, "invalid_ai_request")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
canonical := input.ProtocolVersion != 0 || input.RequestID != "" || input.OperationID != ""
|
||||
if canonical && (input.ProtocolVersion != 2 || input.RequestID != key || !uuidSlugPattern.MatchString(input.OperationID) || !acceptsCanvasV2(r)) {
|
||||
reject(w, 400, "invalid_ai_protocol")
|
||||
return nil
|
||||
}
|
||||
if !canonical && len(fields) > 0 {
|
||||
reject(w, 400, "invalid_ai_request")
|
||||
return nil
|
||||
}
|
||||
hash := payloadDigest(map[string]any{})
|
||||
if canonical {
|
||||
hash = payloadDigest(input)
|
||||
}
|
||||
workspace, board := r.PathValue("workspace"), r.PathValue("material")
|
||||
tx, err := s.db.BeginTx(r.Context(), nil)
|
||||
if err != nil {
|
||||
@@ -38,13 +67,25 @@ func (s *service) cancelCanvasAIRun(w http.ResponseWriter, r *http.Request, proj
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var receipt *canvasAIRequest
|
||||
if canonical {
|
||||
receipt = &canvasAIRequest{Key: key, Hash: hash, Action: "run.cancel", Board: board, Run: id, Operation: input.OperationID}
|
||||
if done, e := beginCanvasAIRequest(w, r, tx, project, workspace, account, receipt); done || e != nil {
|
||||
return e
|
||||
}
|
||||
}
|
||||
rejectRequest := func(status int, code string) error {
|
||||
return rejectCanvasAIRequest(w, r, tx, project, workspace, account, receipt, status, code)
|
||||
}
|
||||
if role == "viewer" {
|
||||
reject(w, 403, "forbidden")
|
||||
return nil
|
||||
return rejectRequest(403, "forbidden")
|
||||
}
|
||||
var status string
|
||||
var rawPlan json.RawMessage
|
||||
err = tx.QueryRowContext(r.Context(), `SELECT status,plan FROM canvas_ai_runs WHERE project=$1 AND workspace_id=$2 AND board_id=$3 AND id=$4 FOR UPDATE`, project, workspace, board, id).Scan(&status, &rawPlan)
|
||||
if err == sql.ErrNoRows {
|
||||
return rejectRequest(404, "not_found")
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -72,8 +113,7 @@ func (s *service) cancelCanvasAIRun(w http.ResponseWriter, r *http.Request, proj
|
||||
return err
|
||||
}
|
||||
if role == "viewer" {
|
||||
reject(w, 403, "forbidden")
|
||||
return nil
|
||||
return rejectRequest(403, "forbidden")
|
||||
}
|
||||
}
|
||||
if status == "queued" || status == "running" {
|
||||
@@ -145,14 +185,14 @@ func (s *service) cancelCanvasAIRun(w http.ResponseWriter, r *http.Request, proj
|
||||
return err
|
||||
}
|
||||
result := response{"run_id": id, "status": status, "applied": applied, "cancelled_step_ids": cancelledSteps, "worker_stop_grace_ms": 1000}
|
||||
if receipt != nil {
|
||||
result["run_status"], result["status"] = status, "applied"
|
||||
bindCanvasAIReceipt(result, receipt)
|
||||
}
|
||||
encoded, _ := json.Marshal(result)
|
||||
_, err = tx.ExecContext(r.Context(), `INSERT INTO canvas_ai_mutations(project,workspace_id,run_id,account_id,action,idempotency_key,payload_hash,response_body) VALUES($1,$2,$3,$4,'cancel',$5,$6,$7)`, project, workspace, id, account, key, hash, encoded)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err = tx.Commit(); err != nil {
|
||||
return err
|
||||
}
|
||||
reply(w, 200, result)
|
||||
return nil
|
||||
return commitCanvasAIReceipt(w, r, tx, project, workspace, account, receipt, 200, "applied", result)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user