vellum-ai 0.14.40__py3-none-any.whl → 0.14.41__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.40",
+            "X-Fern-SDK-Version": "0.14.41",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

vellum/client/reference.md

@@ -1206,6 +1206,143 @@ client.submit_workflow_execution_actuals(
 </details>
 
 ## AdHoc
+<details><summary><code>client.ad_hoc.<a href="src/vellum/resources/ad_hoc/client.py">adhoc_execute_prompt</a>(...)</code></summary>
+<dl>
+<dd>
+
+#### 🔌 Usage
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+```python
+from vellum import (
+    JinjaPromptBlock,
+    PromptParameters,
+    PromptRequestStringInput,
+    Vellum,
+    VellumVariable,
+)
+
+client = Vellum(
+    api_key="YOUR_API_KEY",
+)
+client.ad_hoc.adhoc_execute_prompt(
+    ml_model="ml_model",
+    input_values=[
+        PromptRequestStringInput(
+            key="key",
+            value="value",
+        )
+    ],
+    input_variables=[
+        VellumVariable(
+            id="id",
+            key="key",
+            type="STRING",
+        )
+    ],
+    parameters=PromptParameters(),
+    blocks=[
+        JinjaPromptBlock(
+            template="template",
+        )
+    ],
+)
+
+```
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### ⚙️ Parameters
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+**ml_model:** `str` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**input_values:** `typing.Sequence[PromptRequestInput]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**input_variables:** `typing.Sequence[VellumVariable]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**parameters:** `PromptParameters` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**blocks:** `typing.Sequence[PromptBlock]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**settings:** `typing.Optional[PromptSettings]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**functions:** `typing.Optional[typing.Sequence[FunctionDefinition]]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**expand_meta:** `typing.Optional[AdHocExpandMeta]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.
+    
+</dd>
+</dl>
+</dd>
+</dl>
+
+
+</dd>
+</dl>
+</details>
+
 <details><summary><code>client.ad_hoc.<a href="src/vellum/resources/ad_hoc/client.py">adhoc_execute_prompt_stream</a>(...)</code></summary>
 <dl>
 <dd>
@@ -2110,7 +2247,7 @@ client.deployments.update_deployment_release_tag(
 <dl>
 <dd>
 
-**history_item_id:** `typing.Optional[str]` — The ID of the Deployment History Item to tag
+**history_item_id:** `typing.Optional[str]` — The ID of the Release to tag
     
 </dd>
 </dl>

vellum/client/resources/ad_hoc/client.py

@@ -13,12 +13,12 @@ from ...core.request_options import RequestOptions
 from ...types.ad_hoc_execute_prompt_event import AdHocExecutePromptEvent
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.pydantic_utilities import parse_obj_as
-import json
 from ...errors.bad_request_error import BadRequestError
 from ...errors.forbidden_error import ForbiddenError
 from ...errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError
+import json
 from ...core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -29,6 +29,157 @@ class AdHocClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def adhoc_execute_prompt(
+        self,
+        *,
+        ml_model: str,
+        input_values: typing.Sequence[PromptRequestInput],
+        input_variables: typing.Sequence[VellumVariable],
+        parameters: PromptParameters,
+        blocks: typing.Sequence[PromptBlock],
+        settings: typing.Optional[PromptSettings] = OMIT,
+        functions: typing.Optional[typing.Sequence[FunctionDefinition]] = OMIT,
+        expand_meta: typing.Optional[AdHocExpandMeta] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AdHocExecutePromptEvent:
+        """
+        Parameters
+        ----------
+        ml_model : str
+
+        input_values : typing.Sequence[PromptRequestInput]
+
+        input_variables : typing.Sequence[VellumVariable]
+
+        parameters : PromptParameters
+
+        blocks : typing.Sequence[PromptBlock]
+
+        settings : typing.Optional[PromptSettings]
+
+        functions : typing.Optional[typing.Sequence[FunctionDefinition]]
+
+        expand_meta : typing.Optional[AdHocExpandMeta]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AdHocExecutePromptEvent
+
+
+        Examples
+        --------
+        from vellum import (
+            JinjaPromptBlock,
+            PromptParameters,
+            PromptRequestStringInput,
+            Vellum,
+            VellumVariable,
+        )
+
+        client = Vellum(
+            api_key="YOUR_API_KEY",
+        )
+        client.ad_hoc.adhoc_execute_prompt(
+            ml_model="ml_model",
+            input_values=[
+                PromptRequestStringInput(
+                    key="key",
+                    value="value",
+                )
+            ],
+            input_variables=[
+                VellumVariable(
+                    id="id",
+                    key="key",
+                    type="STRING",
+                )
+            ],
+            parameters=PromptParameters(),
+            blocks=[
+                JinjaPromptBlock(
+                    template="template",
+                )
+            ],
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v1/ad-hoc/execute-prompt",
+            base_url=self._client_wrapper.get_environment().default,
+            method="POST",
+            json={
+                "ml_model": ml_model,
+                "input_values": convert_and_respect_annotation_metadata(
+                    object_=input_values, annotation=typing.Sequence[PromptRequestInput], direction="write"
+                ),
+                "input_variables": convert_and_respect_annotation_metadata(
+                    object_=input_variables, annotation=typing.Sequence[VellumVariable], direction="write"
+                ),
+                "parameters": convert_and_respect_annotation_metadata(
+                    object_=parameters, annotation=PromptParameters, direction="write"
+                ),
+                "settings": convert_and_respect_annotation_metadata(
+                    object_=settings, annotation=PromptSettings, direction="write"
+                ),
+                "blocks": convert_and_respect_annotation_metadata(
+                    object_=blocks, annotation=typing.Sequence[PromptBlock], direction="write"
+                ),
+                "functions": convert_and_respect_annotation_metadata(
+                    object_=functions, annotation=typing.Sequence[FunctionDefinition], direction="write"
+                ),
+                "expand_meta": convert_and_respect_annotation_metadata(
+                    object_=expand_meta, annotation=AdHocExpandMeta, direction="write"
+                ),
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    AdHocExecutePromptEvent,
+                    parse_obj_as(
+                        type_=AdHocExecutePromptEvent,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 400:
+                raise BadRequestError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 403:
+                raise ForbiddenError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 500:
+                raise InternalServerError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
     def adhoc_execute_prompt_stream(
         self,
         *,
@@ -195,6 +346,165 @@ class AsyncAdHocClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def adhoc_execute_prompt(
+        self,
+        *,
+        ml_model: str,
+        input_values: typing.Sequence[PromptRequestInput],
+        input_variables: typing.Sequence[VellumVariable],
+        parameters: PromptParameters,
+        blocks: typing.Sequence[PromptBlock],
+        settings: typing.Optional[PromptSettings] = OMIT,
+        functions: typing.Optional[typing.Sequence[FunctionDefinition]] = OMIT,
+        expand_meta: typing.Optional[AdHocExpandMeta] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AdHocExecutePromptEvent:
+        """
+        Parameters
+        ----------
+        ml_model : str
+
+        input_values : typing.Sequence[PromptRequestInput]
+
+        input_variables : typing.Sequence[VellumVariable]
+
+        parameters : PromptParameters
+
+        blocks : typing.Sequence[PromptBlock]
+
+        settings : typing.Optional[PromptSettings]
+
+        functions : typing.Optional[typing.Sequence[FunctionDefinition]]
+
+        expand_meta : typing.Optional[AdHocExpandMeta]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AdHocExecutePromptEvent
+
+
+        Examples
+        --------
+        import asyncio
+
+        from vellum import (
+            AsyncVellum,
+            JinjaPromptBlock,
+            PromptParameters,
+            PromptRequestStringInput,
+            VellumVariable,
+        )
+
+        client = AsyncVellum(
+            api_key="YOUR_API_KEY",
+        )
+
+
+        async def main() -> None:
+            await client.ad_hoc.adhoc_execute_prompt(
+                ml_model="ml_model",
+                input_values=[
+                    PromptRequestStringInput(
+                        key="key",
+                        value="value",
+                    )
+                ],
+                input_variables=[
+                    VellumVariable(
+                        id="id",
+                        key="key",
+                        type="STRING",
+                    )
+                ],
+                parameters=PromptParameters(),
+                blocks=[
+                    JinjaPromptBlock(
+                        template="template",
+                    )
+                ],
+            )
+
+
+        asyncio.run(main())
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v1/ad-hoc/execute-prompt",
+            base_url=self._client_wrapper.get_environment().default,
+            method="POST",
+            json={
+                "ml_model": ml_model,
+                "input_values": convert_and_respect_annotation_metadata(
+                    object_=input_values, annotation=typing.Sequence[PromptRequestInput], direction="write"
+                ),
+                "input_variables": convert_and_respect_annotation_metadata(
+                    object_=input_variables, annotation=typing.Sequence[VellumVariable], direction="write"
+                ),
+                "parameters": convert_and_respect_annotation_metadata(
+                    object_=parameters, annotation=PromptParameters, direction="write"
+                ),
+                "settings": convert_and_respect_annotation_metadata(
+                    object_=settings, annotation=PromptSettings, direction="write"
+                ),
+                "blocks": convert_and_respect_annotation_metadata(
+                    object_=blocks, annotation=typing.Sequence[PromptBlock], direction="write"
+                ),
+                "functions": convert_and_respect_annotation_metadata(
+                    object_=functions, annotation=typing.Sequence[FunctionDefinition], direction="write"
+                ),
+                "expand_meta": convert_and_respect_annotation_metadata(
+                    object_=expand_meta, annotation=AdHocExpandMeta, direction="write"
+                ),
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    AdHocExecutePromptEvent,
+                    parse_obj_as(
+                        type_=AdHocExecutePromptEvent,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 400:
+                raise BadRequestError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 403:
+                raise ForbiddenError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 500:
+                raise InternalServerError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
     async def adhoc_execute_prompt_stream(
         self,
         *,

vellum/client/resources/deployments/client.py

@@ -351,7 +351,7 @@ class DeploymentsClient:
             The name of the Release Tag associated with this Deployment that you'd like to update.
 
         history_item_id : typing.Optional[str]
-            The ID of the Deployment History Item to tag
+            The ID of the Release to tag
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -895,7 +895,7 @@ class AsyncDeploymentsClient:
             The name of the Release Tag associated with this Deployment that you'd like to update.
 
         history_item_id : typing.Optional[str]
-            The ID of the Deployment History Item to tag
+            The ID of the Release to tag
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.

vellum/workflows/nodes/experimental/tool_calling_node/node.py

@@ -1,8 +1,7 @@
 from collections.abc import Callable
-from typing import Any, ClassVar, Dict, List, Optional, cast
+from typing import Any, ClassVar, List, Optional
 
-from vellum import ChatMessage, FunctionDefinition, PromptBlock
-from vellum.client.types.chat_message_request import ChatMessageRequest
+from vellum import ChatMessage, PromptBlock
 from vellum.workflows.context import execution_context, get_parent_context
 from vellum.workflows.errors.types import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
@@ -35,8 +34,7 @@ class ToolCallingNode(BaseNode):
 
     ml_model: ClassVar[str] = "gpt-4o-mini"
     blocks: ClassVar[List[PromptBlock]] = []
-    functions: ClassVar[List[FunctionDefinition]] = []
-    function_callables: ClassVar[Dict[str, Callable[..., Any]]] = {}
+    functions: ClassVar[List[Callable[..., Any]]] = []
     prompt_inputs: ClassVar[Optional[EntityInputsInterface]] = None
     # TODO: https://linear.app/vellum/issue/APO-342/support-tool-call-max-retries
     max_tool_calls: ClassVar[int] = 1
@@ -59,27 +57,13 @@ class ToolCallingNode(BaseNode):
         This dynamically builds a graph with router and function nodes,
         then executes the workflow.
         """
-        self._validate_functions()
-
-        initial_chat_history = []
-
-        # Extract chat history from prompt inputs if available
-        if self.prompt_inputs and "chat_history" in self.prompt_inputs:
-            chat_history_input = self.prompt_inputs["chat_history"]
-            if isinstance(chat_history_input, list) and all(
-                isinstance(msg, (ChatMessage, ChatMessageRequest)) for msg in chat_history_input
-            ):
-                initial_chat_history = [
-                    msg if isinstance(msg, ChatMessage) else ChatMessage.model_validate(msg.model_dump())
-                    for msg in chat_history_input
-                ]
 
         self._build_graph()
 
         with execution_context(parent_context=get_parent_context()):
 
             class ToolCallingState(BaseState):
-                chat_history: List[ChatMessage] = initial_chat_history
+                chat_history: List[ChatMessage] = []
 
             class ToolCallingWorkflow(BaseWorkflow[BaseInputs, ToolCallingState]):
                 graph = self._graph
@@ -121,9 +105,8 @@ class ToolCallingNode(BaseNode):
         )
 
         self._function_nodes = {
-            function.name: create_function_node(
+            function.__name__: create_function_node(
                 function=function,
-                function_callable=cast(Callable[..., Any], self.function_callables[function.name]),  # type: ignore
             )
             for function in self.functions
         }
@@ -132,7 +115,7 @@ class ToolCallingNode(BaseNode):
 
         # Add connections from ports of router to function nodes and back to router
         for function_name, FunctionNodeClass in self._function_nodes.items():
-            router_port = getattr(self.tool_router_node.Ports, function_name)  # type: ignore  # mypy thinks name is still optional # noqa: E501
+            router_port = getattr(self.tool_router_node.Ports, function_name)
             edge_graph = router_port >> FunctionNodeClass >> self.tool_router_node
             graph_set.add(edge_graph)
 
@@ -140,8 +123,3 @@ class ToolCallingNode(BaseNode):
         graph_set.add(default_port)
 
         self._graph = Graph.from_set(graph_set)
-
-    def _validate_functions(self) -> None:
-        for function in self.functions:
-            if function.name is None:
-                raise ValueError("Function name is required")

vellum/workflows/nodes/experimental/tool_calling_node/utils.py

@@ -35,7 +35,7 @@ class ToolRouterNode(InlinePromptNode):
                         if function_call is not None:
                             self.state.chat_history.append(
                                 ChatMessage(
-                                    role="FUNCTION",
+                                    role="ASSISTANT",
                                     content=FunctionCallChatMessageContent(
                                         value=FunctionCallChatMessageContentValue(
                                             name=function_call.name,
@@ -51,16 +51,12 @@ class ToolRouterNode(InlinePromptNode):
 def create_tool_router_node(
     ml_model: str,
     blocks: List[PromptBlock],
-    functions: List[FunctionDefinition],
+    functions: List[Callable[..., Any]],
     prompt_inputs: Optional[EntityInputsInterface],
 ) -> Type[ToolRouterNode]:
     Ports = type("Ports", (), {})
     for function in functions:
-        if function.name is None:
-            # We should not raise an error here since we filter out functions without names
-            raise ValueError("Function name is required")
-
-        function_name = function.name
+        function_name = function.__name__
         port_condition = LazyReference(
             lambda: (
                 ToolRouterNode.Outputs.results[0]["type"].equals("FUNCTION_CALL")
@@ -98,7 +94,7 @@ def create_tool_router_node(
     return node
 
 
-def create_function_node(function: FunctionDefinition, function_callable: Callable[..., Any]) -> Type[FunctionNode]:
+def create_function_node(function: Callable[..., Any]) -> Type[FunctionNode]:
     """
     Create a FunctionNode class for a given function.
 
@@ -113,14 +109,14 @@ def create_function_node(function: FunctionDefinition, function_callable: Callab
         arguments = outputs["arguments"]
 
         # Call the original function directly with the arguments
-        result = function_callable(**arguments)
+        result = function(**arguments)
 
         self.state.chat_history.append(ChatMessage(role="FUNCTION", text=result))
 
         return self.Outputs()
 
     node = type(
-        f"FunctionNode_{function.name}",
+        f"FunctionNode_{function.__name__}",
         (FunctionNode,),
         {
             "function": function,

{vellum_ai-0.14.40.dist-info → vellum_ai-0.14.41.dist-info}/METADATA

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

{vellum_ai-0.14.40.dist-info → vellum_ai-0.14.41.dist-info}/RECORD

@@ -26,31 +26,30 @@ vellum_ee/workflows/display/base.py,sha256=EqlQFD56kpqMY02ZBJBQajzJKh33Dwi60Wo77
 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=jI1aPBQf8DkmrYoZ4O-wR1duqZByOf5mDFmo_wFJPE4,307
-vellum_ee/workflows/display/nodes/base_node_display.py,sha256=e7agquSClJhamsVo8YX6WcV1PVlUSGD4Lz1feDi-rCw,21235
-vellum_ee/workflows/display/nodes/base_node_vellum_display.py,sha256=WXbfVoGHTfl_owas2WKHwcRhfLeu0cAI4qLmKxfxjOs,1707
+vellum_ee/workflows/display/nodes/base_node_display.py,sha256=zCcCEzpTLXOWbe9zGFF_mWmouJ9zwnTY0dkjepbuZrs,22269
 vellum_ee/workflows/display/nodes/get_node_display_class.py,sha256=5QuXpMth0HmZuC-e8LRKOLbrVXSL-ylMR5IWae8eNmc,2113
 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=YuR3e6ibE_eWDfAJCrooQR3QZGeNRoha1FwpK3hvMh0,2478
+vellum_ee/workflows/display/nodes/tests/test_base_node_display.py,sha256=Z4Mf7xLCNiblSbpKI0BrV5modQr-ZcFzhfir_OSyTTs,2997
 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=RDsxyubod_zYc72_VaHUTfOZXsgrKv8g3fqZFS2_j8Y,8538
-vellum_ee/workflows/display/nodes/vellum/base_adornment_node.py,sha256=DJb7u3ZgLxwzo7ZxD--DPYDy1FDwKwPxRYBrJ5FT1x0,6452
-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
-vellum_ee/workflows/display/nodes/vellum/error_node.py,sha256=I1Jkp2htRINJATtv1e-zs9BrReFX842djpiVgBPHDYg,2186
-vellum_ee/workflows/display/nodes/vellum/final_output_node.py,sha256=BJ--Y-LCbGFJve3OFEKHVxrw8TKvgb342opYLJibToc,3128
-vellum_ee/workflows/display/nodes/vellum/guardrail_node.py,sha256=IuJPKZoZT7lXhQkPH-wlut9-FsGtr8dIHM4jz8rp7BU,2228
-vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py,sha256=86hkneLIBS4Jel3GWsPVIIFqXGD3RHIpXw0iGa_Zues,8843
-vellum_ee/workflows/display/nodes/vellum/inline_subworkflow_node.py,sha256=MU9I8CB1X1TgL1aa1eT6DHWwNJ-2v79t74xl0oy-fBo,5510
+vellum_ee/workflows/display/nodes/vellum/api_node.py,sha256=ke2_t-E6BdsbZlYgAQCxCqbM01owtgKmI1H62AYGWw4,8519
+vellum_ee/workflows/display/nodes/vellum/base_adornment_node.py,sha256=rJbHZBg9A_v2bjk-R6MfWzShcrS2gcKIOyYGoqwTx8s,6353
+vellum_ee/workflows/display/nodes/vellum/code_execution_node.py,sha256=NMlgXgglewZ-k7DolHDAcUnOK68EetmI8EjhYI3ciRg,4391
+vellum_ee/workflows/display/nodes/vellum/conditional_node.py,sha256=slsDIxkuKD2b3XptcGhd8aCKrvYqUSeNmkeCJ23CXXY,11085
+vellum_ee/workflows/display/nodes/vellum/error_node.py,sha256=eJ_nw0u63vJ7fxxMCrfNyKx8JTOcRoujrJsvsxo_FJ4,2167
+vellum_ee/workflows/display/nodes/vellum/final_output_node.py,sha256=WL5At9pRRODV9kOZnY2HtF1zkf7tig7O-x1BhPtI9S8,3109
+vellum_ee/workflows/display/nodes/vellum/guardrail_node.py,sha256=Mc2QilBaGWinOoNItVkkeNkIrV2Yn8vaLN83z8ajC_0,2209
+vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py,sha256=uprXxAph7oavh3ARupcZZ8Rvwv1KtzyUP-x0cSzWJC0,8824
+vellum_ee/workflows/display/nodes/vellum/inline_subworkflow_node.py,sha256=5P5Y3fkRo9o7ITONY_T3Wibfx03z5BopNl7NG19hEOM,5491
 vellum_ee/workflows/display/nodes/vellum/map_node.py,sha256=8CPnn06HIBxBOiECevUffeVmQmCpec6WtPQnNl9gj9Y,3748
-vellum_ee/workflows/display/nodes/vellum/merge_node.py,sha256=xtyecs9mJ_WEwVpP12jxYwvehLXynhqLrPJ-Ahdk2GA,3232
-vellum_ee/workflows/display/nodes/vellum/note_node.py,sha256=DQzzhVGVZf812DkpQZoVYJcDsIOtjkm_sCX3oDLks2Y,1103
-vellum_ee/workflows/display/nodes/vellum/prompt_deployment_node.py,sha256=yAiWMeKs6jEecRdWfTjqxLmnGLeBPguaVsBD7xcOV94,3263
+vellum_ee/workflows/display/nodes/vellum/merge_node.py,sha256=Qirs9cWx7LXKXgUtZBncZ1gou3EIMZ1m9146t9RCC3o,3213
+vellum_ee/workflows/display/nodes/vellum/note_node.py,sha256=3E0UqmgVYdtbj4nyq8gKju8EpMsRHMCQ0KLrJhug3XU,1084
+vellum_ee/workflows/display/nodes/vellum/prompt_deployment_node.py,sha256=mkvc8CPts1d9CZkubT1eg75grQjrmgngMy9Ll99a9ds,3238
 vellum_ee/workflows/display/nodes/vellum/retry_node.py,sha256=TjBpRERmkmm1myZTWKAxxD1F0dWSc7U1sih8g9sqq2Q,3300
-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/search_node.py,sha256=BgphkaSEeUeNXu71mSse-d0QHtXs6989BKEe9OtceGw,9260
+vellum_ee/workflows/display/nodes/vellum/subworkflow_deployment_node.py,sha256=GI2d9W0S72NxZykdyCHDoCfgpiVye7g9fG3wcQ01O8Q,2593
+vellum_ee/workflows/display/nodes/vellum/templating_node.py,sha256=otA0D2vXnfNIktjp4RvWL5pzsqSQiPeCinJy7weTg9g,3223
 vellum_ee/workflows/display/nodes/vellum/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/nodes/vellum/tests/test_code_execution_node.py,sha256=OoNO-BstB96F-VMK6FZ9aXyi-0wyNePo6HiaJC6SYRw,3880
 vellum_ee/workflows/display/nodes/vellum/tests/test_error_node.py,sha256=HoIph_rNlHFNBMqBq1a_eyFwPzBIazdH1yQeRhgba14,1510
@@ -59,7 +58,7 @@ vellum_ee/workflows/display/nodes/vellum/tests/test_prompt_node.py,sha256=6Q6rfE
 vellum_ee/workflows/display/nodes/vellum/tests/test_retry_node.py,sha256=h93ysolmbo2viisyhRnXKHPxiDK0I_dSAbYoHFYIoO4,1953
 vellum_ee/workflows/display/nodes/vellum/tests/test_templating_node.py,sha256=PK7v0AWCgH9gWRfAwGPUGCRLbIH3NSyoAYa9W15ggAo,3321
 vellum_ee/workflows/display/nodes/vellum/tests/test_try_node.py,sha256=Khjsb53PKpZuyhKoRMgKAL45eGp5hZqXvHmVeQWRw4w,2289
-vellum_ee/workflows/display/nodes/vellum/tests/test_utils.py,sha256=etCxL19nuJ-bDytH-9a0wHKFoQyBIvocxgTcyo2Cy2Y,4870
+vellum_ee/workflows/display/nodes/vellum/tests/test_utils.py,sha256=3LS1O4DGPWit05oj_ubeW8AlHGnoBxdUMferGQuAiZs,4851
 vellum_ee/workflows/display/nodes/vellum/try_node.py,sha256=o6wL17XVm6Wj4sHoJkBW54Y5fY9ZwhD7ry0xkNWRu5c,4106
 vellum_ee/workflows/display/nodes/vellum/utils.py,sha256=oICunzyaXPs0tYnW5zH1r93Bx35MSH7mcD-n0DEWRok,4978
 vellum_ee/workflows/display/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -98,7 +97,7 @@ vellum_ee/workflows/display/utils/registry.py,sha256=fWIm5Jj-10gNFjgn34iBu4RWv3V
 vellum_ee/workflows/display/utils/vellum.py,sha256=VSWB3RA3RWQwQ7nMsU9gLfgpX3_BK9ARBIT36i52r9k,9478
 vellum_ee/workflows/display/vellum.py,sha256=o7mq_vk2Yapu9DDKRz5l76h8EmCAypWGQYe6pryrbB8,3576
 vellum_ee/workflows/display/workflows/__init__.py,sha256=kapXsC67VJcgSuiBMa86FdePG5A9kMB5Pi4Uy1O2ob4,207
-vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=L91EOajiV3CkaMTwC98QYJpqno-JhUOo_8FYGjT8xFM,32501
+vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=qjdATqHawQ1IWkyQ3aRlQQAFixNsS-X4ewpmKSnSwvI,32001
 vellum_ee/workflows/display/workflows/get_vellum_workflow_display_class.py,sha256=s6yMO0RxoM8scmfT8TJ-9cwl-WHFe7JSyEJA0alCeEs,1913
 vellum_ee/workflows/display/workflows/tests/test_workflow_display.py,sha256=uWBMmd_2BlDpymGoo5FB2LBeFQKHmPWJAPvSPZHk94o,11869
 vellum_ee/workflows/display/workflows/vellum_workflow_display.py,sha256=aaKdmWrgEe5YyV4zuDY_4E3y-l59rIHQnNGiPj2OWxQ,359
@@ -131,7 +130,7 @@ vellum/client/README.md,sha256=JkCJjmMZl4jrPj46pkmL9dpK4gSzQQmP5I7z4aME4LY,4749
 vellum/client/__init__.py,sha256=Z-JHK2jGxhtTtmkLeOaUGGJWIUNYGNVBLvUewC6lp6w,118148
 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=7bH2-p6hYzfsAz1ScP5muSnO-bbtUPUj3dQ911oa66I,1869
+vellum/client/core/client_wrapper.py,sha256=woJ1T678VkPNsh73oqH8PD5x3z8EX9S3qLVPszexkzc,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
@@ -147,14 +146,14 @@ vellum/client/errors/bad_request_error.py,sha256=_EbO8mWqN9kFZPvIap8qa1lL_EWkRcs
 vellum/client/errors/forbidden_error.py,sha256=QO1kKlhClAPES6zsEK7g9pglWnxn3KWaOCAawWOg6Aw,263
 vellum/client/errors/internal_server_error.py,sha256=8USCagXyJJ1MOm9snpcXIUt6eNXvrd_aq7Gfcu1vlOI,268
 vellum/client/errors/not_found_error.py,sha256=tBVCeBC8n3C811WHRj_n-hs3h8MqwR5gp0vLiobk7W8,262
-vellum/client/reference.md,sha256=iTxdizCeS4bP5BFv_sR6BUI0gzHA8cMkA9KHpQq0ZD4,88081
+vellum/client/reference.md,sha256=Nue7qK61ewnH9QTLxLOm9GLGPdBRqiWz1PTerxBiDyI,89717
 vellum/client/resources/__init__.py,sha256=XgQao4rJxyYu71j64RFIsshz4op9GE8-i-C5GCv-KVE,1555
 vellum/client/resources/ad_hoc/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
-vellum/client/resources/ad_hoc/client.py,sha256=_liorv4AsoJ55kVu0a5oWB3Qeff0iUKXqoHEIyDWLxc,14173
+vellum/client/resources/ad_hoc/client.py,sha256=93FXK-Wpvh72G8ji2__2Dmc5OYl9G5GRHiknyGIjeX4,25557
 vellum/client/resources/container_images/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
 vellum/client/resources/container_images/client.py,sha256=g8X3IkWFj43-sJMvirjDrh1-yjOFYV2C9xsGC20Xfjo,15003
 vellum/client/resources/deployments/__init__.py,sha256=m64MNuPx3qVazOnTNwOY8oEeDrAkNwMJvUEe5xoMDvs,239
-vellum/client/resources/deployments/client.py,sha256=ssXaHJXBxO_I8JLuijusDVWwsfYadTw3j7o41ICYtrY,38777
+vellum/client/resources/deployments/client.py,sha256=_sK5DgxGTksPDDWONoOrNHpYcNyk6YuoFuwE9CKQm70,38745
 vellum/client/resources/deployments/types/__init__.py,sha256=29GVdoLOJsADSSSqZwb6CQPeEmPjkKrbsWfru1bemj8,321
 vellum/client/resources/deployments/types/deployments_list_request_status.py,sha256=CxlQD16KZXme7x31YYCe_3aAgEueutDTeJo5A4Au-aU,174
 vellum/client/resources/deployments/types/list_deployment_release_tags_request_source.py,sha256=hRGgWMYZL9uKCmD_2dU8-u9RCPUUGItpNn1tUY-NXKY,180
@@ -1632,8 +1631,8 @@ vellum/workflows/nodes/experimental/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 vellum/workflows/nodes/experimental/openai_chat_completion_node/__init__.py,sha256=lsyD9laR9p7kx5-BXGH2gUTM242UhKy8SMV0SR6S2iE,90
 vellum/workflows/nodes/experimental/openai_chat_completion_node/node.py,sha256=cKI2Ls25L-JVt4z4a2ozQa-YBeVy21Z7BQ32Sj7iBPE,10460
 vellum/workflows/nodes/experimental/tool_calling_node/__init__.py,sha256=S7OzT3I4cyOU5Beoz87nPwCejCMP2FsHBFL8OcVmxJ4,118
-vellum/workflows/nodes/experimental/tool_calling_node/node.py,sha256=z1hi13Ssya59LL5_hP5UI1qGH_RjUilStxCRLnnxpMI,6064
-vellum/workflows/nodes/experimental/tool_calling_node/utils.py,sha256=oK0y3dAupNOzpdTpjcDPxDFtuDfcQeMpD_QcyKD0lTE,4888
+vellum/workflows/nodes/experimental/tool_calling_node/node.py,sha256=w73v2pfpqFaTOYbtHkH7nFuGgqQebLO6dr_Mxn1n7Dc,4848
+vellum/workflows/nodes/experimental/tool_calling_node/utils.py,sha256=hwJ1GjoNOEWoCdT1R0b6gVRAAGWGTUlKutTgBF7GRP4,4664
 vellum/workflows/nodes/mocks.py,sha256=a1FjWEIocseMfjzM-i8DNozpUsaW0IONRpZmXBoWlyc,10455
 vellum/workflows/nodes/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/nodes/tests/test_mocks.py,sha256=mfPvrs75PKcsNsbJLQAN6PDFoVqs9TmQxpdyFKDdO60,7837
@@ -1698,8 +1697,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=8P5YIsNMO78_CR1NNK6wkEdkMB4b3Q_Ni1qxh78OnHo,20481
 vellum/workflows/workflows/tests/test_context.py,sha256=VJBUcyWVtMa_lE5KxdhgMu0WYNYnUQUDvTF7qm89hJ0,2333
-vellum_ai-0.14.40.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-0.14.40.dist-info/METADATA,sha256=yhGwwOKSMKxH_eHuWxg_zaUq6v3fWl6mDIXS0jv5acI,5484
-vellum_ai-0.14.40.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-0.14.40.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
-vellum_ai-0.14.40.dist-info/RECORD,,
+vellum_ai-0.14.41.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-0.14.41.dist-info/METADATA,sha256=KZufZ6Z5vdimywz8zeA6QW6OMaIa82TopA1biRjbVqE,5484
+vellum_ai-0.14.41.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-0.14.41.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
+vellum_ai-0.14.41.dist-info/RECORD,,

vellum_ee/workflows/display/nodes/base_node_display.py

@@ -49,7 +49,7 @@ from vellum.workflows.expressions.or_ import OrExpression
 from vellum.workflows.expressions.parse_json import ParseJsonExpression
 from vellum.workflows.nodes.bases.base import BaseNode
 from vellum.workflows.nodes.displayable.bases.utils import primitive_to_vellum_value
-from vellum.workflows.nodes.utils import get_wrapped_node
+from vellum.workflows.nodes.utils import get_unadorned_node, get_wrapped_node
 from vellum.workflows.ports import Port
 from vellum.workflows.references import OutputReference
 from vellum.workflows.references.constant import ConstantValueReference
@@ -64,7 +64,7 @@ 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.editor.types import NodeDisplayComment, 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.exceptions import UnsupportedSerializationException
@@ -223,7 +223,7 @@ class BaseNodeDisplay(Generic[NodeType], metaclass=BaseNodeDisplayMeta):
             "id": str(node_id),
             "label": node.__qualname__,
             "type": "GENERIC",
-            "display_data": self._get_generic_node_display_data().dict(),
+            "display_data": self.get_display_data().dict(),
             "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
             "trigger": {
@@ -276,6 +276,13 @@ class BaseNodeDisplay(Generic[NodeType], metaclass=BaseNodeDisplayMeta):
 
         return PortDisplay(id=port_id, node_id=self.node_id)
 
+    def get_source_handle_id(self, port_displays: Dict[Port, PortDisplay]) -> UUID:
+        unadorned_node = get_unadorned_node(self._node)
+        default_port = unadorned_node.Ports.default
+
+        default_port_display = port_displays[default_port]
+        return default_port_display.id
+
     def get_trigger_id(self) -> UUID:
         return self.get_target_handle_id()
 
@@ -363,9 +370,32 @@ class BaseNodeDisplay(Generic[NodeType], metaclass=BaseNodeDisplayMeta):
 
         register_node_display_class(node_class=node_class, node_display_class=cls)
 
-    def _get_generic_node_display_data(self) -> NodeDisplayData:
+    def get_display_data(self) -> NodeDisplayData:
         explicit_value = self._get_explicit_node_display_attr("display_data", NodeDisplayData)
-        return explicit_value if explicit_value else NodeDisplayData()
+        docstring = self._node.__doc__
+
+        if explicit_value and explicit_value.comment and docstring:
+            comment = (
+                NodeDisplayComment(value=docstring, expanded=explicit_value.comment.expanded)
+                if explicit_value.comment.expanded
+                else NodeDisplayComment(value=docstring)
+            )
+            return NodeDisplayData(
+                position=explicit_value.position,
+                width=explicit_value.width,
+                height=explicit_value.height,
+                comment=comment,
+            )
+
+        if explicit_value:
+            return explicit_value
+
+        if docstring:
+            return NodeDisplayData(
+                comment=NodeDisplayComment(value=docstring),
+            )
+
+        return NodeDisplayData()
 
     def serialize_condition(self, display_context: "WorkflowDisplayContext", condition: BaseDescriptor) -> JsonObject:
         if isinstance(

vellum_ee/workflows/display/nodes/tests/test_base_node_display.py

@@ -82,3 +82,21 @@ def test_serialize_condition__accessor_expression():
             },
         }
     ]
+
+
+def test_serialize_display_data():
+    # GIVEN a node with an accessor expression in a Port
+    class MyNode(BaseNode):
+        """I hope this works"""
+
+        pass
+
+    # WHEN we serialize the node
+    node_display_class = get_node_display_class(MyNode)
+    data = node_display_class().serialize(WorkflowDisplayContext())
+
+    # THEN the condition should be serialized correctly
+    assert data["display_data"] == {
+        "position": {"x": 0.0, "y": 0.0},
+        "comment": {"value": "I hope this works"},
+    }

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

@@ -4,7 +4,7 @@ from typing import Any, ClassVar, Dict, Generic, Optional, TypeVar, cast
 from vellum.workflows.nodes.displayable import APINode
 from vellum.workflows.references.output import OutputReference
 from vellum.workflows.types.core import JsonArray, JsonObject
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -13,7 +13,7 @@ from vellum_ee.workflows.display.utils.vellum import WorkspaceSecretPointer
 _APINodeType = TypeVar("_APINodeType", bound=APINode)
 
 
-class BaseAPINodeDisplay(BaseNodeVellumDisplay[_APINodeType], Generic[_APINodeType]):
+class BaseAPINodeDisplay(BaseNodeDisplay[_APINodeType], Generic[_APINodeType]):
     # A mapping between node input keys and their ids for inputs representing additional header keys
     additional_header_key_input_ids: ClassVar[Optional[Dict[str, UUID]]] = None
 

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

@@ -10,7 +10,6 @@ from vellum.workflows.types.core import JsonArray, JsonObject
 from vellum.workflows.types.utils import get_original_base
 from vellum.workflows.utils.uuids import uuid4_from_hash
 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
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
@@ -72,7 +71,7 @@ def _recursively_replace_wrapped_node(node_class: Type[BaseNode], wrapped_node_d
         )
 
 
-class BaseAdornmentNodeDisplay(BaseNodeVellumDisplay[_BaseAdornmentNodeType], Generic[_BaseAdornmentNodeType]):
+class BaseAdornmentNodeDisplay(BaseNodeDisplay[_BaseAdornmentNodeType], Generic[_BaseAdornmentNodeType]):
     __wrapped_node_display__: Optional[Type[BaseNodeDisplay]] = None
 
     def serialize(

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

@@ -6,7 +6,7 @@ from vellum.workflows.nodes.displayable.code_execution_node import CodeExecution
 from vellum.workflows.nodes.displayable.code_execution_node.utils import read_file_from_path
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.utils.vellum_variables import primitive_type_to_vellum_variable_type
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -14,7 +14,7 @@ from vellum_ee.workflows.display.types import WorkflowDisplayContext
 _CodeExecutionNodeType = TypeVar("_CodeExecutionNodeType", bound=CodeExecutionNode)
 
 
-class BaseCodeExecutionNodeDisplay(BaseNodeVellumDisplay[_CodeExecutionNodeType], Generic[_CodeExecutionNodeType]):
+class BaseCodeExecutionNodeDisplay(BaseNodeDisplay[_CodeExecutionNodeType], Generic[_CodeExecutionNodeType]):
     output_id: ClassVar[Optional[UUID]] = None
     log_output_id: ClassVar[Optional[UUID]] = None
 

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

@@ -16,7 +16,7 @@ from vellum.workflows.expressions.or_ import OrExpression
 from vellum.workflows.nodes.displayable import ConditionalNode
 from vellum.workflows.types.core import ConditionType, JsonObject
 from vellum.workflows.utils.uuids import uuid4_from_hash
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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.utils.vellum import convert_descriptor_to_operator
@@ -40,7 +40,7 @@ class ConditionId:
     rule_group_id: Optional[str]
 
 
-class BaseConditionalNodeDisplay(BaseNodeVellumDisplay[_ConditionalNodeType], Generic[_ConditionalNodeType]):
+class BaseConditionalNodeDisplay(BaseNodeDisplay[_ConditionalNodeType], Generic[_ConditionalNodeType]):
     source_handle_ids: ClassVar[Dict[int, UUID]]
     rule_ids: ClassVar[List[RuleIdMap]]
     condition_ids: ClassVar[list[ConditionId]]

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

@@ -3,7 +3,7 @@ from typing import ClassVar, Generic, Optional, TypeVar
 
 from vellum.workflows.nodes import ErrorNode
 from vellum.workflows.types.core import JsonObject
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -11,7 +11,7 @@ from vellum_ee.workflows.display.types import WorkflowDisplayContext
 _ErrorNodeType = TypeVar("_ErrorNodeType", bound=ErrorNode)
 
 
-class BaseErrorNodeDisplay(BaseNodeVellumDisplay[_ErrorNodeType], Generic[_ErrorNodeType]):
+class BaseErrorNodeDisplay(BaseNodeDisplay[_ErrorNodeType], Generic[_ErrorNodeType]):
     error_output_id: ClassVar[Optional[UUID]] = None
 
     name: ClassVar[str] = "error-node"

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

@@ -4,7 +4,7 @@ from typing import Any, ClassVar, Generic, Optional, TypeVar
 from vellum.workflows.nodes.displayable.final_output_node import FinalOutputNode
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.utils.uuids import uuid4_from_hash
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.utils import to_kebab_case
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
@@ -13,7 +13,7 @@ from vellum_ee.workflows.display.utils.vellum import infer_vellum_variable_type
 _FinalOutputNodeType = TypeVar("_FinalOutputNodeType", bound=FinalOutputNode)
 
 
-class BaseFinalOutputNodeDisplay(BaseNodeVellumDisplay[_FinalOutputNodeType], Generic[_FinalOutputNodeType]):
+class BaseFinalOutputNodeDisplay(BaseNodeDisplay[_FinalOutputNodeType], Generic[_FinalOutputNodeType]):
     output_id: ClassVar[Optional[UUID]] = None
     output_name: ClassVar[Optional[str]] = None
     node_input_id: ClassVar[Optional[UUID]] = None

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

@@ -3,7 +3,7 @@ from typing import Generic, Optional, TypeVar
 
 from vellum.workflows.nodes import GuardrailNode
 from vellum.workflows.types.core import JsonObject
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -11,7 +11,7 @@ from vellum_ee.workflows.display.types import WorkflowDisplayContext
 _GuardrailNodeType = TypeVar("_GuardrailNodeType", bound=GuardrailNode)
 
 
-class BaseGuardrailNodeDisplay(BaseNodeVellumDisplay[_GuardrailNodeType], Generic[_GuardrailNodeType]):
+class BaseGuardrailNodeDisplay(BaseNodeDisplay[_GuardrailNodeType], Generic[_GuardrailNodeType]):
     def serialize(
         self, display_context: WorkflowDisplayContext, error_output_id: Optional[UUID] = None, **kwargs
     ) -> JsonObject:

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

@@ -6,7 +6,7 @@ from vellum.workflows.nodes import InlinePromptNode
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.utils.functions import compile_function_definition
 from vellum.workflows.utils.uuids import uuid4_from_hash
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -16,7 +16,7 @@ from vellum_ee.workflows.display.vellum import NodeInput
 _InlinePromptNodeType = TypeVar("_InlinePromptNodeType", bound=InlinePromptNode)
 
 
-class BaseInlinePromptNodeDisplay(BaseNodeVellumDisplay[_InlinePromptNodeType], Generic[_InlinePromptNodeType]):
+class BaseInlinePromptNodeDisplay(BaseNodeDisplay[_InlinePromptNodeType], Generic[_InlinePromptNodeType]):
     def serialize(
         self, display_context: WorkflowDisplayContext, error_output_id: Optional[UUID] = None, **kwargs
     ) -> JsonObject:

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

@@ -5,7 +5,7 @@ from vellum import VellumVariable
 from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.nodes import InlineSubworkflowNode
 from vellum.workflows.types.core import JsonObject
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -17,7 +17,7 @@ _InlineSubworkflowNodeType = TypeVar("_InlineSubworkflowNodeType", bound=InlineS
 
 
 class BaseInlineSubworkflowNodeDisplay(
-    BaseNodeVellumDisplay[_InlineSubworkflowNodeType], Generic[_InlineSubworkflowNodeType]
+    BaseNodeDisplay[_InlineSubworkflowNodeType], Generic[_InlineSubworkflowNodeType]
 ):
     workflow_input_ids_by_name: ClassVar[Dict[str, UUID]] = {}
 

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

@@ -4,13 +4,13 @@ from typing import Any, ClassVar, Generic, List, Optional, TypeVar
 from vellum.workflows.nodes.displayable import MergeNode
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.utils.uuids import uuid4_from_hash
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
 _MergeNodeType = TypeVar("_MergeNodeType", bound=MergeNode)
 
 
-class BaseMergeNodeDisplay(BaseNodeVellumDisplay[_MergeNodeType], Generic[_MergeNodeType]):
+class BaseMergeNodeDisplay(BaseNodeDisplay[_MergeNodeType], Generic[_MergeNodeType]):
     target_handle_ids: ClassVar[List[UUID]]
 
     def __init__(self):

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

@@ -2,13 +2,13 @@ from typing import Any, ClassVar, Dict, Generic, TypeVar, Union
 
 from vellum.workflows.nodes import NoteNode
 from vellum.workflows.types.core import JsonObject
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
 _NoteNodeType = TypeVar("_NoteNodeType", bound=NoteNode)
 
 
-class BaseNoteNodeDisplay(BaseNodeVellumDisplay[_NoteNodeType], Generic[_NoteNodeType]):
+class BaseNoteNodeDisplay(BaseNodeDisplay[_NoteNodeType], Generic[_NoteNodeType]):
     text: ClassVar[str] = ""
     style: ClassVar[Union[Dict[str, Any], None]] = None
 

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

@@ -5,7 +5,7 @@ from vellum.workflows.nodes.displayable.prompt_deployment_node import PromptDepl
 from vellum.workflows.references import OutputReference
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.vellum_client import create_vellum_client
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -13,9 +13,7 @@ from vellum_ee.workflows.display.types import WorkflowDisplayContext
 _PromptDeploymentNodeType = TypeVar("_PromptDeploymentNodeType", bound=PromptDeploymentNode)
 
 
-class BasePromptDeploymentNodeDisplay(
-    BaseNodeVellumDisplay[_PromptDeploymentNodeType], Generic[_PromptDeploymentNodeType]
-):
+class BasePromptDeploymentNodeDisplay(BaseNodeDisplay[_PromptDeploymentNodeType], Generic[_PromptDeploymentNodeType]):
     def serialize(
         self, display_context: WorkflowDisplayContext, error_output_id: Optional[UUID] = None, **kwargs
     ) -> JsonObject:

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

@@ -11,7 +11,7 @@ from vellum.workflows.nodes.displayable.search_node import SearchNode
 from vellum.workflows.references import OutputReference
 from vellum.workflows.types.core import JsonArray, JsonObject
 from vellum.workflows.utils.uuids import uuid4_from_hash
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -28,7 +28,7 @@ class VariableIdMap:
     rhs: Optional["VariableIdMap"]
 
 
-class BaseSearchNodeDisplay(BaseNodeVellumDisplay[_SearchNodeType], Generic[_SearchNodeType]):
+class BaseSearchNodeDisplay(BaseNodeDisplay[_SearchNodeType], Generic[_SearchNodeType]):
     # A mapping between the id of the operand (e.g. "lhs_variable_id" or "rhs_variable_id") and the id of the node input
     # that the operand is pointing to.
     metadata_filter_input_id_by_operand_id: Dict[UUID, UUID] = {}

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

@@ -4,7 +4,7 @@ from typing import Generic, Optional, TypeVar
 from vellum.workflows.nodes import SubworkflowDeploymentNode
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.vellum_client import create_vellum_client
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -13,7 +13,7 @@ _SubworkflowDeploymentNodeType = TypeVar("_SubworkflowDeploymentNodeType", bound
 
 
 class BaseSubworkflowDeploymentNodeDisplay(
-    BaseNodeVellumDisplay[_SubworkflowDeploymentNodeType], Generic[_SubworkflowDeploymentNodeType]
+    BaseNodeDisplay[_SubworkflowDeploymentNodeType], Generic[_SubworkflowDeploymentNodeType]
 ):
 
     def serialize(

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

@@ -4,7 +4,7 @@ from typing import Generic, Optional, TypeVar
 from vellum.workflows.nodes.core.templating_node import TemplatingNode
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.utils.vellum_variables import primitive_type_to_vellum_variable_type
-from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 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
@@ -14,7 +14,7 @@ _TemplatingNodeType = TypeVar("_TemplatingNodeType", bound=TemplatingNode)
 TEMPLATE_INPUT_NAME = TemplatingNode.template.name
 
 
-class BaseTemplatingNodeDisplay(BaseNodeVellumDisplay[_TemplatingNodeType], Generic[_TemplatingNodeType]):
+class BaseTemplatingNodeDisplay(BaseNodeDisplay[_TemplatingNodeType], Generic[_TemplatingNodeType]):
     def serialize(
         self, display_context: WorkflowDisplayContext, error_output_id: Optional[UUID] = None, **kwargs
     ) -> JsonObject:

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

@@ -9,7 +9,7 @@ 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.base_node_display import BaseNodeDisplay
 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
@@ -36,7 +36,7 @@ class MyNodeA(BaseNode):
         output: str
 
 
-class MyNodeADisplay(BaseNodeVellumDisplay[MyNodeA]):
+class MyNodeADisplay(BaseNodeDisplay[MyNodeA]):
     pass
 
 

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -31,7 +31,6 @@ from vellum_ee.workflows.display.base import (
 )
 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.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
 from vellum_ee.workflows.display.nodes.utils import raise_if_descriptor
@@ -241,14 +240,9 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
                 )
 
                 if source_node_display:
-                    if isinstance(source_node_display, BaseNodeVellumDisplay):
-                        source_handle_id = source_node_display.get_source_handle_id(
-                            port_displays=self.display_context.port_displays
-                        )
-                    else:
-                        source_handle_id = source_node_display.get_node_port_display(
-                            source_node_display._node.Ports.default
-                        ).id
+                    source_handle_id = source_node_display.get_source_handle_id(
+                        port_displays=self.display_context.port_displays
+                    )
 
                     synthetic_output_edges.append(
                         {
@@ -617,9 +611,7 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
         node_event_displays = {}
         for node_id in node_displays:
             node, current_node_display = node_displays[node_id]
-            input_display = {}
-            if isinstance(current_node_display, BaseNodeVellumDisplay):
-                input_display = current_node_display.node_input_ids_by_name
+            input_display = current_node_display.node_input_ids_by_name
             output_display = {
                 output.name: current_node_display.output_display[output].id
                 for output in current_node_display.output_display

vellum_ee/workflows/display/nodes/base_node_vellum_display.py

@@ -1,40 +0,0 @@
-from uuid import UUID
-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
-
-
-class BaseNodeVellumDisplay(BaseNodeDisplay[NodeType]):
-    # Used to explicitly set display data for a node
-    display_data: ClassVar[Optional[NodeDisplayData]] = None
-
-    def get_display_data(self) -> NodeDisplayData:
-        explicit_value = self._get_explicit_node_display_attr("display_data", NodeDisplayData)
-        docstring = self._node.__doc__
-
-        if explicit_value and explicit_value.comment and docstring:
-            comment = (
-                NodeDisplayComment(value=docstring, expanded=explicit_value.comment.expanded)
-                if explicit_value.comment.expanded
-                else NodeDisplayComment(value=docstring)
-            )
-            return NodeDisplayData(
-                position=explicit_value.position,
-                width=explicit_value.width,
-                height=explicit_value.height,
-                comment=comment,
-            )
-
-        return explicit_value if explicit_value else NodeDisplayData()
-
-    def get_source_handle_id(self, port_displays: Dict[Port, PortDisplay]) -> UUID:
-        unadorned_node = get_unadorned_node(self._node)
-        default_port = unadorned_node.Ports.default
-
-        default_port_display = port_displays[default_port]
-        return default_port_display.id