Merge pull request #102 from trickest/fix/version-definition

Update workflow version definition
trickest · Dec 6, 2023 · bcea6ed · bcea6ed
2 parents 0f54b24 + 033721e
commit bcea6ed
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/cmd/execute/execute.go b/cmd/execute/execute.go
@@ -837,6 +837,7 @@ func readWorkflowYAMLandCreateVersion(fileName string, workflowName string, obje
 			Nodes          map[string]*types.Node          `json:"nodes"`
 			Connections    []types.Connection              `json:"connections"`
 			PrimitiveNodes map[string]*types.PrimitiveNode `json:"primitiveNodes"`
+			Annotations    map[string]*types.Annotation    `json:"annotations"`
 		}{
 			Nodes:          nodes,
 			Connections:    connections,
@@ -965,6 +966,7 @@ func createToolWorkflow(wfName string, space *types.SpaceDetailed, project *type
 			Nodes          map[string]*types.Node          `json:"nodes"`
 			Connections    []types.Connection              `json:"connections"`
 			PrimitiveNodes map[string]*types.PrimitiveNode `json:"primitiveNodes"`
+			Annotations    map[string]*types.Annotation    `json:"annotations"`
 		}{
 			Nodes: map[string]*types.Node{
 				node.Name: node,

diff --git a/types/download.go b/types/download.go
@@ -50,9 +50,21 @@ type WorkflowVersionDetailed struct {
 		Nodes          map[string]*Node          `json:"nodes"`
 		Connections    []Connection              `json:"connections"`
 		PrimitiveNodes map[string]*PrimitiveNode `json:"primitiveNodes"`
+		Annotations    map[string]*Annotation    `json:"annotations"`
 	} `json:"data"`
 }
 
+type Annotation struct {
+	Content     string  `json:"content"`
+	Width       float64 `json:"width"`
+	Height      float64 `json:"height"`
+	Name        string  `json:"name"`
+	Coordinates struct {
+		X float64 `json:"x"`
+		Y float64 `json:"y"`
+	} `json:"coordinates"`
+}
+
 type WorkflowVersionStripped struct {
 	ID           uuid.UUID `json:"id"`
 	WorkflowInfo uuid.UUID `json:"workflow_info"`
@@ -64,6 +76,7 @@ type WorkflowVersionStripped struct {
 		Nodes          map[string]*Node          `json:"nodes"`
 		Connections    []Connection              `json:"connections"`
 		PrimitiveNodes map[string]*PrimitiveNode `json:"primitiveNodes"`
+		Annotations    map[string]*Annotation    `json:"annotations"`
 	} `json:"data"`
 }
 
@@ -139,4 +152,5 @@ type NodeInput struct {
 	Description     *string     `json:"description,omitempty"`
 	WorkerConnected *bool       `json:"workerConnected,omitempty"`
 	Multi           *bool       `json:"multi,omitempty"`
+	Visible         *bool       `json:"visible"`
 }