vellum-ai 1.7.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

vellum/client/core/client_wrapper.py

@@ -27,10 +27,10 @@ class BaseClientWrapper:
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "vellum-ai/1.7.0",
+            "User-Agent": "vellum-ai/1.7.1",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "1.7.0",
+            "X-Fern-SDK-Version": "1.7.1",
             **(self.get_custom_headers() or {}),
         }
         if self._api_version is not None:

vellum/workflows/resolvers/resolver.py

@@ -1,9 +1,7 @@
 import logging
 from uuid import UUID
-from typing import Iterator, List, Optional, Tuple, Type, Union
+from typing import Iterator, Optional, Type, Union
 
-from vellum.client.types.vellum_span import VellumSpan
-from vellum.client.types.workflow_execution_initiated_event import WorkflowExecutionInitiatedEvent
 from vellum.workflows.events.workflow import WorkflowEvent
 from vellum.workflows.nodes.utils import cast_to_output_type
 from vellum.workflows.resolvers.base import BaseWorkflowResolver
@@ -20,38 +18,6 @@ class VellumResolver(BaseWorkflowResolver):
     def get_state_snapshot_history(self) -> Iterator[BaseState]:
         return iter([])
 
-    def _find_previous_and_root_span(
-        self, execution_id: str, spans: List[VellumSpan]
-    ) -> Tuple[Optional[str], Optional[str], Optional[str], Optional[str]]:
-        previous_trace_id: Optional[str] = None
-        root_trace_id: Optional[str] = None
-        previous_span_id: Optional[str] = None
-        root_span_id: Optional[str] = None
-
-        for span in spans:
-            # Look for workflow execution spans with matching ID first
-            if span.name == "workflow.execution" and span.span_id == execution_id:
-                # Find the WorkflowExecutionInitiatedEvent in the span's events
-                initiated_event = next(
-                    (event for event in span.events if isinstance(event, WorkflowExecutionInitiatedEvent)), None
-                )
-                if initiated_event:
-                    previous_trace_id = initiated_event.trace_id
-                    previous_span_id = initiated_event.span_id
-                    links = initiated_event.links
-                    if links:
-                        root_span = next((link for link in links if link.type == "ROOT_SPAN"), None)
-                        if root_span:
-                            root_trace_id = root_span.trace_id
-                            root_span_id = root_span.span_context.span_id
-                    else:
-                        # no links means this is the first execution
-                        root_trace_id = initiated_event.trace_id
-                        root_span_id = initiated_event.span_id
-                    break
-
-        return previous_trace_id, root_trace_id, previous_span_id, root_span_id
-
     def _deserialize_state(self, state_data: dict, state_class: Type[BaseState]) -> BaseState:
         """Deserialize state data with proper type conversion for complex types like List[ChatMessage]."""
         converted_data = {}
@@ -79,18 +45,19 @@ class VellumResolver(BaseWorkflowResolver):
             return None
 
         client = self._context.vellum_client
-        response = client.workflow_executions.retrieve_workflow_execution_detail(
-            execution_id=previous_execution_id,
+        response = client.workflows.retrieve_state(
+            span_id=previous_execution_id,
         )
 
         if response.state is None:
             return None
 
-        previous_trace_id, root_trace_id, previous_span_id, root_span_id = self._find_previous_and_root_span(
-            previous_execution_id, response.spans
-        )
-
-        if previous_trace_id is None or root_trace_id is None or previous_span_id is None or root_span_id is None:
+        if (
+            response.previous_trace_id is None
+            or response.root_trace_id is None
+            or response.previous_span_id is None
+            or response.root_span_id is None
+        ):
             logger.warning("Could not find required execution events for state loading")
             return None
 
@@ -106,8 +73,8 @@ class VellumResolver(BaseWorkflowResolver):
 
         return LoadStateResult(
             state=state,
-            previous_trace_id=previous_trace_id,
-            previous_span_id=previous_span_id,
-            root_trace_id=root_trace_id,
-            root_span_id=root_span_id,
+            previous_trace_id=response.previous_trace_id,
+            previous_span_id=response.previous_span_id,
+            root_trace_id=response.root_trace_id,
+            root_span_id=response.root_span_id,
         )

vellum/workflows/resolvers/tests/test_resolver.py

@@ -4,14 +4,7 @@ from uuid import uuid4
 from typing import List
 
 from vellum import ChatMessage
-from vellum.client.types.span_link import SpanLink
-from vellum.client.types.vellum_code_resource_definition import VellumCodeResourceDefinition
-from vellum.client.types.workflow_execution_detail import WorkflowExecutionDetail
-from vellum.client.types.workflow_execution_initiated_body import WorkflowExecutionInitiatedBody
-from vellum.client.types.workflow_execution_initiated_event import WorkflowExecutionInitiatedEvent
-from vellum.client.types.workflow_execution_span import WorkflowExecutionSpan
-from vellum.client.types.workflow_execution_span_attributes import WorkflowExecutionSpanAttributes
-from vellum.client.types.workflow_parent_context import WorkflowParentContext
+from vellum.client.types.workflow_resolved_state import WorkflowResolvedState
 from vellum.workflows import BaseWorkflow
 from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.resolvers.resolver import VellumResolver
@@ -24,7 +17,6 @@ def test_load_state_with_context_success():
     """Test load_state successfully loads state when context and client are available."""
     resolver = VellumResolver()
     execution_id = uuid4()
-    root_execution_id = uuid4()
 
     class TestState(BaseState):
         test_key: str = "test_value"
@@ -50,60 +42,24 @@ def test_load_state_with_context_success():
         },
     }
 
-    mock_workflow_definition = VellumCodeResourceDefinition(
-        name="TestWorkflow", module=["test", "module"], id=str(uuid4())
-    )
-
-    mock_body = WorkflowExecutionInitiatedBody(workflow_definition=mock_workflow_definition, inputs={})
-
     previous_trace_id = str(uuid4())
+    previous_span_id = str(uuid4())
     root_trace_id = str(uuid4())
+    root_span_id = str(uuid4())
 
-    previous_invocation = WorkflowExecutionInitiatedEvent(
-        id=str(uuid4()),
+    mock_response = WorkflowResolvedState(
+        trace_id=str(uuid4()),
         timestamp=datetime.now(),
-        trace_id=previous_trace_id,
         span_id=str(execution_id),
-        body=mock_body,
-        links=[
-            SpanLink(
-                trace_id=previous_trace_id,
-                type="PREVIOUS_SPAN",
-                span_context=WorkflowParentContext(workflow_definition=mock_workflow_definition, span_id=str(uuid4())),
-            ),
-            SpanLink(
-                trace_id=root_trace_id,
-                type="ROOT_SPAN",
-                span_context=WorkflowParentContext(
-                    workflow_definition=mock_workflow_definition, span_id=str(root_execution_id)
-                ),
-            ),
-        ],
-    )
-
-    root_invocation = WorkflowExecutionInitiatedEvent(
-        id=str(uuid4()),
-        timestamp=datetime.now(),
-        trace_id=root_trace_id,
-        span_id=str(root_execution_id),
-        body=mock_body,
-        links=None,  # Root invocation has no links
-    )
-
-    mock_span = WorkflowExecutionSpan(
-        span_id=str(execution_id),  # Use the actual execution_id
-        start_ts=datetime.now(),
-        end_ts=datetime.now(),
-        attributes=WorkflowExecutionSpanAttributes(label="Test Workflow", workflow_id=str(uuid4())),
-        events=[previous_invocation, root_invocation],
-    )
-
-    mock_response = WorkflowExecutionDetail(
-        span_id="test-span-id", start=datetime.now(), inputs=[], outputs=[], spans=[mock_span], state=state_dict
+        state=state_dict,
+        previous_trace_id=previous_trace_id,
+        previous_span_id=previous_span_id,
+        root_trace_id=root_trace_id,
+        root_span_id=root_span_id,
     )
 
     mock_client = Mock()
-    mock_client.workflow_executions.retrieve_workflow_execution_detail.return_value = mock_response
+    mock_client.workflows.retrieve_state.return_value = mock_response
 
     # AND context with the test workflow class is set up
     context = WorkflowContext(vellum_client=mock_client)
@@ -123,21 +79,18 @@ def test_load_state_with_context_success():
     assert str(result.state.meta.span_id) != prev_span_id
 
     # AND should have span link info
-    assert result.previous_trace_id == previous_invocation.trace_id
-    assert result.previous_span_id == previous_invocation.span_id
-    assert result.root_trace_id == root_invocation.trace_id
-    assert result.root_span_id == root_invocation.span_id
+    assert result.previous_trace_id == previous_trace_id
+    assert result.previous_span_id == previous_span_id
+    assert result.root_trace_id == root_trace_id
+    assert result.root_span_id == root_span_id
 
-    mock_client.workflow_executions.retrieve_workflow_execution_detail.assert_called_once_with(
-        execution_id=str(execution_id)
-    )
+    mock_client.workflows.retrieve_state.assert_called_once_with(span_id=str(execution_id))
 
 
 def test_load_state_with_chat_message_list():
     """Test load_state successfully loads state with chat_history containing ChatMessage list."""
     resolver = VellumResolver()
     execution_id = uuid4()
-    root_execution_id = uuid4()
 
     class TestStateWithChatHistory(BaseState):
         test_key: str = "test_value"
@@ -169,60 +122,24 @@ def test_load_state_with_chat_message_list():
         },
     }
 
-    mock_workflow_definition = VellumCodeResourceDefinition(
-        name="TestWorkflow", module=["test", "module"], id=str(uuid4())
-    )
-
-    mock_body = WorkflowExecutionInitiatedBody(workflow_definition=mock_workflow_definition, inputs={})
-
     previous_trace_id = str(uuid4())
+    previous_span_id = str(uuid4())
     root_trace_id = str(uuid4())
+    root_span_id = str(uuid4())
 
-    previous_invocation = WorkflowExecutionInitiatedEvent(
-        id=str(uuid4()),
-        timestamp=datetime.now(),
-        trace_id=previous_trace_id,
-        span_id=str(execution_id),
-        body=mock_body,
-        links=[
-            SpanLink(
-                trace_id=previous_trace_id,
-                type="PREVIOUS_SPAN",
-                span_context=WorkflowParentContext(workflow_definition=mock_workflow_definition, span_id=str(uuid4())),
-            ),
-            SpanLink(
-                trace_id=root_trace_id,
-                type="ROOT_SPAN",
-                span_context=WorkflowParentContext(
-                    workflow_definition=mock_workflow_definition, span_id=str(root_execution_id)
-                ),
-            ),
-        ],
-    )
-
-    root_invocation = WorkflowExecutionInitiatedEvent(
-        id=str(uuid4()),
+    mock_response = WorkflowResolvedState(
+        trace_id=str(uuid4()),
         timestamp=datetime.now(),
-        trace_id=root_trace_id,
-        span_id=str(root_execution_id),
-        body=mock_body,
-        links=None,
-    )
-
-    mock_span = WorkflowExecutionSpan(
         span_id=str(execution_id),
-        start_ts=datetime.now(),
-        end_ts=datetime.now(),
-        attributes=WorkflowExecutionSpanAttributes(label="Test Workflow", workflow_id=str(uuid4())),
-        events=[previous_invocation, root_invocation],
-    )
-
-    mock_response = WorkflowExecutionDetail(
-        span_id="test-span-id", start=datetime.now(), inputs=[], outputs=[], spans=[mock_span], state=state_dict
+        state=state_dict,
+        previous_trace_id=previous_trace_id,
+        previous_span_id=previous_span_id,
+        root_trace_id=root_trace_id,
+        root_span_id=root_span_id,
     )
 
     mock_client = Mock()
-    mock_client.workflow_executions.retrieve_workflow_execution_detail.return_value = mock_response
+    mock_client.workflows.retrieve_state.return_value = mock_response
 
     # AND context with the test workflow class is set up
     context = WorkflowContext(vellum_client=mock_client)
@@ -247,6 +164,4 @@ def test_load_state_with_chat_message_list():
     assert result.state.chat_history[2].role == "USER"
     assert result.state.chat_history[2].text == "What can you help me with?"
 
-    mock_client.workflow_executions.retrieve_workflow_execution_detail.assert_called_once_with(
-        execution_id=str(execution_id)
-    )
+    mock_client.workflows.retrieve_state.assert_called_once_with(span_id=str(execution_id))

{vellum_ai-1.7.0.dist-info → vellum_ai-1.7.1.dist-info}/METADATA

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

{vellum_ai-1.7.0.dist-info → vellum_ai-1.7.1.dist-info}/RECORD

@@ -22,7 +22,7 @@ vellum_cli/tests/test_ping.py,sha256=b3aQLd-N59_8w2rRiWqwpB1rlHaKEYVbAj1Y3hi7A-g
 vellum_cli/tests/test_pull.py,sha256=e2XHzcHIx9k-FyuNAl7wMSNsSSebPGyP6U05JGcddFs,49447
 vellum_cli/tests/test_push.py,sha256=2MjkNKr_9Guv5Exjsm3L1BeVXmPkKUcCSiKnp90HgW4,41996
 vellum_ee/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum_ee/assets/node-definitions.json,sha256=tinXep1k-FicJWSPQb5mlWRkdKul1WJtG4o94SqD4ds,29800
+vellum_ee/assets/node-definitions.json,sha256=UkHixt8WAnHmupooOrtpxYCaNG-5pRon1c8QUlc0Vhk,30754
 vellum_ee/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/scripts/generate_node_definitions.py,sha256=FOYQsXIqU45I0OAcsyZUGODF9JK44yunf58rR6YaAdA,3303
 vellum_ee/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -55,7 +55,7 @@ vellum_ee/workflows/display/nodes/vellum/prompt_deployment_node.py,sha256=Ue727X
 vellum_ee/workflows/display/nodes/vellum/retry_node.py,sha256=5xv5OR4xRuI1R5yqJDZTNdCFYY-z8PkTdpWM4ziGjw0,3192
 vellum_ee/workflows/display/nodes/vellum/search_node.py,sha256=ZHqkwzCRsM0TkZmh3ePHreZAoQXeT-SFS7zbUrSjMsw,12037
 vellum_ee/workflows/display/nodes/vellum/subworkflow_deployment_node.py,sha256=hC5hTSRf1f9ppiZ_wXzpcp-jl0fwNAUB9PY8s0AykHs,3131
-vellum_ee/workflows/display/nodes/vellum/templating_node.py,sha256=QExp4l2KMNBdqMVDL4CG_iFMpFf3RYiTP2q5P2DmEFk,3178
+vellum_ee/workflows/display/nodes/vellum/templating_node.py,sha256=sWupmR7Ri2ZeCLx8713JbuawabR_kpWp_-HwT1tCrtU,3163
 vellum_ee/workflows/display/nodes/vellum/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/nodes/vellum/tests/test_api_node.py,sha256=DQAtsabvn6BE6xWwKNHzMOppzoy1-1dssNnrwbHUdRU,1490
 vellum_ee/workflows/display/nodes/vellum/tests/test_code_execution_node.py,sha256=6_1yVYftVnqXJn3hLUGHlcHvbgKbQgBfS6vYQ6R79oc,10891
@@ -79,7 +79,7 @@ vellum_ee/workflows/display/tests/test_base_workflow_display.py,sha256=-LYQw5nWq
 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=Y-ajeT65b5varmrZCw6L3hir4hJCFq-eO0jZfRcrs7g,1886
-vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py,sha256=bD9AtBo7Pz1Drbh420NR0VSiHBfExw_UtNRPCiAqki0,13967
+vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py,sha256=wdVaFvxicj48Kj-6VUlu61KR0oSArLTjownRi2p0NWQ,14941
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_attributes_serialization.py,sha256=bPTwkLpB7trFLpAaDvXMfMP0c9H1u_c1cdnj7K-gtnw,24962
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_outputs_serialization.py,sha256=SwXRzjdoEZLvkzaRMvRV8_UqbBm0EB_UtAHD_zXKZBY,6303
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_ports_serialization.py,sha256=jubGYgLJImOqILd5LjnYJ4B1UMIrToDrQbPZOvaQCX4,40035
@@ -126,7 +126,7 @@ vellum_ee/workflows/display/utils/tests/test_events.py,sha256=42IEBnMbaQrH8gigw5
 vellum_ee/workflows/display/utils/vellum.py,sha256=Bt7kdLdXoBsHn5dVEY2uKcF542VL09jwu8J_30rl2vk,6413
 vellum_ee/workflows/display/vellum.py,sha256=J2mdJZ1sdLW535DDUkq_Vm8Z572vhuxHxVZF9deKSdk,391
 vellum_ee/workflows/display/workflows/__init__.py,sha256=JTB9ObEV3l4gGGdtfBHwVJtTTKC22uj-a-XjTVwXCyA,148
-vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=FAsEeqkQu4xGvdZ4Ri5H7LDEISQYziidPc2QHzbOVWs,44311
+vellum_ee/workflows/display/workflows/base_workflow_display.py,sha256=uP3pqSloGjmUYBvVfKP0skZXJnqZxm7TEVxSLdrzU5c,44682
 vellum_ee/workflows/display/workflows/get_vellum_workflow_display_class.py,sha256=gxz76AeCqgAZ9D2lZeTiZzxY9eMgn3qOSfVgiqYcOh8,2028
 vellum_ee/workflows/display/workflows/tests/test_workflow_display.py,sha256=lg-c_3P3ldtqWq2VFsk_2Mkn3pVdXWuT59QpH7QwXVs,39764
 vellum_ee/workflows/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -160,7 +160,7 @@ vellum/client/README.md,sha256=flqu57ubZNTfpq60CdLtJC9gp4WEkyjb_n_eZ4OYf9w,6497
 vellum/client/__init__.py,sha256=rMnKRqL5-356SBc-rfm56MkO87PuAi2mtcfBszcJU1M,74316
 vellum/client/core/__init__.py,sha256=lTcqUPXcx4112yLDd70RAPeqq6tu3eFMe1pKOqkW9JQ,1562
 vellum/client/core/api_error.py,sha256=44vPoTyWN59gonCIZMdzw7M1uspygiLnr3GNFOoVL2Q,614
-vellum/client/core/client_wrapper.py,sha256=7jdvkc9bp52v55uLBImLe_fMXRZUgS2HqLAzuk-JDRg,2840
+vellum/client/core/client_wrapper.py,sha256=9h4pM282vdjaHkk3Un2KTjxOCDbg7xu7r__5qwxzPZ8,2840
 vellum/client/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 vellum/client/core/file.py,sha256=d4NNbX8XvXP32z8KpK2Xovv33nFfruIrpz0QWxlgpZk,2663
 vellum/client/core/force_multipart.py,sha256=awxh5MtcRYe74ehY8U76jzv6fYM_w_D3Rur7KQQzSDk,429
@@ -2017,8 +2017,8 @@ vellum/workflows/references/vellum_secret.py,sha256=Od4d19a5yletWMqNfJR5d_mZQUkV
 vellum/workflows/references/workflow_input.py,sha256=W3rOK1EPd2gYHb04WJwmNm1CUSdvZ9LKrs8RMKxACBs,1751
 vellum/workflows/resolvers/__init__.py,sha256=eH6hTvZO4IciDaf_cf7aM2vs-DkBDyJPycOQevJxQnI,82
 vellum/workflows/resolvers/base.py,sha256=wrQiSC02Bw4-dBwgFjJIHsjpe-4xz4rUJs_1RdErKA0,1164
-vellum/workflows/resolvers/resolver.py,sha256=yK-oY0HDsFJcjlNKAm3vpsPKRIFerIh59FcTwuEN5RY,4839
-vellum/workflows/resolvers/tests/test_resolver.py,sha256=jXkJBb9SwtoH__bBN-ECohpyD0aTIB9ErEvtFhuTMQM,9750
+vellum/workflows/resolvers/resolver.py,sha256=EIIiA2OlaVUPiKiSh6egQZxPA6ny1GDMdPq1AuN-mV8,2961
+vellum/workflows/resolvers/tests/test_resolver.py,sha256=PnUGzsulo1It_LjjhHsRNiILvvl5G_IaK8ZX56zKC28,6204
 vellum/workflows/resolvers/types.py,sha256=Hndhlk69g6EKLh_LYg5ILepW5U_h_BYNllfzhS9k8p4,237
 vellum/workflows/runner/__init__.py,sha256=i1iG5sAhtpdsrlvwgH6B-m49JsINkiWyPWs8vyT-bqM,72
 vellum/workflows/runner/runner.py,sha256=rwMZlQBkzK-EfewC6OysNCeuDeTCfpNuzaUlgYoFJMw,43329
@@ -2065,8 +2065,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=Boa-_m9ii2Qsa1RvVM-VYniF7zCpzGgEGy-OnPZkrHg,23941
 vellum/workflows/workflows/tests/test_context.py,sha256=VJBUcyWVtMa_lE5KxdhgMu0WYNYnUQUDvTF7qm89hJ0,2333
-vellum_ai-1.7.0.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-1.7.0.dist-info/METADATA,sha256=SMmQ-iMX4Dymys9Y_j7Jz4xq_QJGNUf8U9xYOgYKSw0,5547
-vellum_ai-1.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-1.7.0.dist-info/entry_points.txt,sha256=xVavzAKN4iF_NbmhWOlOkHluka0YLkbN_pFQ9pW3gLI,117
-vellum_ai-1.7.0.dist-info/RECORD,,
+vellum_ai-1.7.1.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-1.7.1.dist-info/METADATA,sha256=M80DXrz0TQVVr0BUKSFDyCqBpCHtXk3_c4M6vTqK-eQ,5547
+vellum_ai-1.7.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-1.7.1.dist-info/entry_points.txt,sha256=xVavzAKN4iF_NbmhWOlOkHluka0YLkbN_pFQ9pW3gLI,117
+vellum_ai-1.7.1.dist-info/RECORD,,

vellum_ee/assets/node-definitions.json

@@ -699,6 +699,51 @@
         }
       ]
     },
+    {
+      "id": "ee9b5234-247b-49d1-bed4-490312f18838",
+      "display_data": {
+        "position": {
+          "x": 0.0,
+          "y": 0.0
+        },
+        "comment": {
+          "value": "Used to render a Jinja template.\n\n    Useful for lightweight data transformations and complex string templating.\n    ",
+          "expanded": true
+        }
+      },
+      "base": {
+        "name": "BaseNode",
+        "module": [
+          "vellum",
+          "workflows",
+          "nodes",
+          "bases",
+          "base"
+        ]
+      },
+      "definition": {
+        "name": "TemplatingNode",
+        "module": [
+          "vellum",
+          "workflows",
+          "nodes",
+          "core",
+          "templating_node",
+          "node"
+        ]
+      },
+      "trigger": {
+        "id": "005e1cd2-5452-4e1f-be6a-ac9fe3c02b9b",
+        "merge_behavior": "AWAIT_ATTRIBUTES"
+      },
+      "ports": [
+        {
+          "id": "8f4460f0-717b-4972-a6f4-ac164e5e204e",
+          "name": "default",
+          "type": "DEFAULT"
+        }
+      ]
+    },
     {
       "id": "035842e0-34ed-43af-97de-a706e40912ae",
       "label": "Tool Calling Node",
@@ -1010,10 +1055,5 @@
       ]
     }
   ],
-  "errors": [
-    {
-      "node": "TemplatingNode",
-      "error": "KeyError: TemplatingNode.Outputs.result"
-    }
-  ]
+  "errors": []
 }

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

@@ -50,7 +50,7 @@ class BaseTemplatingNodeDisplay(BaseNodeDisplay[_TemplatingNodeType], Generic[_T
         # Misc type ignore is due to `node.Outputs` being generic
         # https://app.shortcut.com/vellum/story/4784
         output_descriptor = node.Outputs.result  # type: ignore [misc]
-        output_display = display_context.global_node_output_displays[output_descriptor]
+        output_display = self.get_node_output_display(output_descriptor)
         inferred_output_type = primitive_type_to_vellum_variable_type(output_descriptor)
 
         return {

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

@@ -353,3 +353,33 @@ def test_serialize_node__adornment_order_matches_decorator_order():
     assert len(adornments) == 2
     assert adornments[0]["label"] == "Try Node"
     assert adornments[1]["label"] == "Retry Node"
+
+
+def test_serialize_workflow__retry_node_edges():
+    """
+    Tests that both retry-adorned nodes are correctly serialized in the nodes array.
+    """
+
+    @RetryNode.wrap(max_attempts=3, delay=60)
+    class FirstNode(BaseNode):
+        class Outputs(BaseOutputs):
+            value: str
+
+    @RetryNode.wrap(max_attempts=5, delay=120)
+    class SecondNode(BaseNode):
+        class Outputs(BaseOutputs):
+            result: str
+
+    class MyWorkflow(BaseWorkflow):
+        graph = FirstNode >> SecondNode
+
+    workflow_display = get_workflow_display(workflow_class=MyWorkflow)
+    exec_config = cast(Dict[str, Any], workflow_display.serialize())
+
+    assert isinstance(exec_config["workflow_raw_data"], dict)
+    assert isinstance(exec_config["workflow_raw_data"]["nodes"], list)
+
+    nodes = cast(List[Dict[str, Any]], exec_config["workflow_raw_data"]["nodes"])
+
+    generic_nodes = [node for node in nodes if node["type"] == "GENERIC"]
+    assert len(generic_nodes) == 2

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -208,7 +208,15 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
                 self.display_context.add_invalid_node(node)
                 continue
 
-            serialized_nodes[node_display.node_id] = serialized_node
+            # Use wrapped node's ID as dict key for adornment wrappers to prevent overwrites
+            wrapped_node = get_wrapped_node(node)
+            if wrapped_node:
+                wrapped_node_display = self.display_context.node_displays[wrapped_node]
+                dict_key = wrapped_node_display.node_id
+            else:
+                dict_key = node_display.node_id
+
+            serialized_nodes[dict_key] = serialized_node
 
         synthetic_output_edges: JsonArray = []
         output_variables: JsonArray = []