vellum-ai 0.14.23__py3-none-any.whl → 0.14.24__py3-none-any.whl

vellum/client/core/client_wrapper.py

@@ -18,7 +18,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "0.14.23",
+            "X-Fern-SDK-Version": "0.14.24",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

vellum/plugins/pydantic.py

@@ -46,6 +46,8 @@ class OnValidatePython(ValidatePythonHandlerProtocol):
         context: Optional[Dict[str, Any]] = None,
         self_instance: Optional[Any] = None,
         allow_partial: Union[bool, Literal["off", "on", "trailing-strings"]] = False,
+        by_alias: Optional[bool] = None,
+        by_name: Optional[bool] = None,
     ) -> None:
         if not isinstance(input, dict):
             return

vellum/workflows/nodes/core/inline_subworkflow_node/node.py

@@ -13,6 +13,7 @@ from vellum.workflows.state.base import BaseState
 from vellum.workflows.state.context import WorkflowContext
 from vellum.workflows.types.core import EntityInputsInterface
 from vellum.workflows.types.generics import InputsType, StateType
+from vellum.workflows.utils.uuids import uuid4_from_hash
 from vellum.workflows.workflows.event_filters import all_workflow_event_filter
 
 if TYPE_CHECKING:
@@ -140,3 +141,8 @@ class InlineSubworkflowNode(
         # Subclasses of InlineSubworkflowNode can override this method to provider their own
         # approach to annotating the outputs class based on the `subworkflow.Outputs`
         setattr(outputs_class, reference.name, reference)
+
+        if cls.__output_ids__ is None:
+            cls.__output_ids__ = {}
+
+        cls.__output_ids__[reference.name] = uuid4_from_hash(f"{cls.__id__}|{reference.name}")

vellum/workflows/nodes/core/inline_subworkflow_node/tests/test_node.py

@@ -116,3 +116,30 @@ def test_inline_subworkflow_node__base_inputs_validation():
     # AND the error message should indicate the missing required input
     assert e.value.code == WorkflowErrorCode.INVALID_INPUTS
     assert "Required input variables required_input should have defined value" == str(e.value)
+
+
+def test_inline_subworkflow_node__with_adornment():
+    # GIVEN a simple inline subworkflow with an output
+    class InnerNode(BaseNode):
+        class Outputs(BaseNode.Outputs):
+            final_output = "hello"
+
+    class TestSubworkflow(BaseWorkflow):
+        graph = InnerNode
+
+        class Outputs(BaseWorkflow.Outputs):
+            final_output = InnerNode.Outputs.final_output
+
+    # AND it's wrapped in a TryNode
+    @TryNode.wrap()
+    class TestNode(InlineSubworkflowNode):
+        subworkflow = TestSubworkflow
+
+    # THEN the wrapped node should have the correct output IDs
+    assert "final_output" in TestNode.__output_ids__
+
+    # AND when we run the node
+    node = TestNode()
+    outputs = list(node.run())
+
+    assert outputs[-1].name == "final_output" and outputs[-1].value == "hello"

{vellum_ai-0.14.23.dist-info → vellum_ai-0.14.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vellum-ai
-Version: 0.14.23
+Version: 0.14.24
 Summary: 
 License: MIT
 Requires-Python: >=3.9,<4.0

{vellum_ai-0.14.23.dist-info → vellum_ai-0.14.24.dist-info}/RECORD

@@ -22,17 +22,19 @@ vellum_ee/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum_ee/workflows/display/base.py,sha256=xhrMfirVLBuIeDuxdOUmtJ6CcfCx8DChFo-4HfMY6uc,1883
+vellum_ee/workflows/display/base.py,sha256=rIycT9p18XWng7cpJwcjXXNvJq3bPObQ0GN4fuQO_Wk,2633
+vellum_ee/workflows/display/editor/__init__.py,sha256=MSAgY91xCEg2neH5d8jXx5wRdR962ftZVa6vO9BGq9k,167
+vellum_ee/workflows/display/editor/types.py,sha256=x-tOOCJ6CF4HmiKDfCmcc3bOVfc1EBlP5o6u5WEfLoY,567
 vellum_ee/workflows/display/nodes/__init__.py,sha256=436iSAh_Ex5tC68oEYvNgPu05ZVIAVXnS4PKGrQeZ0Y,321
-vellum_ee/workflows/display/nodes/base_node_display.py,sha256=4xIkrKXVryaD0fPd7RxSpzIqPg6Y14NEB7j7m0DrJvM,18974
-vellum_ee/workflows/display/nodes/base_node_vellum_display.py,sha256=rhbWYBQSXkpEPIvTa--LPwhsl8RnX4KyU6Ax0M0A0pU,1701
+vellum_ee/workflows/display/nodes/base_node_display.py,sha256=APdax1M8isohM-B8j2E0OFL-4v2L17scZ0ynpkYgVek,19036
+vellum_ee/workflows/display/nodes/base_node_vellum_display.py,sha256=WXbfVoGHTfl_owas2WKHwcRhfLeu0cAI4qLmKxfxjOs,1707
 vellum_ee/workflows/display/nodes/get_node_display_class.py,sha256=59Nht1XAxMcNESFV1VmECrF01lZMnGkB_9JWaTAFnv0,2214
 vellum_ee/workflows/display/nodes/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/nodes/tests/test_base_node_display.py,sha256=QqR3Ly0RNrXwOeLdW5nERDFt0gRPf76n1bPES6o5UN4,1093
 vellum_ee/workflows/display/nodes/types.py,sha256=St1BB6no528OyELGiyRabWao0GGw6mLhstQAvEACbGk,247
 vellum_ee/workflows/display/nodes/utils.py,sha256=sloya5TpXsnot1HURc9L51INwflRqUzHxRVnCS9Cd-4,973
 vellum_ee/workflows/display/nodes/vellum/__init__.py,sha256=nUIgH2s0-7IbQRNrBhLPyRNe8YIrx3Yo9HeeW-aXXFk,1668
-vellum_ee/workflows/display/nodes/vellum/api_node.py,sha256=lumtypr0JEZfiA32hcs_olTmnT0wIUzPBy0pnZVfyU4,8532
+vellum_ee/workflows/display/nodes/vellum/api_node.py,sha256=RDsxyubod_zYc72_VaHUTfOZXsgrKv8g3fqZFS2_j8Y,8538
 vellum_ee/workflows/display/nodes/vellum/base_adornment_node.py,sha256=Bzqplrnx-bDIRD1JgU7036m8pSWSO45zEReNv8RJTu4,6379
 vellum_ee/workflows/display/nodes/vellum/code_execution_node.py,sha256=IYx0nll0t-tsPcjfgpfHMZE4FJgMFIsOiaQanGLYF0Q,4410
 vellum_ee/workflows/display/nodes/vellum/conditional_node.py,sha256=ybLIa4uclqVIy3VAQvI1ivg2tnK5Ug_1R5a69DFqL7E,11104
@@ -46,7 +48,7 @@ vellum_ee/workflows/display/nodes/vellum/merge_node.py,sha256=xtyecs9mJ_WEwVpP12
 vellum_ee/workflows/display/nodes/vellum/note_node.py,sha256=TMb8txILu2uWjzoxaghjgjlzeBAgzn4vkP_8zSh2qoE,1151
 vellum_ee/workflows/display/nodes/vellum/prompt_deployment_node.py,sha256=9YR6MtxVq8Bavb0ud2lZX0t2Y_NUd-dY9kRgq8WBz-Y,3093
 vellum_ee/workflows/display/nodes/vellum/retry_node.py,sha256=LgokATi7sSS38Fil-XjqoR4t7AMOJ-GzXRw6p606Svo,3397
-vellum_ee/workflows/display/nodes/vellum/search_node.py,sha256=TxcAGZDl_hvJ7Y1hUi9YVEVrj9Ie0hKkASdpfRL4_cs,9227
+vellum_ee/workflows/display/nodes/vellum/search_node.py,sha256=Hn55mKO1Q6BBspQtbsurvJJqX7RjSSuEyRjUW29xvg0,9279
 vellum_ee/workflows/display/nodes/vellum/subworkflow_deployment_node.py,sha256=62baAElKoRKIoba0lLhnrXGWWx96B73VxKGxh7BaIxc,2612
 vellum_ee/workflows/display/nodes/vellum/templating_node.py,sha256=5EWzdA3TSUPlbJhs4uo1KGH6eGtDXZucVhlUoc_xpl4,3242
 vellum_ee/workflows/display/nodes/vellum/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -56,14 +58,14 @@ vellum_ee/workflows/display/nodes/vellum/tests/test_prompt_node.py,sha256=bg9INs
 vellum_ee/workflows/display/nodes/vellum/tests/test_retry_node.py,sha256=NuIw8Yb42KUdoGi3Ur8_7VPg50IC4hNrwAkCociwqNk,2091
 vellum_ee/workflows/display/nodes/vellum/tests/test_templating_node.py,sha256=Us32jf_FQnLuT4Bs2o5JyHxihCTAN8ozZghWIR0pl9k,3459
 vellum_ee/workflows/display/nodes/vellum/tests/test_try_node.py,sha256=mtzB8LJlFCHVFM4H5AanLp29gQfaVmnN4A4iaRGJHoI,2427
-vellum_ee/workflows/display/nodes/vellum/tests/test_utils.py,sha256=4YUaTeD_OWF-UaPMyOTBTu9skGC1jgSHlAYrzbH7Z04,5039
+vellum_ee/workflows/display/nodes/vellum/tests/test_utils.py,sha256=8_4b_U2l60b3TPLTHiDd_lzk6gi-30FmNJreDVeG0oM,4876
 vellum_ee/workflows/display/nodes/vellum/try_node.py,sha256=0ipBZMYm521tuwefQFgHOvTyTgiWVTkzxpQtnnmOAI0,4203
-vellum_ee/workflows/display/nodes/vellum/utils.py,sha256=lY3YsvzawDy15-8w3Brb4oSnVpVaMe5FQtgMi3BE3Mo,4737
+vellum_ee/workflows/display/nodes/vellum/utils.py,sha256=MAoHDSURlLRJ9V8D6I6icclqGq2hExU_h7ABx6BWuJY,4733
 vellum_ee/workflows/display/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/tests/test_vellum_workflow_display.py,sha256=VD-4USiRlCcdC3Qe9WfdkxwFdircai0vqvuZCbELR84,9556
 vellum_ee/workflows/display/tests/workflow_serialization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/conftest.py,sha256=iR9vt-Xf8NSLHptrp1uTd_qbhHz-LrWkrRyKN96aqGM,2492
+vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/conftest.py,sha256=lXw_Zvhlf7b1z3dsZoDznDweF1O-AStibV7BYrEtr0M,2544
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py,sha256=4R8cZ98JsGmIq-kmt3q519c4nCI7wCy5ynAUCUNnvuI,15605
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_attributes_serialization.py,sha256=PXoNUAgqfyNCAoYGWoo5D-_5SLEannn7SD08nxZmVe8,19781
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_outputs_serialization.py,sha256=s6_mnk0pkztU59wYpSfOFpMhAJaRjmyfxM6WJGtnD4Y,6456
@@ -87,16 +89,16 @@ vellum_ee/workflows/display/tests/workflow_serialization/test_basic_templating_n
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_terminal_node_serialization.py,sha256=UrueKI15Ez-DRfZpZH82o127v0LRXLP-s308kjDTPMI,4084
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_try_node_serialization.py,sha256=eD5686C9nWC5s6t08vbAnm9qf9t53gYQM-E1FwAa75c,3035
 vellum_ee/workflows/display/tests/workflow_serialization/test_complex_terminal_node_serialization.py,sha256=zXTjfjUdji0WBu6ZhocvM4UiXEWFJIpds24sxV9TZT0,7714
-vellum_ee/workflows/display/types.py,sha256=UZ23Hv2ULWFrMaG1mRSbVnPEa9YvuLlv0dOMkA2j5_Y,2466
+vellum_ee/workflows/display/types.py,sha256=13gGBga5p1Tufe2h3aKBmr2mXlnGDtL8RqWKhW9LaDk,2543
 vellum_ee/workflows/display/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum_ee/workflows/display/utils/expressions.py,sha256=9FpOslDI-RCR5m4TgAu9KCHh4aTVnh7CHR2ykyMUDw0,1151
-vellum_ee/workflows/display/utils/vellum.py,sha256=EVPQUSsZ3OIeLTEbV6LHPor37t9fnj9kJxDqP4PmTLQ,8234
-vellum_ee/workflows/display/vellum.py,sha256=bevbLCd2KqJBKqJ3lQayeRfjY7x1Djf57F9iJ-6KBJw,5162
+vellum_ee/workflows/display/utils/expressions.py,sha256=2u2o8Fqr-2C45FII01ej5rt6i8n2EEGiliXugK7buVw,1210
+vellum_ee/workflows/display/utils/vellum.py,sha256=Pzmg9Xiq-hRaYxbOSDaJhIAQ4A0apQN6dURn_h5DnWI,9364
+vellum_ee/workflows/display/vellum.py,sha256=3Hri8-MGNhRSoNBC-u6hiot_9-k92a_NzrYgYJVY1CQ,3547
 vellum_ee/workflows/display/workflows/__init__.py,sha256=kapXsC67VJcgSuiBMa86FdePG5A9kMB5Pi4Uy1O2ob4,207
-vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=YRz485jI0O_eDx3QRZYdf3jFtbPamBglMPS2EZKXTeE,19603
+vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=rYpvUVGnQNFOnsk6OUhh_2GXDojQtKmuRElNjwQujDk,19486
 vellum_ee/workflows/display/workflows/get_vellum_workflow_display_class.py,sha256=kp0u8LN_2IwshLrhMImhpZx1hRyAcD5gXY-kDuuaGMQ,1269
-vellum_ee/workflows/display/workflows/tests/test_workflow_display.py,sha256=zHpeXrSFPtiQuoaLwbfMUJAmtxvEiReeOYVwXzD1qIQ,10617
-vellum_ee/workflows/display/workflows/vellum_workflow_display.py,sha256=AS-vMrM93KEjb02-ye0Il29l3bX74o0Q8P2Nvf9NIZ0,16683
+vellum_ee/workflows/display/workflows/tests/test_workflow_display.py,sha256=nD6_lZnNp56siVJwhlWzSEHdMaSKjvWlsJa31SqfQAE,10623
+vellum_ee/workflows/display/workflows/vellum_workflow_display.py,sha256=cSQybNy6qBiEv2WtPRh1-hSNuwvdWQtjvAGW6vNBSmU,16623
 vellum_ee/workflows/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/server/virtual_file_loader.py,sha256=ET-Q83W5Cgqzqz3qtFNwtS2nJEIcm3VtvR5kffsT3VY,2262
 vellum_ee/workflows/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -126,7 +128,7 @@ vellum/client/README.md,sha256=JkCJjmMZl4jrPj46pkmL9dpK4gSzQQmP5I7z4aME4LY,4749
 vellum/client/__init__.py,sha256=tKtdM1_GqmGq1gpi9ydWD_T-MM7fPn8QdHh8ww19cNI,117564
 vellum/client/core/__init__.py,sha256=SQ85PF84B9MuKnBwHNHWemSGuy-g_515gFYNFhvEE0I,1438
 vellum/client/core/api_error.py,sha256=RE8LELok2QCjABadECTvtDp7qejA1VmINCh6TbqPwSE,426
-vellum/client/core/client_wrapper.py,sha256=ZreSjScbQcW_5PwQSZMU9AXIjX1VTwTOWrmoCvLNq-I,1869
+vellum/client/core/client_wrapper.py,sha256=8wv6fQx1EwJtvzVuLS-i7sPo_b87mIrTj43SWrHA6fM,1869
 vellum/client/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 vellum/client/core/file.py,sha256=X9IbmkZmB2bB_DpmZAO3crWdXagOakAyn6UCOCImCPg,2322
 vellum/client/core/http_client.py,sha256=R0pQpCppnEtxccGvXl4uJ76s7ro_65Fo_erlNNLp_AI,19228
@@ -785,7 +787,7 @@ vellum/evaluations/utils/env.py,sha256=Xj_nxsoU5ox06EOTjRopR4lrigQI6Le6qbWGltYoE
 vellum/evaluations/utils/exceptions.py,sha256=dXMAkzqbHV_AP5FjjbegPlfUE0zQDlpA3qOsoOJUxfg,49
 vellum/evaluations/utils/paginator.py,sha256=rEED_BJAXAM6tM1yMwHePNzszjq_tTq4NbQvi1jWQ_Q,697
 vellum/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum/plugins/pydantic.py,sha256=XpQQs_o8DQY_5gFFDzJzaXahUqR_l5TEI4b5ZoH9ob8,3528
+vellum/plugins/pydantic.py,sha256=_kx82JIA050R67QAimgR7NQTuweSP7xLGW4qHLIepo4,3609
 vellum/plugins/utils.py,sha256=cPmxE9R2CK1bki2jKE8rB-G9zMf2pzHjSPDHFPXwd3Q,878
 vellum/plugins/vellum_mypy.py,sha256=QTuMSq6PiZW1dyTUZ5Bf1d4XkgFj0TKAgZLP8f4UgL4,27914
 vellum/prompts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1499,9 +1501,9 @@ vellum/workflows/nodes/core/__init__.py,sha256=5zDMCmyt1v0HTJzlUBwq3U9L825yZGZhT
 vellum/workflows/nodes/core/error_node/__init__.py,sha256=g7RRnlHhqu4qByfLjBwCunmgGA8dI5gNsjS3h6TwlSI,60
 vellum/workflows/nodes/core/error_node/node.py,sha256=MFHU5vITYSK-L9CuMZ49In2ZeNLWnhZD0f8r5dWvb5Y,1270
 vellum/workflows/nodes/core/inline_subworkflow_node/__init__.py,sha256=nKNEH1QTl-1PcvmYoqSWEl0-t6gAur8GLTXHzklRQfM,84
-vellum/workflows/nodes/core/inline_subworkflow_node/node.py,sha256=1RZ9x69qwziPupR5pkUQVTQnEaF4ieaJ8Uvx2gSbiow,6382
+vellum/workflows/nodes/core/inline_subworkflow_node/node.py,sha256=e-Mal5tZ6JXJdWn8MspoBbXC8LBaCVxKb4RjoHnuZ0A,6611
 vellum/workflows/nodes/core/inline_subworkflow_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum/workflows/nodes/core/inline_subworkflow_node/tests/test_node.py,sha256=BLmwLeWxgn6RgRKL8gi8bvV2ZfWnCTsqZDykTgJOjXg,3529
+vellum/workflows/nodes/core/inline_subworkflow_node/tests/test_node.py,sha256=kUqwcRMMxjTHALbwGUXCJT_aJBrHS1bkg49oL8R0JO8,4337
 vellum/workflows/nodes/core/map_node/__init__.py,sha256=MXpZYmGfhsMJHqqlpd64WiJRtbAtAMQz-_3fCU_cLV0,56
 vellum/workflows/nodes/core/map_node/node.py,sha256=dY27Xm11LHsqD7hnZnVYYDIazZ-XfL4_zatvWKTi6CU,9243
 vellum/workflows/nodes/core/map_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1644,8 +1646,8 @@ vellum/workflows/workflows/event_filters.py,sha256=GSxIgwrX26a1Smfd-6yss2abGCnad
 vellum/workflows/workflows/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/workflows/tests/test_base_workflow.py,sha256=tCxrV3QBHL8wfdEO3bvKteDdw32xBlUl1_WxkAwaONw,8344
 vellum/workflows/workflows/tests/test_context.py,sha256=VJBUcyWVtMa_lE5KxdhgMu0WYNYnUQUDvTF7qm89hJ0,2333
-vellum_ai-0.14.23.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-0.14.23.dist-info/METADATA,sha256=0Xb69QSCT3eV6id9Yn6oCfyj2LW_IQcxuYwJZW293zU,5484
-vellum_ai-0.14.23.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-0.14.23.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
-vellum_ai-0.14.23.dist-info/RECORD,,
+vellum_ai-0.14.24.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-0.14.24.dist-info/METADATA,sha256=eb9VJttYaBZqKdHGOIIAv6Pz2XxjEgZXBddFHyrXNNo,5484
+vellum_ai-0.14.24.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-0.14.24.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
+vellum_ai-0.14.24.dist-info/RECORD,,

vellum_ee/workflows/display/base.py

@@ -1,15 +1,37 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from uuid import UUID
 from typing import TypeVar
 
+from pydantic import Field
+
+from vellum.client.core.pydantic_utilities import UniversalBaseModel
+from vellum_ee.workflows.display.editor.types import NodeDisplayData
+
+
+class WorkflowDisplayDataViewport(UniversalBaseModel):
+    x: float = 0.0
+    y: float = 0.0
+    zoom: float = 1.0
+
+
+class WorkflowDisplayData(UniversalBaseModel):
+    viewport: WorkflowDisplayDataViewport = Field(default_factory=WorkflowDisplayDataViewport)
+
 
 @dataclass
-class WorkflowMetaDisplayOverrides:
-    pass
+class WorkflowMetaDisplay:
+    entrypoint_node_id: UUID
+    entrypoint_node_source_handle_id: UUID
+    entrypoint_node_display: NodeDisplayData = Field(default_factory=NodeDisplayData)
+    display_data: WorkflowDisplayData = field(default_factory=WorkflowDisplayData)
 
 
 @dataclass
-class WorkflowMetaDisplay(WorkflowMetaDisplayOverrides):
+class WorkflowMetaDisplayOverrides(WorkflowMetaDisplay):
+    """
+    DEPRECATED: Use WorkflowMetaDisplay instead. Will be removed in 0.15.0
+    """
+
     pass
 
 

vellum_ee/workflows/display/editor/__init__.py

@@ -0,0 +1,7 @@
+from .types import NodeDisplayComment, NodeDisplayData, NodeDisplayPosition
+
+__all__ = [
+    "NodeDisplayComment",
+    "NodeDisplayData",
+    "NodeDisplayPosition",
+]

vellum_ee/workflows/display/editor/types.py

@@ -0,0 +1,22 @@
+from typing import Optional
+
+from pydantic import Field
+
+from vellum.client.core.pydantic_utilities import UniversalBaseModel
+
+
+class NodeDisplayPosition(UniversalBaseModel):
+    x: float = 0.0
+    y: float = 0.0
+
+
+class NodeDisplayComment(UniversalBaseModel):
+    value: Optional[str] = None
+    expanded: Optional[bool] = None
+
+
+class NodeDisplayData(UniversalBaseModel):
+    position: NodeDisplayPosition = Field(default_factory=NodeDisplayPosition)
+    width: Optional[int] = None
+    height: Optional[int] = None
+    comment: Optional[NodeDisplayComment] = None

vellum_ee/workflows/display/nodes/base_node_display.py

@@ -17,6 +17,7 @@ from typing import (
     get_origin,
 )
 
+from vellum.client.types.code_resource_definition import CodeResourceDefinition
 from vellum.workflows import BaseWorkflow
 from vellum.workflows.constants import undefined
 from vellum.workflows.descriptors.base import BaseDescriptor
@@ -45,11 +46,11 @@ from vellum.workflows.types.utils import get_original_base
 from vellum.workflows.utils.names import pascal_to_title_case
 from vellum.workflows.utils.uuids import uuid4_from_hash
 from vellum.workflows.utils.vellum_variables import primitive_type_to_vellum_variable_type
+from vellum_ee.workflows.display.editor.types import NodeDisplayData
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
 from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay, PortDisplayOverrides
 from vellum_ee.workflows.display.utils.expressions import get_child_descriptor
 from vellum_ee.workflows.display.utils.vellum import convert_descriptor_to_operator, primitive_to_vellum_value
-from vellum_ee.workflows.display.vellum import CodeResourceDefinition, NodeDisplayData
 
 if TYPE_CHECKING:
     from vellum_ee.workflows.display.types import WorkflowDisplayContext

vellum_ee/workflows/display/nodes/base_node_vellum_display.py

@@ -4,9 +4,9 @@ from typing import ClassVar, Dict, Optional
 from vellum.workflows.nodes.utils import get_unadorned_node
 from vellum.workflows.ports import Port
 from vellum.workflows.types.generics import NodeType
+from vellum_ee.workflows.display.editor.types import NodeDisplayComment, NodeDisplayData
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.types import PortDisplay
-from vellum_ee.workflows.display.vellum import NodeDisplayComment, NodeDisplayData
 
 
 class BaseNodeVellumDisplay(BaseNodeDisplay[NodeType]):

vellum_ee/workflows/display/nodes/vellum/api_node.py

@@ -8,7 +8,7 @@ from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeV
 from vellum_ee.workflows.display.nodes.utils import raise_if_descriptor
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
-from vellum_ee.workflows.display.vellum import WorkspaceSecretPointer
+from vellum_ee.workflows.display.utils.vellum import WorkspaceSecretPointer
 
 _APINodeType = TypeVar("_APINodeType", bound=APINode)
 

vellum_ee/workflows/display/nodes/vellum/search_node.py

@@ -15,7 +15,8 @@ from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeV
 from vellum_ee.workflows.display.nodes.utils import raise_if_descriptor
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
-from vellum_ee.workflows.display.vellum import InputVariablePointer, NodeInput
+from vellum_ee.workflows.display.utils.vellum import InputVariablePointer
+from vellum_ee.workflows.display.vellum import NodeInput
 
 _SearchNodeType = TypeVar("_SearchNodeType", bound=SearchNode)
 

vellum_ee/workflows/display/nodes/vellum/tests/test_utils.py

@@ -8,21 +8,20 @@ from vellum.workflows.inputs import BaseInputs
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.outputs import BaseOutputs
 from vellum.workflows.references import LazyReference
+from vellum_ee.workflows.display.editor.types import NodeDisplayData
 from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
 from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input_value_pointer_rules
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
-from vellum_ee.workflows.display.vellum import (
+from vellum_ee.workflows.display.utils.vellum import (
     ConstantValuePointer,
     InputVariableData,
     InputVariablePointer,
-    NodeDisplayData,
     NodeInputValuePointerRule,
     NodeOutputData,
     NodeOutputPointer,
-    WorkflowInputsVellumDisplayOverrides,
-    WorkflowMetaVellumDisplay,
 )
+from vellum_ee.workflows.display.vellum import WorkflowInputsVellumDisplayOverrides, WorkflowMetaVellumDisplay
 from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
 
 
@@ -68,41 +67,36 @@ class MyNodeB(BaseNode):
             MyNodeB.fallback_example,
             [
                 NodeOutputPointer(
-                    type="NODE_OUTPUT",
                     data=NodeOutputData(
                         node_id="b48fa5e0-d7d3-4fe3-ae48-615415011cc5",
                         output_id="4b16a629-11a1-4b3f-a965-a57b872d13b8",
                     ),
                 ),
                 InputVariablePointer(
-                    type="INPUT_VARIABLE",
                     data=InputVariableData(input_variable_id="a154c29d-fac0-4cd0-ba88-bc52034f5470"),
                 ),
-                ConstantValuePointer(type="CONSTANT_VALUE", data=StringVellumValue(value="fallback")),
+                ConstantValuePointer(data=StringVellumValue(value="fallback")),
             ],
         ),
         (
             MyNodeB.constant_coalesce,
             [
                 InputVariablePointer(
-                    type="INPUT_VARIABLE",
                     data=InputVariableData(input_variable_id="a154c29d-fac0-4cd0-ba88-bc52034f5470"),
                 ),
-                ConstantValuePointer(type="CONSTANT_VALUE", data=StringVellumValue(value="default_value")),
+                ConstantValuePointer(data=StringVellumValue(value="default_value")),
             ],
         ),
         (
             MyNodeB.lazy_coalesce,
             [
                 NodeOutputPointer(
-                    type="NODE_OUTPUT",
                     data=NodeOutputData(
                         node_id="b48fa5e0-d7d3-4fe3-ae48-615415011cc5",
                         output_id="4b16a629-11a1-4b3f-a965-a57b872d13b8",
                     ),
                 ),
                 InputVariablePointer(
-                    type="INPUT_VARIABLE",
                     data=InputVariableData(input_variable_id="a154c29d-fac0-4cd0-ba88-bc52034f5470"),
                 ),
             ],

vellum_ee/workflows/display/nodes/vellum/utils.py

@@ -9,19 +9,18 @@ from vellum.workflows.references.lazy import LazyReference
 from vellum.workflows.utils.uuids import uuid4_from_hash
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
 from vellum_ee.workflows.display.utils.expressions import get_child_descriptor
-from vellum_ee.workflows.display.utils.vellum import create_node_input_value_pointer_rule
-from vellum_ee.workflows.display.vellum import (
+from vellum_ee.workflows.display.utils.vellum import (
     ConstantValuePointer,
     ExecutionCounterData,
     ExecutionCounterPointer,
     InputVariableData,
     InputVariablePointer,
-    NodeInput,
-    NodeInputValuePointer,
     NodeInputValuePointerRule,
     WorkspaceSecretData,
     WorkspaceSecretPointer,
+    create_node_input_value_pointer_rule,
 )
+from vellum_ee.workflows.display.vellum import NodeInput, NodeInputValuePointer
 
 
 def create_node_input(

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

@@ -9,11 +9,12 @@ from vellum.workflows.references.workflow_input import WorkflowInputReference
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.types.generics import NodeType
 from vellum_ee.workflows.display.base import StateValueDisplayType, WorkflowInputsDisplayType
+from vellum_ee.workflows.display.editor.types import NodeDisplayData
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
 from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
-from vellum_ee.workflows.display.vellum import NodeDisplayData, WorkflowMetaVellumDisplay
+from vellum_ee.workflows.display.vellum import WorkflowMetaVellumDisplay
 from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
 
 

vellum_ee/workflows/display/types.py

@@ -11,41 +11,44 @@ from vellum_ee.workflows.display.base import (
     EntrypointDisplayType,
     StateValueDisplayType,
     WorkflowInputsDisplayType,
-    WorkflowMetaDisplayType,
+    WorkflowMetaDisplay,
     WorkflowOutputDisplay,
 )
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
+from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay
 
 if TYPE_CHECKING:
-    from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
-    from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay
     from vellum_ee.workflows.display.workflows import BaseWorkflowDisplay
 
 WorkflowDisplayType = TypeVar("WorkflowDisplayType", bound="BaseWorkflowDisplay")
 
+NodeDisplays = Dict[Type[BaseNode], BaseNodeDisplay]
+NodeOutputDisplays = Dict[OutputReference, Tuple[Type[BaseNode], NodeOutputDisplay]]
+WorkflowOutputDisplays = Dict[BaseDescriptor, WorkflowOutputDisplay]
+EdgeDisplays = Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay]
+PortDisplays = Dict[Port, PortDisplay]
+
 
 @dataclass
 class WorkflowDisplayContext(
     Generic[
-        WorkflowMetaDisplayType,
         WorkflowInputsDisplayType,
         StateValueDisplayType,
         EntrypointDisplayType,
     ]
 ):
     workflow_display_class: Type["BaseWorkflowDisplay"]
-    workflow_display: WorkflowMetaDisplayType
+    workflow_display: WorkflowMetaDisplay
     workflow_input_displays: Dict[WorkflowInputReference, WorkflowInputsDisplayType] = field(default_factory=dict)
     global_workflow_input_displays: Dict[WorkflowInputReference, WorkflowInputsDisplayType] = field(
         default_factory=dict
     )
     state_value_displays: Dict[StateValueReference, StateValueDisplayType] = field(default_factory=dict)
     global_state_value_displays: Dict[StateValueReference, StateValueDisplayType] = field(default_factory=dict)
-    node_displays: Dict[Type[BaseNode], "BaseNodeDisplay"] = field(default_factory=dict)
-    global_node_displays: Dict[Type[BaseNode], "BaseNodeDisplay"] = field(default_factory=dict)
-    global_node_output_displays: Dict[OutputReference, Tuple[Type[BaseNode], "NodeOutputDisplay"]] = field(
-        default_factory=dict
-    )
+    node_displays: NodeDisplays = field(default_factory=dict)
+    global_node_displays: NodeDisplays = field(default_factory=dict)
+    global_node_output_displays: NodeOutputDisplays = field(default_factory=dict)
     entrypoint_displays: Dict[Type[BaseNode], EntrypointDisplayType] = field(default_factory=dict)
-    workflow_output_displays: Dict[BaseDescriptor, WorkflowOutputDisplay] = field(default_factory=dict)
-    edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay] = field(default_factory=dict)
-    port_displays: Dict[Port, "PortDisplay"] = field(default_factory=dict)
+    workflow_output_displays: WorkflowOutputDisplays = field(default_factory=dict)
+    edge_displays: EdgeDisplays = field(default_factory=dict)
+    port_displays: PortDisplays = field(default_factory=dict)

vellum_ee/workflows/display/utils/expressions.py

@@ -1,9 +1,13 @@
+from typing import TYPE_CHECKING
+
 from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.references.lazy import LazyReference
-from vellum_ee.workflows.display.types import WorkflowDisplayContext
+
+if TYPE_CHECKING:
+    from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
 
-def get_child_descriptor(value: LazyReference, display_context: WorkflowDisplayContext) -> BaseDescriptor:
+def get_child_descriptor(value: LazyReference, display_context: "WorkflowDisplayContext") -> BaseDescriptor:
     if isinstance(value._get, str):
         reference_parts = value._get.split(".")
         if len(reference_parts) < 3:

vellum_ee/workflows/display/utils/vellum.py

@@ -1,6 +1,9 @@
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 
+from vellum.client.core.pydantic_utilities import UniversalBaseModel
+from vellum.client.types.array_vellum_value import ArrayVellumValue
 from vellum.client.types.logical_operator import LogicalOperator
+from vellum.client.types.vellum_value import VellumValue
 from vellum.client.types.vellum_variable_type import VellumVariableType
 from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.expressions.and_ import AndExpression
@@ -39,23 +42,66 @@ 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.utils.expressions import get_child_descriptor
-from vellum_ee.workflows.display.vellum import (
-    ConstantValuePointer,
-    ExecutionCounterData,
-    ExecutionCounterPointer,
-    InputVariableData,
-    InputVariablePointer,
-    NodeInputValuePointerRule,
-    NodeOutputData,
-    NodeOutputPointer,
-    WorkspaceSecretData,
-    WorkspaceSecretPointer,
-)
 
 if TYPE_CHECKING:
     from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
 
+class ConstantValuePointer(UniversalBaseModel):
+    type: Literal["CONSTANT_VALUE"] = "CONSTANT_VALUE"
+    data: VellumValue
+
+
+ArrayVellumValue.model_rebuild()
+
+
+class NodeOutputData(UniversalBaseModel):
+    node_id: str
+    output_id: str
+
+
+class NodeOutputPointer(UniversalBaseModel):
+    type: Literal["NODE_OUTPUT"] = "NODE_OUTPUT"
+    data: NodeOutputData
+
+
+class InputVariableData(UniversalBaseModel):
+    input_variable_id: str
+
+
+class InputVariablePointer(UniversalBaseModel):
+    type: Literal["INPUT_VARIABLE"] = "INPUT_VARIABLE"
+    data: InputVariableData
+
+
+class WorkspaceSecretData(UniversalBaseModel):
+    type: VellumVariableType
+    workspace_secret_id: Optional[str] = None
+
+
+class WorkspaceSecretPointer(UniversalBaseModel):
+    type: Literal["WORKSPACE_SECRET"] = "WORKSPACE_SECRET"
+    data: WorkspaceSecretData
+
+
+class ExecutionCounterData(UniversalBaseModel):
+    node_id: str
+
+
+class ExecutionCounterPointer(UniversalBaseModel):
+    type: Literal["EXECUTION_COUNTER"] = "EXECUTION_COUNTER"
+    data: ExecutionCounterData
+
+
+NodeInputValuePointerRule = Union[
+    NodeOutputPointer,
+    InputVariablePointer,
+    ConstantValuePointer,
+    WorkspaceSecretPointer,
+    ExecutionCounterPointer,
+]
+
+
 def infer_vellum_variable_type(value: Any) -> VellumVariableType:
     inferred_type: VellumVariableType
 

vellum_ee/workflows/display/vellum.py

@@ -1,12 +1,7 @@
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from uuid import UUID
-from typing import List, Literal, Optional, Union
+from typing import List, Literal, Optional
 
-from pydantic import Field
-
-from vellum import VellumVariableType
-from vellum.client.types.array_vellum_value import ArrayVellumValue
-from vellum.client.types.vellum_value import VellumValue
 from vellum.core import UniversalBaseModel
 from vellum_ee.workflows.display.base import (
     EdgeDisplay,
@@ -17,27 +12,15 @@ from vellum_ee.workflows.display.base import (
     StateValueDisplayOverrides,
     WorkflowInputsDisplay,
     WorkflowInputsDisplayOverrides,
-    WorkflowMetaDisplay,
     WorkflowMetaDisplayOverrides,
     WorkflowOutputDisplayOverrides,
 )
-
-
-class NodeDisplayPosition(UniversalBaseModel):
-    x: float = 0.0
-    y: float = 0.0
-
-
-class NodeDisplayComment(UniversalBaseModel):
-    value: Optional[str] = None
-    expanded: Optional[bool] = None
-
-
-class NodeDisplayData(UniversalBaseModel):
-    position: NodeDisplayPosition = Field(default_factory=NodeDisplayPosition)
-    width: Optional[int] = None
-    height: Optional[int] = None
-    comment: Optional[NodeDisplayComment] = None
+from vellum_ee.workflows.display.base import WorkflowDisplayData  # noqa: F401 - Remove in 0.15.0
+from vellum_ee.workflows.display.base import WorkflowDisplayDataViewport  # noqa: F401 - Remove in 0.15.0
+from vellum_ee.workflows.display.editor.types import NodeDisplayComment  # noqa: F401 - Remove in 0.15.0
+from vellum_ee.workflows.display.editor.types import NodeDisplayData
+from vellum_ee.workflows.display.editor.types import NodeDisplayPosition  # noqa: F401 - Remove in 0.15.0
+from vellum_ee.workflows.display.utils.vellum import NodeInputValuePointerRule
 
 
 class CodeResourceDefinition(UniversalBaseModel):
@@ -45,26 +28,21 @@ class CodeResourceDefinition(UniversalBaseModel):
     module: List[str]
 
 
-class WorkflowDisplayDataViewport(UniversalBaseModel):
-    x: float = 0.0
-    y: float = 0.0
-    zoom: float = 1.0
-
-
-class WorkflowDisplayData(UniversalBaseModel):
-    viewport: WorkflowDisplayDataViewport = Field(default_factory=WorkflowDisplayDataViewport)
-
-
 @dataclass
-class WorkflowMetaVellumDisplayOverrides(WorkflowMetaDisplay, WorkflowMetaDisplayOverrides):
-    entrypoint_node_id: UUID
-    entrypoint_node_source_handle_id: UUID
-    entrypoint_node_display: NodeDisplayData
-    display_data: WorkflowDisplayData = field(default_factory=WorkflowDisplayData)
+class WorkflowMetaVellumDisplayOverrides(WorkflowMetaDisplayOverrides):
+    """
+    DEPRECATED: Use WorkflowMetaDisplay instead. Will be removed in 0.15.0
+    """
+
+    pass
 
 
 @dataclass
 class WorkflowMetaVellumDisplay(WorkflowMetaVellumDisplayOverrides):
+    """
+    DEPRECATED: Use WorkflowMetaDisplay instead. Will be removed in 0.15.0
+    """
+
     pass
 
 
@@ -145,61 +123,6 @@ class WorkflowOutputVellumDisplay(WorkflowOutputVellumDisplayOverrides):
     pass
 
 
-class ConstantValuePointer(UniversalBaseModel):
-    type: Literal["CONSTANT_VALUE"] = "CONSTANT_VALUE"
-    data: VellumValue
-
-
-ArrayVellumValue.model_rebuild()
-
-
-class NodeOutputData(UniversalBaseModel):
-    node_id: str
-    output_id: str
-
-
-class NodeOutputPointer(UniversalBaseModel):
-    type: Literal["NODE_OUTPUT"] = "NODE_OUTPUT"
-    data: NodeOutputData
-
-
-class InputVariableData(UniversalBaseModel):
-    input_variable_id: str
-
-
-class InputVariablePointer(UniversalBaseModel):
-    type: Literal["INPUT_VARIABLE"] = "INPUT_VARIABLE"
-    data: InputVariableData
-
-
-class WorkspaceSecretData(UniversalBaseModel):
-    type: VellumVariableType
-    workspace_secret_id: Optional[str] = None
-
-
-class WorkspaceSecretPointer(UniversalBaseModel):
-    type: Literal["WORKSPACE_SECRET"] = "WORKSPACE_SECRET"
-    data: WorkspaceSecretData
-
-
-class ExecutionCounterData(UniversalBaseModel):
-    node_id: str
-
-
-class ExecutionCounterPointer(UniversalBaseModel):
-    type: Literal["EXECUTION_COUNTER"] = "EXECUTION_COUNTER"
-    data: ExecutionCounterData
-
-
-NodeInputValuePointerRule = Union[
-    NodeOutputPointer,
-    InputVariablePointer,
-    ConstantValuePointer,
-    WorkspaceSecretPointer,
-    ExecutionCounterPointer,
-]
-
-
 class NodeInputValuePointer(UniversalBaseModel):
     rules: List[NodeInputValuePointerRule]
     combinator: Literal["OR"] = "OR"

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -25,16 +25,22 @@ from vellum_ee.workflows.display.base import (
     StateValueDisplayType,
     WorkflowInputsDisplayOverridesType,
     WorkflowInputsDisplayType,
-    WorkflowMetaDisplayOverridesType,
-    WorkflowMetaDisplayType,
+    WorkflowMetaDisplay,
     WorkflowOutputDisplay,
 )
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
-from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay, PortDisplayOverrides
+from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay
 from vellum_ee.workflows.display.nodes.utils import raise_if_descriptor
-from vellum_ee.workflows.display.types import WorkflowDisplayContext
+from vellum_ee.workflows.display.types import (
+    EdgeDisplays,
+    NodeDisplays,
+    NodeOutputDisplays,
+    PortDisplays,
+    WorkflowDisplayContext,
+    WorkflowOutputDisplays,
+)
 from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
 
 logger = logging.getLogger(__name__)
@@ -43,8 +49,6 @@ logger = logging.getLogger(__name__)
 class BaseWorkflowDisplay(
     Generic[
         WorkflowType,
-        WorkflowMetaDisplayType,
-        WorkflowMetaDisplayOverridesType,
         WorkflowInputsDisplayType,
         WorkflowInputsDisplayOverridesType,
         StateValueDisplayType,
@@ -54,7 +58,7 @@ class BaseWorkflowDisplay(
     ]
 ):
     # Used to specify the display data for a workflow.
-    workflow_display: Optional[WorkflowMetaDisplayOverridesType] = None
+    workflow_display: Optional[WorkflowMetaDisplay] = None
 
     # Used to explicitly specify display data for a workflow's inputs.
     inputs_display: Dict[WorkflowInputReference, WorkflowInputsDisplayOverridesType] = {}
@@ -66,13 +70,13 @@ class BaseWorkflowDisplay(
     entrypoint_displays: Dict[Type[BaseNode], EntrypointDisplayOverridesType] = {}
 
     # Used to explicitly specify display data for a workflow's outputs.
-    output_displays: Dict[BaseDescriptor, WorkflowOutputDisplay] = {}
+    output_displays: WorkflowOutputDisplays = {}
 
     # Used to explicitly specify display data for a workflow's edges.
-    edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay] = {}
+    edge_displays: EdgeDisplays = {}
 
     # Used to explicitly specify display data for a workflow's ports.
-    port_displays: Dict[Port, PortDisplayOverrides] = {}
+    port_displays: PortDisplays = {}
 
     # Used to store the mapping between workflows and their display classes
     _workflow_display_registry: Dict[Type[WorkflowType], Type["BaseWorkflowDisplay"]] = {}
@@ -87,7 +91,6 @@ class BaseWorkflowDisplay(
         *,
         parent_display_context: Optional[
             WorkflowDisplayContext[
-                WorkflowMetaDisplayType,
                 WorkflowInputsDisplayType,
                 StateValueDisplayType,
                 EntrypointDisplayType,
@@ -183,50 +186,41 @@ class BaseWorkflowDisplay(
     def display_context(
         self,
     ) -> WorkflowDisplayContext[
-        WorkflowMetaDisplayType,
         WorkflowInputsDisplayType,
         StateValueDisplayType,
         EntrypointDisplayType,
     ]:
         workflow_display = self._generate_workflow_meta_display()
 
-        global_node_output_displays: Dict[OutputReference, Tuple[Type[BaseNode], NodeOutputDisplay]] = (
+        global_node_output_displays: NodeOutputDisplays = (
             copy(self._parent_display_context.global_node_output_displays) if self._parent_display_context else {}
         )
 
-        node_displays: Dict[Type[BaseNode], BaseNodeDisplay] = {}
+        node_displays: NodeDisplays = {}
 
-        global_node_displays: Dict[Type[BaseNode], BaseNodeDisplay] = (
+        global_node_displays: NodeDisplays = (
             copy(self._parent_display_context.global_node_displays) if self._parent_display_context else {}
         )
 
-        port_displays: Dict[Port, PortDisplay] = {}
+        port_displays: PortDisplays = {}
 
         for node in self._workflow.get_nodes():
-            extracted_node_displays = self._extract_node_displays(node)
-
-            for extracted_node, extracted_node_display in extracted_node_displays.items():
-                if extracted_node not in node_displays:
-                    node_displays[extracted_node] = extracted_node_display
-
-                if extracted_node not in global_node_displays:
-                    global_node_displays[extracted_node] = extracted_node_display
-
-            self._enrich_global_node_output_displays(node, extracted_node_displays[node], global_node_output_displays)
-            self._enrich_node_port_displays(node, extracted_node_displays[node], port_displays)
+            self._enrich_node_displays(
+                node=node,
+                node_displays=node_displays,
+                global_node_displays=global_node_displays,
+                global_node_output_displays=global_node_output_displays,
+                port_displays=port_displays,
+            )
 
         for node in self._workflow.get_unused_nodes():
-            extracted_node_displays = self._extract_node_displays(node)
-
-            for extracted_node, extracted_node_display in extracted_node_displays.items():
-                if extracted_node not in node_displays:
-                    node_displays[extracted_node] = extracted_node_display
-
-                if extracted_node not in global_node_displays:
-                    global_node_displays[extracted_node] = extracted_node_display
-
-            self._enrich_global_node_output_displays(node, extracted_node_displays[node], global_node_output_displays)
-            self._enrich_node_port_displays(node, extracted_node_displays[node], port_displays)
+            self._enrich_node_displays(
+                node=node,
+                node_displays=node_displays,
+                global_node_displays=global_node_displays,
+                global_node_output_displays=global_node_output_displays,
+                port_displays=port_displays,
+            )
 
         workflow_input_displays: Dict[WorkflowInputReference, WorkflowInputsDisplayType] = {}
         # If we're dealing with a nested workflow, then it should have access to the inputs of its parents.
@@ -312,7 +306,7 @@ class BaseWorkflowDisplay(
         )
 
     @abstractmethod
-    def _generate_workflow_meta_display(self) -> WorkflowMetaDisplayType:
+    def _generate_workflow_meta_display(self) -> WorkflowMetaDisplay:
         pass
 
     @abstractmethod
@@ -331,7 +325,7 @@ class BaseWorkflowDisplay(
     def _generate_entrypoint_display(
         self,
         entrypoint: Type[BaseNode],
-        workflow_display: WorkflowMetaDisplayType,
+        workflow_display: WorkflowMetaDisplay,
         node_displays: Dict[Type[BaseNode], BaseNodeDisplay],
         overrides: Optional[EntrypointDisplayOverridesType] = None,
     ) -> EntrypointDisplayType:
@@ -418,6 +412,26 @@ class BaseWorkflowDisplay(
         )
         return display_meta
 
+    def _enrich_node_displays(
+        self,
+        node: Type[BaseNode],
+        node_displays: NodeDisplays,
+        global_node_displays: NodeDisplays,
+        global_node_output_displays: NodeOutputDisplays,
+        port_displays: PortDisplays,
+    ) -> None:
+        extracted_node_displays = self._extract_node_displays(node)
+
+        for extracted_node, extracted_node_display in extracted_node_displays.items():
+            if extracted_node not in node_displays:
+                node_displays[extracted_node] = extracted_node_display
+
+            if extracted_node not in global_node_displays:
+                global_node_displays[extracted_node] = extracted_node_display
+
+        self._enrich_global_node_output_displays(node, extracted_node_displays[node], global_node_output_displays)
+        self._enrich_node_port_displays(node, extracted_node_displays[node], port_displays)
+
     def _extract_node_displays(self, node: Type[BaseNode]) -> Dict[Type[BaseNode], BaseNodeDisplay]:
         node_display = self._get_node_display(node)
         additional_node_displays: Dict[Type[BaseNode], BaseNodeDisplay] = {

vellum_ee/workflows/display/workflows/tests/test_workflow_display.py

@@ -7,10 +7,10 @@ from vellum.workflows.nodes.core.retry_node.node import RetryNode
 from vellum.workflows.nodes.core.templating_node.node import TemplatingNode
 from vellum.workflows.nodes.core.try_node.node import TryNode
 from vellum.workflows.workflows.base import BaseWorkflow
+from vellum_ee.workflows.display.editor.types import NodeDisplayData, NodeDisplayPosition
 from vellum_ee.workflows.display.nodes import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.vellum.retry_node import BaseRetryNodeDisplay
 from vellum_ee.workflows.display.nodes.vellum.try_node import BaseTryNodeDisplay
-from vellum_ee.workflows.display.vellum import NodeDisplayData, NodeDisplayPosition
 from vellum_ee.workflows.display.workflows import VellumWorkflowDisplay
 from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
 

vellum_ee/workflows/display/workflows/vellum_workflow_display.py

@@ -12,6 +12,7 @@ from vellum.workflows.references.output import OutputReference
 from vellum.workflows.types.core import JsonArray, JsonObject
 from vellum.workflows.types.generics import WorkflowType
 from vellum.workflows.utils.uuids import uuid4_from_hash
+from vellum_ee.workflows.display.base import WorkflowMetaDisplay
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input
@@ -25,7 +26,6 @@ from vellum_ee.workflows.display.vellum import (
     WorkflowInputsVellumDisplay,
     WorkflowInputsVellumDisplayOverrides,
     WorkflowMetaVellumDisplay,
-    WorkflowMetaVellumDisplayOverrides,
 )
 from vellum_ee.workflows.display.workflows.base_workflow_display import BaseWorkflowDisplay
 
@@ -35,8 +35,6 @@ logger = logging.getLogger(__name__)
 class VellumWorkflowDisplay(
     BaseWorkflowDisplay[
         WorkflowType,
-        WorkflowMetaVellumDisplay,
-        WorkflowMetaVellumDisplayOverrides,
         WorkflowInputsVellumDisplay,
         WorkflowInputsVellumDisplayOverrides,
         StateValueVellumDisplay,
@@ -346,7 +344,7 @@ class VellumWorkflowDisplay(
     def _generate_entrypoint_display(
         self,
         entrypoint: Type[BaseNode],
-        workflow_display: WorkflowMetaVellumDisplay,
+        workflow_display: WorkflowMetaDisplay,
         node_displays: Dict[Type[BaseNode], BaseNodeDisplay],
         overrides: Optional[EntrypointVellumDisplayOverrides] = None,
     ) -> EntrypointVellumDisplay: