vellum-ai 0.14.41__py3-none-any.whl → 1.11.2__py3-none-any.whl

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_search_node_serialization.py

@@ -40,7 +40,6 @@ def test_serialize_workflow():
 
     # AND its raw data is what we expect
     workflow_raw_data = serialized_workflow["workflow_raw_data"]
-    assert workflow_raw_data.keys() == {"nodes", "edges", "display_data", "definition"}
     assert len(workflow_raw_data["nodes"]) == 3
     assert len(workflow_raw_data["edges"]) == 2
 
@@ -51,18 +50,18 @@ def test_serialize_workflow():
         "type": "ENTRYPOINT",
         "inputs": [],
         "data": {"label": "Entrypoint Node", "source_handle_id": "df80b4aa-2ba1-49a2-8375-fb1f78eee31f"},
-        "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "display_data": {"position": {"x": 0.0, "y": -50.0}},
         "base": None,
         "definition": None,
     }
 
     search_node = workflow_raw_data["nodes"][1]
     assert search_node == {
-        "id": "ab3a1413-c7b5-4cb0-a2d4-f5ab7d1d65b4",
+        "id": "89c8bee0-8015-4d73-9112-e436ab086567",
         "type": "SEARCH",
         "inputs": [
             {
-                "id": "49d21956-6e62-472b-b62a-7ec65faea1fd",
+                "id": "1dbfd1d9-8e8e-47b6-bb65-c578385ef978",
                 "key": "query",
                 "value": {
                     "rules": [
@@ -75,7 +74,7 @@ def test_serialize_workflow():
                 },
             },
             {
-                "id": "8cb28a69-088d-410d-bd0d-886d57ce7b64",
+                "id": "8f197069-4729-4db3-811c-9a522685dfba",
                 "key": "document_index_id",
                 "value": {
                     "rules": [{"type": "CONSTANT_VALUE", "data": {"type": "STRING", "value": "name"}}],
@@ -83,7 +82,7 @@ def test_serialize_workflow():
                 },
             },
             {
-                "id": "983f2b7f-ad86-45cf-b04b-08724af27236",
+                "id": "dd991fc6-5690-496b-b63e-b1a1219f3682",
                 "key": "weights",
                 "value": {
                     "rules": [
@@ -96,7 +95,7 @@ def test_serialize_workflow():
                 },
             },
             {
-                "id": "8072ec05-5fe4-47db-bc48-4c20ce49e123",
+                "id": "52f6c3ab-cd96-4ca7-bfb1-7554c431b318",
                 "key": "limit",
                 "value": {
                     "rules": [{"type": "CONSTANT_VALUE", "data": {"type": "JSON", "value": None}}],
@@ -104,7 +103,7 @@ def test_serialize_workflow():
                 },
             },
             {
-                "id": "051c5d2e-4667-4ae2-9202-1076b21adf7b",
+                "id": "e1822f91-ca9c-46c9-8dcd-cce83fe331ce",
                 "key": "separator",
                 "value": {
                     "rules": [{"type": "CONSTANT_VALUE", "data": {"type": "STRING", "value": "\n\n#####\n\n"}}],
@@ -112,7 +111,7 @@ def test_serialize_workflow():
                 },
             },
             {
-                "id": "8aac5dac-209e-48f3-97e1-0a39e4cd98d5",
+                "id": "3ee2bc2a-d72a-471a-8dd6-5e5028db8bfe",
                 "key": "result_merging_enabled",
                 "value": {
                     "rules": [{"type": "CONSTANT_VALUE", "data": {"type": "STRING", "value": "False"}}],
@@ -120,7 +119,7 @@ def test_serialize_workflow():
                 },
             },
             {
-                "id": "036dee8f-194a-4b92-9739-69c98a4aa1b9",
+                "id": "5c766934-13f7-4a0f-a751-21e25fd2ca30",
                 "key": "external_id_filters",
                 "value": {
                     "rules": [{"type": "CONSTANT_VALUE", "data": {"type": "JSON", "value": None}}],
@@ -128,7 +127,7 @@ def test_serialize_workflow():
                 },
             },
             {
-                "id": "855d3f57-e633-467e-a348-a394360247df",
+                "id": "977d75bc-520f-447b-ad75-8b56c793f951",
                 "key": "metadata_filters",
                 "value": {
                     "rules": [
@@ -168,7 +167,7 @@ def test_serialize_workflow():
                     "rules": [
                         {
                             "type": "INPUT_VARIABLE",
-                            "data": {"input_variable_id": "8ffffeb2-79b3-4105-acc7-78b0267da955"},
+                            "data": {"input_variable_id": "67fd852b-789b-4c18-8465-2bbf1696b8eb"},
                         }
                     ],
                     "combinator": "OR",
@@ -181,7 +180,7 @@ def test_serialize_workflow():
                     "rules": [
                         {
                             "type": "INPUT_VARIABLE",
-                            "data": {"input_variable_id": "8ffffeb2-79b3-4105-acc7-78b0267da955"},
+                            "data": {"input_variable_id": "58e909b0-9269-454d-b40d-3846fd2c39f2"},
                         }
                     ],
                     "combinator": "OR",
@@ -194,7 +193,7 @@ def test_serialize_workflow():
                     "rules": [
                         {
                             "type": "INPUT_VARIABLE",
-                            "data": {"input_variable_id": "f5eee974-b0c3-4775-bc8a-679a9e99d7ba"},
+                            "data": {"input_variable_id": "7564f9c7-b2cf-4584-b4c7-845a14ac4dfa"},
                         }
                     ],
                     "combinator": "OR",
@@ -207,7 +206,7 @@ def test_serialize_workflow():
                     "rules": [
                         {
                             "type": "INPUT_VARIABLE",
-                            "data": {"input_variable_id": "f5eee974-b0c3-4775-bc8a-679a9e99d7ba"},
+                            "data": {"input_variable_id": "cd081063-ab26-4ec7-99b3-af7e035a16e3"},
                         }
                     ],
                     "combinator": "OR",
@@ -216,21 +215,21 @@ def test_serialize_workflow():
         ],
         "data": {
             "label": "Simple Search Node",
-            "results_output_id": "e27fa934-589a-48f7-92a9-dcc90710ec7b",
-            "text_output_id": "3f3bd066-ce73-46ee-84f1-d8ece69ecd8c",
+            "results_output_id": "184c5214-29be-4029-8ece-2991972e0822",
+            "text_output_id": "9bab7f1b-3a4b-46bf-8b30-e3016ac38f51",
             "error_output_id": None,
-            "source_handle_id": "00ae06b3-f8d9-4ae6-9fbf-e4ff4d520e9b",
-            "target_handle_id": "6d50305f-588b-469f-a042-b0767d3f99b1",
-            "query_node_input_id": "49d21956-6e62-472b-b62a-7ec65faea1fd",
-            "document_index_node_input_id": "8cb28a69-088d-410d-bd0d-886d57ce7b64",
-            "weights_node_input_id": "983f2b7f-ad86-45cf-b04b-08724af27236",
-            "limit_node_input_id": "8072ec05-5fe4-47db-bc48-4c20ce49e123",
-            "separator_node_input_id": "051c5d2e-4667-4ae2-9202-1076b21adf7b",
-            "result_merging_enabled_node_input_id": "8aac5dac-209e-48f3-97e1-0a39e4cd98d5",
-            "external_id_filters_node_input_id": "036dee8f-194a-4b92-9739-69c98a4aa1b9",
-            "metadata_filters_node_input_id": "855d3f57-e633-467e-a348-a394360247df",
+            "source_handle_id": "928c79f2-bc07-43ee-9420-380a3bd36fb8",
+            "target_handle_id": "85db938d-9a85-4f08-8bbf-b795db2c40d5",
+            "query_node_input_id": "1dbfd1d9-8e8e-47b6-bb65-c578385ef978",
+            "document_index_node_input_id": "8f197069-4729-4db3-811c-9a522685dfba",
+            "weights_node_input_id": "dd991fc6-5690-496b-b63e-b1a1219f3682",
+            "limit_node_input_id": "52f6c3ab-cd96-4ca7-bfb1-7554c431b318",
+            "separator_node_input_id": "e1822f91-ca9c-46c9-8dcd-cce83fe331ce",
+            "result_merging_enabled_node_input_id": "3ee2bc2a-d72a-471a-8dd6-5e5028db8bfe",
+            "external_id_filters_node_input_id": "5c766934-13f7-4a0f-a751-21e25fd2ca30",
+            "metadata_filters_node_input_id": "977d75bc-520f-447b-ad75-8b56c793f951",
         },
-        "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "display_data": {"position": {"x": 200.0, "y": -50.0}},
         "base": {
             "name": "SearchNode",
             "module": ["vellum", "workflows", "nodes", "displayable", "search_node", "node"],
@@ -239,6 +238,11 @@ def test_serialize_workflow():
             "name": "SimpleSearchNode",
             "module": ["tests", "workflows", "basic_search_node", "workflow"],
         },
+        "trigger": {
+            "id": "85db938d-9a85-4f08-8bbf-b795db2c40d5",
+            "merge_behavior": "AWAIT_ANY",
+        },
+        "ports": [{"id": "928c79f2-bc07-43ee-9420-380a3bd36fb8", "name": "default", "type": "DEFAULT"}],
     }
 
     final_output_node = workflow_raw_data["nodes"][2]
@@ -262,8 +266,8 @@ def test_serialize_workflow():
                         {
                             "type": "NODE_OUTPUT",
                             "data": {
-                                "node_id": "ab3a1413-c7b5-4cb0-a2d4-f5ab7d1d65b4",
-                                "output_id": "3f3bd066-ce73-46ee-84f1-d8ece69ecd8c",
+                                "node_id": "89c8bee0-8015-4d73-9112-e436ab086567",
+                                "output_id": "9bab7f1b-3a4b-46bf-8b30-e3016ac38f51",
                             },
                         }
                     ],
@@ -271,7 +275,7 @@ def test_serialize_workflow():
                 },
             }
         ],
-        "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "display_data": {"position": {"x": 400.0, "y": -50.0}},
         "base": {
             "name": "FinalOutputNode",
             "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -283,17 +287,17 @@ def test_serialize_workflow():
     serialized_edges = workflow_raw_data["edges"]
     assert serialized_edges == [
         {
-            "id": "06533904-4897-4a7a-aa8d-50419b3d33ae",
+            "id": "16500e66-1e19-4ee3-a197-baf9c2926ae4",
             "source_node_id": "06671b25-5c6b-4675-8c74-6c396a608728",
             "source_handle_id": "df80b4aa-2ba1-49a2-8375-fb1f78eee31f",
-            "target_node_id": "ab3a1413-c7b5-4cb0-a2d4-f5ab7d1d65b4",
-            "target_handle_id": "6d50305f-588b-469f-a042-b0767d3f99b1",
+            "target_node_id": "89c8bee0-8015-4d73-9112-e436ab086567",
+            "target_handle_id": "85db938d-9a85-4f08-8bbf-b795db2c40d5",
             "type": "DEFAULT",
         },
         {
             "id": "cb918deb-f546-47b5-8b6b-db0d22a29fd1",
-            "source_node_id": "ab3a1413-c7b5-4cb0-a2d4-f5ab7d1d65b4",
-            "source_handle_id": "00ae06b3-f8d9-4ae6-9fbf-e4ff4d520e9b",
+            "source_node_id": "89c8bee0-8015-4d73-9112-e436ab086567",
+            "source_handle_id": "928c79f2-bc07-43ee-9420-380a3bd36fb8",
             "target_node_id": "4e466510-6756-403f-a182-56e5a2b85d94",
             "target_handle_id": "cd8c736f-1b77-493d-b857-d8feb5c03b15",
             "type": "DEFAULT",

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_set_state_node_serialization.py

@@ -0,0 +1,86 @@
+from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
+
+from tests.workflows.basic_set_state_node.workflow import BasicSetStateNodeWorkflow
+
+
+def test_serialize_workflow():
+    # GIVEN a Workflow that uses a SetStateNode to update chat history
+    # WHEN we serialize it
+    workflow_display = get_workflow_display(workflow_class=BasicSetStateNodeWorkflow)
+
+    serialized_workflow: dict = workflow_display.serialize()
+
+    # THEN we should get a serialized representation of the Workflow
+    assert serialized_workflow.keys() == {
+        "workflow_raw_data",
+        "input_variables",
+        "state_variables",
+        "output_variables",
+    }
+
+    # AND its state variables should be what we expect
+    state_variables = serialized_workflow["state_variables"]
+    assert state_variables == [
+        {
+            "id": "5102baaa-6413-45b7-828d-11caf56ff489",
+            "key": "chat_history",
+            "type": "CHAT_HISTORY",
+            "default": {"type": "CHAT_HISTORY", "value": []},
+            "required": False,
+            "extensions": {"color": None},
+        },
+        {
+            "id": "24c5e751-2283-48cc-adff-91d216150aad",
+            "key": "counter",
+            "type": "NUMBER",
+            "default": {"type": "NUMBER", "value": 0.0},
+            "required": False,
+            "extensions": {"color": None},
+        },
+    ]
+
+    # AND its raw data should include at least the SetState node
+    workflow_raw_data = serialized_workflow["workflow_raw_data"]
+    set_state_node = next(
+        node
+        for node in workflow_raw_data["nodes"]
+        if node["type"] == "GENERIC" and node["label"] == "Update State Node"
+    )
+
+    operations_attribute = next(
+        attribute for attribute in set_state_node["attributes"] if attribute["name"] == "operations"
+    )
+
+    assert operations_attribute == {
+        "id": "933beba4-7455-4563-a447-b0d06e3d2589",
+        "name": "operations",
+        "value": {
+            "type": "DICTIONARY_REFERENCE",
+            "entries": [
+                {
+                    "id": "6caeb2fb-c634-4cad-a97c-fc444cbaa6fb",
+                    "key": "chat_history",
+                    "value": {
+                        "type": "BINARY_EXPRESSION",
+                        "lhs": {"type": "WORKFLOW_STATE", "state_variable_id": "5102baaa-6413-45b7-828d-11caf56ff489"},
+                        "operator": "concat",
+                        "rhs": {
+                            "type": "NODE_OUTPUT",
+                            "node_id": "32f69de2-53e8-4151-b036-4e831669cf1d",
+                            "node_output_id": "611ad55f-6c6d-420b-b5a2-b50a06812254",
+                        },
+                    },
+                },
+                {
+                    "id": "04964b4f-65bc-436e-943d-fef8b5d0dc60",
+                    "key": "counter",
+                    "value": {
+                        "type": "BINARY_EXPRESSION",
+                        "lhs": {"type": "WORKFLOW_STATE", "state_variable_id": "24c5e751-2283-48cc-adff-91d216150aad"},
+                        "operator": "+",
+                        "rhs": {"type": "CONSTANT_VALUE", "value": {"type": "NUMBER", "value": 1.0}},
+                    },
+                },
+            ],
+        },
+    }

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_subworkflow_deployment_serialization.py

@@ -83,7 +83,6 @@ def test_serialize_workflow(vellum_client):
 
     # AND its raw data should be what we expect
     workflow_raw_data = serialized_workflow["workflow_raw_data"]
-    assert workflow_raw_data.keys() == {"edges", "nodes", "display_data", "definition"}
     assert len(workflow_raw_data["edges"]) == 3
     assert len(workflow_raw_data["nodes"]) == 4
 
@@ -100,17 +99,17 @@ def test_serialize_workflow(vellum_client):
             "source_handle_id": "13d9eb34-aecb-496d-9e57-d5e786b0bc7c",
         },
         "display_data": {
-            "position": {"x": 0.0, "y": 0.0},
+            "position": {"x": 0.0, "y": -50.0},
         },
     }
 
     subworkflow_node = workflow_raw_data["nodes"][1]
     assert subworkflow_node == {
-        "id": "d71f674e-8a6b-44ab-b552-7f4637a4e7a6",
+        "id": "bb98a2c4-c9a7-4c39-8f31-dc7961dc9996",
         "type": "SUBWORKFLOW",
         "inputs": [
             {
-                "id": "dade23b9-dab6-4760-9247-da189f1019d2",
+                "id": "8107cec2-8215-4730-b52c-859e87a1c116",
                 "key": "city",
                 "value": {
                     "rules": [
@@ -123,7 +122,7 @@ def test_serialize_workflow(vellum_client):
                 },
             },
             {
-                "id": "8d73270e-2cf9-4146-b053-4780b99857a6",
+                "id": "3487e51a-e7fe-4b2c-a1f9-f72c83a329db",
                 "key": "date",
                 "value": {
                     "rules": [
@@ -139,13 +138,13 @@ def test_serialize_workflow(vellum_client):
         "data": {
             "label": "Example Subworkflow Deployment Node",
             "error_output_id": None,
-            "source_handle_id": "ab0db8a9-7b53-4d88-8667-273b31303273",
-            "target_handle_id": "e4d80502-9281-42c8-91e3-10817bcd7d9e",
+            "source_handle_id": "ff99bf0c-c239-4b8b-8ac1-483b134f94f4",
+            "target_handle_id": "d6194ccf-d31b-4846-8e24-3e189d84351a",
             "variant": "DEPLOYMENT",
             "workflow_deployment_id": deployment.id,
             "release_tag": "LATEST",
         },
-        "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "display_data": {"position": {"x": 200.0, "y": -50.0}},
         "base": {
             "module": ["vellum", "workflows", "nodes", "displayable", "subworkflow_deployment_node", "node"],
             "name": "SubworkflowDeploymentNode",
@@ -154,6 +153,11 @@ def test_serialize_workflow(vellum_client):
             "module": ["tests", "workflows", "basic_subworkflow_deployment", "workflow"],
             "name": "ExampleSubworkflowDeploymentNode",
         },
+        "trigger": {
+            "id": "d6194ccf-d31b-4846-8e24-3e189d84351a",
+            "merge_behavior": "AWAIT_ANY",
+        },
+        "ports": [{"id": "ff99bf0c-c239-4b8b-8ac1-483b134f94f4", "name": "default", "type": "DEFAULT"}],
     }
 
     assert not DeepDiff(
@@ -190,8 +194,8 @@ def test_serialize_workflow(vellum_client):
                                 {
                                     "type": "NODE_OUTPUT",
                                     "data": {
-                                        "node_id": "d71f674e-8a6b-44ab-b552-7f4637a4e7a6",
-                                        "output_id": "5170e2fb-2b7c-4cb1-8958-6c0f2a359e1e",
+                                        "node_id": "bb98a2c4-c9a7-4c39-8f31-dc7961dc9996",
+                                        "output_id": "d901cbed-9905-488c-be62-e2668f85438f",
                                     },
                                 }
                             ],
@@ -199,7 +203,7 @@ def test_serialize_workflow(vellum_client):
                         },
                     }
                 ],
-                "display_data": {"position": {"x": 0.0, "y": 0.0}},
+                "display_data": {"position": {"x": 400.0, "y": -175.0}},
             },
             {
                 "id": "94afd0ac-1ec4-486b-a6fb-fa1ec7029d19",
@@ -233,8 +237,8 @@ def test_serialize_workflow(vellum_client):
                                 {
                                     "type": "NODE_OUTPUT",
                                     "data": {
-                                        "node_id": "d71f674e-8a6b-44ab-b552-7f4637a4e7a6",
-                                        "output_id": "d9ab77e4-226f-436f-ad70-585b57510001",
+                                        "node_id": "bb98a2c4-c9a7-4c39-8f31-dc7961dc9996",
+                                        "output_id": "68de689c-fe8a-4189-b7d0-82c620ac30f9",
                                     },
                                 }
                             ],
@@ -242,7 +246,7 @@ def test_serialize_workflow(vellum_client):
                         },
                     }
                 ],
-                "display_data": {"position": {"x": 0.0, "y": 0.0}},
+                "display_data": {"position": {"x": 400.0, "y": 75.0}},
             },
         ],
         workflow_raw_data["nodes"][2:],
@@ -254,25 +258,25 @@ def test_serialize_workflow(vellum_client):
     assert not DeepDiff(
         [
             {
-                "id": "77f5b6e0-16e3-4bb5-9344-4d9557289802",
+                "id": "4a08ef93-c0f4-4a3a-9a24-5d79ee4d85fc",
                 "source_handle_id": "13d9eb34-aecb-496d-9e57-d5e786b0bc7c",
                 "source_node_id": "f0eea82b-39cc-44e3-9c0d-12205ed5652c",
-                "target_handle_id": "e4d80502-9281-42c8-91e3-10817bcd7d9e",
-                "target_node_id": "d71f674e-8a6b-44ab-b552-7f4637a4e7a6",
+                "target_handle_id": "d6194ccf-d31b-4846-8e24-3e189d84351a",
+                "target_node_id": "bb98a2c4-c9a7-4c39-8f31-dc7961dc9996",
                 "type": "DEFAULT",
             },
             {
                 "id": "69933897-e91e-4c6c-9ba3-ed3e3c265c73",
-                "source_handle_id": "ab0db8a9-7b53-4d88-8667-273b31303273",
-                "source_node_id": "d71f674e-8a6b-44ab-b552-7f4637a4e7a6",
+                "source_handle_id": "ff99bf0c-c239-4b8b-8ac1-483b134f94f4",
+                "source_node_id": "bb98a2c4-c9a7-4c39-8f31-dc7961dc9996",
                 "target_handle_id": "c3aeba92-4faf-4814-9842-eec7436ee555",
                 "target_node_id": "94afd0ac-1ec4-486b-a6fb-fa1ec7029d19",
                 "type": "DEFAULT",
             },
             {
                 "id": "86a9af31-f78e-45ac-b170-f66bbba98f9d",
-                "source_handle_id": "ab0db8a9-7b53-4d88-8667-273b31303273",
-                "source_node_id": "d71f674e-8a6b-44ab-b552-7f4637a4e7a6",
+                "source_handle_id": "ff99bf0c-c239-4b8b-8ac1-483b134f94f4",
+                "source_node_id": "bb98a2c4-c9a7-4c39-8f31-dc7961dc9996",
                 "target_handle_id": "23117248-df28-4519-bebc-abcb24f966b3",
                 "target_node_id": "18170041-1a70-4836-9fa0-adceba2a1f4f",
                 "type": "DEFAULT",

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_templating_node_serialization.py

@@ -46,7 +46,6 @@ def test_serialize_workflow():
 
     # AND its raw data should be what we expect
     workflow_raw_data = serialized_workflow["workflow_raw_data"]
-    assert workflow_raw_data.keys() == {"edges", "nodes", "display_data", "definition"}
     assert len(workflow_raw_data["edges"]) == 2
     assert len(workflow_raw_data["nodes"]) == 3
 
@@ -57,7 +56,7 @@ def test_serialize_workflow():
         "type": "ENTRYPOINT",
         "inputs": [],
         "data": {"label": "Entrypoint Node", "source_handle_id": "34069190-0942-4e0c-8700-b33b9dea4ea0"},
-        "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "display_data": {"position": {"x": 0.0, "y": -50.0}},
         "base": None,
         "definition": None,
     }
@@ -65,11 +64,11 @@ def test_serialize_workflow():
     templating_node = workflow_raw_data["nodes"][1]
     assert not DeepDiff(
         {
-            "id": "51cbe21d-0232-4362-bc54-5bc283297aa6",
+            "id": "28ac8611-a755-4d8a-a5c3-520ddd119cf8",
             "type": "TEMPLATING",
             "inputs": [
                 {
-                    "id": "7c775379-d589-4d79-b876-dcd224d72966",
+                    "id": "7ceb3528-49c6-4f90-b3ef-92b1921a1b7d",
                     "key": "template",
                     "value": {
                         "rules": [
@@ -82,7 +81,7 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "e6c9d062-1a4f-4d4d-a258-59b75c6062fc",
+                    "id": "f46b5986-74f1-4ad4-b4d1-b8d2df6bc86f",
                     "key": "info",
                     "value": {
                         "rules": [
@@ -97,14 +96,14 @@ def test_serialize_workflow():
             ],
             "data": {
                 "label": "Example Templating Node",
-                "output_id": "6834cae4-8173-4fa6-88f7-bc09d335bdd1",
+                "output_id": "076becd5-f282-40c5-9917-61099e114298",
                 "error_output_id": None,
-                "source_handle_id": "39317827-df43-4f5a-bfbc-20bffc839748",
-                "target_handle_id": "58427684-3848-498a-8299-c6b0fc70265d",
-                "template_node_input_id": "7c775379-d589-4d79-b876-dcd224d72966",
+                "source_handle_id": "90a2ea33-b08d-46ec-8d9e-612592764268",
+                "target_handle_id": "a215a440-cbd9-48ae-a831-be8fa78530a6",
+                "template_node_input_id": "7ceb3528-49c6-4f90-b3ef-92b1921a1b7d",
                 "output_type": "JSON",
             },
-            "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "display_data": {"position": {"x": 200.0, "y": -50.0}},
             "base": {
                 "name": "TemplatingNode",
                 "module": ["vellum", "workflows", "nodes", "core", "templating_node", "node"],
@@ -113,6 +112,11 @@ def test_serialize_workflow():
                 "name": "ExampleTemplatingNode",
                 "module": ["tests", "workflows", "basic_templating_node", "workflow_with_json_input"],
             },
+            "trigger": {
+                "id": "a215a440-cbd9-48ae-a831-be8fa78530a6",
+                "merge_behavior": "AWAIT_ATTRIBUTES",
+            },
+            "ports": [{"id": "90a2ea33-b08d-46ec-8d9e-612592764268", "name": "default", "type": "DEFAULT"}],
         },
         templating_node,
     )
@@ -139,8 +143,8 @@ def test_serialize_workflow():
                             {
                                 "type": "NODE_OUTPUT",
                                 "data": {
-                                    "node_id": "51cbe21d-0232-4362-bc54-5bc283297aa6",
-                                    "output_id": "6834cae4-8173-4fa6-88f7-bc09d335bdd1",
+                                    "node_id": "28ac8611-a755-4d8a-a5c3-520ddd119cf8",
+                                    "output_id": "076becd5-f282-40c5-9917-61099e114298",
                                 },
                             }
                         ],
@@ -148,7 +152,7 @@ def test_serialize_workflow():
                     },
                 }
             ],
-            "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "display_data": {"position": {"x": 400.0, "y": -50.0}},
             "base": {
                 "name": "FinalOutputNode",
                 "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -164,17 +168,17 @@ def test_serialize_workflow():
     assert not DeepDiff(
         [
             {
-                "id": "9f753b40-68de-4186-838e-806a14853935",
+                "id": "7f26b32f-defb-4a2a-8656-c719fc9996a8",
                 "source_node_id": "09579c0a-acbf-4e04-8724-2230a8aa6534",
                 "source_handle_id": "34069190-0942-4e0c-8700-b33b9dea4ea0",
-                "target_node_id": "51cbe21d-0232-4362-bc54-5bc283297aa6",
-                "target_handle_id": "58427684-3848-498a-8299-c6b0fc70265d",
+                "target_node_id": "28ac8611-a755-4d8a-a5c3-520ddd119cf8",
+                "target_handle_id": "a215a440-cbd9-48ae-a831-be8fa78530a6",
                 "type": "DEFAULT",
             },
             {
                 "id": "00cbff5c-5cce-4ef4-81b2-1a11d9b42597",
-                "source_node_id": "51cbe21d-0232-4362-bc54-5bc283297aa6",
-                "source_handle_id": "39317827-df43-4f5a-bfbc-20bffc839748",
+                "source_node_id": "28ac8611-a755-4d8a-a5c3-520ddd119cf8",
+                "source_handle_id": "90a2ea33-b08d-46ec-8d9e-612592764268",
                 "target_node_id": "9f75228b-1d5b-4c30-a581-6087e6a1b738",
                 "target_handle_id": "16ba108e-61a8-4338-8a5b-4f1278d7fd7b",
                 "type": "DEFAULT",

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_terminal_node_serialization.py

@@ -44,7 +44,6 @@ def test_serialize_workflow():
 
     # AND its raw data should be what we expect
     workflow_raw_data = serialized_workflow["workflow_raw_data"]
-    assert workflow_raw_data.keys() == {"edges", "nodes", "display_data", "definition"}
     assert len(workflow_raw_data["edges"]) == 1
     assert len(workflow_raw_data["nodes"]) == 2
 
@@ -55,26 +54,26 @@ def test_serialize_workflow():
         "type": "ENTRYPOINT",
         "inputs": [],
         "data": {"label": "Entrypoint Node", "source_handle_id": "8b8d52a2-844f-44fe-a6c4-142fa70d391b"},
-        "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "display_data": {"position": {"x": 0.0, "y": -50.0}},
         "base": None,
         "definition": None,
     }
 
     final_output_node = workflow_raw_data["nodes"][1]
     assert final_output_node == {
-        "id": "620ec17b-e330-4212-b619-3c39dc63fb22",
+        "id": "3944559b-fb23-45fe-90db-4a4c7f88bd63",
         "type": "TERMINAL",
         "data": {
             "label": "Basic Final Output Node",
-            "name": "basic-final-output-node",
-            "target_handle_id": "0173d3c6-11d1-44b7-b070-ca9ff5119046",
-            "output_id": "97349956-d228-4b51-a64b-1331f788373f",
+            "name": "value",
+            "target_handle_id": "24099320-8607-431b-acf2-de593cce3b43",
+            "output_id": "f331936d-2cce-4dd7-ab02-b650bc5260df",
             "output_type": "STRING",
-            "node_input_id": "5322567a-f40c-400a-96b3-c3b054db543e",
+            "node_input_id": "ea92ef63-e7f0-4ee6-87da-206a96ca202c",
         },
         "inputs": [
             {
-                "id": "5322567a-f40c-400a-96b3-c3b054db543e",
+                "id": "ea92ef63-e7f0-4ee6-87da-206a96ca202c",
                 "key": "node_input",
                 "value": {
                     "rules": [
@@ -87,7 +86,7 @@ def test_serialize_workflow():
                 },
             }
         ],
-        "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "display_data": {"position": {"x": 200.0, "y": -50.0}},
         "base": {
             "name": "FinalOutputNode",
             "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -98,10 +97,15 @@ def test_serialize_workflow():
         },
         "outputs": [
             {
-                "id": "97349956-d228-4b51-a64b-1331f788373f",
+                "id": "f331936d-2cce-4dd7-ab02-b650bc5260df",
                 "name": "value",
                 "type": "STRING",
                 "value": {"type": "WORKFLOW_INPUT", "input_variable_id": "e39a7b63-de15-490a-ae9b-8112c767aea0"},
             }
         ],
+        "trigger": {
+            "id": "24099320-8607-431b-acf2-de593cce3b43",
+            "merge_behavior": "AWAIT_ANY",
+        },
+        "ports": [],
     }