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

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

@@ -111,19 +111,19 @@ def test_serialize_workflow():
             "source_handle_id": "c2f0871d-0d9d-417f-8b0e-c813ccf880ac",
         },
         "display_data": {
-            "position": {"x": 0.0, "y": 0.0},
+            "position": {"x": 0.0, "y": -50.0},
         },
     }
 
     conditional_node = workflow_raw_data["nodes"][1]
     assert not DeepDiff(
         {
-            "id": "9b619e4d-b0a7-4121-9060-100d457868cb",
+            "id": "23e4bbef-6127-49b1-8011-27b2508a60d8",
             "type": "CONDITIONAL",
             "inputs": [
                 {
-                    "id": "c99fb71e-a8ad-4627-b9a2-aa36bf1fdc02",
-                    "key": "e0490a35-c863-422b-a12a-f18858d75241.field",
+                    "id": "6927a094-4eda-4e97-a759-233bc4a84c28",
+                    "key": "7034b205-0b48-494a-a29f-0d22772e9dbf.field",
                     "value": {
                         "rules": [
                             {
@@ -135,8 +135,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "7aaebb17-b670-4366-80f9-fb569c8f8f85",
-                    "key": "e0490a35-c863-422b-a12a-f18858d75241.value",
+                    "id": "8ec07ec7-076e-4c6c-ae25-3e234c96ccf5",
+                    "key": "7034b205-0b48-494a-a29f-0d22772e9dbf.value",
                     "value": {
                         "rules": [
                             {
@@ -148,8 +148,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "d8675161-1aa1-4f10-8b98-ea6384211c87",
-                    "key": "f7818d41-3f66-42c7-8218-de5c30379906.field",
+                    "id": "df55c731-dcae-49cc-8832-182a542a3635",
+                    "key": "c0a5254d-5e41-420c-807d-93503e394d8a.field",
                     "value": {
                         "rules": [
                             {
@@ -161,8 +161,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "4c77a541-9a13-41b2-b68e-ed1487d195d3",
-                    "key": "f7818d41-3f66-42c7-8218-de5c30379906.value",
+                    "id": "f8b3ab58-1429-4d41-8a8d-6189cecf61f8",
+                    "key": "c0a5254d-5e41-420c-807d-93503e394d8a.value",
                     "value": {
                         "rules": [
                             {
@@ -174,8 +174,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "a593293c-9c17-45c5-8c99-fc867aad580e",
-                    "key": "38483416-c474-4e50-bfbc-7e92de2b4c2c.field",
+                    "id": "04b98bde-48bd-4f4b-bf12-b556fcc409ad",
+                    "key": "d2c25be7-a0cc-45d9-9341-fd97aa2a9fbe.field",
                     "value": {
                         "rules": [
                             {
@@ -187,8 +187,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "d9ea5424-44d5-481a-b769-3bce5ef6c353",
-                    "key": "38483416-c474-4e50-bfbc-7e92de2b4c2c.value",
+                    "id": "047cd3a4-9dee-42ab-ad77-67400e49aa9c",
+                    "key": "d2c25be7-a0cc-45d9-9341-fd97aa2a9fbe.value",
                     "value": {
                         "rules": [
                             {
@@ -200,8 +200,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "2066a9e9-7a55-4ef0-8897-7df32e31f0e8",
-                    "key": "aa692069-9672-4adb-b874-74da98745f24.field",
+                    "id": "e92b1631-58b5-4eb8-a446-e316a06d845a",
+                    "key": "6163c855-9ff3-42cf-b284-88a9285e393d.field",
                     "value": {
                         "rules": [
                             {
@@ -213,8 +213,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "fbbef65b-0d3b-4a10-9479-ebe07b8e3a82",
-                    "key": "aa692069-9672-4adb-b874-74da98745f24.value",
+                    "id": "4a1bdf26-afc7-4885-80af-f76f2a55a205",
+                    "key": "6163c855-9ff3-42cf-b284-88a9285e393d.value",
                     "value": {
                         "rules": [
                             {
@@ -226,8 +226,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "3c1186a8-5a0f-4b6b-8637-9c09aea9c14d",
-                    "key": "25aaa0ca-9312-49d7-9ad5-b6f40f8a0658.field",
+                    "id": "0945b52e-f721-488c-ad96-c13a76c6b36b",
+                    "key": "aada758f-5662-4597-9fcc-a7b97e7e49c4.field",
                     "value": {
                         "rules": [
                             {
@@ -239,8 +239,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "78e99399-ed5a-4d26-8a42-c4f355cf60e3",
-                    "key": "25aaa0ca-9312-49d7-9ad5-b6f40f8a0658.value",
+                    "id": "f7905ea6-7c12-4ac8-818b-c1561a0c3b6c",
+                    "key": "aada758f-5662-4597-9fcc-a7b97e7e49c4.value",
                     "value": {
                         "rules": [
                             {
@@ -252,8 +252,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "5b7e4b08-68eb-471e-9eda-36c768f8eb46",
-                    "key": "e59504e1-4134-46dc-8055-114c6a606af8.field",
+                    "id": "6a057146-e73b-4848-b62f-4bbf5e07880b",
+                    "key": "c56528ee-12e9-4eab-a029-ef4f40633fb5.field",
                     "value": {
                         "rules": [
                             {
@@ -265,8 +265,8 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "02d26ab6-8faa-4da3-84b1-190581a6fd66",
-                    "key": "e59504e1-4134-46dc-8055-114c6a606af8.value",
+                    "id": "2537d049-b71c-48f8-a934-9bd28df6bce2",
+                    "key": "c56528ee-12e9-4eab-a029-ef4f40633fb5.value",
                     "value": {
                         "rules": [
                             {
@@ -280,23 +280,23 @@ def test_serialize_workflow():
             ],
             "data": {
                 "label": "Category Conditional Node",
-                "target_handle_id": "dd89e228-a23e-422b-80b2-34362c1c050e",
+                "target_handle_id": "31e71b98-f5fe-4181-82d1-d16a820a15ca",
                 "conditions": [
                     {
-                        "id": "de7b0b4e-7803-4d36-a275-2e7e3f60342b",
+                        "id": "09919c37-daa9-4861-8e63-1529d5c279ef",
                         "type": "IF",
-                        "source_handle_id": "561b4e3a-8db3-448a-8933-1115937082ff",
+                        "source_handle_id": "67fe1e1b-97c3-441c-aedb-887df848bc8a",
                         "data": {
-                            "id": "2ccd0730-26d1-4fb4-baa9-1a2a182dd9a0",
+                            "id": "50e4bab9-c70f-441f-8956-61902b4c2ff6",
                             "rules": [
                                 {
-                                    "id": "e0490a35-c863-422b-a12a-f18858d75241",
+                                    "id": "7034b205-0b48-494a-a29f-0d22772e9dbf",
                                     "rules": None,
                                     "combinator": None,
                                     "negated": False,
-                                    "field_node_input_id": "c99fb71e-a8ad-4627-b9a2-aa36bf1fdc02",
+                                    "field_node_input_id": "6927a094-4eda-4e97-a759-233bc4a84c28",
                                     "operator": "=",
-                                    "value_node_input_id": "7aaebb17-b670-4366-80f9-fb569c8f8f85",
+                                    "value_node_input_id": "8ec07ec7-076e-4c6c-ae25-3e234c96ccf5",
                                 }
                             ],
                             "combinator": "AND",
@@ -307,20 +307,20 @@ def test_serialize_workflow():
                         },
                     },
                     {
-                        "id": "5e783d17-6808-441a-ac6c-33a4e184f4e0",
+                        "id": "ea750051-0409-49ac-8a77-2369bf805776",
                         "type": "ELIF",
-                        "source_handle_id": "0644f22e-2680-441a-9554-eedf1d3d22a9",
+                        "source_handle_id": "0d084c4f-1c0b-4029-ab53-a69cc486be1b",
                         "data": {
-                            "id": "cc3f0d92-b603-42cc-b2e9-83e3b23b3bcb",
+                            "id": "d5997bf7-7df6-407c-9d9e-2d7264f0cbde",
                             "rules": [
                                 {
-                                    "id": "f7818d41-3f66-42c7-8218-de5c30379906",
+                                    "id": "c0a5254d-5e41-420c-807d-93503e394d8a",
                                     "rules": None,
                                     "combinator": None,
                                     "negated": False,
-                                    "field_node_input_id": "d8675161-1aa1-4f10-8b98-ea6384211c87",
+                                    "field_node_input_id": "df55c731-dcae-49cc-8832-182a542a3635",
                                     "operator": "=",
-                                    "value_node_input_id": "4c77a541-9a13-41b2-b68e-ed1487d195d3",
+                                    "value_node_input_id": "f8b3ab58-1429-4d41-8a8d-6189cecf61f8",
                                 }
                             ],
                             "combinator": "AND",
@@ -331,20 +331,20 @@ def test_serialize_workflow():
                         },
                     },
                     {
-                        "id": "6bd2f643-9cf5-4e7f-9113-f90e5c8057be",
+                        "id": "43025985-122d-4c1a-83a4-d7f7646821e0",
                         "type": "ELIF",
-                        "source_handle_id": "2a48d274-ecfc-4f40-95ac-bc697663f10c",
+                        "source_handle_id": "d49e16ad-9493-4f58-b881-936b93ca2f7f",
                         "data": {
-                            "id": "a5a0f391-7052-452f-9fe1-a5781a491591",
+                            "id": "8208327f-879d-41fc-a976-39be6b0c3904",
                             "rules": [
                                 {
-                                    "id": "38483416-c474-4e50-bfbc-7e92de2b4c2c",
+                                    "id": "d2c25be7-a0cc-45d9-9341-fd97aa2a9fbe",
                                     "rules": None,
                                     "combinator": None,
                                     "negated": False,
-                                    "field_node_input_id": "a593293c-9c17-45c5-8c99-fc867aad580e",
+                                    "field_node_input_id": "04b98bde-48bd-4f4b-bf12-b556fcc409ad",
                                     "operator": "=",
-                                    "value_node_input_id": "d9ea5424-44d5-481a-b769-3bce5ef6c353",
+                                    "value_node_input_id": "047cd3a4-9dee-42ab-ad77-67400e49aa9c",
                                 }
                             ],
                             "combinator": "AND",
@@ -355,41 +355,41 @@ def test_serialize_workflow():
                         },
                     },
                     {
-                        "id": "0a058485-18a4-4e20-8a30-6da8196ac46f",
+                        "id": "fa5810d6-c98a-431c-9b49-7afd5f135927",
                         "type": "ELIF",
-                        "source_handle_id": "90fc9dc8-0a74-4a98-b6ac-55ffce4a2881",
+                        "source_handle_id": "0b0024bf-b10a-45fd-995c-e226bbe78fcb",
                         "data": {
-                            "id": "efe7a851-2a67-4189-99ec-bc193242b270",
+                            "id": "b3597697-90d1-491c-b136-ca267e1dae2f",
                             "rules": [
                                 {
-                                    "id": "aa692069-9672-4adb-b874-74da98745f24",
+                                    "id": "6163c855-9ff3-42cf-b284-88a9285e393d",
                                     "rules": None,
                                     "combinator": None,
                                     "negated": False,
-                                    "field_node_input_id": "2066a9e9-7a55-4ef0-8897-7df32e31f0e8",
+                                    "field_node_input_id": "e92b1631-58b5-4eb8-a446-e316a06d845a",
                                     "operator": "=",
-                                    "value_node_input_id": "fbbef65b-0d3b-4a10-9479-ebe07b8e3a82",
+                                    "value_node_input_id": "4a1bdf26-afc7-4885-80af-f76f2a55a205",
                                 },
                                 {
-                                    "id": "2c78817b-8b73-43fd-8dab-a8923018da9d",
+                                    "id": "488ca06f-1ae6-46ee-8f83-919bc90559e8",
                                     "rules": [
                                         {
-                                            "id": "25aaa0ca-9312-49d7-9ad5-b6f40f8a0658",
+                                            "id": "aada758f-5662-4597-9fcc-a7b97e7e49c4",
                                             "rules": None,
                                             "combinator": None,
                                             "negated": False,
-                                            "field_node_input_id": "3c1186a8-5a0f-4b6b-8637-9c09aea9c14d",
+                                            "field_node_input_id": "0945b52e-f721-488c-ad96-c13a76c6b36b",
                                             "operator": "=",
-                                            "value_node_input_id": "78e99399-ed5a-4d26-8a42-c4f355cf60e3",
+                                            "value_node_input_id": "f7905ea6-7c12-4ac8-818b-c1561a0c3b6c",
                                         },
                                         {
-                                            "id": "e59504e1-4134-46dc-8055-114c6a606af8",
+                                            "id": "c56528ee-12e9-4eab-a029-ef4f40633fb5",
                                             "rules": None,
                                             "combinator": None,
                                             "negated": False,
-                                            "field_node_input_id": "5b7e4b08-68eb-471e-9eda-36c768f8eb46",
+                                            "field_node_input_id": "6a057146-e73b-4848-b62f-4bbf5e07880b",
                                             "operator": "=",
-                                            "value_node_input_id": "02d26ab6-8faa-4da3-84b1-190581a6fd66",
+                                            "value_node_input_id": "2537d049-b71c-48f8-a934-9bd28df6bce2",
                                         },
                                     ],
                                     "combinator": "AND",
@@ -407,15 +407,15 @@ def test_serialize_workflow():
                         },
                     },
                     {
-                        "id": "c2fa8a44-923b-462a-b0d2-fa800a152e52",
+                        "id": "4773ebec-866e-47f8-a57f-f9b04b704670",
                         "type": "ELSE",
-                        "source_handle_id": "493024f4-8010-4e1a-abae-b6adbc6fb208",
+                        "source_handle_id": "92cbdaf9-496c-48ba-9eec-7d5a3b0d1593",
                         "data": None,
                     },
                 ],
                 "version": "2",
             },
-            "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "display_data": {"position": {"x": 200.0, "y": -50.0}},
             "base": {
                 "name": "ConditionalNode",
                 "module": ["vellum", "workflows", "nodes", "displayable", "conditional_node", "node"],
@@ -424,9 +424,13 @@ def test_serialize_workflow():
                 "name": "CategoryConditionalNode",
                 "module": ["tests", "workflows", "basic_conditional_node", "workflow"],
             },
+            "trigger": {
+                "id": "31e71b98-f5fe-4181-82d1-d16a820a15ca",
+                "merge_behavior": "AWAIT_ANY",
+            },
             "ports": [
                 {
-                    "id": "3a45b81f-95e4-4cbd-8997-bfdbe30251e8",
+                    "id": "67fe1e1b-97c3-441c-aedb-887df848bc8a",
                     "name": "category_question",
                     "type": "IF",
                     "expression": {
@@ -437,7 +441,7 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "7202f702-1ebc-4067-ab1e-ec67e49158ee",
+                    "id": "0d084c4f-1c0b-4029-ab53-a69cc486be1b",
                     "name": "category_complaint",
                     "type": "ELIF",
                     "expression": {
@@ -448,7 +452,7 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "cf45705d-1a47-43a6-9d24-a7fdf78baae0",
+                    "id": "d49e16ad-9493-4f58-b881-936b93ca2f7f",
                     "name": "category_compliment",
                     "type": "ELIF",
                     "expression": {
@@ -459,7 +463,7 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "f04610dd-61cf-41b0-b337-2235e101cdb0",
+                    "id": "0b0024bf-b10a-45fd-995c-e226bbe78fcb",
                     "name": "category_statement",
                     "type": "ELIF",
                     "expression": {
@@ -499,7 +503,7 @@ def test_serialize_workflow():
                     },
                 },
                 {
-                    "id": "f9dde637-ea90-465f-a871-caf8380ae377",
+                    "id": "92cbdaf9-496c-48ba-9eec-7d5a3b0d1593",
                     "name": "category_fallthrough",
                     "type": "ELSE",
                     "expression": None,
@@ -535,8 +539,8 @@ def test_serialize_workflow():
                                 {
                                     "type": "NODE_OUTPUT",
                                     "data": {
-                                        "node_id": "ed7caf01-9ae7-47a3-b15a-16697abaf486",
-                                        "output_id": "74ea6af1-8934-4e3c-b68d-b93092b4be73",
+                                        "node_id": "c5dc093d-379e-4655-84ec-5c0f4527f39d",
+                                        "output_id": "fef1242f-f91e-4b07-96df-d37e052a76b3",
                                     },
                                 }
                             ],
@@ -544,7 +548,7 @@ def test_serialize_workflow():
                         },
                     }
                 ],
-                "display_data": {"position": {"x": 0.0, "y": 0.0}},
+                "display_data": {"position": {"x": 600.0, "y": -50.0}},
                 "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -571,8 +575,8 @@ def test_serialize_workflow():
                                 {
                                     "type": "NODE_OUTPUT",
                                     "data": {
-                                        "node_id": "8df781b1-ff28-48a5-98a2-d7d796b932b0",
-                                        "output_id": "61c357a1-41d8-4adf-bfe1-ce615c4d7d23",
+                                        "node_id": "b7663f0c-f86d-4924-b551-36279259bf65",
+                                        "output_id": "68e90c31-23f0-4fc9-8d3b-529c58ba9621",
                                     },
                                 }
                             ],
@@ -580,7 +584,7 @@ def test_serialize_workflow():
                         },
                     }
                 ],
-                "display_data": {"position": {"x": 0.0, "y": 0.0}},
+                "display_data": {"position": {"x": 600.0, "y": -550.0}},
                 "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -607,8 +611,8 @@ def test_serialize_workflow():
                                 {
                                     "type": "NODE_OUTPUT",
                                     "data": {
-                                        "node_id": "68c02b7c-5077-4087-803d-841474a8081f",
-                                        "output_id": "0ec68ffe-cbb7-4dbb-aaff-f6025bd62efa",
+                                        "node_id": "120dc445-3472-4e6e-bd2d-42991ac3a1b1",
+                                        "output_id": "82949306-1719-4538-8f4d-5f253ab5d93b",
                                     },
                                 }
                             ],
@@ -616,7 +620,7 @@ def test_serialize_workflow():
                         },
                     }
                 ],
-                "display_data": {"position": {"x": 0.0, "y": 0.0}},
+                "display_data": {"position": {"x": 600.0, "y": 200.0}},
                 "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -643,8 +647,8 @@ def test_serialize_workflow():
                                 {
                                     "type": "NODE_OUTPUT",
                                     "data": {
-                                        "node_id": "148c61bd-e8b0-4d4b-8734-b043a72b90ed",
-                                        "output_id": "fafa0bde-8508-43d5-a9c8-db5d49f307f6",
+                                        "node_id": "0d91d9f5-6b10-44d2-90c7-4a4636bb4735",
+                                        "output_id": "571351c8-4caf-4071-995b-93e1fa66a653",
                                     },
                                 }
                             ],
@@ -652,7 +656,7 @@ def test_serialize_workflow():
                         },
                     }
                 ],
-                "display_data": {"position": {"x": 0.0, "y": 0.0}},
+                "display_data": {"position": {"x": 600.0, "y": -300.0}},
                 "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -679,8 +683,8 @@ def test_serialize_workflow():
                                 {
                                     "type": "NODE_OUTPUT",
                                     "data": {
-                                        "node_id": "0d959311-c836-4641-a867-58f63df9dfea",
-                                        "output_id": "db9f7ff3-77e2-4b0a-9c39-bb4bb50e3ad5",
+                                        "node_id": "66980efc-ab25-46f3-af21-d66d994b3cdc",
+                                        "output_id": "d011aa88-36ca-48e5-94ee-cb053f8b21fd",
                                     },
                                 }
                             ],
@@ -688,7 +692,7 @@ def test_serialize_workflow():
                         },
                     }
                 ],
-                "display_data": {"position": {"x": 0.0, "y": 0.0}},
+                "display_data": {"position": {"x": 600.0, "y": 450.0}},
                 "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
@@ -705,89 +709,89 @@ def test_serialize_workflow():
     assert not DeepDiff(
         [
             {
-                "id": "32263c88-d725-4d03-a500-fadc34e10c9a",
+                "id": "8bc5a416-7e46-473e-b16a-ad5a54eb0d84",
                 "source_node_id": "089b3201-537a-4ed7-8d15-2524a00e8534",
                 "source_handle_id": "c2f0871d-0d9d-417f-8b0e-c813ccf880ac",
-                "target_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
-                "target_handle_id": "dd89e228-a23e-422b-80b2-34362c1c050e",
+                "target_node_id": "23e4bbef-6127-49b1-8011-27b2508a60d8",
+                "target_handle_id": "31e71b98-f5fe-4181-82d1-d16a820a15ca",
                 "type": "DEFAULT",
             },
             {
-                "id": "1ae3cdb6-5b52-4ad3-bcfe-6997c86083f8",
-                "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
-                "source_handle_id": "3a45b81f-95e4-4cbd-8997-bfdbe30251e8",
-                "target_node_id": "0d959311-c836-4641-a867-58f63df9dfea",
-                "target_handle_id": "7beba198-c452-4749-a38a-ea9420d84e14",
+                "id": "ee9d2e2d-f0ed-48ff-b4b9-536b347746c4",
+                "source_node_id": "23e4bbef-6127-49b1-8011-27b2508a60d8",
+                "source_handle_id": "92cbdaf9-496c-48ba-9eec-7d5a3b0d1593",
+                "target_node_id": "0d91d9f5-6b10-44d2-90c7-4a4636bb4735",
+                "target_handle_id": "fea48cec-0ddc-4575-ad51-125723b3a892",
                 "type": "DEFAULT",
             },
             {
-                "id": "5704cb9c-9d01-4809-9d91-8014276e6574",
-                "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
-                "source_handle_id": "7202f702-1ebc-4067-ab1e-ec67e49158ee",
-                "target_node_id": "68c02b7c-5077-4087-803d-841474a8081f",
-                "target_handle_id": "1dc4eebe-b6db-4229-96e5-115ff8cedb76",
+                "id": "4baf6b42-2247-4c75-aac7-9e680f6d1878",
+                "source_node_id": "23e4bbef-6127-49b1-8011-27b2508a60d8",
+                "source_handle_id": "d49e16ad-9493-4f58-b881-936b93ca2f7f",
+                "target_node_id": "b7663f0c-f86d-4924-b551-36279259bf65",
+                "target_handle_id": "d72034de-9e42-4227-ad2f-9909d28e667d",
                 "type": "DEFAULT",
             },
             {
-                "id": "c923e009-06c9-4978-b789-6ae995dcc81c",
-                "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
-                "source_handle_id": "cf45705d-1a47-43a6-9d24-a7fdf78baae0",
-                "target_node_id": "8df781b1-ff28-48a5-98a2-d7d796b932b0",
-                "target_handle_id": "b73c39be-cbfe-4225-86e6-e6e4c161881e",
+                "id": "49f5d207-a468-43af-a97d-96cc6caeba1e",
+                "source_node_id": "23e4bbef-6127-49b1-8011-27b2508a60d8",
+                "source_handle_id": "67fe1e1b-97c3-441c-aedb-887df848bc8a",
+                "target_node_id": "66980efc-ab25-46f3-af21-d66d994b3cdc",
+                "target_handle_id": "48096c18-7248-4335-938b-a9b5814293e2",
                 "type": "DEFAULT",
             },
             {
-                "id": "e487c031-fd5b-41b3-94d7-eb3f7ce8e25c",
-                "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
-                "source_handle_id": "f04610dd-61cf-41b0-b337-2235e101cdb0",
-                "target_node_id": "ed7caf01-9ae7-47a3-b15a-16697abaf486",
-                "target_handle_id": "76fe7aec-5cd4-4c1a-b386-cfe09ebe66e4",
+                "id": "dde5efa3-86af-4846-8aae-736837ea9d89",
+                "source_node_id": "23e4bbef-6127-49b1-8011-27b2508a60d8",
+                "source_handle_id": "0b0024bf-b10a-45fd-995c-e226bbe78fcb",
+                "target_node_id": "c5dc093d-379e-4655-84ec-5c0f4527f39d",
+                "target_handle_id": "64f089ab-b0dc-4faf-8f87-a258d9a22df5",
                 "type": "DEFAULT",
             },
             {
-                "id": "6a1c379d-bbe4-4034-8ac9-0353901ebc21",
-                "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
-                "source_handle_id": "f9dde637-ea90-465f-a871-caf8380ae377",
-                "target_node_id": "148c61bd-e8b0-4d4b-8734-b043a72b90ed",
-                "target_handle_id": "c88839af-3a79-4310-abbd-e1553d981dce",
+                "id": "3563a5a8-21cc-46f5-b4a8-8d2ffc131799",
+                "source_node_id": "23e4bbef-6127-49b1-8011-27b2508a60d8",
+                "source_handle_id": "0d084c4f-1c0b-4029-ab53-a69cc486be1b",
+                "target_node_id": "120dc445-3472-4e6e-bd2d-42991ac3a1b1",
+                "target_handle_id": "c0ea7386-dc76-4f9c-b29a-0e107f0a5211",
                 "type": "DEFAULT",
             },
             {
-                "id": "8a554637-e382-4a66-9b77-4eadce45a25a",
-                "source_node_id": "ed7caf01-9ae7-47a3-b15a-16697abaf486",
-                "source_handle_id": "cde43aef-f607-4b5d-87f6-9238dd4a3a2b",
-                "target_node_id": "9c22ee47-01da-4e4e-863d-b4a6874bed66",
-                "target_handle_id": "f02a8971-e9a4-4716-bfb4-d08f5614b5d8",
+                "id": "47758209-70cb-4f12-b71f-dc28df0f6d0b",
+                "source_node_id": "66980efc-ab25-46f3-af21-d66d994b3cdc",
+                "source_handle_id": "5760d2bd-7ea7-4a87-a036-0bc87d666963",
+                "target_node_id": "fa11b84b-1d76-4adc-ab28-cbbaa933c267",
+                "target_handle_id": "e1a6da28-02c5-40d7-8ac5-9fb07e2e3e1d",
                 "type": "DEFAULT",
             },
             {
                 "id": "af083f7d-226c-4341-bb6f-756f00846b42",
-                "source_node_id": "68c02b7c-5077-4087-803d-841474a8081f",
-                "source_handle_id": "ef032cf7-c8df-4a98-827c-386dd8a5a346",
+                "source_node_id": "120dc445-3472-4e6e-bd2d-42991ac3a1b1",
+                "source_handle_id": "56f7ffff-3898-4eb2-b72a-935d034819e1",
                 "target_node_id": "e3d29229-f746-4125-819e-f847acbed307",
                 "target_handle_id": "c5dd9bf5-9e18-4dbc-8c20-2c0baf969ebe",
                 "type": "DEFAULT",
             },
-            {
-                "id": "47758209-70cb-4f12-b71f-dc28df0f6d0b",
-                "source_node_id": "0d959311-c836-4641-a867-58f63df9dfea",
-                "source_handle_id": "69a2121d-fc21-47a1-af49-6200aad836de",
-                "target_node_id": "fa11b84b-1d76-4adc-ab28-cbbaa933c267",
-                "target_handle_id": "e1a6da28-02c5-40d7-8ac5-9fb07e2e3e1d",
-                "type": "DEFAULT",
-            },
             {
                 "id": "f08a49f8-8bfd-4c05-8f28-dfa536654af8",
-                "source_node_id": "8df781b1-ff28-48a5-98a2-d7d796b932b0",
-                "source_handle_id": "aeb6805d-2c9f-4d52-a690-341ea0e869b3",
+                "source_node_id": "b7663f0c-f86d-4924-b551-36279259bf65",
+                "source_handle_id": "092b3989-c0a5-4b9e-beba-dfdc3f916284",
                 "target_node_id": "47f0931c-41f6-4b84-bf39-0c486941f599",
                 "target_handle_id": "a4d57adc-58c1-40c6-810b-ee5fd923bfc5",
                 "type": "DEFAULT",
             },
+            {
+                "id": "8a554637-e382-4a66-9b77-4eadce45a25a",
+                "source_node_id": "c5dc093d-379e-4655-84ec-5c0f4527f39d",
+                "source_handle_id": "11c9eb73-6112-408b-b94f-46b3be1b9326",
+                "target_node_id": "9c22ee47-01da-4e4e-863d-b4a6874bed66",
+                "target_handle_id": "f02a8971-e9a4-4716-bfb4-d08f5614b5d8",
+                "type": "DEFAULT",
+            },
             {
                 "id": "c45e03b4-dba6-4620-bc02-3847ad90086b",
-                "source_node_id": "148c61bd-e8b0-4d4b-8734-b043a72b90ed",
-                "source_handle_id": "26f50353-85ae-462f-b82d-9fd736900bd6",
+                "source_node_id": "0d91d9f5-6b10-44d2-90c7-4a4636bb4735",
+                "source_handle_id": "798215e2-0988-4bd2-9dbe-3b4a75a27d81",
                 "target_node_id": "6efa7b45-0580-406d-85aa-439117ba8021",
                 "target_handle_id": "2283cd2c-b077-4b5d-a96f-aa2cd6023eda",
                 "type": "DEFAULT",
@@ -876,12 +880,12 @@ def test_conditional_node_serialize_all_operators_with_lhs_and_rhs(descriptor, o
     conditional_node = workflow_raw_data["nodes"][1]
     assert not DeepDiff(
         {
-            "id": "a9143814-6bb0-4cb3-a817-4fc076417121",
+            "id": "9d1b29dc-b795-415f-8a56-bea2c77bbf1a",
             "type": "CONDITIONAL",
             "inputs": [
                 {
-                    "id": "738a274f-962d-466e-9aee-7774d3e05ab9",
-                    "key": "f497b2bf-7d35-43af-b162-ced2d8abd46f.field",
+                    "id": "3afbc787-fe7d-4411-934e-32c6ad101676",
+                    "key": "12944986-8e31-4501-bc74-4eb00f2d7d2a.field",
                     "value": {
                         "rules": [
                             {
@@ -893,8 +897,8 @@ def test_conditional_node_serialize_all_operators_with_lhs_and_rhs(descriptor, o
                     },
                 },
                 {
-                    "id": "f30bceb4-39bf-433a-9229-b6871dbdbe00",
-                    "key": "f497b2bf-7d35-43af-b162-ced2d8abd46f.value",
+                    "id": "c9d3791a-da39-42b4-83cd-2205cd2beece",
+                    "key": "12944986-8e31-4501-bc74-4eb00f2d7d2a.value",
                     "value": {
                         "rules": [
                             {
@@ -908,23 +912,23 @@ def test_conditional_node_serialize_all_operators_with_lhs_and_rhs(descriptor, o
             ],
             "data": {
                 "label": "Simple Conditional Node",
-                "target_handle_id": "c6e99e94-bc8e-47a4-b75c-cc96c6bedbb0",
+                "target_handle_id": "82348aaa-655f-47ef-8a7c-96a618b0aab0",
                 "conditions": [
                     {
-                        "id": "a4c32611-fd58-4b98-9d08-313cfd1c214e",
+                        "id": "4d325440-5c08-4669-9ac2-df56dc97205c",
                         "type": "IF",
-                        "source_handle_id": "8124a6cf-4a34-4149-adc0-68696c11bd4e",
+                        "source_handle_id": "90f7bb16-87b5-48dd-a14a-5dc12e8347d6",
                         "data": {
-                            "id": "650e7105-3e76-43ca-858f-b290970b438b",
+                            "id": "08c6312c-bfe3-4254-affd-8650e48c7f47",
                             "rules": [
                                 {
-                                    "id": "f497b2bf-7d35-43af-b162-ced2d8abd46f",
+                                    "id": "12944986-8e31-4501-bc74-4eb00f2d7d2a",
                                     "rules": None,
                                     "combinator": None,
                                     "negated": False,
-                                    "field_node_input_id": "738a274f-962d-466e-9aee-7774d3e05ab9",
+                                    "field_node_input_id": "3afbc787-fe7d-4411-934e-32c6ad101676",
                                     "operator": f"{operator}",
-                                    "value_node_input_id": "f30bceb4-39bf-433a-9229-b6871dbdbe00",
+                                    "value_node_input_id": "c9d3791a-da39-42b4-83cd-2205cd2beece",
                                 }
                             ],
                             "combinator": "AND",
@@ -935,15 +939,15 @@ def test_conditional_node_serialize_all_operators_with_lhs_and_rhs(descriptor, o
                         },
                     },
                     {
-                        "id": "342e5497-ea2b-4e5c-99cf-e6492f133a3c",
+                        "id": "5d164388-d76d-4bf1-9a88-a9fb8e797cbe",
                         "type": "ELSE",
-                        "source_handle_id": "4df924c0-7bed-4f4a-9db4-2bfe51841755",
+                        "source_handle_id": "a66da8a4-7148-4554-a63c-38d20643cbb7",
                         "data": None,
                     },
                 ],
                 "version": "2",
             },
-            "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "display_data": {"position": {"x": 200.0, "y": -50.0}},
             "base": {
                 "name": "ConditionalNode",
                 "module": ["vellum", "workflows", "nodes", "displayable", "conditional_node", "node"],
@@ -952,9 +956,13 @@ def test_conditional_node_serialize_all_operators_with_lhs_and_rhs(descriptor, o
                 "name": "SimpleConditionalNode",
                 "module": ["tests", "workflows", "basic_conditional_node", "workflow_with_only_one_conditional_node"],
             },
+            "trigger": {
+                "id": "82348aaa-655f-47ef-8a7c-96a618b0aab0",
+                "merge_behavior": "AWAIT_ANY",
+            },
             "ports": [
                 {
-                    "id": "2ff87aa6-37cf-43dd-af9d-13b9198ab70a",
+                    "id": "90f7bb16-87b5-48dd-a14a-5dc12e8347d6",
                     "name": "text_str",
                     "type": "IF",
                     "expression": {
@@ -965,7 +973,7 @@ def test_conditional_node_serialize_all_operators_with_lhs_and_rhs(descriptor, o
                     },
                 },
                 {
-                    "id": "9a7e8c2e-0228-4321-8f74-61cb5778f3df",
+                    "id": "a66da8a4-7148-4554-a63c-38d20643cbb7",
                     "name": "text_fallthrough",
                     "type": "ELSE",
                     "expression": None,
@@ -1000,12 +1008,12 @@ def test_conditional_node_serialize_all_operators_with_expression(descriptor, op
     conditional_node = workflow_raw_data["nodes"][1]
     assert not DeepDiff(
         {
-            "id": "a9143814-6bb0-4cb3-a817-4fc076417121",
+            "id": "9d1b29dc-b795-415f-8a56-bea2c77bbf1a",
             "type": "CONDITIONAL",
             "inputs": [
                 {
-                    "id": "738a274f-962d-466e-9aee-7774d3e05ab9",
-                    "key": "f497b2bf-7d35-43af-b162-ced2d8abd46f.field",
+                    "id": "3afbc787-fe7d-4411-934e-32c6ad101676",
+                    "key": "12944986-8e31-4501-bc74-4eb00f2d7d2a.field",
                     "value": {
                         "rules": [
                             {
@@ -1019,23 +1027,23 @@ def test_conditional_node_serialize_all_operators_with_expression(descriptor, op
             ],
             "data": {
                 "label": "Simple Conditional Node",
-                "target_handle_id": "c6e99e94-bc8e-47a4-b75c-cc96c6bedbb0",
+                "target_handle_id": "82348aaa-655f-47ef-8a7c-96a618b0aab0",
                 "conditions": [
                     {
-                        "id": "a4c32611-fd58-4b98-9d08-313cfd1c214e",
+                        "id": "4d325440-5c08-4669-9ac2-df56dc97205c",
                         "type": "IF",
-                        "source_handle_id": "8124a6cf-4a34-4149-adc0-68696c11bd4e",
+                        "source_handle_id": "90f7bb16-87b5-48dd-a14a-5dc12e8347d6",
                         "data": {
-                            "id": "650e7105-3e76-43ca-858f-b290970b438b",
+                            "id": "08c6312c-bfe3-4254-affd-8650e48c7f47",
                             "rules": [
                                 {
-                                    "id": "f497b2bf-7d35-43af-b162-ced2d8abd46f",
+                                    "id": "12944986-8e31-4501-bc74-4eb00f2d7d2a",
                                     "rules": None,
                                     "combinator": None,
                                     "negated": False,
-                                    "field_node_input_id": "738a274f-962d-466e-9aee-7774d3e05ab9",
+                                    "field_node_input_id": "3afbc787-fe7d-4411-934e-32c6ad101676",
                                     "operator": f"{operator}",
-                                    "value_node_input_id": "f30bceb4-39bf-433a-9229-b6871dbdbe00",
+                                    "value_node_input_id": "c9d3791a-da39-42b4-83cd-2205cd2beece",
                                 }
                             ],
                             "combinator": "AND",
@@ -1046,15 +1054,15 @@ def test_conditional_node_serialize_all_operators_with_expression(descriptor, op
                         },
                     },
                     {
-                        "id": "342e5497-ea2b-4e5c-99cf-e6492f133a3c",
+                        "id": "5d164388-d76d-4bf1-9a88-a9fb8e797cbe",
                         "type": "ELSE",
-                        "source_handle_id": "4df924c0-7bed-4f4a-9db4-2bfe51841755",
+                        "source_handle_id": "a66da8a4-7148-4554-a63c-38d20643cbb7",
                         "data": None,
                     },
                 ],
                 "version": "2",
             },
-            "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "display_data": {"position": {"x": 200.0, "y": -50.0}},
             "base": {
                 "name": "ConditionalNode",
                 "module": ["vellum", "workflows", "nodes", "displayable", "conditional_node", "node"],
@@ -1063,9 +1071,13 @@ def test_conditional_node_serialize_all_operators_with_expression(descriptor, op
                 "name": "SimpleConditionalNode",
                 "module": ["tests", "workflows", "basic_conditional_node", "workflow_with_only_one_conditional_node"],
             },
+            "trigger": {
+                "id": "82348aaa-655f-47ef-8a7c-96a618b0aab0",
+                "merge_behavior": "AWAIT_ANY",
+            },
             "ports": [
                 {
-                    "id": "2ff87aa6-37cf-43dd-af9d-13b9198ab70a",
+                    "id": "90f7bb16-87b5-48dd-a14a-5dc12e8347d6",
                     "name": "text_str",
                     "type": "IF",
                     "expression": {
@@ -1075,7 +1087,7 @@ def test_conditional_node_serialize_all_operators_with_expression(descriptor, op
                     },
                 },
                 {
-                    "id": "9a7e8c2e-0228-4321-8f74-61cb5778f3df",
+                    "id": "a66da8a4-7148-4554-a63c-38d20643cbb7",
                     "name": "text_fallthrough",
                     "type": "ELSE",
                     "expression": None,
@@ -1110,12 +1122,12 @@ def test_conditional_node_serialize_all_operators_with_value_and_start_and_end(d
     conditional_node = workflow_raw_data["nodes"][1]
     assert not DeepDiff(
         {
-            "id": "a9143814-6bb0-4cb3-a817-4fc076417121",
+            "id": "9d1b29dc-b795-415f-8a56-bea2c77bbf1a",
             "type": "CONDITIONAL",
             "inputs": [
                 {
-                    "id": "738a274f-962d-466e-9aee-7774d3e05ab9",
-                    "key": "f497b2bf-7d35-43af-b162-ced2d8abd46f.field",
+                    "id": "3afbc787-fe7d-4411-934e-32c6ad101676",
+                    "key": "12944986-8e31-4501-bc74-4eb00f2d7d2a.field",
                     "value": {
                         "rules": [
                             {
@@ -1127,8 +1139,8 @@ def test_conditional_node_serialize_all_operators_with_value_and_start_and_end(d
                     },
                 },
                 {
-                    "id": "f30bceb4-39bf-433a-9229-b6871dbdbe00",
-                    "key": "f497b2bf-7d35-43af-b162-ced2d8abd46f.value",
+                    "id": "c9d3791a-da39-42b4-83cd-2205cd2beece",
+                    "key": "12944986-8e31-4501-bc74-4eb00f2d7d2a.value",
                     "value": {
                         "rules": [
                             {
@@ -1142,23 +1154,23 @@ def test_conditional_node_serialize_all_operators_with_value_and_start_and_end(d
             ],
             "data": {
                 "label": "Simple Conditional Node",
-                "target_handle_id": "c6e99e94-bc8e-47a4-b75c-cc96c6bedbb0",
+                "target_handle_id": "82348aaa-655f-47ef-8a7c-96a618b0aab0",
                 "conditions": [
                     {
-                        "id": "a4c32611-fd58-4b98-9d08-313cfd1c214e",
+                        "id": "4d325440-5c08-4669-9ac2-df56dc97205c",
                         "type": "IF",
-                        "source_handle_id": "8124a6cf-4a34-4149-adc0-68696c11bd4e",
+                        "source_handle_id": "90f7bb16-87b5-48dd-a14a-5dc12e8347d6",
                         "data": {
-                            "id": "650e7105-3e76-43ca-858f-b290970b438b",
+                            "id": "08c6312c-bfe3-4254-affd-8650e48c7f47",
                             "rules": [
                                 {
-                                    "id": "f497b2bf-7d35-43af-b162-ced2d8abd46f",
+                                    "id": "12944986-8e31-4501-bc74-4eb00f2d7d2a",
                                     "rules": None,
                                     "combinator": None,
                                     "negated": False,
-                                    "field_node_input_id": "738a274f-962d-466e-9aee-7774d3e05ab9",
+                                    "field_node_input_id": "3afbc787-fe7d-4411-934e-32c6ad101676",
                                     "operator": f"{operator}",
-                                    "value_node_input_id": "f30bceb4-39bf-433a-9229-b6871dbdbe00",
+                                    "value_node_input_id": "c9d3791a-da39-42b4-83cd-2205cd2beece",
                                 }
                             ],
                             "combinator": "AND",
@@ -1169,15 +1181,15 @@ def test_conditional_node_serialize_all_operators_with_value_and_start_and_end(d
                         },
                     },
                     {
-                        "id": "342e5497-ea2b-4e5c-99cf-e6492f133a3c",
+                        "id": "5d164388-d76d-4bf1-9a88-a9fb8e797cbe",
                         "type": "ELSE",
-                        "source_handle_id": "4df924c0-7bed-4f4a-9db4-2bfe51841755",
+                        "source_handle_id": "a66da8a4-7148-4554-a63c-38d20643cbb7",
                         "data": None,
                     },
                 ],
                 "version": "2",
             },
-            "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "display_data": {"position": {"x": 200.0, "y": -50.0}},
             "base": {
                 "name": "ConditionalNode",
                 "module": ["vellum", "workflows", "nodes", "displayable", "conditional_node", "node"],
@@ -1186,9 +1198,13 @@ def test_conditional_node_serialize_all_operators_with_value_and_start_and_end(d
                 "name": "SimpleConditionalNode",
                 "module": ["tests", "workflows", "basic_conditional_node", "workflow_with_only_one_conditional_node"],
             },
+            "trigger": {
+                "id": "82348aaa-655f-47ef-8a7c-96a618b0aab0",
+                "merge_behavior": "AWAIT_ANY",
+            },
             "ports": [
                 {
-                    "id": "2ff87aa6-37cf-43dd-af9d-13b9198ab70a",
+                    "id": "90f7bb16-87b5-48dd-a14a-5dc12e8347d6",
                     "name": "text_str",
                     "type": "IF",
                     "expression": {
@@ -1200,7 +1216,7 @@ def test_conditional_node_serialize_all_operators_with_value_and_start_and_end(d
                     },
                 },
                 {
-                    "id": "9a7e8c2e-0228-4321-8f74-61cb5778f3df",
+                    "id": "a66da8a4-7148-4554-a63c-38d20643cbb7",
                     "name": "text_fallthrough",
                     "type": "ELSE",
                     "expression": None,