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

vellum/utils/templating/render.py

@@ -2,6 +2,7 @@ import json
 from typing import Any, Dict, Optional
 
 from jinja2.sandbox import SandboxedEnvironment
+from pydantic import BaseModel
 
 from vellum.utils.templating.constants import FilterFunc
 from vellum.utils.templating.exceptions import JinjaTemplateError
@@ -12,6 +13,9 @@ def finalize(obj: Any) -> str:
     if isinstance(obj, (dict, list)):
         return json.dumps(obj, cls=DefaultStateEncoder)
 
+    if isinstance(obj, BaseModel):
+        return json.dumps(obj.model_dump(), cls=DefaultStateEncoder)
+
     return str(obj)
 
 
@@ -23,7 +27,6 @@ def render_sandboxed_jinja_template(
     jinja_globals: Optional[Dict[str, Any]] = None,
 ) -> str:
     """Render a Jinja template within a sandboxed environment."""
-
     try:
         environment = SandboxedEnvironment(
             keep_trailing_newline=True,

vellum/workflows/events/types.py

@@ -75,6 +75,7 @@ class BaseDeploymentParentContext(BaseParentContext):
     release_tag_id: UUID
     release_tag_name: str
     external_id: Optional[str]
+    metadata: Optional[dict]
 
 
 class WorkflowDeploymentParentContext(BaseDeploymentParentContext):
@@ -104,6 +105,10 @@ class WorkflowSandboxParentContext(BaseParentContext):
     scenario_id: UUID
 
 
+class APIRequestParentContext(BaseParentContext):
+    type: Literal["API_REQUEST"] = "API_REQUEST"
+
+
 # Define the discriminated union
 ParentContext = Annotated[
     Union[
@@ -112,6 +117,7 @@ ParentContext = Annotated[
         WorkflowDeploymentParentContext,
         PromptDeploymentParentContext,
         WorkflowSandboxParentContext,
+        APIRequestParentContext,
     ],
     Field(discriminator="type"),
 ]

vellum/workflows/events/workflow.py

@@ -39,14 +39,15 @@ class _BaseWorkflowEvent(BaseEvent):
         return self.body.workflow_definition
 
 
-class NodeDisplay(UniversalBaseModel):
+class NodeEventDisplayContext(UniversalBaseModel):
     input_display: Dict[str, UUID]
     output_display: Dict[str, UUID]
     port_display: Dict[str, UUID]
+    subworkflow_display: Optional["WorkflowEventDisplayContext"] = None
 
 
 class WorkflowEventDisplayContext(UniversalBaseModel):
-    node_displays: Dict[str, NodeDisplay]
+    node_displays: Dict[str, NodeEventDisplayContext]
     workflow_inputs: Dict[str, UUID]
     workflow_outputs: Dict[str, UUID]
 

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

@@ -82,7 +82,6 @@ class TemplatingNode(BaseNode[StateType], Generic[StateType, _OutputType], metac
     def run(self) -> Outputs:
         rendered_template = self._render_template()
         result = self._cast_rendered_template(rendered_template)
-
         return self.Outputs(result=result)
 
     def _render_template(self) -> str:

vellum/workflows/nodes/core/templating_node/tests/test_templating_node.py

@@ -234,3 +234,52 @@ def test_templating_node__last_chat_message():
 
     # THEN the output is the expected JSON
     assert outputs.result == [ChatMessage(role="USER", text="Hello")]
+
+
+def test_templating_node__function_call_value_input():
+    # GIVEN a templating node that receives a FunctionCallVellumValue
+    class FunctionCallTemplateNode(TemplatingNode[BaseState, FunctionCall]):
+        template = """{{ function_call }}"""
+        inputs = {
+            "function_call": FunctionCallVellumValue(
+                type="FUNCTION_CALL",
+                value=FunctionCall(name="test_function", arguments={"key": "value"}, id="test_id", state="FULFILLED"),
+            )
+        }
+
+    # WHEN the node is run
+    node = FunctionCallTemplateNode()
+    outputs = node.run()
+
+    # THEN the output is the expected function call
+    assert outputs.result == FunctionCall(
+        name="test_function", arguments={"key": "value"}, id="test_id", state="FULFILLED"
+    )
+
+
+def test_templating_node__function_call_as_json():
+    # GIVEN a node that receives a FunctionCallVellumValue but outputs as Json
+    class JsonOutputNode(TemplatingNode[BaseState, Json]):
+        template = """{{ function_call }}"""
+        inputs = {
+            "function_call": FunctionCallVellumValue(
+                type="FUNCTION_CALL",
+                value=FunctionCall(name="test_function", arguments={"key": "value"}, id="test_id", state="FULFILLED"),
+            )
+        }
+
+    # WHEN the node is run
+    node = JsonOutputNode()
+    outputs = node.run()
+
+    # THEN we get just the FunctionCall data as JSON
+    assert outputs.result == {
+        "name": "test_function",
+        "arguments": {"key": "value"},
+        "id": "test_id",
+        "state": "FULFILLED",
+    }
+
+    # AND we can access fields directly
+    assert outputs.result["arguments"] == {"key": "value"}
+    assert outputs.result["name"] == "test_function"

vellum/workflows/nodes/displayable/code_execution_node/tests/test_code_execution_node.py

@@ -458,16 +458,7 @@ def main(word: str) -> int:
         node.run()
 
     # THEN the node should have produced the exception we expected
-    assert (
-        exc_info.value.message
-        == """\
-2 validation errors for FunctionCall
-arguments
-  Field required [type=missing, input_value={'n': 'hello', 'a': {}}, input_type=dict]
-name
-  Field required [type=missing, input_value={'n': 'hello', 'a': {}}, input_type=dict]\
-"""
-    )
+    assert exc_info.value.message == "Expected an output of type 'FunctionCall', but received 'dict'"
 
 
 def test_run_node__run_inline__valid_dict_to_pydantic_any_type():
@@ -743,3 +734,46 @@ Node.js v21.7.3
 
     # AND the error should contain the execution error details
     assert exc_info.value.message == message
+
+
+def test_run_node__execute_code__list_extends():
+    # GIVEN a node that will return a list with output type Json
+    class ExampleCodeExecutionNode(CodeExecutionNode[BaseState, Json]):
+        code = """\
+def main(left, right):
+    all = []
+    all.extend(left)
+    all.extend(right)
+    return all
+"""
+        code_inputs = {
+            "left": [1, 2, 3],
+            "right": [4, 5, 6],
+        }
+        runtime = "PYTHON_3_11_6"
+
+    # WHEN we run the node
+    node = ExampleCodeExecutionNode()
+    outputs = node.run()
+
+    # AND the result should be the correct output
+    assert outputs == {"result": [1, 2, 3, 4, 5, 6], "log": ""}
+
+
+def test_run_node__execute_code__non_str_print():
+    # GIVEN a node that will print a non-string value
+    class ExampleCodeExecutionNode(CodeExecutionNode[BaseState, str]):
+        code = """\
+def main():
+    print(type(1))
+    return "hello"
+"""
+        code_inputs = {}
+        runtime = "PYTHON_3_11_6"
+
+    # WHEN we run the node
+    node = ExampleCodeExecutionNode()
+    outputs = node.run()
+
+    # AND the result should be the correct output
+    assert outputs == {"result": "hello", "log": "<class 'int'>\n"}

vellum/workflows/nodes/displayable/code_execution_node/utils.py

@@ -1,12 +1,12 @@
 import io
 import os
-import re
-from typing import Any, Tuple, Union, get_args, get_origin
+from typing import Any, Tuple, Union
 
-from pydantic import BaseModel, ValidationError
+from pydantic import BaseModel
 
 from vellum.workflows.errors.types import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
+from vellum.workflows.nodes.utils import cast_to_output_type
 from vellum.workflows.types.core import EntityInputsInterface
 
 
@@ -67,49 +67,6 @@ def _clean_for_dict_wrapper(obj):
     return obj
 
 
-def _get_type_name(obj: Any) -> str:
-    if isinstance(obj, type):
-        return obj.__name__
-
-    if get_origin(obj) is Union:
-        children = [_get_type_name(child) for child in get_args(obj)]
-        return " | ".join(children)
-
-    return str(obj)
-
-
-def _cast_to_output_type(result: Any, output_type: Any) -> Any:
-    is_valid_output_type = isinstance(output_type, type)
-    if get_origin(output_type) is Union:
-        allowed_types = get_args(output_type)
-        for allowed_type in allowed_types:
-            try:
-                return _cast_to_output_type(result, allowed_type)
-            except NodeException:
-                continue
-    elif get_origin(output_type) is list:
-        allowed_item_type = get_args(output_type)[0]
-        if isinstance(result, list):
-            return [_cast_to_output_type(item, allowed_item_type) for item in result]
-    elif is_valid_output_type and issubclass(output_type, BaseModel) and not isinstance(result, output_type):
-        try:
-            return output_type.model_validate(result)
-        except ValidationError as e:
-            raise NodeException(
-                code=WorkflowErrorCode.INVALID_OUTPUTS,
-                message=re.sub(r"\s+For further information visit [^\s]+", "", str(e)),
-            ) from e
-    elif is_valid_output_type and isinstance(result, output_type):
-        return result
-
-    output_type_name = _get_type_name(output_type)
-    result_type_name = _get_type_name(type(result))
-    raise NodeException(
-        code=WorkflowErrorCode.INVALID_OUTPUTS,
-        message=f"Expected an output of type '{output_type_name}', but received '{result_type_name}'",
-    )
-
-
 def run_code_inline(
     code: str,
     inputs: EntityInputsInterface,
@@ -117,6 +74,11 @@ def run_code_inline(
 ) -> Tuple[str, Any]:
     log_buffer = io.StringIO()
 
+    def _inline_print(*args: Any, **kwargs: Any) -> None:
+        str_args = [str(arg) for arg in args]
+        print_line = f"{' '.join(str_args)}\n"
+        log_buffer.write(print_line)
+
     def wrap_value(value):
         if isinstance(value, list):
             return ListWrapper(
@@ -135,7 +97,7 @@ def run_code_inline(
     exec_globals = {
         "__arg__inputs": {name: wrap_value(value) for name, value in inputs.items()},
         "__arg__out": None,
-        "print": lambda *args, **kwargs: log_buffer.write(f"{' '.join(args)}\n"),
+        "print": _inline_print,
     }
     run_args = [f"{name}=__arg__inputs['{name}']" for name in inputs.keys()]
     execution_code = f"""\
@@ -154,7 +116,6 @@ __arg__out = main({", ".join(run_args)})
     logs = log_buffer.getvalue()
     result = exec_globals["__arg__out"]
 
-    if output_type != Any:
-        result = _cast_to_output_type(result, output_type)
+    result = cast_to_output_type(result, output_type)
 
     return logs, result

vellum/workflows/nodes/displayable/final_output_node/node.py

@@ -1,7 +1,9 @@
 from typing import Any, Dict, Generic, Tuple, Type, TypeVar, get_args
 
+from vellum.workflows.constants import undefined
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.bases.base import BaseNodeMeta
+from vellum.workflows.nodes.utils import cast_to_output_type
 from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 from vellum.workflows.types.utils import get_original_base
@@ -48,4 +50,14 @@ class FinalOutputNode(BaseNode[StateType], Generic[StateType, _OutputType], meta
     class Outputs(BaseNode.Outputs):
         # We use our mypy plugin to override the _OutputType with the actual output type
         # for downstream references to this output.
-        value: _OutputType  # type: ignore[valid-type]
+        value: _OutputType = undefined  # type: ignore[valid-type]
+
+    def run(self) -> Outputs:
+        original_outputs = self.Outputs()
+
+        return self.Outputs(
+            value=cast_to_output_type(
+                original_outputs.value,
+                self.__class__.get_output_type(),
+            )
+        )

vellum/workflows/nodes/displayable/final_output_node/tests/test_node.py

@@ -0,0 +1,20 @@
+import pytest
+
+from vellum.workflows.exceptions import NodeException
+from vellum.workflows.nodes.displayable.final_output_node import FinalOutputNode
+from vellum.workflows.state.base import BaseState
+
+
+def test_final_output_node__mismatched_output_type():
+    # GIVEN a FinalOutputNode with a mismatched output type
+    class StringOutputNode(FinalOutputNode[BaseState, str]):
+        class Outputs(FinalOutputNode.Outputs):
+            value = {"foo": "bar"}
+
+    # WHEN the node is run
+    node = StringOutputNode()
+    with pytest.raises(NodeException) as exc_info:
+        node.run()
+
+    # THEN an error is raised
+    assert str(exc_info.value) == "Expected an output of type 'str', but received 'dict'"

vellum/workflows/nodes/utils.py

@@ -2,10 +2,12 @@ from functools import cache
 import json
 import sys
 from types import ModuleType
-from typing import Any, Callable, Optional, Type, TypeVar, Union, get_args, get_origin
+from typing import Any, Callable, Dict, ForwardRef, List, Optional, Type, TypeVar, Union, get_args, get_origin
 
-from pydantic import BaseModel
+from pydantic import BaseModel, create_model
 
+from vellum.workflows.errors.types import WorkflowErrorCode
+from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes import BaseNode
 from vellum.workflows.nodes.bases.base_adornment_node import BaseAdornmentNode
 from vellum.workflows.ports.port import Port
@@ -109,7 +111,11 @@ def parse_type_from_str(result_as_str: str, output_type: Any) -> Any:
 
     if output_type is Json:
         try:
-            return json.loads(result_as_str)
+            data = json.loads(result_as_str)
+            # If we got a FunctionCallVellumValue, return just the value
+            if isinstance(data, dict) and data.get("type") == "FUNCTION_CALL" and "value" in data:
+                return data["value"]
+            return data
         except json.JSONDecodeError:
             raise ValueError("Invalid JSON format for result_as_str")
 
@@ -124,9 +130,68 @@ def parse_type_from_str(result_as_str: str, output_type: Any) -> Any:
     if issubclass(output_type, BaseModel):
         try:
             data = json.loads(result_as_str)
+            # If we got a FunctionCallVellumValue extract FunctionCall,
+            if (
+                hasattr(output_type, "__name__")
+                and output_type.__name__ == "FunctionCall"
+                and isinstance(data, dict)
+                and "value" in data
+            ):
+                data = data["value"]
+            return output_type.model_validate(data)
         except json.JSONDecodeError:
             raise ValueError("Invalid JSON format for result_as_str")
 
-        return output_type.model_validate(data)
-
     raise ValueError(f"Unsupported output type: {output_type}")
+
+
+def _get_type_name(obj: Any) -> str:
+    if isinstance(obj, type):
+        return obj.__name__
+
+    if get_origin(obj) is Union:
+        children = [_get_type_name(child) for child in get_args(obj)]
+        return " | ".join(children)
+
+    return str(obj)
+
+
+def _clean_output_type(output_type: Any) -> Any:
+    """
+    pydantic currently has a bug where it doesn't support forward references in the create_model function. It will
+    fail due to a max recursion depth error. This negatively impacts our `Json` type, but could also apply to other
+    user defined ForwardRef types.
+    """
+    if get_origin(output_type) is Union:
+        clean_args = [_clean_output_type(child) for child in get_args(output_type)]
+        return Union[tuple(clean_args)]
+
+    if isinstance(output_type, ForwardRef):
+        # Here is where we prevent the max recursion depth error
+        return Any
+
+    if get_origin(output_type) is list:
+        clean_args = [_clean_output_type(child) for child in get_args(output_type)]
+        return List[clean_args[0]]  # type: ignore[valid-type]
+
+    if get_origin(output_type) is dict:
+        clean_args = [_clean_output_type(child) for child in get_args(output_type)]
+        return Dict[clean_args[0], clean_args[1]]  # type: ignore[valid-type]
+
+    return output_type
+
+
+def cast_to_output_type(result: Any, output_type: Any) -> Any:
+    clean_output_type = _clean_output_type(output_type)
+    DynamicModel = create_model("Output", output_type=(clean_output_type, ...))
+
+    try:
+        # mypy doesn't realize that this dynamic model has the output_type field defined above
+        return DynamicModel.model_validate({"output_type": result}).output_type  # type: ignore[attr-defined]
+    except Exception:
+        output_type_name = _get_type_name(output_type)
+        result_type_name = _get_type_name(type(result))
+        raise NodeException(
+            code=WorkflowErrorCode.INVALID_OUTPUTS,
+            message=f"Expected an output of type '{output_type_name}', but received '{result_type_name}'",
+        )

vellum/workflows/outputs/base.py

@@ -204,13 +204,11 @@ class BaseOutputs(metaclass=_BaseOutputsMeta):
         if not isinstance(other, dict):
             return super().__eq__(other)
 
-        outputs = {
-            name: value for name, value in vars(self).items() if not name.startswith("_") and value is not undefined
-        }
+        outputs = {ref.name: value for ref, value in self if value is not undefined}
         return outputs == other
 
     def __repr__(self) -> str:
-        values = f"{', '.join(f'{k}={v}' for k, v in vars(self).items() if not k.startswith('_'))}"
+        values = f"{', '.join(f'{ref.name}={value}' for ref, value in self if value is not undefined)}"
         return f"{self.__class__.__name__}({values})"
 
     def __iter__(self) -> Iterator[Tuple[OutputReference, Any]]:

vellum/workflows/runner/runner.py

@@ -328,11 +328,7 @@ class WorkflowRunner(Generic[StateType]):
                         node_definition=node.__class__,
                         error=e.error,
                     ),
-                    parent=WorkflowParentContext(
-                        span_id=span_id,
-                        workflow_definition=self.workflow.__class__,
-                        parent=self._parent_context,
-                    ),
+                    parent=parent_context,
                 )
             )
         except Exception as e:

vellum/workflows/workflows/base.py

@@ -24,7 +24,6 @@ from typing import (
     get_args,
 )
 
-from vellum.workflows.context import get_execution_context
 from vellum.workflows.edges import Edge
 from vellum.workflows.emitters.base import BaseWorkflowEmitter
 from vellum.workflows.errors import WorkflowError, WorkflowErrorCode
@@ -481,7 +480,7 @@ class BaseWorkflow(Generic[InputsType, StateType], metaclass=_BaseWorkflowMeta):
         return self.get_inputs_class()()
 
     def get_default_state(self, workflow_inputs: Optional[InputsType] = None) -> StateType:
-        execution_context = get_execution_context()
+        execution_context = self._execution_context
         return self.get_state_class()(
             meta=(
                 StateMeta(

{vellum_ai-0.14.9.dist-info → vellum_ai-0.14.11.dist-info}/METADATA

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

{vellum_ai-0.14.9.dist-info → vellum_ai-0.14.11.dist-info}/RECORD

@@ -3,7 +3,7 @@ vellum_cli/README.md,sha256=2NudRoLzWxNKqnuVy1JuQ7DerIaxWGYkrH8kMd-asIE,90
 vellum_cli/__init__.py,sha256=7aO9XFnaEVRiVshn86cFudebFUccT-gV8xIARJWqKYo,12257
 vellum_cli/aliased_group.py,sha256=ugW498j0yv4ALJ8vS9MsO7ctDW7Jlir9j6nE_uHAP8c,3363
 vellum_cli/config.py,sha256=aKnhvM5B8QdPA4cQC5Sqg7ImP-vNcVdSkZmk_OBpQTw,9309
-vellum_cli/image_push.py,sha256=SJwhwWJsLjwGNezNVd_oCVpFMfPsAB3dfLWmriZZUtw,4419
+vellum_cli/image_push.py,sha256=4auU15Pb6c8DTGvT-AQ5HHXXrvIvEDs6L02d4OvJYI8,5199
 vellum_cli/init.py,sha256=WpnMXPItPmh0f0bBGIer3p-e5gu8DUGwSArT_FuoMEw,5093
 vellum_cli/logger.py,sha256=PuRFa0WCh4sAGFS5aqWB0QIYpS6nBWwPJrIXpWxugV4,1022
 vellum_cli/ping.py,sha256=lWyJw6sziXjyTopTYRdFF5hV-sYPVDdX0yVbG5fzcY4,585
@@ -44,13 +44,14 @@ vellum_ee/workflows/display/nodes/vellum/map_node.py,sha256=8CPnn06HIBxBOiECevUf
 vellum_ee/workflows/display/nodes/vellum/merge_node.py,sha256=HkNMgdQELiON42jdO-xDLmqrEKdGx1RVqrz2DXNTLS8,3239
 vellum_ee/workflows/display/nodes/vellum/note_node.py,sha256=TMb8txILu2uWjzoxaghjgjlzeBAgzn4vkP_8zSh2qoE,1151
 vellum_ee/workflows/display/nodes/vellum/prompt_deployment_node.py,sha256=LFjLUrH6sJ4czPnExdRqFr0PB_yKBMLXLvK5GAzIAgc,3273
-vellum_ee/workflows/display/nodes/vellum/retry_node.py,sha256=hVqTtuHjlw_cYJ3ydNAvUHfGEoQi5YocVONZUo4i_Gs,1717
+vellum_ee/workflows/display/nodes/vellum/retry_node.py,sha256=-eH41LUcpUeZ8Jt5f40-e7bn2nymeKnsYsmuprVSo7g,5805
 vellum_ee/workflows/display/nodes/vellum/search_node.py,sha256=TxcAGZDl_hvJ7Y1hUi9YVEVrj9Ie0hKkASdpfRL4_cs,9227
 vellum_ee/workflows/display/nodes/vellum/subworkflow_deployment_node.py,sha256=62baAElKoRKIoba0lLhnrXGWWx96B73VxKGxh7BaIxc,2612
 vellum_ee/workflows/display/nodes/vellum/templating_node.py,sha256=JVIMPR3WpveOCWZubHKZkE04mavnTdb_9QY_r3XliRg,3424
 vellum_ee/workflows/display/nodes/vellum/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/nodes/vellum/tests/test_error_node.py,sha256=ulrpoYUW-5kIxfG4Lf5F2p0k_EoYKhmahEbF3P_eruM,1648
 vellum_ee/workflows/display/nodes/vellum/tests/test_prompt_node.py,sha256=bg9INsXiWfyK047u8TD1oEOFYrqDq8GC7Hvgz69n7BE,1988
+vellum_ee/workflows/display/nodes/vellum/tests/test_retry_node.py,sha256=NuIw8Yb42KUdoGi3Ur8_7VPg50IC4hNrwAkCociwqNk,2091
 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/try_node.py,sha256=HBfGz4yt9GlmMW9JxzaCacPnHBDNIeXE8Jhqr9DqLLw,6191
@@ -60,7 +61,7 @@ vellum_ee/workflows/display/tests/test_vellum_workflow_display.py,sha256=cdpUoDN
 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=A1-tIpC5KIKG9JA_rkd1nLS8zUG3Kb4QiVdvb3boFxE,2509
-vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py,sha256=9bIAEXXZQDqsUrDJqmHEeWYiZsYkVTQ4jBY-dPFVXEc,15054
+vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py,sha256=jw8keqLNwqtaRSAqStsMqSH_OuuaTQm2MvIx8NTWAa4,14905
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_attributes_serialization.py,sha256=1cszL6N6FNGVm61MOa7AEiHnF0QjZWqDQuPOp4yiG94,18277
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_outputs_serialization.py,sha256=-12ZkZb3f5gyoNASV2yeQtMo5HmNsVEo8nXwL6IC-I8,6261
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_ports_serialization.py,sha256=6th6kCwzql6lddjkTQx4Jbvvs4ChqtJwctW-B4QuBhI,37352
@@ -89,9 +90,9 @@ vellum_ee/workflows/display/utils/expressions.py,sha256=9FpOslDI-RCR5m4TgAu9KCHh
 vellum_ee/workflows/display/utils/vellum.py,sha256=UjK_RxnSEmlIu9klGCPWU5RAQBmgZ7cRbRdgxaTbubE,8081
 vellum_ee/workflows/display/vellum.py,sha256=7mqQaKZPPrLMcXSAQkPIxCy5x8HkKs5PbCu3GRaC2o8,8507
 vellum_ee/workflows/display/workflows/__init__.py,sha256=kapXsC67VJcgSuiBMa86FdePG5A9kMB5Pi4Uy1O2ob4,207
-vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=p9Lt1AypyC0Y6WHOUCsk4lYmlgODwg5oz-IDo0UA-1o,18678
+vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=Z9s_rtqAH5IfBtXOw40gbiT0GZeN6JRdFwGgPT-DIYM,20143
 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=_yB3-u7_bWdD4lUBWpRdWztJmJL-DXkkZaw9Vy9HH6g,3245
+vellum_ee/workflows/display/workflows/tests/test_workflow_display.py,sha256=STVSG0eL97mdnwBA5nOOgW8AuK8k-b8kWDyHKatNXIA,4259
 vellum_ee/workflows/display/workflows/vellum_workflow_display.py,sha256=mbAzCpswOek34ITeTkesbVreCXpulj4NFjIg3RcdVZ8,18243
 vellum_ee/workflows/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/server/virtual_file_loader.py,sha256=X_DdNK7MfyOjKWekk6YQpOSCT6klKcdjT6nVJcBH1sM,1481
@@ -114,7 +115,7 @@ vellum_ee/workflows/tests/local_workflow/nodes/__init__.py,sha256=1F6jxUpSKfPXPj
 vellum_ee/workflows/tests/local_workflow/nodes/final_output.py,sha256=ZX7zBv87zirg0w9VKUW3QVDSdBLDqcqAMZjCL_oWbpU,297
 vellum_ee/workflows/tests/local_workflow/nodes/templating_node.py,sha256=NQwFN61QkHfI3Vssz-B0NKGfupK8PU0FDSAIAhYBLi0,325
 vellum_ee/workflows/tests/local_workflow/workflow.py,sha256=A4qOzOPNwePYxWbcAgIPLsmrVS_aVEZEc-wULSv787Q,393
-vellum_ee/workflows/tests/test_display_meta.py,sha256=pzdqND4KLWs7EUIbpXuqgso7BIRpoUsO3T_bgeENs0Q,2205
+vellum_ee/workflows/tests/test_display_meta.py,sha256=xLQ7QtIXIiIm61pm2lyl588Ohzc3pjyq1nDp-qVu2Fs,2295
 vellum_ee/workflows/tests/test_server.py,sha256=M6vvQ2hjIpDWtQdDM9EPbMvUrZ93niAuYnxMNJWOjPA,511
 vellum_ee/workflows/tests/test_virtual_files.py,sha256=TJEcMR0v2S8CkloXNmCHA0QW0K6pYNGaIjraJz7sFvY,2762
 vellum/__init__.py,sha256=a_aM1_A04XGma4MAIDNeBF9BKzWbiQaVVMRzImHuxjA,36438
@@ -122,7 +123,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=RhAfDORGTXyVqWFHTHUIONrGJRy7OCD049LPC0pwN_k,1868
+vellum/client/core/client_wrapper.py,sha256=l2ugjFyqT9acEpOr6jNbb_P6uA6RL_Y5IP-FTsOd_uQ,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
@@ -1287,7 +1288,7 @@ vellum/utils/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 vellum/utils/templating/constants.py,sha256=8OHMO6WFAEimbIaiHc5gy6s91D7_KvW-vTlEMWwvl_M,711
 vellum/utils/templating/custom_filters.py,sha256=XVHriwazejRZmxB_eg4xHgCxl7AiQQ2sx-hRLMmylfU,885
 vellum/utils/templating/exceptions.py,sha256=cDp140PP4OnInW4qAvg3KqiSiF70C71UyEAKRBR1Abo,46
-vellum/utils/templating/render.py,sha256=5OsD1e9fks1aysYTyPKjYGaloYUbIKWpajcxtjtiFuU,2037
+vellum/utils/templating/render.py,sha256=P2t9qU4w_WdXAVLM5Nj3bc1-XlIKOkwK-czQ80pHBag,2172
 vellum/utils/templating/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/utils/templating/tests/test_custom_filters.py,sha256=mkJwc7t1gE13SKgPxhF-lN_m2XGCkphCB9Te81dGekI,532
 vellum/utils/typing.py,sha256=wx_daFqD69cYkuJTVnvNrpjhqC3uuhbnyJ9_bIwC9OU,327
@@ -1314,8 +1315,8 @@ vellum/workflows/events/__init__.py,sha256=6pxxceJo2dcaRkWtkDAYlUQZ-PHBQSZytIoyu
 vellum/workflows/events/node.py,sha256=uHT6If0esgZ3nLjrjmUPTKf3qbjGhoV_x5YKpjDBDcU,5280
 vellum/workflows/events/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/events/tests/test_event.py,sha256=uRfMwSOqU-ROeZKCEngGvvJYlOZuxBhnC3qH5AGi3fM,15399
-vellum/workflows/events/types.py,sha256=cjRE8WL8tYCFradd9NOGl_H0mN3LiWWnA1uHmyT2Q0Q,3412
-vellum/workflows/events/workflow.py,sha256=XtmGG7NRp0TQ4memOJPcaNOs7qMUBbd4WKSZVlxWrCk,5937
+vellum/workflows/events/types.py,sha256=AeTJaQt_fNHDLI4nyBzo7XrW9QQybRC09AKzu3kEYEE,3575
+vellum/workflows/events/workflow.py,sha256=sLO29djAeHGVd4hLhaNtOQ48uwUjfl-DotZQt06PxQA,6033
 vellum/workflows/exceptions.py,sha256=NiBiR3ggfmPxBVqD-H1SqmjI-7mIn0EStSN1BqApvCM,1213
 vellum/workflows/expressions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/expressions/accessor.py,sha256=ItZF7fMLzVTqsdAiaXb5SiDupXmX0X9xbIus1W6hRds,1870
@@ -1381,8 +1382,8 @@ vellum/workflows/nodes/core/retry_node/node.py,sha256=Vt3fx4G-DRIb9a-IHIUfaAclgf
 vellum/workflows/nodes/core/retry_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/nodes/core/retry_node/tests/test_node.py,sha256=RM_OHwxrHwyxvlQQBJPqVBxpedFuWQ9h2-Xa3kP75sc,4399
 vellum/workflows/nodes/core/templating_node/__init__.py,sha256=GmyuYo81_A1_Bz6id69ozVFS6FKiuDsZTiA3I6MaL2U,70
-vellum/workflows/nodes/core/templating_node/node.py,sha256=Vqlg4L-5XNuIdbZKQe-GEYqTIV7iXNjLO7QIRgz4ujc,3722
-vellum/workflows/nodes/core/templating_node/tests/test_templating_node.py,sha256=nY2P6r7cW85k7NEKXUFNeDTMWlz8ZEZyMY2Sg-0qO_E,7327
+vellum/workflows/nodes/core/templating_node/node.py,sha256=-JIqLUv6Xpx_LTVZt7whQ2X2VatgHDdTxjMrz64luEs,3721
+vellum/workflows/nodes/core/templating_node/tests/test_templating_node.py,sha256=ldnmSASx0TfAnT3ZvU0AXtN0diZGrfySiXipuJIIzWU,9055
 vellum/workflows/nodes/core/try_node/__init__.py,sha256=JVD4DrldTIqFQQFrubs9KtWCCc0YCAc7Fzol5ZWIWeM,56
 vellum/workflows/nodes/core/try_node/node.py,sha256=_0df2_6kim8pW4hB7IXUJOYS4fLduaeGDH4rRhYYvcg,4212
 vellum/workflows/nodes/core/try_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1411,12 +1412,14 @@ vellum/workflows/nodes/displayable/code_execution_node/node.py,sha256=pdDrjI8wdq
 vellum/workflows/nodes/displayable/code_execution_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/nodes/displayable/code_execution_node/tests/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/nodes/displayable/code_execution_node/tests/fixtures/main.py,sha256=5QsbmkzSlSbcbWTG_JmIqcP-JNJzOPTKxGzdHos19W4,79
-vellum/workflows/nodes/displayable/code_execution_node/tests/test_code_execution_node.py,sha256=OTnw5jgX90xWVB3vKryL5QSIr2YnGBz-W0q9C9LpNoc,22471
-vellum/workflows/nodes/displayable/code_execution_node/utils.py,sha256=BQraIN4I3DCzXLEuBlRYCyp7ote7hQmnnKHu4jFHCCA,5174
+vellum/workflows/nodes/displayable/code_execution_node/tests/test_code_execution_node.py,sha256=6_RMWedAWU8Zrl0HpQorQgDfjV9khnhSouZeKadClyI,23441
+vellum/workflows/nodes/displayable/code_execution_node/utils.py,sha256=-7YdoF-NO6sYRFLrdkd0n1FhQFiZbJBK5jFcLNghgVo,3635
 vellum/workflows/nodes/displayable/conditional_node/__init__.py,sha256=AS_EIqFdU1F9t8aLmbZU-rLh9ry6LCJ0uj0D8F0L5Uw,72
 vellum/workflows/nodes/displayable/conditional_node/node.py,sha256=Qjfl33gZ3JEgxBA1EgzSUebboGvsARthIxxcQyvx5Gg,1152
 vellum/workflows/nodes/displayable/final_output_node/__init__.py,sha256=G7VXM4OWpubvSJtVkGmMNeqgb9GkM7qZT838eL18XU4,72
-vellum/workflows/nodes/displayable/final_output_node/node.py,sha256=TFbDZLGEtmg2cOQeJ56pUQdAkuHRa_qjBRIOGZU7Fy4,1990
+vellum/workflows/nodes/displayable/final_output_node/node.py,sha256=PuQ0RvtAmoSIZ5En_92tym7gpSMEoiHgwu20-UDbC7o,2368
+vellum/workflows/nodes/displayable/final_output_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vellum/workflows/nodes/displayable/final_output_node/tests/test_node.py,sha256=E6LQ74qZjY4Xi4avx2qdOCgGhF8pEcNLBh8cqYRkzMI,709
 vellum/workflows/nodes/displayable/guardrail_node/__init__.py,sha256=Ab5eXmOoBhyV4dMWdzh32HLUmnPIBEK_zFCT38C4Fng,68
 vellum/workflows/nodes/displayable/guardrail_node/node.py,sha256=h5nIBzQxbXTrdTq1wjDcekk1RV4-rKUNCshqdBAiJJY,4025
 vellum/workflows/nodes/displayable/inline_prompt_node/__init__.py,sha256=gSUOoEZLlrx35-tQhSAd3An8WDwBqyiQh-sIebLU9wU,74
@@ -1448,9 +1451,9 @@ 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=1EGeiaT-Zoo6pttQFKKBcdf3dmhAbjKGaErYD5FFwlc,10185
 vellum/workflows/nodes/mocks.py,sha256=gvM2tyoe-V84jFbFdhQsyGAPyQBzmjn_CkhT_yxccgY,499
-vellum/workflows/nodes/utils.py,sha256=YRj3qIz6--N6CuDiKalsWpBmUR6z7WcRhqtLxoenDZE,4354
+vellum/workflows/nodes/utils.py,sha256=uaTPGYp4utenz_QDghqQ23Q1iCsGHQ40nNZh1g9H9WI,7117
 vellum/workflows/outputs/__init__.py,sha256=AyZ4pRh_ACQIGvkf0byJO46EDnSix1ZCAXfvh-ms1QE,94
-vellum/workflows/outputs/base.py,sha256=2MtTlyzePopMZDpBWQIV8HRV-km1-z0vI8Gm012q9OQ,8665
+vellum/workflows/outputs/base.py,sha256=W5KL9FaWfSbZuF7lOQ677giHO839Do-MXmuzkDuzPqk,8607
 vellum/workflows/ports/__init__.py,sha256=bZuMt-R7z5bKwpu4uPW7LlJeePOQWmCcDSXe5frUY5g,101
 vellum/workflows/ports/node_ports.py,sha256=g4A-8iUAvEJSkaWppbvzAR8XU02R9U-qLN4rP2Kq4Aw,2743
 vellum/workflows/ports/port.py,sha256=eI2SOZPZ5rsC3jMsxW6Rbn0NpaYQsrR7AapiIbbiy8Q,3635
@@ -1470,7 +1473,7 @@ vellum/workflows/references/workflow_input.py,sha256=86IuhlBz-9cGxeUzizyjdp482aj
 vellum/workflows/resolvers/__init__.py,sha256=eH6hTvZO4IciDaf_cf7aM2vs-DkBDyJPycOQevJxQnI,82
 vellum/workflows/resolvers/base.py,sha256=WHra9LRtlTuB1jmuNqkfVE2JUgB61Cyntn8f0b0WZg4,411
 vellum/workflows/runner/__init__.py,sha256=i1iG5sAhtpdsrlvwgH6B-m49JsINkiWyPWs8vyT-bqM,72
-vellum/workflows/runner/runner.py,sha256=VUGw-QlUNyfwRWjXgBZ1VqKRuYdFC7YdtAmQcsgR6I0,31206
+vellum/workflows/runner/runner.py,sha256=_p19T1woplSxZGabZuSUFBKSYBrXADrM7b_1YnWVN3g,31013
 vellum/workflows/sandbox.py,sha256=GVJzVjMuYzOBnSrboB0_6MMRZWBluAyQ2o7syeaeBd0,2235
 vellum/workflows/state/__init__.py,sha256=yUUdR-_Vl7UiixNDYQZ-GEM_kJI9dnOia75TtuNEsnE,60
 vellum/workflows/state/base.py,sha256=Vkhneko3VlQrPsMLU1PYSzXU_W1u7_AraJsghiv5O-4,15512
@@ -1501,13 +1504,13 @@ vellum/workflows/utils/uuids.py,sha256=DFzPv9RCvsKhvdTEIQyfSek2A31D6S_QcmeLPbgrg
 vellum/workflows/utils/vellum_variables.py,sha256=fC2aSLvlS31D15dOWu43LBRR0QsgUKNXBiCUvvaLXSs,3231
 vellum/workflows/vellum_client.py,sha256=ODrq_TSl-drX2aezXegf7pizpWDVJuTXH-j6528t75s,683
 vellum/workflows/workflows/__init__.py,sha256=KY45TqvavCCvXIkyCFMEc0dc6jTMOUci93U2DUrlZYc,66
-vellum/workflows/workflows/base.py,sha256=ggnrtDWSScVRuH3PEs2A81qXX0LngYuvS62SkDS2SOE,22724
+vellum/workflows/workflows/base.py,sha256=TSS2BHC8LAi-N5GdEa75BeChwzwTzL7yldFnTlLINro,22665
 vellum/workflows/workflows/event_filters.py,sha256=GSxIgwrX26a1Smfd-6yss2abGCnadGsrSZGa7t7LpJA,2008
 vellum/workflows/workflows/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/workflows/tests/test_base_workflow.py,sha256=NRteiICyJvDM5zrtUfq2fZoXcGQVaWC9xmNlLLVW0cU,7979
 vellum/workflows/workflows/tests/test_context.py,sha256=VJBUcyWVtMa_lE5KxdhgMu0WYNYnUQUDvTF7qm89hJ0,2333
-vellum_ai-0.14.9.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-0.14.9.dist-info/METADATA,sha256=JO_Tqa4ayXrL4ytBbrfiXfly8yXeiPyQc-4NOoL9kDk,5407
-vellum_ai-0.14.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-0.14.9.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
-vellum_ai-0.14.9.dist-info/RECORD,,
+vellum_ai-0.14.11.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-0.14.11.dist-info/METADATA,sha256=584bKGEOfx24lR-N0_BdsuLUo5G-nDYN2-hXxKWGCNg,5408
+vellum_ai-0.14.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-0.14.11.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
+vellum_ai-0.14.11.dist-info/RECORD,,

vellum_cli/image_push.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import re
 import subprocess
 from typing import List, Optional
 
@@ -24,9 +25,11 @@ def image_push_command(image: str, tags: Optional[List[str]] = None) -> None:
     # listing all of the architectures of the image instead of just the one that matches the machine. We can fall back
     # to using normal inspect which returns the machine image for this case though. And in the future we could figure
     # out how to call the docker host directly to do this.
+    logger.info("Pre-validating image...")
     docker_client = docker.from_env()
     check_architecture(docker_client, image, logger)
 
+    logger.info("Authenticating...")
     auth = vellum_client.container_images.docker_service_token()
 
     docker_client.login(
@@ -70,9 +73,29 @@ def image_push_command(image: str, tags: Optional[List[str]] = None) -> None:
             except Exception:
                 continue
 
-    logger.info("Updating Vellum metadata and enforcing the first law of robotics...")
-    image_details = docker_client.api.inspect_image(image)
-    sha = image_details["Id"]
+    result = subprocess.run(
+        ["docker", "inspect", "--format='{{index .RepoDigests 0}}'", image],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+
+    sha = ""
+    if result.returncode == 0:
+        match = re.search(r"sha256[^']*", result.stdout.decode("utf-8"))
+        if match and match.group(0):
+            sha = match.group(0)
+
+    if not sha:
+        # Fallback to using docker client if command line fails, at least on some systems
+        # this appears to give a bad sha.
+        logger.warning(
+            "Could not determine image hash with command line docker falling back to python docker client..."
+        )
+
+        image_details = docker_client.api.inspect_image(image)
+        sha = image_details["Id"]
+
+    logger.info(f"Updating Vellum metadata and validating image works in our system with image digest: {sha}...")
 
     vellum_client.container_images.push_container_image(
         name=image_name,
@@ -95,12 +118,12 @@ def check_architecture(docker_client: DockerClient, image: str, logger: logging.
         manifest = json.loads(result.stdout)
         architectures = [manifest_item["platform"]["architecture"] for manifest_item in manifest["manifests"]]
     except Exception:
-        logger.warning("Error parsing manifest response")
+        logger.debug("Error parsing manifest response")
         manifest_parse_failed = True
 
     # Fall back to inspect image if we errored out using docker command line
     if result.returncode != 0 or manifest_parse_failed:
-        logger.warning(f"Error inspecting manifest: {result.stderr.decode('utf-8').strip()}")
+        logger.debug(f"Error inspecting manifest: {result.stderr.decode('utf-8').strip()}")
         image_details = docker_client.api.inspect_image(image)
 
         if image_details["Architecture"] != _SUPPORTED_ARCHITECTURE:

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

@@ -1,11 +1,19 @@
 import inspect
-from typing import Any, Generic, TypeVar, cast
+from typing import Any, Callable, Generic, Optional, Tuple, Type, TypeVar, cast
 
 from vellum.workflows.descriptors.base import BaseDescriptor
+from vellum.workflows.errors.types import WorkflowErrorCode
+from vellum.workflows.nodes.bases.base import BaseNode
 from vellum.workflows.nodes.core.retry_node.node import RetryNode
+from vellum.workflows.nodes.utils import ADORNMENT_MODULE_NAME
+from vellum.workflows.references.output import OutputReference
 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.workflows.workflows.base import BaseWorkflow
+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.nodes.vellum.base_adornment_node import BaseAdornmentNodeDisplay
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
@@ -39,4 +47,86 @@ class BaseRetryNodeDisplay(BaseAdornmentNodeDisplay[_RetryNodeType], Generic[_Re
             "attributes": attributes,
         }
 
-        return super().serialize(display_context, adornment=adornment)
+        serialized_node = super().serialize(
+            display_context,
+            adornment=adornment,
+        )
+
+        if serialized_node["type"] == "GENERIC":
+            return serialized_node
+
+        serialized_node_definition = serialized_node.get("definition")
+        if isinstance(serialized_node_definition, dict):
+            serialized_node_definition_module = serialized_node_definition.get("module")
+            if isinstance(serialized_node_definition_module, list):
+                serialized_node_definition_module.extend(
+                    [
+                        serialized_node_definition["name"],
+                        ADORNMENT_MODULE_NAME,
+                    ]
+                )
+                serialized_node_definition["name"] = node.__name__
+
+        return serialized_node
+
+    def get_node_output_display(self, output: OutputReference) -> Tuple[Type[BaseNode], NodeOutputDisplay]:
+        inner_node = self._node.__wrapped_node__
+        if not inner_node:
+            return super().get_node_output_display(output)
+
+        node_display_class = get_node_display_class(BaseNodeDisplay, inner_node)
+        node_display = node_display_class()
+
+        inner_output = getattr(inner_node.Outputs, output.name)
+        return node_display.get_node_output_display(inner_output)
+
+    @classmethod
+    def wrap(
+        cls,
+        max_attempts: int,
+        delay: Optional[float] = None,
+        retry_on_error_code: Optional[WorkflowErrorCode] = None,
+        retry_on_condition: Optional[BaseDescriptor] = None,
+    ) -> Callable[..., Type["BaseRetryNodeDisplay"]]:
+        _max_attempts = max_attempts
+        _delay = delay
+        _retry_on_error_code = retry_on_error_code
+        _retry_on_condition = retry_on_condition
+
+        NodeDisplayType = TypeVar("NodeDisplayType", bound=BaseNodeDisplay)
+
+        def decorator(inner_cls: Type[NodeDisplayType]) -> Type[NodeDisplayType]:
+            node_class = inner_cls.infer_node_class()
+            wrapped_node_class = cast(Type[BaseNode], node_class.__wrapped_node__)
+
+            class RetryNodeDisplay(BaseRetryNodeDisplay[node_class]):  # type: ignore[valid-type]
+                max_attempts = _max_attempts
+                delay = _delay
+                retry_on_error_code = _retry_on_error_code
+                retry_on_condition = _retry_on_condition
+
+            setattr(inner_cls, "__adorned_by__", RetryNodeDisplay)
+
+            # We must edit the node display class to use __wrapped_node__ everywhere it
+            # references the adorned node class, which is three places:
+
+            # 1. The node display class' parameterized type
+            original_base_node_display = get_original_base(inner_cls)
+            original_base_node_display.__args__ = (wrapped_node_class,)
+            inner_cls._node_display_registry[wrapped_node_class] = inner_cls
+
+            # 2. The node display class' output displays
+            old_outputs = list(inner_cls.output_display.keys())
+            for old_output in old_outputs:
+                new_output = getattr(wrapped_node_class.Outputs, old_output.name)
+                inner_cls.output_display[new_output] = inner_cls.output_display.pop(old_output)
+
+            # 3. The node display class' port displays
+            old_ports = list(inner_cls.port_displays.keys())
+            for old_port in old_ports:
+                new_port = getattr(wrapped_node_class.Ports, old_port.name)
+                inner_cls.port_displays[new_port] = inner_cls.port_displays.pop(old_port)
+
+            return inner_cls
+
+        return decorator

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

@@ -0,0 +1,47 @@
+from typing import Any, Dict, cast
+
+from vellum.workflows import BaseWorkflow
+from vellum.workflows.errors.types import WorkflowErrorCode
+from vellum.workflows.nodes.bases.base import BaseNode
+from vellum.workflows.nodes.core.retry_node.node import RetryNode
+from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
+from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
+
+
+def test_retry_node_parameters():
+    """Test that RetryNode parameters are correctly serialized."""
+
+    # GIVEN a RetryNode with specific parameters
+    @RetryNode.wrap(max_attempts=5, delay=2.5, retry_on_error_code=WorkflowErrorCode.INVALID_INPUTS)
+    class MyRetryNode(BaseNode):
+        pass
+
+    # AND a workflow using the node
+    class MyWorkflow(BaseWorkflow):
+        graph = MyRetryNode
+
+    # WHEN we serialize the workflow
+    workflow_display = get_workflow_display(base_display_class=VellumWorkflowDisplay, workflow_class=MyWorkflow)
+    serialized_workflow = cast(Dict[str, Any], workflow_display.serialize())
+
+    # THEN the correct inputs should be serialized on the node
+    serialized_node = next(
+        node for node in serialized_workflow["workflow_raw_data"]["nodes"] if node["type"] != "ENTRYPOINT"
+    )
+
+    retry_adornment = next(
+        adornment for adornment in serialized_node["adornments"] if adornment["label"] == "RetryNode"
+    )
+
+    max_attempts_attribute = next(attr for attr in retry_adornment["attributes"] if attr["name"] == "max_attempts")
+    assert max_attempts_attribute["value"]["value"]["value"] == 5
+
+    delay_attribute = next(attr for attr in retry_adornment["attributes"] if attr["name"] == "delay")
+    assert delay_attribute["value"]["value"]["value"] == 2.5
+
+    retry_on_error_code_attribute = next(
+        attr for attr in retry_adornment["attributes"] if attr["name"] == "retry_on_error_code"
+    )
+
+    assert retry_on_error_code_attribute["value"]["value"]["type"] == "STRING"
+    assert retry_on_error_code_attribute["value"]["value"]["value"] == "INVALID_INPUTS"

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

@@ -29,11 +29,8 @@ class InnerRetryGenericNode(BaseNode):
         output: str
 
 
-class InnerRetryGenericNodeDisplay(BaseNodeDisplay[InnerRetryGenericNode.__wrapped_node__]):  # type: ignore
-    pass
-
-
-class OuterRetryNodeDisplay(BaseRetryNodeDisplay[InnerRetryGenericNode]):  # type: ignore
+@BaseRetryNodeDisplay.wrap(max_attempts=3)
+class InnerRetryGenericNodeDisplay(BaseNodeDisplay[InnerRetryGenericNode]):
     pass
 
 
@@ -44,7 +41,6 @@ def test_serialize_node__retry(serialize_node):
         global_workflow_input_displays={Inputs.input: WorkflowInputsDisplay(id=input_id)},
         global_node_displays={
             InnerRetryGenericNode.__wrapped_node__: InnerRetryGenericNodeDisplay,
-            InnerRetryGenericNode: OuterRetryNodeDisplay,
         },
     )
 

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, Generic, Iterator, List, Optional, Tuple, Type, Un
 from vellum.workflows import BaseWorkflow
 from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.edges import Edge
-from vellum.workflows.events.workflow import NodeDisplay, WorkflowEventDisplayContext
+from vellum.workflows.events.workflow import NodeEventDisplayContext, WorkflowEventDisplayContext
 from vellum.workflows.expressions.coalesce_expression import CoalesceExpression
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.utils import get_wrapped_node
@@ -34,7 +34,9 @@ from vellum_ee.workflows.display.base import (
 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.utils import raise_if_descriptor
 from vellum_ee.workflows.display.types import NodeDisplayType, WorkflowDisplayContext
+from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
 
 logger = logging.getLogger(__name__)
 
@@ -383,10 +385,15 @@ class BaseWorkflowDisplay(
         except ModuleNotFoundError:
             return None
 
-        display_context = display_class.WorkflowDisplay(workflow_class).display_context
-        if not isinstance(display_context, WorkflowDisplayContext):
+        workflow_display = display_class.WorkflowDisplay(workflow_class)
+        if not isinstance(workflow_display, BaseWorkflowDisplay):
             return None
 
+        return workflow_display.get_event_display_context()
+
+    def get_event_display_context(self):
+        display_context = self.display_context
+
         workflow_outputs = {
             output.name: display_context.workflow_output_displays[output].id
             for output in display_context.workflow_output_displays
@@ -398,27 +405,44 @@ class BaseWorkflowDisplay(
         node_displays = {
             str(node.__id__): display_context.node_displays[node] for node in display_context.node_displays
         }
-        temp_node_displays = {}
-        for node in node_displays:
-            current_node = node_displays[node]
+        node_event_displays = {}
+        for node_id in node_displays:
+            current_node_display = node_displays[node_id]
             input_display = {}
-            if isinstance(current_node, BaseNodeVellumDisplay):
-                input_display = current_node.node_input_ids_by_name
+            if isinstance(current_node_display, BaseNodeVellumDisplay):
+                input_display = current_node_display.node_input_ids_by_name
             node_display_meta = {
-                output.name: current_node.output_display[output].id for output in current_node.output_display
+                output.name: current_node_display.output_display[output].id
+                for output in current_node_display.output_display
             }
-            port_display_meta = {port.name: current_node.port_displays[port].id for port in current_node.port_displays}
-
-            temp_node_displays[node] = NodeDisplay(
+            port_display_meta = {
+                port.name: current_node_display.port_displays[port].id for port in current_node_display.port_displays
+            }
+            node = current_node_display._node
+            subworkflow_display_context: Optional[WorkflowEventDisplayContext] = None
+            if hasattr(node, "subworkflow"):
+                # All nodes that have a subworkflow attribute are currently expected to call them `subworkflow`
+                # This will change if in the future we decide to support multiple subworkflows on a single node
+                subworkflow_attribute = raise_if_descriptor(getattr(node, "subworkflow"))
+                if issubclass(subworkflow_attribute, BaseWorkflow):
+                    subworkflow_display = get_workflow_display(
+                        base_display_class=display_context.workflow_display_class,
+                        workflow_class=subworkflow_attribute,
+                        parent_display_context=display_context,
+                    )
+                    subworkflow_display_context = subworkflow_display.get_event_display_context()
+
+            node_event_displays[node_id] = NodeEventDisplayContext(
                 input_display=input_display,
                 output_display=node_display_meta,
                 port_display=port_display_meta,
+                subworkflow_display=subworkflow_display_context,
             )
 
         display_meta = WorkflowEventDisplayContext(
             workflow_outputs=workflow_outputs,
             workflow_inputs=workflow_inputs,
-            node_displays=temp_node_displays,
+            node_displays=node_event_displays,
         )
         return display_meta
 

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

@@ -1,6 +1,7 @@
 import pytest
 
 from vellum.workflows.nodes.bases.base import BaseNode
+from vellum.workflows.nodes.core.inline_subworkflow_node.node import InlineSubworkflowNode
 from vellum.workflows.workflows.base import BaseWorkflow
 from vellum_ee.workflows.display.nodes import BaseNodeDisplay
 from vellum_ee.workflows.display.vellum import NodeDisplayData, NodeDisplayPosition
@@ -92,3 +93,29 @@ def test_serialize_workflow__node_display_class_not_registered():
 
     # THEN it should should succeed
     assert data is not None
+
+
+def test_get_event_display_context__node_display_to_include_subworkflow_display():
+    # GIVEN a simple workflow
+    class InnerNode(BaseNode):
+        pass
+
+    class Subworkflow(BaseWorkflow):
+        graph = InnerNode
+
+    # AND a workflow that includes the subworkflow
+    class SubworkflowNode(InlineSubworkflowNode):
+        subworkflow = Subworkflow
+
+    class MyWorkflow(BaseWorkflow):
+        graph = SubworkflowNode
+
+    # WHEN we gather the event display context
+    display_context = VellumWorkflowDisplay(MyWorkflow).get_event_display_context()
+
+    # THEN the subworkflow display should be included
+    assert str(SubworkflowNode.__id__) in display_context.node_displays
+    node_event_display = display_context.node_displays[str(SubworkflowNode.__id__)]
+
+    assert node_event_display.subworkflow_display is not None
+    assert str(InnerNode.__id__) in node_event_display.subworkflow_display.node_displays

vellum_ee/workflows/tests/test_display_meta.py

@@ -40,11 +40,13 @@ def test_base_class_dynamic_import(files):
                 },
                 "output_display": {"result": UUID("423bc529-1a1a-4f72-af4d-cbdb5f0a5929")},
                 "port_display": {"default": UUID("afda9a19-0618-42e1-9b63-5d0db2a88f62")},
+                "subworkflow_display": None,
             },
             "f3ef4b2b-fec9-4026-9cc6-e5eac295307f": {
                 "input_display": {"node_input": UUID("fe6cba85-2423-4b5e-8f85-06311a8be5fb")},
                 "output_display": {"value": UUID("5469b810-6ea6-4362-9e79-e360d44a1405")},
                 "port_display": {},
+                "subworkflow_display": None,
             },
         },
         "workflow_inputs": {"input_value": UUID("2268a996-bd17-4832-b3ff-f5662d54b306")},