vellum-ai 0.14.19__py3-none-any.whl → 0.14.20__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. vellum/client/core/client_wrapper.py +1 -1
  2. vellum/workflows/nodes/displayable/code_execution_node/node.py +1 -1
  3. vellum/workflows/nodes/displayable/code_execution_node/tests/test_code_execution_node.py +41 -0
  4. vellum/workflows/nodes/displayable/code_execution_node/utils.py +6 -1
  5. vellum/workflows/references/lazy.py +9 -1
  6. vellum/workflows/references/tests/test_lazy.py +30 -0
  7. {vellum_ai-0.14.19.dist-info → vellum_ai-0.14.20.dist-info}/METADATA +1 -1
  8. {vellum_ai-0.14.19.dist-info → vellum_ai-0.14.20.dist-info}/RECORD +37 -35
  9. vellum_ee/workflows/display/base.py +6 -2
  10. vellum_ee/workflows/display/nodes/base_node_display.py +27 -2
  11. vellum_ee/workflows/display/nodes/base_node_vellum_display.py +0 -20
  12. vellum_ee/workflows/display/nodes/get_node_display_class.py +3 -3
  13. vellum_ee/workflows/display/nodes/vellum/code_execution_node.py +7 -3
  14. vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py +2 -6
  15. vellum_ee/workflows/display/nodes/vellum/prompt_deployment_node.py +2 -6
  16. vellum_ee/workflows/display/nodes/vellum/tests/test_code_execution_node.py +113 -0
  17. vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/conftest.py +2 -2
  18. vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py +4 -4
  19. vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_attributes_serialization.py +8 -8
  20. vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_outputs_serialization.py +3 -3
  21. vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_ports_serialization.py +14 -14
  22. vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_trigger_serialization.py +3 -3
  23. vellum_ee/workflows/display/tests/workflow_serialization/test_basic_conditional_node_serialization.py +5 -5
  24. vellum_ee/workflows/display/tests/workflow_serialization/test_basic_default_state_serialization.py +1 -1
  25. vellum_ee/workflows/display/tests/workflow_serialization/test_basic_generic_node_serialization.py +1 -1
  26. vellum_ee/workflows/display/tests/workflow_serialization/test_basic_inline_subworkflow_serialization.py +2 -2
  27. vellum_ee/workflows/display/tests/workflow_serialization/test_basic_map_node_serialization.py +2 -2
  28. vellum_ee/workflows/display/tests/workflow_serialization/test_basic_merge_node_serialization.py +3 -3
  29. vellum_ee/workflows/display/types.py +4 -7
  30. vellum_ee/workflows/display/vellum.py +10 -2
  31. vellum_ee/workflows/display/workflows/base_workflow_display.py +60 -32
  32. vellum_ee/workflows/display/workflows/vellum_workflow_display.py +33 -78
  33. vellum_ee/workflows/server/virtual_file_loader.py +52 -22
  34. vellum_ee/workflows/tests/test_server.py +61 -0
  35. {vellum_ai-0.14.19.dist-info → vellum_ai-0.14.20.dist-info}/LICENSE +0 -0
  36. {vellum_ai-0.14.19.dist-info → vellum_ai-0.14.20.dist-info}/WHEEL +0 -0
  37. {vellum_ai-0.14.19.dist-info → vellum_ai-0.14.20.dist-info}/entry_points.txt +0 -0
vellum_ee/workflows/display/nodes/vellum/tests/test_code_execution_node.py ADDED
@@ -0,0 +1,113 @@
1
+ import pytest
2
+ from uuid import UUID
3
+ from typing import Type
4
+
5
+ from vellum.workflows.nodes.displayable.code_execution_node.node import CodeExecutionNode
6
+ from vellum.workflows.workflows.base import BaseWorkflow
7
+ from vellum_ee.workflows.display.nodes.vellum.code_execution_node import BaseCodeExecutionNodeDisplay
8
+ from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
9
+ from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
10
+
11
+
12
+ def _no_display_class(Node: Type[CodeExecutionNode]):
13
+ return None
14
+
15
+
16
+ def _display_class_with_node_input_ids_by_name(Node: Type[CodeExecutionNode]):
17
+ class CodeExecutionNodeDisplay(BaseCodeExecutionNodeDisplay[Node]): # type: ignore[valid-type]
18
+ node_input_ids_by_name = {"foo": UUID("fba6a4d5-835a-4e99-afb7-f6a4aed15110")}
19
+
20
+ return CodeExecutionNodeDisplay
21
+
22
+
23
+ def _display_class_with_node_input_ids_by_name_with_inputs_prefix(Node: Type[CodeExecutionNode]):
24
+ class CodeExecutionNodeDisplay(BaseCodeExecutionNodeDisplay[Node]): # type: ignore[valid-type]
25
+ node_input_ids_by_name = {"code_inputs.foo": UUID("fba6a4d5-835a-4e99-afb7-f6a4aed15110")}
26
+
27
+ return CodeExecutionNodeDisplay
28
+
29
+
30
+ @pytest.mark.parametrize(
31
+ ["GetDisplayClass", "expected_input_id"],
32
+ [
33
+ (_no_display_class, "e3cdb222-324e-4ad1-abb2-bdd7881b3a0e"),
34
+ (_display_class_with_node_input_ids_by_name, "fba6a4d5-835a-4e99-afb7-f6a4aed15110"),
35
+ (_display_class_with_node_input_ids_by_name_with_inputs_prefix, "fba6a4d5-835a-4e99-afb7-f6a4aed15110"),
36
+ ],
37
+ ids=[
38
+ "no_display_class",
39
+ "display_class_with_node_input_ids_by_name",
40
+ "display_class_with_node_input_ids_by_name_with_inputs_prefix",
41
+ ],
42
+ )
43
+ def test_serialize_node__code_node_inputs(GetDisplayClass, expected_input_id):
44
+ # GIVEN a code node with inputs
45
+ class MyCodeExecutionNode(CodeExecutionNode):
46
+ code_inputs = {"foo": "bar"}
47
+
48
+ # AND a workflow with the code node
49
+ class Workflow(BaseWorkflow):
50
+ graph = MyCodeExecutionNode
51
+
52
+ # AND a display class
53
+ GetDisplayClass(MyCodeExecutionNode)
54
+
55
+ # WHEN the workflow is serialized
56
+ workflow_display = get_workflow_display(base_display_class=VellumWorkflowDisplay, workflow_class=Workflow)
57
+ serialized_workflow: dict = workflow_display.serialize()
58
+
59
+ # THEN the node should properly serialize the inputs
60
+ my_code_execution_node = next(
61
+ node for node in serialized_workflow["workflow_raw_data"]["nodes"] if node["type"] == "CODE_EXECUTION"
62
+ )
63
+
64
+ assert my_code_execution_node["inputs"] == [
65
+ {
66
+ "id": expected_input_id,
67
+ "key": "foo",
68
+ "value": {
69
+ "combinator": "OR",
70
+ "rules": [
71
+ {
72
+ "type": "CONSTANT_VALUE",
73
+ "data": {
74
+ "type": "STRING",
75
+ "value": "bar",
76
+ },
77
+ }
78
+ ],
79
+ },
80
+ },
81
+ {
82
+ "id": "9774d864-c76d-4a1a-8181-b632ed3ab87c",
83
+ "key": "code",
84
+ "value": {
85
+ "combinator": "OR",
86
+ "rules": [
87
+ {
88
+ "type": "CONSTANT_VALUE",
89
+ "data": {
90
+ "type": "STRING",
91
+ "value": "",
92
+ },
93
+ }
94
+ ],
95
+ },
96
+ },
97
+ {
98
+ "id": "34742235-5699-45cd-9d34-bce3745e743d",
99
+ "key": "runtime",
100
+ "value": {
101
+ "combinator": "OR",
102
+ "rules": [
103
+ {
104
+ "type": "CONSTANT_VALUE",
105
+ "data": {
106
+ "type": "STRING",
107
+ "value": "PYTHON_3_11_6",
108
+ },
109
+ }
110
+ ],
111
+ },
112
+ },
113
+ ]
vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/conftest.py CHANGED
@@ -12,7 +12,7 @@ from vellum_ee.workflows.display.base import StateValueDisplayType, WorkflowInpu
12
12
  from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
13
13
  from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
14
14
  from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay
15
- from vellum_ee.workflows.display.types import NodeDisplayType, WorkflowDisplayContext
15
+ from vellum_ee.workflows.display.types import WorkflowDisplayContext
16
16
  from vellum_ee.workflows.display.vellum import NodeDisplayData, WorkflowMetaVellumDisplay
17
17
  from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
18
18
 
@@ -24,7 +24,7 @@ def serialize_node():
24
24
  base_class: type[BaseNodeDisplay[Any]] = BaseNodeDisplay,
25
25
  global_workflow_input_displays: Dict[WorkflowInputReference, WorkflowInputsDisplayType] = {},
26
26
  global_state_value_displays: Dict[StateValueReference, StateValueDisplayType] = {},
27
- global_node_displays: Dict[Type[BaseNode], NodeDisplayType] = {},
27
+ global_node_displays: Dict[Type[BaseNode], BaseNodeDisplay] = {},
28
28
  global_node_output_displays: Dict[OutputReference, Tuple[Type[BaseNode], NodeOutputDisplay]] = {},
29
29
  ) -> JsonObject:
30
30
  node_display_class = get_node_display_class(base_class, node_class)
vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py CHANGED
@@ -64,7 +64,7 @@ def test_serialize_node__retry(serialize_node):
64
64
  "test_adornments_serialization",
65
65
  ],
66
66
  },
67
- "trigger": {"id": "d38a83bf-23d1-4f9d-a875-a08dc27cf397", "merge_behavior": "AWAIT_ATTRIBUTES"},
67
+ "trigger": {"id": "75fbe874-c00b-4fc2-9ade-52f4fe9209fa", "merge_behavior": "AWAIT_ATTRIBUTES"},
68
68
  "ports": [{"id": "078650c9-f775-4cd0-a08c-23af9983a361", "name": "default", "type": "DEFAULT"}],
69
69
  "adornments": [
70
70
  {
@@ -175,7 +175,7 @@ def test_serialize_node__try(serialize_node):
175
175
  "test_adornments_serialization",
176
176
  ],
177
177
  },
178
- "trigger": {"id": "16bc1522-c408-47ad-9a22-0ef136384abf", "merge_behavior": "AWAIT_ATTRIBUTES"},
178
+ "trigger": {"id": "bbb343ff-2b7a-4793-a8cf-fb05132ca46a", "merge_behavior": "AWAIT_ATTRIBUTES"},
179
179
  "ports": [{"id": "8d25f244-4b12-4f8b-b202-8948698679a0", "name": "default", "type": "DEFAULT"}],
180
180
  "adornments": [
181
181
  {
@@ -283,7 +283,7 @@ def test_serialize_node__stacked():
283
283
  "test_adornments_serialization",
284
284
  ],
285
285
  },
286
- "trigger": {"id": "f206358d-04a5-41c9-beee-0871a074fa48", "merge_behavior": "AWAIT_ATTRIBUTES"},
286
+ "trigger": {"id": "6e4af17f-bbee-4777-b10d-af042cd6e16a", "merge_behavior": "AWAIT_ATTRIBUTES"},
287
287
  "ports": [{"id": "408cd5fb-3a3e-4eb2-9889-61111bd6a129", "name": "default", "type": "DEFAULT"}],
288
288
  "adornments": [
289
289
  {
@@ -342,7 +342,7 @@ def test_serialize_node__stacked():
342
342
  "source_node_id": "c14c1c9b-a7a4-4d2c-84fb-c940cfb09525",
343
343
  "source_handle_id": "51a5eb25-af14-4bee-9ced-d2aa534ea8e9",
344
344
  "target_node_id": "074833b0-e142-4bbc-8dec-209a35e178a3",
345
- "target_handle_id": "f206358d-04a5-41c9-beee-0871a074fa48",
345
+ "target_handle_id": "6e4af17f-bbee-4777-b10d-af042cd6e16a",
346
346
  "type": "DEFAULT",
347
347
  }
348
348
  ],
vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_attributes_serialization.py CHANGED
@@ -48,7 +48,7 @@ def test_serialize_node__constant_value(serialize_node):
48
48
  "test_attributes_serialization",
49
49
  ],
50
50
  },
51
- "trigger": {"id": "5d41f6fc-fc1a-4a19-9a06-6a0ea9d38557", "merge_behavior": "AWAIT_ATTRIBUTES"},
51
+ "trigger": {"id": "e2cde904-de60-4755-87cf-55052ea23a51", "merge_behavior": "AWAIT_ATTRIBUTES"},
52
52
  "ports": [{"id": "96ac6512-0128-4cf7-ba51-2725b4807c8f", "type": "DEFAULT", "name": "default"}],
53
53
  "adornments": None,
54
54
  "attributes": [
@@ -96,7 +96,7 @@ def test_serialize_node__constant_value_reference(serialize_node):
96
96
  "test_attributes_serialization",
97
97
  ],
98
98
  },
99
- "trigger": {"id": "174f3a8e-99c2-4045-8327-ad2dc658889e", "merge_behavior": "AWAIT_ATTRIBUTES"},
99
+ "trigger": {"id": "dc2f90b9-14a1-457a-a9f9-dec7a04f74eb", "merge_behavior": "AWAIT_ATTRIBUTES"},
100
100
  "ports": [{"id": "61adfacf-c3a9-4aea-a3da-bcdbc03273c6", "name": "default", "type": "DEFAULT"}],
101
101
  "adornments": None,
102
102
  "attributes": [
@@ -138,7 +138,7 @@ def test_serialize_node__lazy_reference(serialize_node):
138
138
  "test_attributes_serialization",
139
139
  ],
140
140
  },
141
- "trigger": {"id": "a3598540-7464-4965-8a2f-f022a011007d", "merge_behavior": "AWAIT_ATTRIBUTES"},
141
+ "trigger": {"id": "14ec4d19-13e5-4db3-94fa-4e15274bffc7", "merge_behavior": "AWAIT_ATTRIBUTES"},
142
142
  "ports": [{"id": "2dba7224-a376-4780-8414-2b50601f9283", "name": "default", "type": "DEFAULT"}],
143
143
  "adornments": None,
144
144
  "attributes": [
@@ -221,7 +221,7 @@ def test_serialize_node__workflow_input(serialize_node):
221
221
  "test_attributes_serialization",
222
222
  ],
223
223
  },
224
- "trigger": {"id": "dcb92d51-1fbd-4d41-ab89-c8f490d2bb38", "merge_behavior": "AWAIT_ATTRIBUTES"},
224
+ "trigger": {"id": "debf37b9-720d-48dd-9699-69283966f927", "merge_behavior": "AWAIT_ATTRIBUTES"},
225
225
  "ports": [{"id": "20d91130-ca86-4420-b2e7-a962c0f1a509", "type": "DEFAULT", "name": "default"}],
226
226
  "adornments": None,
227
227
  "attributes": [
@@ -309,7 +309,7 @@ def test_serialize_node__node_output(serialize_node):
309
309
  "test_attributes_serialization",
310
310
  ],
311
311
  },
312
- "trigger": {"id": "aa7f0dce-0413-4802-b1dd-f96a2d2eb8e5", "merge_behavior": "AWAIT_ATTRIBUTES"},
312
+ "trigger": {"id": "d4b08664-bb78-4fdd-83a2-877c4ca4175a", "merge_behavior": "AWAIT_ATTRIBUTES"},
313
313
  "ports": [{"id": "a345665a-decd-4f6b-af38-387bd41c2643", "type": "DEFAULT", "name": "default"}],
314
314
  "adornments": None,
315
315
  "attributes": [
@@ -359,7 +359,7 @@ def test_serialize_node__vellum_secret(serialize_node):
359
359
  "test_attributes_serialization",
360
360
  ],
361
361
  },
362
- "trigger": {"id": "c5006d90-90cc-4e97-9092-f75785fa61ec", "merge_behavior": "AWAIT_ATTRIBUTES"},
362
+ "trigger": {"id": "70a3d4c0-83e3-428d-ac84-bf9e5644a84d", "merge_behavior": "AWAIT_ATTRIBUTES"},
363
363
  "ports": [{"id": "6d1c2139-64bd-4433-84d7-3fe08850134b", "type": "DEFAULT", "name": "default"}],
364
364
  "adornments": None,
365
365
  "attributes": [
@@ -412,7 +412,7 @@ def test_serialize_node__node_execution(serialize_node):
412
412
  "test_attributes_serialization",
413
413
  ],
414
414
  },
415
- "trigger": {"id": "2fc95236-b5bc-4574-bade-2c9f0933b18c", "merge_behavior": "AWAIT_ATTRIBUTES"},
415
+ "trigger": {"id": "0c06baa5-55b6-494a-a89d-9535dfa5f24b", "merge_behavior": "AWAIT_ATTRIBUTES"},
416
416
  "ports": [{"id": "59844b72-ac5e-43c5-b3a7-9c57ba73ec8c", "type": "DEFAULT", "name": "default"}],
417
417
  "adornments": None,
418
418
  "attributes": [
@@ -493,7 +493,7 @@ def test_serialize_node__coalesce(serialize_node):
493
493
  "test_attributes_serialization",
494
494
  ],
495
495
  },
496
- "trigger": {"id": "0302231d-73f2-4587-8a62-8ed3640f0f91", "merge_behavior": "AWAIT_ATTRIBUTES"},
496
+ "trigger": {"id": "b9894d9a-1887-416d-895d-a4129aac37b8", "merge_behavior": "AWAIT_ATTRIBUTES"},
497
497
  "ports": [{"id": "9d97a0c9-6a79-433a-bcdf-e07aa10c0f3c", "name": "default", "type": "DEFAULT"}],
498
498
  "adornments": None,
499
499
  "attributes": [
vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_outputs_serialization.py CHANGED
@@ -39,7 +39,7 @@ def test_serialize_node__annotated_output(serialize_node):
39
39
  "test_outputs_serialization",
40
40
  ],
41
41
  },
42
- "trigger": {"id": "753f7ef1-8724-4af2-939a-794f74ffc21b", "merge_behavior": "AWAIT_ATTRIBUTES"},
42
+ "trigger": {"id": "e66c7dde-02c9-4f6d-84a6-16117b54cd88", "merge_behavior": "AWAIT_ATTRIBUTES"},
43
43
  "ports": [{"id": "d83b7a5d-bbac-47ee-9277-1fbed71e83e8", "type": "DEFAULT", "name": "default"}],
44
44
  "adornments": None,
45
45
  "attributes": [],
@@ -87,7 +87,7 @@ def test_serialize_node__workflow_input(serialize_node):
87
87
  "test_outputs_serialization",
88
88
  ],
89
89
  },
90
- "trigger": {"id": "dcb92d51-1fbd-4d41-ab89-c8f490d2bb38", "merge_behavior": "AWAIT_ATTRIBUTES"},
90
+ "trigger": {"id": "debf37b9-720d-48dd-9699-69283966f927", "merge_behavior": "AWAIT_ATTRIBUTES"},
91
91
  "ports": [{"id": "20d91130-ca86-4420-b2e7-a962c0f1a509", "type": "DEFAULT", "name": "default"}],
92
92
  "adornments": None,
93
93
  "attributes": [],
@@ -150,7 +150,7 @@ def test_serialize_node__node_output_reference(serialize_node):
150
150
  "test_outputs_serialization",
151
151
  ],
152
152
  },
153
- "trigger": {"id": "e949426f-9f3c-425e-a4de-8c0c5f6a8945", "merge_behavior": "AWAIT_ATTRIBUTES"},
153
+ "trigger": {"id": "c8804b97-9f84-41b6-ade8-aa74544d6846", "merge_behavior": "AWAIT_ATTRIBUTES"},
154
154
  "ports": [{"id": "383dc10a-d8f3-4bac-b995-8b95bc6deb21", "type": "DEFAULT", "name": "default"}],
155
155
  "adornments": None,
156
156
  "attributes": [],
vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_ports_serialization.py CHANGED
@@ -40,7 +40,7 @@ def test_serialize_node__basic(serialize_node):
40
40
  "test_ports_serialization",
41
41
  ],
42
42
  },
43
- "trigger": {"id": "be19c63b-3492-46b1-be9d-16f8d2e6410b", "merge_behavior": "AWAIT_ATTRIBUTES"},
43
+ "trigger": {"id": "b95cca96-b570-42ac-ace8-51ca0f627881", "merge_behavior": "AWAIT_ATTRIBUTES"},
44
44
  "ports": [
45
45
  {
46
46
  "id": "8bec8d0c-113f-4110-afcb-4a6e566e7236",
@@ -86,7 +86,7 @@ def test_serialize_node__if(serialize_node):
86
86
  "test_ports_serialization",
87
87
  ],
88
88
  },
89
- "trigger": {"id": "abe5abf8-9678-4606-be71-3104efc25c74", "merge_behavior": "AWAIT_ATTRIBUTES"},
89
+ "trigger": {"id": "46e21bcc-47e1-457f-8134-ead575253b74", "merge_behavior": "AWAIT_ATTRIBUTES"},
90
90
  "ports": [
91
91
  {
92
92
  "id": "9889fe69-62f8-4bb3-aac6-425b75700bea",
@@ -148,7 +148,7 @@ def test_serialize_node__if_else(serialize_node):
148
148
  "test_ports_serialization",
149
149
  ],
150
150
  },
151
- "trigger": {"id": "b5ef0133-0605-495f-a229-169d7490cd07", "merge_behavior": "AWAIT_ATTRIBUTES"},
151
+ "trigger": {"id": "664c941c-275c-474c-9a5c-8501b934e86d", "merge_behavior": "AWAIT_ATTRIBUTES"},
152
152
  "ports": [
153
153
  {
154
154
  "id": "6fd9edea-9c1f-4463-aeb9-bfdde3231ee0",
@@ -217,7 +217,7 @@ def test_serialize_node__if_elif_else(serialize_node):
217
217
  "test_ports_serialization",
218
218
  ],
219
219
  },
220
- "trigger": {"id": "d41d03f1-36f3-4cfe-ac9f-0f79a918a810", "merge_behavior": "AWAIT_ATTRIBUTES"},
220
+ "trigger": {"id": "bba33909-beeb-4ebd-ad77-46b617ab07b0", "merge_behavior": "AWAIT_ATTRIBUTES"},
221
221
  "ports": [
222
222
  {
223
223
  "id": "19a1cc62-1f18-49b0-8026-7c82709e34db",
@@ -316,7 +316,7 @@ def test_serialize_node__node_output_reference(serialize_node):
316
316
  ],
317
317
  },
318
318
  "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
319
- "trigger": {"id": "e949426f-9f3c-425e-a4de-8c0c5f6a8945", "merge_behavior": "AWAIT_ATTRIBUTES"},
319
+ "trigger": {"id": "c8804b97-9f84-41b6-ade8-aa74544d6846", "merge_behavior": "AWAIT_ATTRIBUTES"},
320
320
  "ports": [
321
321
  {
322
322
  "id": "500075dc-fc65-428a-b3c0-a410f8c7f8cf",
@@ -379,7 +379,7 @@ def test_serialize_node__vellum_secret_reference(serialize_node):
379
379
  ],
380
380
  },
381
381
  "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
382
- "trigger": {"id": "d762741b-c137-4df4-ade6-65f31ea5a624", "merge_behavior": "AWAIT_ATTRIBUTES"},
382
+ "trigger": {"id": "93cc612b-c020-420b-94ef-62d9687c212c", "merge_behavior": "AWAIT_ATTRIBUTES"},
383
383
  "ports": [
384
384
  {
385
385
  "id": "3b6b4048-8622-446d-9772-2766357d7b18",
@@ -445,7 +445,7 @@ def test_serialize_node__execution_count_reference(serialize_node):
445
445
  ],
446
446
  },
447
447
  "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
448
- "trigger": {"id": "d6aa7eec-6f01-41c5-9f5c-d50c53259527", "merge_behavior": "AWAIT_ATTRIBUTES"},
448
+ "trigger": {"id": "ccc61dda-a947-47ac-b484-78f971ae1148", "merge_behavior": "AWAIT_ATTRIBUTES"},
449
449
  "ports": [
450
450
  {
451
451
  "id": "79d0cfa3-c8f9-4434-a2f8-5e416d66437a",
@@ -506,7 +506,7 @@ def test_serialize_node__null(serialize_node):
506
506
  "test_ports_serialization",
507
507
  ],
508
508
  },
509
- "trigger": {"id": "f4dcf8a3-692c-4b7c-8625-1a54eaa16ff2", "merge_behavior": "AWAIT_ATTRIBUTES"},
509
+ "trigger": {"id": "ad543514-516f-47ac-a363-1bbfccb0dfa9", "merge_behavior": "AWAIT_ATTRIBUTES"},
510
510
  "ports": [
511
511
  {
512
512
  "id": "7f1fb75d-0c8b-4ebc-8c59-4ae68f1a68e1",
@@ -564,7 +564,7 @@ def test_serialize_node__between(serialize_node):
564
564
  "test_ports_serialization",
565
565
  ],
566
566
  },
567
- "trigger": {"id": "12f79444-890b-4e5e-93b6-6c0efaee40db", "merge_behavior": "AWAIT_ATTRIBUTES"},
567
+ "trigger": {"id": "36799ad9-5c1a-4bb6-be13-aee5487c021b", "merge_behavior": "AWAIT_ATTRIBUTES"},
568
568
  "ports": [
569
569
  {
570
570
  "id": "b745c089-1023-46dc-b2b6-ba75ac37563a",
@@ -633,7 +633,7 @@ def test_serialize_node__or(serialize_node):
633
633
  "test_ports_serialization",
634
634
  ],
635
635
  },
636
- "trigger": {"id": "fb39e80b-4032-4538-83e4-59480b1ef7ff", "merge_behavior": "AWAIT_ATTRIBUTES"},
636
+ "trigger": {"id": "f2837ac2-2132-4af2-b8bb-30de9b0a2815", "merge_behavior": "AWAIT_ATTRIBUTES"},
637
637
  "ports": [
638
638
  {
639
639
  "id": "0bd64819-b866-4333-82e0-8ac672c09b79",
@@ -716,7 +716,7 @@ def test_serialize_node__and_then_or(serialize_node):
716
716
  "test_ports_serialization",
717
717
  ],
718
718
  },
719
- "trigger": {"id": "b2b040de-9fba-4204-a6a5-e17f6ab321b1", "merge_behavior": "AWAIT_ATTRIBUTES"},
719
+ "trigger": {"id": "aa7747fe-4b59-4994-a5c4-0ccc8065f93d", "merge_behavior": "AWAIT_ATTRIBUTES"},
720
720
  "ports": [
721
721
  {
722
722
  "id": "8bb89da2-a752-4541-8f90-1276c44910a8",
@@ -818,7 +818,7 @@ def test_serialize_node__parenthesized_and_then_or(serialize_node):
818
818
  "test_ports_serialization",
819
819
  ],
820
820
  },
821
- "trigger": {"id": "bfd1504d-f642-431d-a900-28b0709bd65c", "merge_behavior": "AWAIT_ATTRIBUTES"},
821
+ "trigger": {"id": "71601746-3722-423c-8fc0-d15a6bb6ddd4", "merge_behavior": "AWAIT_ATTRIBUTES"},
822
822
  "ports": [
823
823
  {
824
824
  "id": "30478083-924d-469e-ad55-df28bc282cdb",
@@ -920,7 +920,7 @@ def test_serialize_node__or_then_and(serialize_node):
920
920
  "test_ports_serialization",
921
921
  ],
922
922
  },
923
- "trigger": {"id": "9c59699a-edf9-4618-b6bc-1074f3bfae78", "merge_behavior": "AWAIT_ATTRIBUTES"},
923
+ "trigger": {"id": "9c875b19-fce1-4eef-80ea-19651dec1a76", "merge_behavior": "AWAIT_ATTRIBUTES"},
924
924
  "ports": [
925
925
  {
926
926
  "id": "7f442cce-0b99-482c-aec8-8eed6ccadde2",
@@ -1021,7 +1021,7 @@ def test_serialize_node__parse_json(serialize_node):
1021
1021
  "test_ports_serialization",
1022
1022
  ],
1023
1023
  },
1024
- "trigger": {"id": "1d3287e2-cc05-49d2-be99-150320264f24", "merge_behavior": "AWAIT_ATTRIBUTES"},
1024
+ "trigger": {"id": "ecff8eef-b928-48e7-ac26-841322ff2752", "merge_behavior": "AWAIT_ATTRIBUTES"},
1025
1025
  "ports": [
1026
1026
  {
1027
1027
  "id": "5a88bac8-89b3-4d81-b539-2f977a36a9c0",
vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_trigger_serialization.py CHANGED
@@ -33,7 +33,7 @@ def test_serialize_node__basic(serialize_node):
33
33
  "test_trigger_serialization",
34
34
  ],
35
35
  },
36
- "trigger": {"id": "be19c63b-3492-46b1-be9d-16f8d2e6410b", "merge_behavior": "AWAIT_ATTRIBUTES"},
36
+ "trigger": {"id": "b95cca96-b570-42ac-ace8-51ca0f627881", "merge_behavior": "AWAIT_ATTRIBUTES"},
37
37
  "ports": [
38
38
  {
39
39
  "id": "8bec8d0c-113f-4110-afcb-4a6e566e7236",
@@ -75,7 +75,7 @@ def test_serialize_node__await_any(serialize_node):
75
75
  "test_trigger_serialization",
76
76
  ],
77
77
  },
78
- "trigger": {"id": "5bb6bb4c-4374-44c8-a7b5-7bb6c1060a5b", "merge_behavior": "AWAIT_ANY"},
78
+ "trigger": {"id": "c0db17e7-6766-4062-aaee-7404580d76e4", "merge_behavior": "AWAIT_ANY"},
79
79
  "ports": [
80
80
  {
81
81
  "id": "d9a84db7-8bd6-4a15-9e3c-c2e898c26d16",
@@ -117,7 +117,7 @@ def test_serialize_node__await_all(serialize_node):
117
117
  "test_trigger_serialization",
118
118
  ],
119
119
  },
120
- "trigger": {"id": "124ba9cf-a30e-41ef-81bf-143708f8b1c3", "merge_behavior": "AWAIT_ALL"},
120
+ "trigger": {"id": "1b22935e-0e79-485a-b274-a2f316c0983c", "merge_behavior": "AWAIT_ALL"},
121
121
  "ports": [
122
122
  {
123
123
  "id": "fa73da35-0bf9-4f02-bf5b-0b0d1a6f1494",
vellum_ee/workflows/display/tests/workflow_serialization/test_basic_conditional_node_serialization.py CHANGED
@@ -638,7 +638,7 @@ def test_serialize_workflow():
638
638
  "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
639
639
  "source_handle_id": "3a45b81f-95e4-4cbd-8997-bfdbe30251e8",
640
640
  "target_node_id": "0d959311-c836-4641-a867-58f63df9dfea",
641
- "target_handle_id": "139c6965-68f0-4bae-a6d9-3ee68d6347c0",
641
+ "target_handle_id": "7beba198-c452-4749-a38a-ea9420d84e14",
642
642
  "type": "DEFAULT",
643
643
  },
644
644
  {
@@ -646,7 +646,7 @@ def test_serialize_workflow():
646
646
  "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
647
647
  "source_handle_id": "7202f702-1ebc-4067-ab1e-ec67e49158ee",
648
648
  "target_node_id": "68c02b7c-5077-4087-803d-841474a8081f",
649
- "target_handle_id": "6d2c998b-1525-475f-9327-d8495b5e2692",
649
+ "target_handle_id": "1dc4eebe-b6db-4229-96e5-115ff8cedb76",
650
650
  "type": "DEFAULT",
651
651
  },
652
652
  {
@@ -654,7 +654,7 @@ def test_serialize_workflow():
654
654
  "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
655
655
  "source_handle_id": "cf45705d-1a47-43a6-9d24-a7fdf78baae0",
656
656
  "target_node_id": "8df781b1-ff28-48a5-98a2-d7d796b932b0",
657
- "target_handle_id": "4584996a-4c1e-45d0-8f49-6918d69b755e",
657
+ "target_handle_id": "b73c39be-cbfe-4225-86e6-e6e4c161881e",
658
658
  "type": "DEFAULT",
659
659
  },
660
660
  {
@@ -662,7 +662,7 @@ def test_serialize_workflow():
662
662
  "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
663
663
  "source_handle_id": "f04610dd-61cf-41b0-b337-2235e101cdb0",
664
664
  "target_node_id": "ed7caf01-9ae7-47a3-b15a-16697abaf486",
665
- "target_handle_id": "8da86a9b-0d22-442c-b622-63afe1b569ab",
665
+ "target_handle_id": "76fe7aec-5cd4-4c1a-b386-cfe09ebe66e4",
666
666
  "type": "DEFAULT",
667
667
  },
668
668
  {
@@ -670,7 +670,7 @@ def test_serialize_workflow():
670
670
  "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
671
671
  "source_handle_id": "f9dde637-ea90-465f-a871-caf8380ae377",
672
672
  "target_node_id": "148c61bd-e8b0-4d4b-8734-b043a72b90ed",
673
- "target_handle_id": "f81bbac8-d7f1-4bfd-95ec-9d0b93e28114",
673
+ "target_handle_id": "c88839af-3a79-4310-abbd-e1553d981dce",
674
674
  "type": "DEFAULT",
675
675
  },
676
676
  {
vellum_ee/workflows/display/tests/workflow_serialization/test_basic_default_state_serialization.py CHANGED
@@ -196,7 +196,7 @@ def test_serialize_workflow():
196
196
  "source_node_id": "32684932-7c7c-4b1c-aed2-553de29bf3f7",
197
197
  "source_handle_id": "e4136ee4-a51a-4ca3-9a3a-aa96f5de2347",
198
198
  "target_node_id": "1381c078-efa2-4255-89a1-7b4cb742c7fc",
199
- "target_handle_id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
199
+ "target_handle_id": "6492efcf-4437-4af1-9ad7-269795ccb27a",
200
200
  "type": "DEFAULT",
201
201
  },
202
202
  {
vellum_ee/workflows/display/tests/workflow_serialization/test_basic_generic_node_serialization.py CHANGED
@@ -124,7 +124,7 @@ def test_serialize_workflow(vellum_client):
124
124
  "source_node_id": "f1e4678f-c470-400b-a40e-c8922cc99a86",
125
125
  "source_handle_id": "40201804-8beb-43ad-8873-a027759512f1",
126
126
  "target_node_id": "c2ed23f7-f6cb-4a56-a91c-2e5f9d8fda7f",
127
- "target_handle_id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8",
127
+ "target_handle_id": "b7bfb298-959a-4d2b-8b85-bbd0d2522703",
128
128
  "type": "DEFAULT",
129
129
  },
130
130
  {
vellum_ee/workflows/display/tests/workflow_serialization/test_basic_inline_subworkflow_serialization.py CHANGED
@@ -142,7 +142,7 @@ def test_serialize_workflow():
142
142
  "module": ["tests", "workflows", "basic_inline_subworkflow", "workflow"],
143
143
  },
144
144
  "trigger": {
145
- "id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
145
+ "id": "6492efcf-4437-4af1-9ad7-269795ccb27a",
146
146
  "merge_behavior": "AWAIT_ATTRIBUTES",
147
147
  },
148
148
  "ports": [
@@ -261,7 +261,7 @@ def test_serialize_workflow():
261
261
  "source_node_id": "afa49a0f-db35-4552-9217-5b8f237e84bc",
262
262
  "source_handle_id": "9914a6a0-9a99-430d-8ddd-f7c13847fe1a",
263
263
  "target_node_id": "1381c078-efa2-4255-89a1-7b4cb742c7fc",
264
- "target_handle_id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
264
+ "target_handle_id": "6492efcf-4437-4af1-9ad7-269795ccb27a",
265
265
  "type": "DEFAULT",
266
266
  },
267
267
  {
vellum_ee/workflows/display/tests/workflow_serialization/test_basic_map_node_serialization.py CHANGED
@@ -131,7 +131,7 @@ def test_serialize_workflow():
131
131
  "module": ["tests", "workflows", "basic_map_node", "workflow"],
132
132
  },
133
133
  "trigger": {
134
- "id": "01324747-9bc0-4ecd-a8ab-40dca5a94e2e",
134
+ "id": "551d5528-f4e1-42ea-bde0-9de4b4968253",
135
135
  "merge_behavior": "AWAIT_ATTRIBUTES",
136
136
  },
137
137
  "ports": [
@@ -215,7 +215,7 @@ def test_serialize_workflow():
215
215
  "source_node_id": "ff9bfe6e-839d-4d40-b8fc-313b3bbd0ab0",
216
216
  "source_handle_id": "520d3616-8369-4e79-9da5-3febae299c2a",
217
217
  "target_node_id": "baf6d316-dc75-41e8-96c0-015aede96309",
218
- "target_handle_id": "01324747-9bc0-4ecd-a8ab-40dca5a94e2e",
218
+ "target_handle_id": "551d5528-f4e1-42ea-bde0-9de4b4968253",
219
219
  "type": "DEFAULT",
220
220
  },
221
221
  {
vellum_ee/workflows/display/tests/workflow_serialization/test_basic_merge_node_serialization.py CHANGED
@@ -146,7 +146,7 @@ def test_serialize_workflow__await_all():
146
146
  "source_node_id": "dc8aecd0-49ba-4464-a45f-29d3bfd686e4",
147
147
  "source_handle_id": "017d40f5-8326-4e42-a409-b08995defaa8",
148
148
  "target_node_id": "59243c65-053f-4ea6-9157-3f3edb1477bf",
149
- "target_handle_id": "75293c10-d6d8-4fc0-afae-ba6437af982e",
149
+ "target_handle_id": "e622fe61-3bca-4aff-86e1-25dad7bdf9d4",
150
150
  "type": "DEFAULT",
151
151
  },
152
152
  {
@@ -154,7 +154,7 @@ def test_serialize_workflow__await_all():
154
154
  "source_node_id": "dc8aecd0-49ba-4464-a45f-29d3bfd686e4",
155
155
  "source_handle_id": "017d40f5-8326-4e42-a409-b08995defaa8",
156
156
  "target_node_id": "127ef456-91bc-43c6-bd8b-1772db5e3cb5",
157
- "target_handle_id": "10c7392f-7dc0-4273-8380-ddc3497e6072",
157
+ "target_handle_id": "e5cc41cb-71db-43ec-b3f0-c78706af3351",
158
158
  "type": "DEFAULT",
159
159
  },
160
160
  {
@@ -178,7 +178,7 @@ def test_serialize_workflow__await_all():
178
178
  "source_node_id": "37c10e8a-771b-432b-a767-31f5007851f0",
179
179
  "source_handle_id": "3bbc469f-0fb0-4b3d-a28b-746fefec2818",
180
180
  "target_node_id": "634f0202-9ea9-4c62-b152-1a58c595cffb",
181
- "target_handle_id": "c0c993cd-1370-480b-b175-59590735aa46",
181
+ "target_handle_id": "acd48f48-54fb-4b2b-ab37-96d336f6dfb3",
182
182
  "type": "DEFAULT",
183
183
  },
184
184
  {
vellum_ee/workflows/display/types.py CHANGED
@@ -7,7 +7,6 @@ from vellum.workflows.nodes import BaseNode
7
7
  from vellum.workflows.ports import Port
8
8
  from vellum.workflows.references import OutputReference, StateValueReference, WorkflowInputReference
9
9
  from vellum_ee.workflows.display.base import (
10
- EdgeDisplayType,
11
10
  EntrypointDisplayType,
12
11
  StateValueDisplayType,
13
12
  WorkflowInputsDisplayType,
@@ -18,9 +17,9 @@ from vellum_ee.workflows.display.base import (
18
17
  if TYPE_CHECKING:
19
18
  from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
20
19
  from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay
20
+ from vellum_ee.workflows.display.vellum import EdgeVellumDisplay
21
21
  from vellum_ee.workflows.display.workflows import BaseWorkflowDisplay
22
22
 
23
- NodeDisplayType = TypeVar("NodeDisplayType", bound="BaseNodeDisplay")
24
23
  WorkflowDisplayType = TypeVar("WorkflowDisplayType", bound="BaseWorkflowDisplay")
25
24
 
26
25
 
@@ -30,9 +29,7 @@ class WorkflowDisplayContext(
30
29
  WorkflowMetaDisplayType,
31
30
  WorkflowInputsDisplayType,
32
31
  StateValueDisplayType,
33
- NodeDisplayType,
34
32
  EntrypointDisplayType,
35
- EdgeDisplayType,
36
33
  ]
37
34
  ):
38
35
  workflow_display_class: Type["BaseWorkflowDisplay"]
@@ -43,12 +40,12 @@ class WorkflowDisplayContext(
43
40
  )
44
41
  state_value_displays: Dict[StateValueReference, StateValueDisplayType] = field(default_factory=dict)
45
42
  global_state_value_displays: Dict[StateValueReference, StateValueDisplayType] = field(default_factory=dict)
46
- node_displays: Dict[Type[BaseNode], "NodeDisplayType"] = field(default_factory=dict)
47
- global_node_displays: Dict[Type[BaseNode], NodeDisplayType] = field(default_factory=dict)
43
+ node_displays: Dict[Type[BaseNode], "BaseNodeDisplay"] = field(default_factory=dict)
44
+ global_node_displays: Dict[Type[BaseNode], "BaseNodeDisplay"] = field(default_factory=dict)
48
45
  global_node_output_displays: Dict[OutputReference, Tuple[Type[BaseNode], "NodeOutputDisplay"]] = field(
49
46
  default_factory=dict
50
47
  )
51
48
  entrypoint_displays: Dict[Type[BaseNode], EntrypointDisplayType] = field(default_factory=dict)
52
49
  workflow_output_displays: Dict[BaseDescriptor, WorkflowOutputDisplay] = field(default_factory=dict)
53
- edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplayType] = field(default_factory=dict)
50
+ edge_displays: Dict[Tuple[Port, Type[BaseNode]], "EdgeVellumDisplay"] = field(default_factory=dict)
54
51
  port_displays: Dict[Port, "PortDisplay"] = field(default_factory=dict)
vellum_ee/workflows/display/vellum.py CHANGED
@@ -93,12 +93,20 @@ class StateValueVellumDisplay(StateValueVellumDisplayOverrides):
93
93
 
94
94
 
95
95
  @dataclass
96
- class EdgeVellumDisplayOverrides(EdgeDisplay, EdgeDisplayOverrides):
96
+ class EdgeVellumDisplayOverrides(EdgeDisplayOverrides):
97
+ """
98
+ DEPRECATED: Use EdgeDisplay instead. Will be removed in 0.15.0
99
+ """
100
+
97
101
  pass
98
102
 
99
103
 
100
104
  @dataclass
101
105
  class EdgeVellumDisplay(EdgeVellumDisplayOverrides):
106
+ """
107
+ DEPRECATED: Use EdgeDisplay instead. Will be removed in 0.15.0
108
+ """
109
+
102
110
  source_node_id: UUID
103
111
  source_handle_id: UUID
104
112
  target_node_id: UUID
@@ -108,7 +116,7 @@ class EdgeVellumDisplay(EdgeVellumDisplayOverrides):
108
116
 
109
117
  @dataclass
110
118
  class EntrypointVellumDisplayOverrides(EntrypointDisplay, EntrypointDisplayOverrides):
111
- edge_display: EdgeVellumDisplayOverrides
119
+ edge_display: EdgeDisplay
112
120
 
113
121
 
114
122
  @dataclass