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

vellum/workflows/references/lazy.py

@@ -1,7 +1,8 @@
 import ast
 import inspect
-from typing import TYPE_CHECKING, Callable, Generic, TypeVar, get_args
+from typing import TYPE_CHECKING, Callable, Generic, TypeVar, Union, get_args
 
+from vellum.workflows.constants import UNDEF
 from vellum.workflows.descriptors.base import BaseDescriptor
 
 if TYPE_CHECKING:
@@ -13,7 +14,7 @@ _T = TypeVar("_T")
 class LazyReference(BaseDescriptor[_T], Generic[_T]):
     def __init__(
         self,
-        get: Callable[[], BaseDescriptor[_T]],
+        get: Union[Callable[[], BaseDescriptor[_T]], str],
     ) -> None:
         self._get = get
         # TODO: figure out this some times returns empty
@@ -25,6 +26,19 @@ class LazyReference(BaseDescriptor[_T], Generic[_T]):
     def resolve(self, state: "BaseState") -> _T:
         from vellum.workflows.descriptors.utils import resolve_value
 
+        if isinstance(self._get, str):
+            # The full solution will involve creating a nodes registry on `WorkflowContext`. I want to update
+            # how WorkflowContext works so that we could just access it directly instead of it needing to be
+            # passed in, similar to get_workflow_context(). Because we don't want this to slow down p1 issues
+            # that we are debugging with existing workflows, using the following workaround for now.
+            for output_reference, value in state.meta.node_outputs.items():
+                if str(output_reference) == self._get:
+                    return value
+
+            # Fix typing surrounding the return value of node outputs/output descriptors
+            # https://app.shortcut.com/vellum/story/4783
+            return UNDEF  # type: ignore[return-value]
+
         return resolve_value(self._get(), state)
 
     def _get_name(self) -> str:
@@ -33,6 +47,9 @@ class LazyReference(BaseDescriptor[_T], Generic[_T]):
         setting that as the descriptor's name. Names are only used for debugging, so
         we could flesh out edge cases over time.
         """
+        if isinstance(self._get, str):
+            return self._get
+
         source = inspect.getsource(self._get).strip()
         try:
             parsed = ast.parse(source)

{vellum_ai-0.13.24.dist-info → vellum_ai-0.13.26.dist-info}/METADATA

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

{vellum_ai-0.13.24.dist-info → vellum_ai-0.13.26.dist-info}/RECORD

@@ -21,7 +21,7 @@ vellum_ee/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 vellum_ee/workflows/display/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/base.py,sha256=3ZFUYRNKL24fBqXhKpa_Dq2W1a-a86J20dmJYA3H2eY,1755
 vellum_ee/workflows/display/nodes/__init__.py,sha256=5XOcZJXYUgaLS55QgRJzyQ_W1tpeprjnYAeYVezqoGw,160
-vellum_ee/workflows/display/nodes/base_node_display.py,sha256=ErIK_1DYax0LlFX4AvV1oua8I7JlpXNncjGNadVe-bo,15801
+vellum_ee/workflows/display/nodes/base_node_display.py,sha256=7RuZkNJxbyOD2w3qPr-5S11mc-iN-NydyUT4FppS62o,16849
 vellum_ee/workflows/display/nodes/base_node_vellum_display.py,sha256=pLO0dORfRu--Ne9NgoyFT_CNjfpr5fGCsgbsMkUF5GM,2845
 vellum_ee/workflows/display/nodes/get_node_display_class.py,sha256=0S6ksPp53WXWh1RQVH71nj2bkCWBj4ZaFYhTxW3N2F4,1230
 vellum_ee/workflows/display/nodes/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,7 +35,7 @@ vellum_ee/workflows/display/nodes/vellum/conditional_node.py,sha256=ybLIa4uclqVI
 vellum_ee/workflows/display/nodes/vellum/error_node.py,sha256=I1Jkp2htRINJATtv1e-zs9BrReFX842djpiVgBPHDYg,2186
 vellum_ee/workflows/display/nodes/vellum/final_output_node.py,sha256=p-PvlnxpBQ7IKskZi2A19jKAtKnSxJ8LPbGMA83VkFk,2805
 vellum_ee/workflows/display/nodes/vellum/guardrail_node.py,sha256=aYZSJTxknU4LMiQdWk9LcK6CkhdozeDEMiRxfAyUNEc,2202
-vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py,sha256=h8K183cZsU2b86WYQlqFtwMkwIHydnNr4ZaaQcWnFWo,7316
+vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py,sha256=aNZhjw5CwpUO8IcLJ2nhYrzn96RJ3FWeJXdfDizuPzw,8491
 vellum_ee/workflows/display/nodes/vellum/inline_subworkflow_node.py,sha256=9858pFzuhkAAmLcw4gkt5mPvsqWk5vqcX_vwHOg2xZw,5610
 vellum_ee/workflows/display/nodes/vellum/map_node.py,sha256=VlO3UwkspCOdDQ-h3v8k16-7JZwWNSLpOLT4p-eirIs,3740
 vellum_ee/workflows/display/nodes/vellum/merge_node.py,sha256=HkNMgdQELiON42jdO-xDLmqrEKdGx1RVqrz2DXNTLS8,3239
@@ -57,7 +57,7 @@ vellum_ee/workflows/display/tests/workflow_serialization/__init__.py,sha256=47DE
 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=EenmEdBtHUFQ0OS-kE7Vboax3JnDdj-K4Qixt5oR0Po,2253
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py,sha256=KYdohS5pRgHM0DcUaK0tHa40f0gSvDKi2K5On0zNEU8,8305
-vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_attributes_serialization.py,sha256=yPXhdZxEDunNl5LL5Obb0jeO34djt7F-GiaTJhp_fmo,16742
+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
 vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_trigger_serialization.py,sha256=EbVgg_3_ipTt3MOop4RARX0fmNjwqZtkhIXzx9nGw7Y,4487
@@ -67,6 +67,7 @@ vellum_ee/workflows/display/tests/workflow_serialization/test_basic_conditional_
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_error_node_serialization.py,sha256=02gG5C0wHbjzuTgVYCsNrtW1kEOeaM_5zXmznaUKzgk,6079
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_generic_node_serialization.py,sha256=Ah8CxAxAQYnxsNasLB8esN_c9eRDQnmV_aDWC9Kp98s,5746
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_guardrail_node_serialization.py,sha256=0xK9TFqPD5Hy65T-iacZ8pjYHD8XkzZXS35rLwof7uc,7427
+vellum_ee/workflows/display/tests/workflow_serialization/test_basic_inline_prompt_node_serialization.py,sha256=XRtXTWtNXHe1g8E_mNcAhYZVjc0UcGlJRjq34_sd0jo,787
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_inline_subworkflow_serialization.py,sha256=HEfRYBVwZ6fy0hHhgsgTBEQJJAp_0wsaCJ_OtpZGdqE,20578
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_map_node_serialization.py,sha256=L1SrD5KfZjlAVh2BkOe3pCQOstVf_SiqD0KGoZlknU8,16145
 vellum_ee/workflows/display/tests/workflow_serialization/test_basic_merge_node_serialization.py,sha256=ojzdgGb2zGYloOX57V_FyXxjUqOnWMN6z8GUlF8yDMA,8422
@@ -115,7 +116,7 @@ vellum/client/README.md,sha256=JkCJjmMZl4jrPj46pkmL9dpK4gSzQQmP5I7z4aME4LY,4749
 vellum/client/__init__.py,sha256=j6zi0NZ4BMC6JrwckvzMWuG5x8KoOvO4KqsLhvVCa68,117624
 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=CHUMF1rAO0mKKIpxyLeUmpjLICY4ZwyiCpiYCjAnHwE,1869
+vellum/client/core/client_wrapper.py,sha256=OeB6d4nSFCwetdfw5HC-RyJ2w6UtPzrA37zmdAlKB-k,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
@@ -1423,7 +1424,7 @@ vellum/workflows/references/environment_variable.py,sha256=-gfOcdYwVp9ztSUYz6h2W
 vellum/workflows/references/execution_count.py,sha256=JILHqt8ELdc9ct-WsVCA5X-rKiP1rmJODw-XTf4kpHI,722
 vellum/workflows/references/external_input.py,sha256=WyBC6uMDu77431YVSU_WvTt-nGLC_bW65tIsplUJXa4,2056
 vellum/workflows/references/input.py,sha256=3INu-TLTi4dziWmva6LO3WvgDlPzsjayUx61cVvqLJA,325
-vellum/workflows/references/lazy.py,sha256=SXwZUCTzUR-R2-uK0XHALtvp1x84l-QkNY-Ds6KynYA,1932
+vellum/workflows/references/lazy.py,sha256=HUQRXQMsCwu0JPVPCDUvQm28q8VlJQ-N8SfFyx2Tap8,2901
 vellum/workflows/references/node.py,sha256=LP854wDVs-9I_aZ7-nkbwXqL2H7W2_3LED2e9FixNS8,1418
 vellum/workflows/references/output.py,sha256=6F4zIrGykDxBsR6qEXxEKncQV5zV4yHafnHRNkxvklc,2780
 vellum/workflows/references/state_value.py,sha256=bInUF0A3Pt4-zhA0f6LdSuyv8tz7n5QRkHAEn4gsmqI,711
@@ -1464,8 +1465,8 @@ vellum/workflows/vellum_client.py,sha256=ODrq_TSl-drX2aezXegf7pizpWDVJuTXH-j6528
 vellum/workflows/workflows/__init__.py,sha256=KY45TqvavCCvXIkyCFMEc0dc6jTMOUci93U2DUrlZYc,66
 vellum/workflows/workflows/base.py,sha256=uYT0TQnEDtVaH3pErq785FhxxEEmk7C5ZGfuSO3QK8c,18537
 vellum/workflows/workflows/event_filters.py,sha256=GSxIgwrX26a1Smfd-6yss2abGCnadGsrSZGa7t7LpJA,2008
-vellum_ai-0.13.24.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-0.13.24.dist-info/METADATA,sha256=6i1_pGA_JzLwbgGSvPKSioG96wTBmf5XnTrvtVKPcZM,5335
-vellum_ai-0.13.24.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-0.13.24.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
-vellum_ai-0.13.24.dist-info/RECORD,,
+vellum_ai-0.13.26.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-0.13.26.dist-info/METADATA,sha256=n7NYOH_C-oUfeRVoWTK8GcOHT2JMSgqF8AU1VdqtHwg,5335
+vellum_ai-0.13.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-0.13.26.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
+vellum_ai-0.13.26.dist-info/RECORD,,

vellum_ee/workflows/display/nodes/base_node_display.py

@@ -343,6 +343,27 @@ class BaseNodeDisplay(Generic[NodeType], metaclass=BaseNodeDisplayMeta):
             return self.serialize_value(display_context, value._value)
 
         if isinstance(value, LazyReference):
+            if isinstance(value._get, str):
+                reference_parts = value._get.split(".")
+                if len(reference_parts) < 3:
+                    raise Exception(
+                        f"Failed to parse lazy reference: {value._get}. Only Node Output references are supported."
+                    )
+
+                output_name = reference_parts[-1]
+                nested_class_name = reference_parts[-2]
+                if nested_class_name != "Outputs":
+                    raise Exception(
+                        f"Failed to parse lazy reference: {value._get}. Outputs are the only node reference supported."
+                    )
+
+                node_class_name = ".".join(reference_parts[:-2])
+                for node in display_context.node_displays.keys():
+                    if node.__name__ == node_class_name:
+                        return self.serialize_value(display_context, getattr(node.Outputs, output_name))
+
+                raise NotImplementedError(f"Failed to find a LazyReference for: {value._get}")
+
             return self.serialize_value(display_context, value._get())
 
         if isinstance(value, WorkflowInputReference):

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

@@ -1,9 +1,10 @@
 from uuid import UUID
-from typing import ClassVar, Dict, Generic, List, Optional, Tuple, Type, TypeVar, Union
+from typing import Callable, ClassVar, Dict, Generic, List, Optional, Tuple, Type, TypeVar, Union
 
-from vellum import PromptBlock, RichTextChildBlock, VellumVariable
+from vellum import FunctionDefinition, PromptBlock, RichTextChildBlock, VellumVariable
 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.utils import raise_if_descriptor
@@ -32,6 +33,17 @@ class BaseInlinePromptNodeDisplay(BaseNodeVellumDisplay[_InlinePromptNodeType],
         _, output_display = display_context.global_node_output_displays[node.Outputs.text]
         _, array_display = display_context.global_node_output_displays[node.Outputs.results]
         node_blocks = raise_if_descriptor(node.blocks)
+        function_definitions = raise_if_descriptor(node.functions)
+
+        blocks: list = [
+            self._generate_prompt_block(block, input_variable_id_by_name, [i]) for i, block in enumerate(node_blocks)
+        ]
+        functions = (
+            [self._generate_function_tools(function, i) for i, function in enumerate(function_definitions)]
+            if function_definitions
+            else []
+        )
+        blocks.extend(functions)
 
         return {
             "id": str(node_id),
@@ -50,10 +62,7 @@ class BaseInlinePromptNodeDisplay(BaseNodeVellumDisplay[_InlinePromptNodeType],
                     "input_variables": [prompt_input.dict() for prompt_input in prompt_inputs],
                     "prompt_template_block_data": {
                         "version": 1,
-                        "blocks": [
-                            self._generate_prompt_block(block, input_variable_id_by_name, [i])
-                            for i, block in enumerate(node_blocks)
-                        ],
+                        "blocks": blocks,
                     },
                 },
                 "ml_model_name": raise_if_descriptor(node.ml_model),
@@ -91,6 +100,22 @@ class BaseInlinePromptNodeDisplay(BaseNodeVellumDisplay[_InlinePromptNodeType],
 
         return node_inputs, prompt_inputs
 
+    def _generate_function_tools(self, function: Union[FunctionDefinition, Callable], index: int) -> JsonObject:
+        normalized_functions = (
+            function if isinstance(function, FunctionDefinition) else compile_function_definition(function)
+        )
+        return {
+            "id": str(uuid4_from_hash(f"{self.node_id}-FUNCTION_DEFINITION-{index}")),
+            "block_type": "FUNCTION_DEFINITION",
+            "properties": {
+                "function_name": normalized_functions.name,
+                "function_description": normalized_functions.description,
+                "function_parameters": normalized_functions.parameters,
+                "function_forced": normalized_functions.forced,
+                "function_strict": normalized_functions.strict,
+            },
+        }
+
     def _generate_prompt_block(
         self,
         prompt_block: Union[PromptBlock, RichTextChildBlock],

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

@@ -7,9 +7,12 @@ from vellum.workflows.nodes.bases.base import BaseNode
 from vellum.workflows.references.constant import ConstantValueReference
 from vellum.workflows.references.lazy import LazyReference
 from vellum.workflows.references.vellum_secret import VellumSecretReference
+from vellum.workflows.workflows.base import BaseWorkflow
 from vellum_ee.workflows.display.base import WorkflowInputsDisplay
 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.workflows.get_vellum_workflow_display_class import get_workflow_display
+from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
 
 
 class Inputs(BaseInputs):
@@ -151,6 +154,43 @@ def test_serialize_node__lazy_reference(serialize_node):
     )
 
 
+def test_serialize_node__lazy_reference_with_string():
+    # GIVEN two nodes with one lazily referencing the other
+    class LazyReferenceGenericNode(BaseNode):
+        attr = LazyReference[str]("OtherNode.Outputs.result")
+
+    class OtherNode(BaseNode):
+        class Outputs(BaseNode.Outputs):
+            result: str
+
+    # AND a workflow with both nodes
+    class Workflow(BaseWorkflow):
+        graph = LazyReferenceGenericNode >> OtherNode
+
+    # WHEN the workflow is serialized
+    workflow_display = get_workflow_display(base_display_class=VellumWorkflowDisplay, workflow_class=Workflow)
+    serialized_workflow: dict = workflow_display.serialize()
+
+    # THEN the node should properly serialize the attribute reference
+    lazy_reference_node = next(
+        node
+        for node in serialized_workflow["workflow_raw_data"]["nodes"]
+        if node["id"] == str(LazyReferenceGenericNode.__id__)
+    )
+
+    assert lazy_reference_node["attributes"] == [
+        {
+            "id": "98833d71-42a8-47e9-81c4-6a35646e3d3c",
+            "name": "attr",
+            "value": {
+                "type": "NODE_OUTPUT",
+                "node_id": str(OtherNode.__id__),
+                "node_output_id": "7a3406a1-6f11-4568-8aa0-e5dba6534dc2",
+            },
+        }
+    ]
+
+
 class WorkflowInputGenericNode(BaseNode):
     attr: str = Inputs.input
 

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_inline_prompt_node_serialization.py

@@ -0,0 +1,18 @@
+from vellum_ee.workflows.display.workflows import VellumWorkflowDisplay
+from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
+
+from tests.workflows.basic_inline_prompt_node_with_functions.workflow import BasicInlinePromptWithFunctionsWorkflow
+
+
+def test_serialize_workflow():
+    # WHEN we serialize it
+    workflow_display = get_workflow_display(
+        base_display_class=VellumWorkflowDisplay, workflow_class=BasicInlinePromptWithFunctionsWorkflow
+    )
+    serialized_workflow: dict = workflow_display.serialize()
+    assert (
+        serialized_workflow["workflow_raw_data"]["nodes"][-2]["data"]["exec_config"]["prompt_template_block_data"][
+            "blocks"
+        ][-1]["block_type"]
+        == "FUNCTION_DEFINITION"
+    )