vellum-ai 0.14.1__tar.gz → 0.14.2__tar.gz

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/PKG-INFO

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

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/ee/vellum_cli/pull.py

@@ -2,14 +2,14 @@ import io
 import json
 import os
 from pathlib import Path
-from uuid import UUID
 import zipfile
-from typing import Optional, Union
+from typing import Optional
 
 from dotenv import load_dotenv
 from pydash import snake_case
 
 from vellum.client.core.pydantic_utilities import UniversalBaseModel
+from vellum.utils.uuid import is_valid_uuid
 from vellum.workflows.vellum_client import create_vellum_client
 from vellum_cli.config import VellumCliConfig, WorkflowConfig, load_vellum_cli_config
 from vellum_cli.logger import load_cli_logger
@@ -18,14 +18,6 @@ ERROR_LOG_FILE_NAME = "error.log"
 METADATA_FILE_NAME = "metadata.json"
 
 
-def _is_valid_uuid(val: Union[str, UUID, None]) -> bool:
-    try:
-        UUID(str(val))
-        return True
-    except (ValueError, TypeError):
-        return False
-
-
 class WorkflowConfigResolutionResult(UniversalBaseModel):
     workflow_config: Optional[WorkflowConfig] = None
     pk: Optional[str] = None
@@ -88,7 +80,7 @@ def _resolve_workflow_config(
     elif workflow_deployment:
         module = (
             f"workflow_{workflow_deployment.split('-')[0]}"
-            if _is_valid_uuid(workflow_deployment)
+            if is_valid_uuid(workflow_deployment)
             else snake_case(workflow_deployment)
         )
         workflow_config = WorkflowConfig(

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/ee/vellum_ee/workflows/display/vellum.py

@@ -127,7 +127,7 @@ class WorkflowOutputVellumDisplayOverrides(WorkflowOutputDisplay, WorkflowOutput
     name: str
     label: str
     node_id: UUID
-    display_data: NodeDisplayData
+    display_data: Optional[NodeDisplayData] = None
     target_handle_id: Optional[UUID] = None
 
 

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/ee/vellum_ee/workflows/display/workflows/vellum_workflow_display.py

@@ -176,6 +176,16 @@ class VellumWorkflowDisplay(
                     except IndexError:
                         source_node_display = None
 
+                synthetic_target_handle_id = (
+                    str(workflow_output_display.target_handle_id)
+                    if workflow_output_display.target_handle_id
+                    else str(uuid4_from_hash(f"{self.workflow_id}|target_handle_id|{workflow_output_display.name}"))
+                )
+                synthetic_display_data = (
+                    workflow_output_display.display_data.dict()
+                    if workflow_output_display.display_data
+                    else NodeDisplayData().dict()
+                )
                 nodes.append(
                     {
                         "id": str(final_output_node_id),
@@ -183,13 +193,13 @@ class VellumWorkflowDisplay(
                         "data": {
                             "label": workflow_output_display.label,
                             "name": workflow_output_display.name,
-                            "target_handle_id": str(workflow_output_display.target_handle_id),
+                            "target_handle_id": synthetic_target_handle_id,
                             "output_id": str(workflow_output_display.id),
                             "output_type": inferred_type,
                             "node_input_id": str(node_input.id),
                         },
                         "inputs": [node_input.dict()],
-                        "display_data": workflow_output_display.display_data.dict(),
+                        "display_data": synthetic_display_data,
                         "base": final_output_node_base,
                         "definition": None,
                     }
@@ -211,7 +221,7 @@ class VellumWorkflowDisplay(
                             "source_node_id": str(source_node_display.node_id),
                             "source_handle_id": str(source_handle_id),
                             "target_node_id": str(workflow_output_display.node_id),
-                            "target_handle_id": str(workflow_output_display.target_handle_id),
+                            "target_handle_id": synthetic_target_handle_id,
                             "type": "DEFAULT",
                         }
                     )
@@ -372,15 +382,12 @@ class VellumWorkflowDisplay(
 
         output_id = uuid4_from_hash(f"{self.workflow_id}|id|{output.name}")
         node_id = uuid4_from_hash(f"{self.workflow_id}|node_id|{output.name}")
-        target_handle_id = uuid4_from_hash(f"{self.workflow_id}|target_handle_id|{output.name}")
 
         return WorkflowOutputVellumDisplay(
             id=output_id,
             node_id=node_id,
             name=output.name,
             label="Final Output",
-            target_handle_id=target_handle_id,
-            display_data=NodeDisplayData(),
         )
 
     def _generate_edge_display(

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/ee/vellum_ee/workflows/tests/local_workflow/display/workflow.py

@@ -50,7 +50,5 @@ class WorkflowDisplay(VellumWorkflowDisplay[Workflow]):
             node_id=UUID("f3ef4b2b-fec9-4026-9cc6-e5eac295307f"),
             name="final-output",
             label="Final Output",
-            target_handle_id=UUID("3ec34f6e-da48-40d5-a65b-a48fefa75763"),
-            display_data=NodeDisplayData(position=NodeDisplayPosition(x=2750, y=210), width=459, height=234),
         )
     }

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vellum-ai"
-version = "0.14.1"
+version = "0.14.2"
 description = ""
 readme = "README.md"
 authors = []

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/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.1",
+            "X-Fern-SDK-Version": "0.14.2",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/utils/templating/constants.py

@@ -10,7 +10,7 @@ import pydash
 import pytz
 import yaml
 
-from vellum.utils.templating.custom_filters import is_valid_json_string
+from vellum.utils.templating.custom_filters import is_valid_json_string, replace
 
 DEFAULT_JINJA_GLOBALS: Dict[str, Any] = {
     "datetime": datetime,
@@ -23,6 +23,10 @@ DEFAULT_JINJA_GLOBALS: Dict[str, Any] = {
     "re": re,
     "yaml": yaml,
 }
-DEFAULT_JINJA_CUSTOM_FILTERS: Dict[str, Callable[[Union[str, bytes]], bool]] = {
+
+FilterFunc = Union[Callable[[Union[str, bytes]], bool], Callable[[Any, Any, Any], str]]
+
+DEFAULT_JINJA_CUSTOM_FILTERS: Dict[str, FilterFunc] = {
     "is_valid_json_string": is_valid_json_string,
+    "replace": replace,
 }

vellum_ai-0.14.2/src/vellum/utils/templating/custom_filters.py

@@ -0,0 +1,33 @@
+import json
+from typing import Any, Union
+
+from vellum.workflows.state.encoder import DefaultStateEncoder
+
+
+def is_valid_json_string(value: Union[str, bytes]) -> bool:
+    """Determines whether the given value is a valid JSON string."""
+
+    try:
+        json.loads(value)
+    except ValueError:
+        return False
+    return True
+
+
+def replace(s: Any, old: Any, new: Any) -> str:
+    def encode_to_str(obj: Any) -> str:
+        """Encode an object for template rendering using DefaultStateEncoder."""
+        try:
+            if isinstance(obj, str):
+                return obj
+            return json.dumps(obj, cls=DefaultStateEncoder)
+        except TypeError:
+            return str(obj)
+
+    if old == "":
+        return encode_to_str(s)
+
+    s_str = encode_to_str(s)
+    old_str = encode_to_str(old)
+    new_str = encode_to_str(new)
+    return s_str.replace(old_str, new_str)

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/utils/templating/render.py

@@ -1,8 +1,9 @@
 import json
-from typing import Any, Callable, Dict, Optional, Union
+from typing import Any, Dict, Optional
 
 from jinja2.sandbox import SandboxedEnvironment
 
+from vellum.utils.templating.constants import FilterFunc
 from vellum.utils.templating.exceptions import JinjaTemplateError
 from vellum.workflows.state.encoder import DefaultStateEncoder
 
@@ -18,7 +19,7 @@ def render_sandboxed_jinja_template(
     *,
     template: str,
     input_values: Dict[str, Any],
-    jinja_custom_filters: Optional[Dict[str, Callable[[Union[str, bytes]], bool]]] = None,
+    jinja_custom_filters: Optional[Dict[str, FilterFunc]] = None,
     jinja_globals: Optional[Dict[str, Any]] = None,
 ) -> str:
     """Render a Jinja template within a sandboxed environment."""

vellum_ai-0.14.2/src/vellum/utils/templating/tests/test_custom_filters.py

@@ -0,0 +1,19 @@
+import pytest
+
+from vellum.utils.templating.custom_filters import replace
+
+
+@pytest.mark.parametrize(
+    ["input_str", "old", "new", "expected"],
+    [
+        ("foo", "foo", "bar", "bar"),
+        ({"message": "hello"}, "hello", "world", '{"message": "world"}'),
+        ("Value: 123", 123, 456, "Value: 456"),
+        (123, 2, 4, "143"),
+        ("", "", "", ""),
+        ("foo", "", "bar", "foo"),
+    ],
+)
+def test_replace(input_str, old, new, expected):
+    actual = replace(input_str, old, new)
+    assert actual == expected

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/workflows/errors/types.py

@@ -13,6 +13,7 @@ class WorkflowErrorCode(Enum):
     INVALID_INPUTS = "INVALID_INPUTS"
     INVALID_OUTPUTS = "INVALID_OUTPUTS"
     INVALID_STATE = "INVALID_STATE"
+    INVALID_CODE = "INVALID_CODE"
     INVALID_TEMPLATE = "INVALID_TEMPLATE"
     INTERNAL_ERROR = "INTERNAL_ERROR"
     NODE_EXECUTION = "NODE_EXECUTION"
@@ -54,6 +55,7 @@ _WORKFLOW_EVENT_ERROR_CODE_TO_WORKFLOW_ERROR_CODE: Dict[WorkflowExecutionEventEr
     "INTERNAL_SERVER_ERROR": WorkflowErrorCode.INTERNAL_ERROR,
     "NODE_EXECUTION": WorkflowErrorCode.NODE_EXECUTION,
     "LLM_PROVIDER": WorkflowErrorCode.PROVIDER_ERROR,
+    "INVALID_CODE": WorkflowErrorCode.INVALID_CODE,
     "INVALID_TEMPLATE": WorkflowErrorCode.INVALID_TEMPLATE,
     "USER_DEFINED_ERROR": WorkflowErrorCode.USER_DEFINED_ERROR,
 }
@@ -71,6 +73,7 @@ _WORKFLOW_ERROR_CODE_TO_VELLUM_ERROR_CODE: Dict[WorkflowErrorCode, VellumErrorCo
     WorkflowErrorCode.INVALID_INPUTS: "INVALID_INPUTS",
     WorkflowErrorCode.INVALID_OUTPUTS: "INVALID_REQUEST",
     WorkflowErrorCode.INVALID_STATE: "INVALID_REQUEST",
+    WorkflowErrorCode.INVALID_CODE: "INVALID_CODE",
     WorkflowErrorCode.INVALID_TEMPLATE: "INVALID_INPUTS",
     WorkflowErrorCode.INTERNAL_ERROR: "INTERNAL_SERVER_ERROR",
     WorkflowErrorCode.NODE_EXECUTION: "USER_DEFINED_ERROR",

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/workflows/nodes/core/templating_node/node.py

@@ -1,6 +1,6 @@
-from typing import Any, Callable, ClassVar, Dict, Generic, Mapping, Tuple, Type, TypeVar, Union, get_args
+from typing import Any, ClassVar, Dict, Generic, Mapping, Tuple, Type, TypeVar, get_args
 
-from vellum.utils.templating.constants import DEFAULT_JINJA_CUSTOM_FILTERS, DEFAULT_JINJA_GLOBALS
+from vellum.utils.templating.constants import DEFAULT_JINJA_CUSTOM_FILTERS, DEFAULT_JINJA_GLOBALS, FilterFunc
 from vellum.utils.templating.exceptions import JinjaTemplateError
 from vellum.utils.templating.render import render_sandboxed_jinja_template
 from vellum.workflows.errors import WorkflowErrorCode
@@ -54,7 +54,7 @@ class TemplatingNode(BaseNode[StateType], Generic[StateType, _OutputType], metac
     inputs: ClassVar[EntityInputsInterface]
 
     jinja_globals: Dict[str, Any] = DEFAULT_JINJA_GLOBALS
-    jinja_custom_filters: Mapping[str, Callable[[Union[str, bytes]], bool]] = DEFAULT_JINJA_CUSTOM_FILTERS
+    jinja_custom_filters: Mapping[str, FilterFunc] = DEFAULT_JINJA_CUSTOM_FILTERS
 
     class Outputs(BaseNode.Outputs):
         """

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/workflows/nodes/core/templating_node/tests/test_templating_node.py

@@ -4,6 +4,7 @@ from typing import List, Union
 
 from vellum.client.types.chat_message import ChatMessage
 from vellum.client.types.function_call import FunctionCall
+from vellum.client.types.function_call_vellum_value import FunctionCallVellumValue
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.bases.base import BaseNode
 from vellum.workflows.nodes.core.templating_node.node import TemplatingNode
@@ -193,3 +194,29 @@ def test_templating_node__union_float_int_output():
 
     # THEN it should correctly parse as a float
     assert outputs.result == 42.5
+
+
+def test_templating_node__replace_filter():
+    # GIVEN a templating node that outputs a complex object
+    class ReplaceFilterTemplateNode(TemplatingNode[BaseState, Json]):
+        template = """{{- prompt_outputs | selectattr(\'type\', \'equalto\', \'FUNCTION_CALL\') \
+        | list | replace(\"\\n\",\",\") -}}"""
+        inputs = {
+            "prompt_outputs": [FunctionCallVellumValue(value=FunctionCall(name="test", arguments={"key": "value"}))]
+        }
+
+    # WHEN the node is run
+    node = ReplaceFilterTemplateNode()
+    outputs = node.run()
+
+    # THEN the output is the expected JSON
+    assert outputs.result == [
+        {
+            "type": "FUNCTION_CALL",
+            "value": {
+                "name": "test",
+                "arguments": {"key": "value"},
+                "id": None,
+            },
+        }
+    ]

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/workflows/nodes/displayable/code_execution_node/node.py

@@ -93,13 +93,14 @@ class CodeExecutionNode(BaseNode[StateType], Generic[StateType, _OutputType], me
         log: str
 
     def run(self) -> Outputs:
-        input_values = self._compile_code_inputs()
         output_type = self.__class__.get_output_type()
         code = self._resolve_code()
         if not self.packages and self.runtime == "PYTHON_3_11_6":
-            logs, result = run_code_inline(code, input_values, output_type)
+            logs, result = run_code_inline(code, self.code_inputs, output_type)
             return self.Outputs(result=result, log=logs)
+
         else:
+            input_values = self._compile_code_inputs()
             expected_output_type = primitive_type_to_vellum_variable_type(output_type)
 
             code_execution_result = self._context.vellum_client.execute_code(
@@ -131,7 +132,7 @@ class CodeExecutionNode(BaseNode[StateType], Generic[StateType, _OutputType], me
                 compiled_inputs.append(
                     StringInput(
                         name=input_name,
-                        value=str(input_value),
+                        value=input_value,
                     )
                 )
             elif isinstance(input_value, VellumSecret):
@@ -193,7 +194,7 @@ class CodeExecutionNode(BaseNode[StateType], Generic[StateType, _OutputType], me
                 )
             else:
                 raise NodeException(
-                    message=f"Unrecognized input type for input '{input_name}'",
+                    message=f"Unrecognized input type for input '{input_name}': {input_value.__class__.__name__}",
                     code=WorkflowErrorCode.INVALID_INPUTS,
                 )
 

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/workflows/nodes/displayable/code_execution_node/tests/test_code_execution_node.py

@@ -7,6 +7,7 @@ from vellum.client.types.code_execution_package import CodeExecutionPackage
 from vellum.client.types.code_executor_secret_input import CodeExecutorSecretInput
 from vellum.client.types.function_call import FunctionCall
 from vellum.client.types.number_input import NumberInput
+from vellum.workflows.errors import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.nodes.displayable.code_execution_node import CodeExecutionNode
@@ -559,3 +560,53 @@ def main(arg1: List[Dict]) -> float:
 
     # AND we should not have invoked the Code via Vellum since it's running inline
     vellum_client.execute_code.assert_not_called()
+
+
+def test_run_node__code_execution_error():
+    # GIVEN a node that will raise an error during execution
+    class State(BaseState):
+        pass
+
+    class ExampleCodeExecutionNode(CodeExecutionNode[State, int]):
+        code = """\
+def main(arg1: int, arg2: int) -> int:
+    return arg1 + arg2 + arg3
+"""
+        runtime = "PYTHON_3_11_6"
+        code_inputs = {
+            "arg1": 1,
+            "arg2": 2,
+        }
+
+    # WHEN we run the node
+    node = ExampleCodeExecutionNode(state=State())
+
+    # THEN it should raise a NodeException with the execution error
+    with pytest.raises(NodeException) as exc_info:
+        node.run()
+
+    # AND the error should contain the execution error details
+    assert "name 'arg3' is not defined" in str(exc_info.value)
+    assert exc_info.value.code == WorkflowErrorCode.INVALID_CODE
+
+
+def test_run_node__array_of_bools_input():
+    # GIVEN a node that will raise an error during execution
+    class ExampleCodeExecutionNode(CodeExecutionNode[BaseState, int]):
+        code = """\
+def main(arg1: list[bool]) -> int:
+    return len(arg1)
+"""
+        runtime = "PYTHON_3_11_6"
+        code_inputs = {
+            "arg1": [True, False, True],
+        }
+
+    # WHEN we run the node
+    node = ExampleCodeExecutionNode()
+
+    # THEN it should raise a NodeException with the execution error
+    outputs = node.run()
+
+    # AND the error should contain the execution error details
+    assert outputs == {"result": 3, "log": ""}

{vellum_ai-0.14.1 → vellum_ai-0.14.2}/src/vellum/workflows/nodes/displayable/code_execution_node/utils.py

@@ -1,14 +1,13 @@
 import io
 import os
 import re
-from typing import Any, List, Tuple, Union, get_args, get_origin
+from typing import Any, Tuple, Union, get_args, get_origin
 
 from pydantic import BaseModel, ValidationError
 
-from vellum import VellumValue
-from vellum.client.types.code_executor_input import CodeExecutorInput
 from vellum.workflows.errors.types import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
+from vellum.workflows.types.core import EntityInputsInterface
 
 
 def read_file_from_path(node_filepath: str, script_filepath: str) -> Union[str, None]:
@@ -70,13 +69,11 @@ def _clean_for_dict_wrapper(obj):
 
 def run_code_inline(
     code: str,
-    input_values: List[CodeExecutorInput],
+    inputs: EntityInputsInterface,
     output_type: Any,
 ) -> Tuple[str, Any]:
     log_buffer = io.StringIO()
 
-    VELLUM_TYPES = get_args(VellumValue)
-
     def wrap_value(value):
         if isinstance(value, list):
             return ListWrapper(
@@ -84,7 +81,7 @@ def run_code_inline(
                     # Convert VellumValue to dict with its fields
                     (
                         item.model_dump()
-                        if isinstance(item, VELLUM_TYPES)
+                        if isinstance(item, BaseModel)
                         else _clean_for_dict_wrapper(item) if isinstance(item, (dict, list)) else item
                     )
                     for item in value
@@ -93,18 +90,23 @@ def run_code_inline(
         return _clean_for_dict_wrapper(value)
 
     exec_globals = {
-        "__arg__inputs": {input_value.name: wrap_value(input_value.value) for input_value in input_values},
+        "__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"),
     }
-    run_args = [f"{input_value.name}=__arg__inputs['{input_value.name}']" for input_value in input_values]
+    run_args = [f"{name}=__arg__inputs['{name}']" for name in inputs.keys()]
     execution_code = f"""\
 {code}
 
 __arg__out = main({", ".join(run_args)})
 """
-
-    exec(execution_code, exec_globals)
+    try:
+        exec(execution_code, exec_globals)
+    except Exception as e:
+        raise NodeException(
+            code=WorkflowErrorCode.INVALID_CODE,
+            message=str(e),
+        )
 
     logs = log_buffer.getvalue()
     result = exec_globals["__arg__out"]

vellum_ai-0.14.1/src/vellum/utils/templating/custom_filters.py

@@ -1,12 +0,0 @@
-import json
-from typing import Union
-
-
-def is_valid_json_string(value: Union[str, bytes]) -> bool:
-    """Determines whether the given value is a valid JSON string."""
-
-    try:
-        json.loads(value)
-    except ValueError:
-        return False
-    return True