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

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_code_execution_node_serialization.py

@@ -685,8 +685,7 @@ def test_serialize_workflow__try_wrapped():
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
             },
         ],
-        final_output_nodes,
-        ignore_order=True,
+        sorted(final_output_nodes, key=lambda x: x["id"], reverse=True),
     )
 
     # AND each edge should be serialized correctly

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",
             },
             {

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

@@ -140,9 +140,12 @@ def test_serialize_workflow():
                                 "name": "StartNode",
                                 "module": ["tests", "workflows", "basic_inline_subworkflow", "workflow"],
                             },
-                            "trigger": {"id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135", "merge_behavior": "AWAIT_ANY"},
+                            "trigger": {
+                                "id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
+                                "merge_behavior": "AWAIT_ATTRIBUTES",
+                            },
                             "ports": [
-                                {"id": "4a62dea3-6a4a-4390-88d8-4af5d2c81474", "type": "DEFAULT", "name": "default"}
+                                {"id": "1e739e86-a285-4438-9725-a152c15a63e3", "type": "DEFAULT", "name": "default"}
                             ],
                             "adornments": None,
                             "attributes": [
@@ -271,7 +274,7 @@ def test_serialize_workflow():
                             "source_node_id": "afa49a0f-db35-4552-9217-5b8f237e84bc",
                             "source_handle_id": "9914a6a0-9a99-430d-8ddd-f7c13847fe1a",
                             "target_node_id": "1381c078-efa2-4255-89a1-7b4cb742c7fc",
-                            "target_handle_id": "6492efcf-4437-4af1-9ad7-269795ccb27a",
+                            "target_handle_id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
                             "type": "DEFAULT",
                         },
                         {

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

@@ -129,9 +129,12 @@ def test_serialize_workflow():
                                 "name": "Iteration",
                                 "module": ["tests", "workflows", "basic_map_node", "workflow"],
                             },
-                            "trigger": {"id": "01324747-9bc0-4ecd-a8ab-40dca5a94e2e", "merge_behavior": "AWAIT_ANY"},
+                            "trigger": {
+                                "id": "01324747-9bc0-4ecd-a8ab-40dca5a94e2e",
+                                "merge_behavior": "AWAIT_ATTRIBUTES",
+                            },
                             "ports": [
-                                {"id": "36791877-95b0-4390-a794-10accd8f548e", "type": "DEFAULT", "name": "default"}
+                                {"id": "71ada606-d791-4a59-a252-0795c5faeeaf", "type": "DEFAULT", "name": "default"}
                             ],
                             "adornments": None,
                             "attributes": [
@@ -211,7 +214,7 @@ def test_serialize_workflow():
                             "source_node_id": "ff9bfe6e-839d-4d40-b8fc-313b3bbd0ab0",
                             "source_handle_id": "520d3616-8369-4e79-9da5-3febae299c2a",
                             "target_node_id": "baf6d316-dc75-41e8-96c0-015aede96309",
-                            "target_handle_id": "551d5528-f4e1-42ea-bde0-9de4b4968253",
+                            "target_handle_id": "01324747-9bc0-4ecd-a8ab-40dca5a94e2e",
                             "type": "DEFAULT",
                         },
                         {

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

@@ -145,7 +145,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "dc8aecd0-49ba-4464-a45f-29d3bfd686e4",
                 "source_handle_id": "017d40f5-8326-4e42-a409-b08995defaa8",
                 "target_node_id": "59243c65-053f-4ea6-9157-3f3edb1477bf",
-                "target_handle_id": "e622fe61-3bca-4aff-86e1-25dad7bdf9d4",
+                "target_handle_id": "75293c10-d6d8-4fc0-afae-ba6437af982e",
                 "type": "DEFAULT",
             },
             {
@@ -153,7 +153,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "dc8aecd0-49ba-4464-a45f-29d3bfd686e4",
                 "source_handle_id": "017d40f5-8326-4e42-a409-b08995defaa8",
                 "target_node_id": "127ef456-91bc-43c6-bd8b-1772db5e3cb5",
-                "target_handle_id": "e5cc41cb-71db-43ec-b3f0-c78706af3351",
+                "target_handle_id": "10c7392f-7dc0-4273-8380-ddc3497e6072",
                 "type": "DEFAULT",
             },
             {
@@ -177,7 +177,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "37c10e8a-771b-432b-a767-31f5007851f0",
                 "source_handle_id": "3bbc469f-0fb0-4b3d-a28b-746fefec2818",
                 "target_node_id": "634f0202-9ea9-4c62-b152-1a58c595cffb",
-                "target_handle_id": "acd48f48-54fb-4b2b-ab37-96d336f6dfb3",
+                "target_handle_id": "c0c993cd-1370-480b-b175-59590735aa46",
                 "type": "DEFAULT",
             },
             {

vellum_ee/workflows/display/utils/vellum.py

@@ -1,7 +1,32 @@
-from typing import Any, TypeVar
+from typing import TYPE_CHECKING, Any
 
+from vellum.client.types.logical_operator import LogicalOperator
 from vellum.client.types.vellum_variable_type import VellumVariableType
 from vellum.workflows.descriptors.base import BaseDescriptor
+from vellum.workflows.expressions.and_ import AndExpression
+from vellum.workflows.expressions.begins_with import BeginsWithExpression
+from vellum.workflows.expressions.between import BetweenExpression
+from vellum.workflows.expressions.contains import ContainsExpression
+from vellum.workflows.expressions.does_not_begin_with import DoesNotBeginWithExpression
+from vellum.workflows.expressions.does_not_contain import DoesNotContainExpression
+from vellum.workflows.expressions.does_not_end_with import DoesNotEndWithExpression
+from vellum.workflows.expressions.does_not_equal import DoesNotEqualExpression
+from vellum.workflows.expressions.ends_with import EndsWithExpression
+from vellum.workflows.expressions.equals import EqualsExpression
+from vellum.workflows.expressions.greater_than import GreaterThanExpression
+from vellum.workflows.expressions.greater_than_or_equal_to import GreaterThanOrEqualToExpression
+from vellum.workflows.expressions.in_ import InExpression
+from vellum.workflows.expressions.is_nil import IsNilExpression
+from vellum.workflows.expressions.is_not_nil import IsNotNilExpression
+from vellum.workflows.expressions.is_not_null import IsNotNullExpression
+from vellum.workflows.expressions.is_not_undefined import IsNotUndefinedExpression
+from vellum.workflows.expressions.is_null import IsNullExpression
+from vellum.workflows.expressions.is_undefined import IsUndefinedExpression
+from vellum.workflows.expressions.less_than import LessThanExpression
+from vellum.workflows.expressions.less_than_or_equal_to import LessThanOrEqualToExpression
+from vellum.workflows.expressions.not_between import NotBetweenExpression
+from vellum.workflows.expressions.not_in import NotInExpression
+from vellum.workflows.expressions.or_ import OrExpression
 from vellum.workflows.nodes.displayable.bases.utils import primitive_to_vellum_value
 from vellum.workflows.references import OutputReference, WorkflowInputReference
 from vellum.workflows.references.execution_count import ExecutionCountReference
@@ -9,7 +34,6 @@ from vellum.workflows.references.node import NodeReference
 from vellum.workflows.references.vellum_secret import VellumSecretReference
 from vellum.workflows.utils.vellum_variables import primitive_type_to_vellum_variable_type
 from vellum.workflows.vellum_client import create_vellum_client
-from vellum_ee.workflows.display.types import WorkflowDisplayContext
 from vellum_ee.workflows.display.vellum import (
     ConstantValuePointer,
     ExecutionCounterData,
@@ -23,7 +47,8 @@ from vellum_ee.workflows.display.vellum import (
     WorkspaceSecretPointer,
 )
 
-_T = TypeVar("_T")
+if TYPE_CHECKING:
+    from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
 
 def infer_vellum_variable_type(value: Any) -> VellumVariableType:
@@ -47,7 +72,7 @@ def infer_vellum_variable_type(value: Any) -> VellumVariableType:
 
 
 def create_node_input_value_pointer_rule(
-    value: Any, display_context: WorkflowDisplayContext
+    value: Any, display_context: "WorkflowDisplayContext"
 ) -> NodeInputValuePointerRule:
     if isinstance(value, OutputReference):
         upstream_node, output_display = display_context.global_node_output_displays[value]
@@ -82,3 +107,48 @@ def create_node_input_value_pointer_rule(
         return ConstantValuePointer(type="CONSTANT_VALUE", data=vellum_value)
 
     raise ValueError(f"Unsupported descriptor type: {value.__class__.__name__}")
+
+
+def convert_descriptor_to_operator(descriptor: BaseDescriptor) -> LogicalOperator:
+    if isinstance(descriptor, EqualsExpression):
+        return "="
+    elif isinstance(descriptor, DoesNotEqualExpression):
+        return "!="
+    elif isinstance(descriptor, LessThanExpression):
+        return "<"
+    elif isinstance(descriptor, GreaterThanExpression):
+        return ">"
+    elif isinstance(descriptor, LessThanOrEqualToExpression):
+        return "<="
+    elif isinstance(descriptor, GreaterThanOrEqualToExpression):
+        return ">="
+    elif isinstance(descriptor, ContainsExpression):
+        return "contains"
+    elif isinstance(descriptor, BeginsWithExpression):
+        return "beginsWith"
+    elif isinstance(descriptor, EndsWithExpression):
+        return "endsWith"
+    elif isinstance(descriptor, DoesNotContainExpression):
+        return "doesNotContain"
+    elif isinstance(descriptor, DoesNotBeginWithExpression):
+        return "doesNotBeginWith"
+    elif isinstance(descriptor, DoesNotEndWithExpression):
+        return "doesNotEndWith"
+    elif isinstance(descriptor, (IsNullExpression, IsNilExpression, IsUndefinedExpression)):
+        return "null"
+    elif isinstance(descriptor, (IsNotNullExpression, IsNotNilExpression, IsNotUndefinedExpression)):
+        return "notNull"
+    elif isinstance(descriptor, InExpression):
+        return "in"
+    elif isinstance(descriptor, NotInExpression):
+        return "notIn"
+    elif isinstance(descriptor, BetweenExpression):
+        return "between"
+    elif isinstance(descriptor, NotBetweenExpression):
+        return "notBetween"
+    elif isinstance(descriptor, AndExpression):
+        return "and"
+    elif isinstance(descriptor, OrExpression):
+        return "or"
+    else:
+        raise ValueError(f"Unsupported descriptor type: {descriptor}")

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -11,7 +11,7 @@ from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.edges import Edge
 from vellum.workflows.expressions.coalesce_expression import CoalesceExpression
 from vellum.workflows.nodes.bases import BaseNode
-from vellum.workflows.nodes.utils import get_wrapped_node, has_wrapped_node
+from vellum.workflows.nodes.utils import get_wrapped_node
 from vellum.workflows.ports import Port
 from vellum.workflows.references import OutputReference, WorkflowInputReference
 from vellum.workflows.types.core import JsonObject
@@ -138,19 +138,18 @@ class BaseWorkflowDisplay(
     ):
         """This method recursively adds nodes wrapped in decorators to the node_output_displays dictionary."""
 
+        inner_node = get_wrapped_node(node)
+        if inner_node:
+            inner_node_display = self._get_node_display(inner_node)
+            self._enrich_global_node_output_displays(inner_node, inner_node_display, node_output_displays)
+
         for node_output in node.Outputs:
             if node_output in node_output_displays:
                 continue
 
-            if has_wrapped_node(node):
-                inner_node = get_wrapped_node(node)
-                if inner_node._is_wrapped_node:
-                    inner_node_display = self._get_node_display(inner_node)
-                    self._enrich_global_node_output_displays(inner_node, inner_node_display, node_output_displays)
-
             # TODO: Make sure this output ID matches the workflow output ID of the subworkflow node's workflow
             # https://app.shortcut.com/vellum/story/5660/fix-output-id-in-subworkflow-nodes
-            node_output_displays[node_output] = node, node_display.get_node_output_display(node_output)
+            node_output_displays[node_output] = node_display.get_node_output_display(node_output)
 
     def _enrich_node_port_displays(
         self,
@@ -160,16 +159,15 @@ class BaseWorkflowDisplay(
     ):
         """This method recursively adds nodes wrapped in decorators to the port_displays dictionary."""
 
+        inner_node = get_wrapped_node(node)
+        if inner_node:
+            inner_node_display = self._get_node_display(inner_node)
+            self._enrich_node_port_displays(inner_node, inner_node_display, port_displays)
+
         for port in node.Ports:
             if port in port_displays:
                 continue
 
-            if has_wrapped_node(node):
-                inner_node = get_wrapped_node(node)
-                if inner_node._is_wrapped_node:
-                    inner_node_display = self._get_node_display(inner_node)
-                    self._enrich_node_port_displays(inner_node, inner_node_display, port_displays)
-
             port_displays[port] = node_display.get_node_port_display(port)
 
     def _get_node_display(self, node: Type[BaseNode]) -> NodeDisplayType:
@@ -209,20 +207,20 @@ class BaseWorkflowDisplay(
         # TODO: We should still serialize nodes that are in the workflow's directory but aren't used in the graph.
         # https://app.shortcut.com/vellum/story/5394
         for node in self._workflow.get_nodes():
-            if node in global_node_displays:
-                continue
             node_display = self._get_node_display(node)
-            node_displays[node] = node_display
-            global_node_displays[node] = node_display
+
+            if node not in node_displays:
+                node_displays[node] = node_display
+
+            if node not in global_node_displays:
+                global_node_displays[node] = node_display
 
             # Nodes wrapped in a decorator need to be in our node display dictionary for later retrieval
-            if has_wrapped_node(node):
-                inner_node = get_wrapped_node(node)
+            inner_node = get_wrapped_node(node)
+            if inner_node:
                 inner_node_display = self._get_node_display(inner_node)
-
-                if inner_node._is_wrapped_node:
-                    node_displays[inner_node] = inner_node_display
-                    global_node_displays[inner_node] = inner_node_display
+                node_displays[inner_node] = inner_node_display
+                global_node_displays[inner_node] = inner_node_display
 
             self._enrich_global_node_output_displays(node, node_display, global_node_output_displays)
             self._enrich_node_port_displays(node, node_display, port_displays)