Implement Canvas V2 subgraphs, assets and asynchronous AI execution
This commit is contained in:
+110
-6
@@ -8,6 +8,7 @@ import (
|
||||
"net/http"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
)
|
||||
@@ -71,10 +72,14 @@ func canvasImage(v any) bool {
|
||||
return false
|
||||
}
|
||||
func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
var doc map[string]any
|
||||
if json.Unmarshal(raw, &doc) != nil || !canvasFields(doc, "schema_version", "nodes", "edges", "viewport") || doc["schema_version"] != float64(1) {
|
||||
if len(raw) > canvasLimit {
|
||||
return nil, false
|
||||
}
|
||||
var doc map[string]any
|
||||
if json.Unmarshal(raw, &doc) != nil || !canvasFields(doc, "schema_version", "nodes", "edges", "viewport") || (doc["schema_version"] != float64(1) && doc["schema_version"] != float64(2)) {
|
||||
return nil, false
|
||||
}
|
||||
v2 := doc["schema_version"] == float64(2)
|
||||
nodes, ok := doc["nodes"].([]any)
|
||||
if !ok || len(nodes) > 500 {
|
||||
return nil, false
|
||||
@@ -87,7 +92,11 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
if !ok || !canvasFields(viewport, "x", "y", "zoom") || !canvasNumber(viewport["x"], -math.MaxFloat64, math.MaxFloat64) || !canvasNumber(viewport["y"], -math.MaxFloat64, math.MaxFloat64) || !canvasNumber(viewport["zoom"], .1, 4) {
|
||||
return nil, false
|
||||
}
|
||||
if v2 && (!canvasNumber(viewport["x"], -1e6, 1e6) || !canvasNumber(viewport["y"], -1e6, 1e6)) {
|
||||
return nil, false
|
||||
}
|
||||
kinds := map[string]string{}
|
||||
framePorts := map[string]map[string]string{}
|
||||
for _, v := range nodes {
|
||||
n, ok := v.(map[string]any)
|
||||
if !ok {
|
||||
@@ -121,13 +130,32 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
}
|
||||
_, w := n["width"]
|
||||
_, h := n["height"]
|
||||
if w != h || (w && (!canvasNumber(n["width"], 20, 3000) || !canvasNumber(n["height"], 20, 3000))) {
|
||||
low, high := float64(20), float64(3000)
|
||||
if data, _ := n["data"].(map[string]any); v2 && data["kind"] == "frame" {
|
||||
low, high = 32, 100000
|
||||
}
|
||||
if w != h || (w && (!canvasNumber(n["width"], low, high) || !canvasNumber(n["height"], low, high))) {
|
||||
return nil, false
|
||||
}
|
||||
d, ok := n["data"].(map[string]any)
|
||||
if !ok || !canvasFields(d, "kind", "title", "text", "src", "icon", "rotation", "fontSize", "textStyle", "frameId", "labelMode") {
|
||||
if !ok || !canvasFields(d, "kind", "title", "text", "src", "icon", "rotation", "fontSize", "textStyle", "frameId", "labelMode", "subgraph", "presentation", "ports", "assetId", "ai") {
|
||||
return nil, false
|
||||
}
|
||||
if ai, exists := d["ai"]; exists {
|
||||
kind, _ := d["kind"].(string)
|
||||
if !v2 || !validCanvasAI(ai, kind) {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
if !validCanvasFrameExtensions(d, v2) {
|
||||
return nil, false
|
||||
}
|
||||
if id, exists := d["assetId"]; exists {
|
||||
value, ok := id.(string)
|
||||
if !v2 || !ok || !uuidSlugPattern.MatchString(value) || !canvasChoice(d["kind"], "image", "plain-image") {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
kind, ok := d["kind"].(string)
|
||||
if !ok {
|
||||
return nil, false
|
||||
@@ -161,6 +189,16 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
if kind == "frame" && v2 {
|
||||
ports := map[string]string{}
|
||||
if values, ok := d["ports"].([]any); ok {
|
||||
for _, v := range values {
|
||||
p := v.(map[string]any)
|
||||
ports[p["id"].(string)] = p["direction"].(string)
|
||||
}
|
||||
}
|
||||
framePorts[id] = ports
|
||||
}
|
||||
kinds[id] = kind
|
||||
if r, exists := d["rotation"]; exists && (!canvasNumber(r, 0, 360) || r == float64(360)) {
|
||||
return nil, false
|
||||
@@ -224,7 +262,11 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
return nil, false
|
||||
}
|
||||
delete(e, "selected")
|
||||
if !canvasFields(e, "id", "source", "target", "sourceHandle", "targetHandle", "type") {
|
||||
fields := []string{"id", "source", "target", "sourceHandle", "targetHandle", "type"}
|
||||
if v2 {
|
||||
fields = append(fields, "data")
|
||||
}
|
||||
if !canvasFields(e, fields...) {
|
||||
return nil, false
|
||||
}
|
||||
id, ok := e["id"].(string)
|
||||
@@ -234,15 +276,37 @@ func normalizeCanvas(raw json.RawMessage) (json.RawMessage, bool) {
|
||||
seen[id] = true
|
||||
for _, key := range []string{"source", "target"} {
|
||||
s, ok := e[key].(string)
|
||||
if !ok || !canvasChoice(kinds[s], "text", "image", "script") {
|
||||
if !ok {
|
||||
return nil, false
|
||||
}
|
||||
if v2 && kinds[s] == "frame" {
|
||||
handle, _ := e[key+"Handle"].(string)
|
||||
direction := "input"
|
||||
if key == "source" {
|
||||
direction = "output"
|
||||
}
|
||||
if !strings.HasPrefix(handle, "port:") || framePorts[s][strings.TrimPrefix(handle, "port:")] != direction {
|
||||
return nil, false
|
||||
}
|
||||
continue
|
||||
}
|
||||
if !(canvasChoice(kinds[s], "text", "image", "script") || (v2 && canvasChoice(kinds[s], "plain-text", "plain-image"))) {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
for _, key := range []string{"sourceHandle", "targetHandle"} {
|
||||
endpoint := strings.TrimSuffix(key, "Handle")
|
||||
id, _ := e[endpoint].(string)
|
||||
if v2 && kinds[id] == "frame" {
|
||||
continue
|
||||
}
|
||||
if h, exists := e[key]; exists && h != nil && !canvasChoice(h, "", "top", "right", "bottom", "left") {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
if data, exists := e["data"]; exists && (!v2 || !validCanvasEdgeData(data)) {
|
||||
return nil, false
|
||||
}
|
||||
if typ, exists := e["type"]; exists && !canvasChoice(typ, "default", "bezier") {
|
||||
return nil, false
|
||||
}
|
||||
@@ -276,7 +340,12 @@ func (s *service) canvas(w http.ResponseWriter, r *http.Request, project, accoun
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if canvasSchema(document) == 2 && !acceptsCanvasV2(r) {
|
||||
reject(w, 409, "canvas_schema_upgrade_required")
|
||||
return nil
|
||||
}
|
||||
if r.Method == http.MethodGet {
|
||||
w.Header().Set("X-Canvas-Schema-Version", strconv.Itoa(canvasSchema(document)))
|
||||
setVersion(w, version)
|
||||
reply(w, 200, response{"version": version, "document": document})
|
||||
return nil
|
||||
@@ -303,15 +372,50 @@ func (s *service) canvas(w http.ResponseWriter, r *http.Request, project, accoun
|
||||
reject(w, 400, "invalid_canvas")
|
||||
return nil
|
||||
}
|
||||
if canvasExceededGraphLimits(input.Document) {
|
||||
reject(w, 413, "graph_limit_exceeded")
|
||||
return nil
|
||||
}
|
||||
previousDocument := document
|
||||
previousSchema := canvasSchema(document)
|
||||
document, ok = normalizeCanvas(input.Document)
|
||||
if !ok {
|
||||
reject(w, 400, "invalid_canvas")
|
||||
return nil
|
||||
}
|
||||
if canvasSchema(document) == 2 && !acceptsCanvasV2(r) {
|
||||
reject(w, 409, "canvas_schema_upgrade_required")
|
||||
return nil
|
||||
}
|
||||
if previousSchema == 2 && canvasSchema(document) != 2 {
|
||||
reject(w, 409, "canvas_schema_upgrade_required")
|
||||
return nil
|
||||
}
|
||||
if expected != version {
|
||||
reject(w, 412, "version_conflict")
|
||||
return nil
|
||||
}
|
||||
if valid, e := validateCanvasRelations(r, tx, project, workspace, material, previousDocument, document); e != nil {
|
||||
return e
|
||||
} else if !valid {
|
||||
reject(w, 409, "ownership_conflict")
|
||||
return nil
|
||||
}
|
||||
if !s.validateCanvasAIModels(w, r, document) {
|
||||
return nil
|
||||
}
|
||||
if valid, e := s.validateCanvasAssets(r, tx, project, workspace, account, document); e != nil {
|
||||
return e
|
||||
} else if !valid {
|
||||
reject(w, 400, "invalid_asset_reference")
|
||||
return nil
|
||||
}
|
||||
if err = s.attachCanvasAssets(r, tx, project, workspace, material, document); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = invalidateCanvasAITargets(r, tx, project, workspace, material, previousDocument, document); err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.ExecContext(r.Context(), `UPDATE materials SET canvas_document=$4,canvas_version=canvas_version+1 WHERE project=$1 AND workspace_id=$2 AND id=$3`, project, workspace, material, document)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user