vellum-ai 0.13.9__py3-none-any.whl → 0.13.10__py3-none-any.whl

vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py

@@ -1,47 +1,148 @@
-import pytest
+from uuid import uuid4
 
 from deepdiff import DeepDiff
 
 from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.nodes.bases.base import BaseNode
-from vellum.workflows.nodes.core.map_node.node import MapNode
+from vellum.workflows.nodes.core.retry_node.node import RetryNode
+from vellum.workflows.nodes.core.try_node.node import TryNode
 from vellum.workflows.outputs.base import BaseOutputs
-from vellum.workflows.state.base import BaseState
+from vellum_ee.workflows.display.base import WorkflowInputsDisplay
+from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.vellum.base_node import BaseNodeDisplay
+from vellum_ee.workflows.display.nodes.vellum.try_node import BaseTryNodeDisplay
 
 
 class Inputs(BaseInputs):
-    foo: str
+    input: str
 
 
-class State(BaseState):
-    bar: str
+@RetryNode.wrap(max_attempts=3)
+class InnerRetryGenericNode(BaseNode):
+    input = Inputs.input
+
+    class Outputs(BaseOutputs):
+        output: str
+
+
+class InnerRetryGenericNodeDisplay(BaseNodeDisplay[InnerRetryGenericNode.__wrapped_node__]):  # type: ignore
+    pass
+
+
+class OuterRetryNodeDisplay(BaseNodeDisplay[InnerRetryGenericNode]):
+    pass
+
+
+def test_serialize_node__retry(serialize_node):
+    input_id = uuid4()
+    serialized_node = serialize_node(
+        node_class=InnerRetryGenericNode,
+        global_workflow_input_displays={Inputs.input: WorkflowInputsDisplay(id=input_id)},
+        global_node_displays={
+            InnerRetryGenericNode.__wrapped_node__: InnerRetryGenericNodeDisplay,
+            InnerRetryGenericNode: OuterRetryNodeDisplay,
+        },
+    )
+
+    serialized_node["adornments"][0]["attributes"] = sorted(
+        serialized_node["adornments"][0]["attributes"], key=lambda x: x["name"]
+    )
+    assert not DeepDiff(
+        {
+            "id": "f2a95e79-7d4b-47ad-b986-4f648297ec65",
+            "label": "InnerRetryGenericNode",
+            "type": "GENERIC",
+            "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
+            "definition": {
+                "name": "InnerRetryGenericNode",
+                "module": [
+                    "vellum_ee",
+                    "workflows",
+                    "display",
+                    "tests",
+                    "workflow_serialization",
+                    "generic_nodes",
+                    "test_adornments_serialization",
+                ],
+            },
+            "trigger": {"id": "af9ba01c-4cde-4632-9aa1-7673b42e7bd8", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "c2ecc6c0-f353-4495-9b93-a61a47248556", "name": "default", "type": "DEFAULT"}],
+            "adornments": [
+                {
+                    "id": "5be7d260-74f7-4734-b31b-a46a94539586",
+                    "label": "RetryNode",
+                    "base": {
+                        "name": "RetryNode",
+                        "module": ["vellum", "workflows", "nodes", "core", "retry_node", "node"],
+                    },
+                    "attributes": [
+                        {
+                            "id": "f388e93b-8c68-4f54-8577-bbd0c9091557",
+                            "name": "max_attempts",
+                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "NUMBER", "value": 3.0}},
+                        },
+                        {
+                            "id": "73a02e62-4535-4e1f-97b5-1264ca8b1d71",
+                            "name": "retry_on_condition",
+                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
+                        },
+                        {
+                            "id": "c91782e3-140f-4938-9c23-d2a7b85dcdd8",
+                            "name": "retry_on_error_code",
+                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
+                        },
+                    ],
+                }
+            ],
+            "attributes": [
+                {
+                    "id": "c363daa7-9482-4c0e-aee8-faa080602ee3",
+                    "name": "input",
+                    "value": {"type": "WORKFLOW_INPUT", "input_variable_id": str(input_id)},
+                }
+            ],
+            "outputs": [
+                {"id": "8aaf6cd8-3fa5-4f17-a60f-ec7da5ec6498", "name": "output", "type": "STRING", "value": None}
+            ],
+        },
+        serialized_node,
+    )
 
 
-@MapNode.wrap(items=[1, 2, 3])
-class MapGenericNode(BaseNode):
-    item = MapNode.SubworkflowInputs.item
-    foo = Inputs.foo
-    bar = State.bar
+@TryNode.wrap()
+class InnerTryGenericNode(BaseNode):
+    input = Inputs.input
 
     class Outputs(BaseOutputs):
-        value: str
+        output: str
 
-    def run(self) -> Outputs:
-        return self.Outputs(value=f"{self.foo} {self.bar} {self.item}")
+
+@BaseTryNodeDisplay.wrap()
+class InnerTryGenericNodeDisplay(BaseNodeDisplay[InnerTryGenericNode]):
+    pass
 
 
-@pytest.mark.skip(reason="not implemented")
 def test_serialize_node__try(serialize_node):
-    serialized_node = serialize_node(MapGenericNode)
+    input_id = uuid4()
+    serialized_node = serialize_node(
+        base_class=BaseNodeVellumDisplay,
+        node_class=InnerTryGenericNode,
+        global_workflow_input_displays={Inputs.input: WorkflowInputsDisplay(id=input_id)},
+        global_node_displays={
+            InnerTryGenericNode.__wrapped_node__: InnerTryGenericNodeDisplay,
+        },
+    )
+
     assert not DeepDiff(
         {
-            "id": "c2ed23f7-f6cb-4a56-a91c-2e5f9d8fda7f",
-            "label": "BasicGenericNode",
+            "id": str(InnerTryGenericNode.__wrapped_node__.__id__),
+            "label": "InnerTryGenericNode",
             "type": "GENERIC",
             "display_data": {"position": {"x": 0.0, "y": 0.0}},
             "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
             "definition": {
-                "name": "BasicGenericNode",
+                "name": "InnerTryGenericNode",
                 "module": [
                     "vellum_ee",
                     "workflows",
@@ -52,16 +153,32 @@ def test_serialize_node__try(serialize_node):
                     "test_adornments_serialization",
                 ],
             },
-            "trigger": {"id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8", "merge_behavior": "AWAIT_ANY"},
-            "ports": [
+            "trigger": {"id": "741f7f75-e921-47a9-8c05-9e66640d0866", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "1b8f8ab5-a656-4015-926c-80655bbd9cb8", "name": "default", "type": "DEFAULT"}],
+            "adornments": [
                 {
-                    "id": "4fbf0fff-a42e-4410-852a-238b5059198e",
-                    "type": "DEFAULT",
+                    "id": "3344083c-a32c-4a32-920b-0fb5093448fa",
+                    "label": "TryNode",
+                    "base": {"name": "TryNode", "module": ["vellum", "workflows", "nodes", "core", "try_node", "node"]},
+                    "attributes": [
+                        {
+                            "id": "ab2fbab0-e2a0-419b-b1ef-ce11ecf11e90",
+                            "name": "on_error_code",
+                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
+                        }
+                    ],
                 }
             ],
-            "adornments": None,
-            "attributes": [],
+            "attributes": [
+                {
+                    "id": "4d8b4c2c-4f92-4c7a-abf0-b9c88a15a790",
+                    "name": "input",
+                    "value": {"type": "WORKFLOW_INPUT", "input_variable_id": str(input_id)},
+                }
+            ],
+            "outputs": [
+                {"id": "63ba929b-bf79-44ee-bd1f-d259dbe8d48e", "name": "output", "type": "STRING", "value": None}
+            ],
         },
         serialized_node,
-        ignore_order=True,
     )

vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_attributes_serialization.py

@@ -44,8 +44,8 @@ def test_serialize_node__constant_value(serialize_node):
                     "test_attributes_serialization",
                 ],
             },
-            "trigger": {"id": "279e8228-9b82-43a3-8c31-affc036e3a0b", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "e6cf13b0-5590-421c-84f2-5a0b169677e1", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "279e8228-9b82-43a3-8c31-affc036e3a0b", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "7cd373aa-34d1-402d-bcb4-1c8f329b63e9", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [
                 {
@@ -96,8 +96,8 @@ def test_serialize_node__workflow_input(serialize_node):
                     "test_attributes_serialization",
                 ],
             },
-            "trigger": {"id": "b1a5d749-bac0-4f11-8427-191febb2198e", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "f013bf3f-49f6-41cd-ac13-7439b71a304a", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "b1a5d749-bac0-4f11-8427-191febb2198e", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "d15c7175-139c-4885-8ef8-3e4081db121b", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [
                 {
@@ -160,8 +160,8 @@ def test_serialize_node__node_output(serialize_node):
                     "test_attributes_serialization",
                 ],
             },
-            "trigger": {"id": "449072ba-f7b6-4314-ac96-682123f225e5", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "ec9a79b8-65c3-4de8-bd29-42c914d72d4f", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "449072ba-f7b6-4314-ac96-682123f225e5", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "1879f33e-6efa-46a0-9281-e02bbbc1d413", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [
                 {
@@ -210,8 +210,8 @@ def test_serialize_node__vellum_secret(serialize_node):
                     "test_attributes_serialization",
                 ],
             },
-            "trigger": {"id": "3ea0305d-d8ea-45fe-8cf1-f6c1c85e6979", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "69e49322-8f8a-42d2-b36f-3fbe53dad616", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "3ea0305d-d8ea-45fe-8cf1-f6c1c85e6979", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "881abc1c-ada3-4405-8faf-e167fa2f851b", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [
                 {
@@ -266,8 +266,8 @@ def test_serialize_node__node_execution(serialize_node):
                     "test_attributes_serialization",
                 ],
             },
-            "trigger": {"id": "68a91426-4c30-4194-a4c0-cff224d3c0f3", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "1794c2eb-5cab-49fe-9354-dfc29f11b374", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "68a91426-4c30-4194-a4c0-cff224d3c0f3", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "0e1f78d5-8be1-4533-b2b4-a52777a8d43d", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [
                 {

vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_outputs_serialization.py

@@ -40,8 +40,8 @@ def test_serialize_node__annotated_output(serialize_node):
                     "test_outputs_serialization",
                 ],
             },
-            "trigger": {"id": "256ef76c-39a6-4a8f-8bda-922f5972a1d4", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "378d8939-7a0f-4c87-a849-7fd00067cd2d", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "256ef76c-39a6-4a8f-8bda-922f5972a1d4", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "9f391128-5d83-4c46-a62e-2b8bd075f569", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [],
             "outputs": [
@@ -89,8 +89,8 @@ def test_serialize_node__workflow_input(serialize_node):
                     "test_outputs_serialization",
                 ],
             },
-            "trigger": {"id": "b1a5d749-bac0-4f11-8427-191febb2198e", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "f013bf3f-49f6-41cd-ac13-7439b71a304a", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "b1a5d749-bac0-4f11-8427-191febb2198e", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "d15c7175-139c-4885-8ef8-3e4081db121b", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [],
             "outputs": [
@@ -155,8 +155,8 @@ def test_serialize_node__node_output_reference(serialize_node):
                     "test_outputs_serialization",
                 ],
             },
-            "trigger": {"id": "449072ba-f7b6-4314-ac96-682123f225e5", "merge_behavior": "AWAIT_ANY"},
-            "ports": [{"id": "ec9a79b8-65c3-4de8-bd29-42c914d72d4f", "type": "DEFAULT", "name": "default"}],
+            "trigger": {"id": "449072ba-f7b6-4314-ac96-682123f225e5", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "1879f33e-6efa-46a0-9281-e02bbbc1d413", "type": "DEFAULT", "name": "default"}],
             "adornments": None,
             "attributes": [],
             "outputs": [

vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_ports_serialization.py

@@ -40,10 +40,10 @@ def test_serialize_node__basic(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "4fbf0fff-a42e-4410-852a-238b5059198e",
+                    "id": "89dccfa5-cc1a-4612-bd87-86cb444f6dd4",
                     "name": "default",
                     "type": "DEFAULT",
                 }
@@ -87,10 +87,10 @@ def test_serialize_node__if(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "a8afaebc-7333-4e3f-b221-24452b4a1d47", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "a8afaebc-7333-4e3f-b221-24452b4a1d47", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "7605b4c0-a432-4517-b759-5858045a5146",
+                    "id": "d713e346-b55a-4871-91de-f1470bfb3479",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -150,10 +150,10 @@ def test_serialize_node__if_else(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "5b4f6553-69ca-4844-bbe4-9e5594bc8cae", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "5b4f6553-69ca-4844-bbe4-9e5594bc8cae", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "3eeb7f03-7d65-45aa-b0e5-c7a453f5cbdf",
+                    "id": "1b02eabf-f2bd-45bd-ab26-fe4034ed5978",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -173,7 +173,7 @@ def test_serialize_node__if_else(serialize_node):
                     },
                 },
                 {
-                    "id": "b8472c77-74d5-4432-bf8b-6cd65d3dde06",
+                    "id": "2c858834-8f65-4b6b-89d8-07b394764666",
                     "type": "ELSE",
                     "name": "else_branch",
                     "expression": None,
@@ -184,7 +184,6 @@ def test_serialize_node__if_else(serialize_node):
             "outputs": [],
         },
         serialized_node,
-        ignore_order=True,
     )
 
 
@@ -220,10 +219,10 @@ def test_serialize_node__if_elif_else(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "22d55b5b-3545-4498-8658-9d0464202e78", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "22d55b5b-3545-4498-8658-9d0464202e78", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "f6e0a2c0-192d-452f-bde4-32fb938e91bc",
+                    "id": "dcaa1d8e-01c6-48b4-a851-8828b49d0f57",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -243,7 +242,7 @@ def test_serialize_node__if_elif_else(serialize_node):
                     },
                 },
                 {
-                    "id": "7e44de04-e816-4da8-9251-cf389442a5d6",
+                    "id": "e00351f8-f1f9-4f7b-bf7a-c24e3db40d6c",
                     "type": "ELIF",
                     "name": "elif_branch",
                     "expression": {
@@ -263,7 +262,7 @@ def test_serialize_node__if_elif_else(serialize_node):
                     },
                 },
                 {
-                    "id": "00db3698-ddf5-413b-8408-fff664c212d7",
+                    "id": "90caeb67-5ab7-46aa-b65e-01c27f549eed",
                     "type": "ELSE",
                     "expression": None,
                     "name": "else_branch",
@@ -274,7 +273,6 @@ def test_serialize_node__if_elif_else(serialize_node):
             "outputs": [],
         },
         serialized_node,
-        ignore_order=True,
     )
 
 
@@ -323,10 +321,10 @@ def test_serialize_node__node_output_reference(serialize_node):
                 ],
             },
             "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
-            "trigger": {"id": "449072ba-f7b6-4314-ac96-682123f225e5", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "449072ba-f7b6-4314-ac96-682123f225e5", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "ec9a79b8-65c3-4de8-bd29-42c914d72d4f",
+                    "id": "eecccf2b-82af-4559-8a1b-0c5de5890ac2",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -387,10 +385,10 @@ def test_serialize_node__vellum_secret_reference(serialize_node):
                 ],
             },
             "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
-            "trigger": {"id": "2709539b-352d-455a-bb86-dba070b59aa1", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "2709539b-352d-455a-bb86-dba070b59aa1", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "a353d3f6-2a1f-457c-b8d1-13db5b45be8f",
+                    "id": "b6387c9c-2cce-4667-9567-97e433503e72",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -456,10 +454,10 @@ def test_serialize_node__execution_count_reference(serialize_node):
                 ],
             },
             "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
-            "trigger": {"id": "68a91426-4c30-4194-a4c0-cff224d3c0f3", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "68a91426-4c30-4194-a4c0-cff224d3c0f3", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "1794c2eb-5cab-49fe-9354-dfc29f11b374",
+                    "id": "13ab561e-09c9-48ed-b22b-a4de4d9df887",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -473,7 +471,7 @@ def test_serialize_node__execution_count_reference(serialize_node):
                             "type": "CONSTANT_VALUE",
                             "value": {
                                 "type": "NUMBER",
-                                "value": 5,
+                                "value": 5.0,
                             },
                         },
                     },
@@ -518,10 +516,10 @@ def test_serialize_node__null(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "26b257ed-6a7d-4ca3-a5c8-d17ba1e776ba", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "26b257ed-6a7d-4ca3-a5c8-d17ba1e776ba", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "51932d23-492e-4b3b-8b03-6ad7303a80c9",
+                    "id": "76a2867d-dd4c-409c-b97f-94b168a2233a",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -578,10 +576,10 @@ def test_serialize_node__between(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "086a355e-d9ef-4039-af35-9f1211497b32", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "086a355e-d9ef-4039-af35-9f1211497b32", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "a86bd19f-a9f7-45c3-80ff-73330b1b75af",
+                    "id": "71493245-0778-46f2-8bda-863af50d910d",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -595,14 +593,14 @@ def test_serialize_node__between(serialize_node):
                             "type": "CONSTANT_VALUE",
                             "value": {
                                 "type": "NUMBER",
-                                "value": 1,
+                                "value": 1.0,
                             },
                         },
                         "rhs": {
                             "type": "CONSTANT_VALUE",
                             "value": {
                                 "type": "NUMBER",
-                                "value": 10,
+                                "value": 10.0,
                             },
                         },
                     },
@@ -647,10 +645,10 @@ def test_serialize_node__or(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "dc245f37-9be7-4097-a50a-4f7196e24313", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "dc245f37-9be7-4097-a50a-4f7196e24313", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "652a42f9-f4e7-4791-8167-8903ff839520",
+                    "id": "9b4511aa-2d57-44f9-8156-d41dd8b5f98e",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -731,10 +729,10 @@ def test_serialize_node__and_then_or(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "33cfa8f4-bfc5-40b3-8df8-ab86371c26e0", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "33cfa8f4-bfc5-40b3-8df8-ab86371c26e0", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "42c89e95-6bbf-4e85-8f26-d4b6fc55d99c",
+                    "id": "91174ae5-6ce0-4f6c-9c05-ecfbfb4058f6",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -834,10 +832,10 @@ def test_serialize_node__parenthesized_and_then_or(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "91ac3b05-c931-4a4c-bb48-c2ba0e883867", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "91ac3b05-c931-4a4c-bb48-c2ba0e883867", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "cc07394b-f20b-4370-8a5b-af90e847a73f",
+                    "id": "915f923b-f398-48af-93a4-5f7e66b8aa76",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {
@@ -937,10 +935,10 @@ def test_serialize_node__or_then_and(serialize_node):
                     "test_ports_serialization",
                 ],
             },
-            "trigger": {"id": "dfa53d32-36cc-4b1d-adad-d4de21ac1e5a", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "dfa53d32-36cc-4b1d-adad-d4de21ac1e5a", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "daaff604-da1e-45e6-b3df-5bc8de8d55fe",
+                    "id": "413bba3d-6a16-4f96-ba45-b5372f819277",
                     "type": "IF",
                     "name": "if_branch",
                     "expression": {

vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_trigger_serialization.py

@@ -34,10 +34,10 @@ def test_serialize_node__basic(serialize_node):
                     "test_trigger_serialization",
                 ],
             },
-            "trigger": {"id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8", "merge_behavior": "AWAIT_ANY"},
+            "trigger": {"id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "ports": [
                 {
-                    "id": "4fbf0fff-a42e-4410-852a-238b5059198e",
+                    "id": "89dccfa5-cc1a-4612-bd87-86cb444f6dd4",
                     "name": "default",
                     "type": "DEFAULT",
                 }
@@ -80,7 +80,7 @@ def test_serialize_node__await_any(serialize_node):
             "trigger": {"id": "ffa72187-9a18-453f-ae55-b77aad332630", "merge_behavior": "AWAIT_ANY"},
             "ports": [
                 {
-                    "id": "3e219c0a-e5f8-443a-ac78-1a458b189009",
+                    "id": "38b83138-cb07-40cb-82d2-83982ded6883",
                     "name": "default",
                     "type": "DEFAULT",
                 }
@@ -123,7 +123,7 @@ def test_serialize_node__await_all(serialize_node):
             "trigger": {"id": "62074276-c817-476d-b59d-da523ae3f218", "merge_behavior": "AWAIT_ALL"},
             "ports": [
                 {
-                    "id": "9797e93f-9fe6-48b2-a48e-476abbd20e32",
+                    "id": "9edef179-a1c2-4624-b185-593bb84f08a0",
                     "name": "default",
                     "type": "DEFAULT",
                 }

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

@@ -672,7 +672,7 @@ def test_serialize_workflow():
                 "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",
+                "target_handle_id": "139c6965-68f0-4bae-a6d9-3ee68d6347c0",
                 "type": "DEFAULT",
             },
             {
@@ -680,7 +680,7 @@ def test_serialize_workflow():
                 "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",
+                "target_handle_id": "6d2c998b-1525-475f-9327-d8495b5e2692",
                 "type": "DEFAULT",
             },
             {
@@ -688,7 +688,7 @@ def test_serialize_workflow():
                 "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",
+                "target_handle_id": "4584996a-4c1e-45d0-8f49-6918d69b755e",
                 "type": "DEFAULT",
             },
             {
@@ -696,7 +696,7 @@ def test_serialize_workflow():
                 "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",
+                "target_handle_id": "8da86a9b-0d22-442c-b622-63afe1b569ab",
                 "type": "DEFAULT",
             },
             {
@@ -704,7 +704,7 @@ def test_serialize_workflow():
                 "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",
+                "target_handle_id": "f81bbac8-d7f1-4bfd-95ec-9d0b93e28114",
                 "type": "DEFAULT",
             },
             {

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

@@ -123,7 +123,7 @@ def test_serialize_workflow(vellum_client):
                 "source_node_id": "f1e4678f-c470-400b-a40e-c8922cc99a86",
                 "source_handle_id": "40201804-8beb-43ad-8873-a027759512f1",
                 "target_node_id": "c2ed23f7-f6cb-4a56-a91c-2e5f9d8fda7f",
-                "target_handle_id": "b7bfb298-959a-4d2b-8b85-bbd0d2522703",
+                "target_handle_id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8",
                 "type": "DEFAULT",
             },
             {