vellum-ai 0.12.5__tar.gz → 0.12.7__tar.gz

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/PKG-INFO

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

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/ee/vellum_cli/__init__.py

@@ -130,11 +130,18 @@ Should only be used for debugging purposes.""",
     is_flag=True,
     help="""Raises an error immediately if there are any issues with the pulling of the Resource.""",
 )
+@click.option(
+    "--include-sandbox",
+    is_flag=True,
+    help="""Generates a runnable sandbox.py file containing test data from the Resource's sandbox. \
+Helpful for running and debugging workflows locally.""",
+)
 def pull(
     ctx: click.Context,
     include_json: Optional[bool],
     exclude_code: Optional[bool],
     strict: Optional[bool],
+    include_sandbox: Optional[bool],
 ) -> None:
     """Pull Resources from Vellum"""
 
@@ -143,6 +150,7 @@ def pull(
             include_json=include_json,
             exclude_code=exclude_code,
             strict=strict,
+            include_sandbox=include_sandbox,
         )
 
 
@@ -171,6 +179,12 @@ Should only be used for debugging purposes.""",
     is_flag=True,
     help="""Raises an error immediately if there are any issues with the pulling of the Workflow.""",
 )
+@click.option(
+    "--include-sandbox",
+    is_flag=True,
+    help="""Generates a runnable sandbox.py file containing test data from the Resource's sandbox. \
+Helpful for running and debugging workflows locally.""",
+)
 def workflows_pull(
     module: Optional[str],
     include_json: Optional[bool],
@@ -178,6 +192,7 @@ def workflows_pull(
     workflow_deployment: Optional[str],
     exclude_code: Optional[bool],
     strict: Optional[bool],
+    include_sandbox: Optional[bool],
 ) -> None:
     """
     Pull Workflows from Vellum. If a module is provided, only the Workflow for that module will be pulled.
@@ -191,6 +206,7 @@ def workflows_pull(
         workflow_deployment=workflow_deployment,
         exclude_code=exclude_code,
         strict=strict,
+        include_sandbox=include_sandbox,
     )
 
 
@@ -208,10 +224,23 @@ Should only be used for debugging purposes.""",
     help="""Exclude the code definition of the Resource from the pull response. \
 Should only be used for debugging purposes.""",
 )
+@click.option(
+    "--strict",
+    is_flag=True,
+    help="""Raises an error immediately if there are any issues with the pulling of the Resource.""",
+)
+@click.option(
+    "--include-sandbox",
+    is_flag=True,
+    help="""Generates a runnable sandbox.py file containing test data from the Resource's sandbox. \
+Helpful for running and debugging resources locally.""",
+)
 def pull_module(
     ctx: click.Context,
     include_json: Optional[bool],
     exclude_code: Optional[bool],
+    strict: Optional[bool],
+    include_sandbox: Optional[bool],
 ) -> None:
     """Pull a specific module from Vellum"""
 
@@ -220,6 +249,8 @@ def pull_module(
             module=ctx.parent.invoked_subcommand,
             include_json=include_json,
             exclude_code=exclude_code,
+            strict=strict,
+            include_sandbox=include_sandbox,
         )
 
 

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/ee/vellum_cli/pull.py

@@ -84,6 +84,7 @@ def pull_command(
     include_json: Optional[bool] = None,
     exclude_code: Optional[bool] = None,
     strict: Optional[bool] = None,
+    include_sandbox: Optional[bool] = None,
 ) -> None:
     load_dotenv()
     logger = load_cli_logger()
@@ -114,6 +115,8 @@ def pull_command(
         query_parameters["exclude_code"] = exclude_code
     if strict:
         query_parameters["strict"] = strict
+    if include_sandbox:
+        query_parameters["include_sandbox"] = include_sandbox
 
     response = client.workflows.pull(
         pk,
@@ -166,6 +169,17 @@ def pull_command(
 Its schema should be considered unstable and subject to change at any time."""
         )
 
+    if include_sandbox:
+        if not workflow_config.ignore:
+            workflow_config.ignore = "sandbox.py"
+            save_lock_file = True
+        elif isinstance(workflow_config.ignore, str) and "sandbox.py" != workflow_config.ignore:
+            workflow_config.ignore = [workflow_config.ignore, "sandbox.py"]
+            save_lock_file = True
+        elif isinstance(workflow_config.ignore, list) and "sandbox.py" not in workflow_config.ignore:
+            workflow_config.ignore.append("sandbox.py")
+            save_lock_file = True
+
     if save_lock_file:
         config.save()
 

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/ee/vellum_cli/tests/test_pull.py

@@ -486,3 +486,32 @@ def test_pull__strict__with_error(vellum_client, mock_module):
     vellum_client.workflows.pull.assert_called_once()
     call_args = vellum_client.workflows.pull.call_args.kwargs
     assert call_args["request_options"]["additional_query_parameters"] == {"strict": True}
+
+
+def test_pull__include_sandbox(vellum_client, mock_module):
+    # GIVEN a module on the user's filesystem
+    module = mock_module.module
+    temp_dir = mock_module.temp_dir
+
+    # AND the workflow pull API call returns a zip file
+    vellum_client.workflows.pull.return_value = iter(
+        [_zip_file_map({"workflow.py": "print('hello')", "sandbox.py": "print('hello')"})]
+    )
+
+    # WHEN the user runs the pull command
+    runner = CliRunner()
+    result = runner.invoke(cli_main, ["pull", module, "--include-sandbox"])
+
+    # THEN the command returns successfully
+    assert result.exit_code == 0, result.output
+
+    # AND the pull api is called with include_sandbox=True
+    vellum_client.workflows.pull.assert_called_once()
+    call_args = vellum_client.workflows.pull.call_args.kwargs
+    assert call_args["request_options"]["additional_query_parameters"] == {"include_sandbox": True}
+
+    # AND the sandbox.py should be added to the ignore list
+    lock_json = os.path.join(temp_dir, "vellum.lock.json")
+    with open(lock_json) as f:
+        lock_data = json.load(f)
+        assert lock_data["workflows"][0]["ignore"] == "sandbox.py"

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/ee/vellum_ee/workflows/display/nodes/vellum/code_execution_node.py

@@ -27,8 +27,8 @@ class BaseCodeExecutionNodeDisplay(BaseNodeVellumDisplay[_CodeExecutionNodeType]
         node = self._node
         node_id = self.node_id
         raw_code = raise_if_descriptor(node.code)
-        code_value = None
 
+        code_value: Optional[str]
         if raw_code:
             code_value = raw_code
         else:

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/ee/vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py

@@ -104,13 +104,12 @@ class BaseInlinePromptNodeDisplay(BaseNodeVellumDisplay[_InlinePromptNodeType],
             chat_properties: JsonObject = {
                 "chat_role": prompt_block.chat_role,
                 "chat_source": prompt_block.chat_source,
+                "chat_message_unterminated": bool(prompt_block.chat_message_unterminated),
                 "blocks": [
                     self._generate_prompt_block(block, input_variable_id_by_name, path + [i])
                     for i, block in enumerate(prompt_block.blocks)
                 ],
             }
-            if prompt_block.chat_message_unterminated is not None:
-                chat_properties["chat_message_unterminated"] = prompt_block.chat_message_unterminated
 
             block = {
                 "block_type": "CHAT_MESSAGE",

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/pyproject.toml

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

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

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/src/vellum/workflows/nodes/displayable/bases/inline_prompt_node/node.py

@@ -1,6 +1,6 @@
 import json
 from uuid import uuid4
-from typing import ClassVar, Generic, Iterator, List, Optional, Tuple, cast
+from typing import Callable, ClassVar, Generic, Iterator, List, Optional, Tuple, Union, cast
 
 from vellum import (
     AdHocExecutePromptEvent,
@@ -24,9 +24,10 @@ from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.displayable.bases.base_prompt_node import BasePromptNode
 from vellum.workflows.nodes.displayable.bases.inline_prompt_node.constants import DEFAULT_PROMPT_PARAMETERS
 from vellum.workflows.types.generics import StateType
+from vellum.workflows.utils.functions import compile_function_definition
 
 
-class BaseInlinePromptNode(BasePromptNode, Generic[StateType]):
+class BaseInlinePromptNode(BasePromptNode[StateType], Generic[StateType]):
     """
     Used to execute a Prompt defined inline.
 
@@ -45,7 +46,7 @@ class BaseInlinePromptNode(BasePromptNode, Generic[StateType]):
     blocks: ClassVar[List[PromptBlock]]
 
     # The functions/tools that a Prompt has access to
-    functions: Optional[List[FunctionDefinition]] = OMIT
+    functions: Optional[List[Union[FunctionDefinition, Callable]]] = None
 
     parameters: PromptParameters = DEFAULT_PROMPT_PARAMETERS
     expand_meta: Optional[AdHocExpandMeta] = OMIT
@@ -59,6 +60,14 @@ class BaseInlinePromptNode(BasePromptNode, Generic[StateType]):
             "execution_context": {"parent_context": parent_context},
             **request_options.get("additional_body_parameters", {}),
         }
+        normalized_functions = (
+            [
+                function if isinstance(function, FunctionDefinition) else compile_function_definition(function)
+                for function in self.functions
+            ]
+            if self.functions
+            else None
+        )
 
         return self._context.vellum_client.ad_hoc.adhoc_execute_prompt_stream(
             ml_model=self.ml_model,
@@ -66,7 +75,7 @@ class BaseInlinePromptNode(BasePromptNode, Generic[StateType]):
             input_variables=input_variables,
             parameters=self.parameters,
             blocks=self.blocks,
-            functions=self.functions,
+            functions=normalized_functions,
             expand_meta=self.expand_meta,
             request_options=self.request_options,
         )

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/src/vellum/workflows/nodes/displayable/inline_prompt_node/tests/test_node.py

@@ -5,10 +5,14 @@ from typing import Any, Iterator, List
 from vellum.client.core.pydantic_utilities import UniversalBaseModel
 from vellum.client.types.execute_prompt_event import ExecutePromptEvent
 from vellum.client.types.fulfilled_execute_prompt_event import FulfilledExecutePromptEvent
+from vellum.client.types.function_call import FunctionCall
+from vellum.client.types.function_call_vellum_value import FunctionCallVellumValue
+from vellum.client.types.function_definition import FunctionDefinition
 from vellum.client.types.initiated_execute_prompt_event import InitiatedExecutePromptEvent
 from vellum.client.types.prompt_output import PromptOutput
 from vellum.client.types.prompt_request_json_input import PromptRequestJsonInput
 from vellum.client.types.string_vellum_value import StringVellumValue
+from vellum.workflows.nodes.displayable.bases.inline_prompt_node.node import BaseInlinePromptNode
 from vellum.workflows.nodes.displayable.inline_prompt_node.node import InlinePromptNode
 
 
@@ -62,3 +66,54 @@ def test_inline_prompt_node__json_inputs(vellum_adhoc_prompt_client):
         PromptRequestJsonInput(key="a_pydantic", type="JSON", value={"example": "example"}),
     ]
     assert len(mock_api.call_args.kwargs["input_variables"]) == 4
+
+
+def test_inline_prompt_node__function_definitions(vellum_adhoc_prompt_client):
+    # GIVEN a function definition
+    def my_function(foo: str, bar: int) -> None:
+        pass
+
+    # AND a prompt node with a accepting that function definition
+    class MyNode(BaseInlinePromptNode):
+        ml_model = "gpt-4o"
+        functions = [my_function]
+        prompt_inputs = {}
+        blocks = []
+
+    # AND a known response from invoking an inline prompt
+    expected_outputs: List[PromptOutput] = [
+        FunctionCallVellumValue(value=FunctionCall(name="my_function", arguments={"foo": "hello", "bar": 1})),
+    ]
+
+    def generate_prompt_events(*args: Any, **kwargs: Any) -> Iterator[ExecutePromptEvent]:
+        execution_id = str(uuid4())
+        events: List[ExecutePromptEvent] = [
+            InitiatedExecutePromptEvent(execution_id=execution_id),
+            FulfilledExecutePromptEvent(
+                execution_id=execution_id,
+                outputs=expected_outputs,
+            ),
+        ]
+        yield from events
+
+    vellum_adhoc_prompt_client.adhoc_execute_prompt_stream.side_effect = generate_prompt_events
+
+    # WHEN the node is run
+    list(MyNode().run())
+
+    # THEN the prompt is executed with the correct inputs
+    mock_api = vellum_adhoc_prompt_client.adhoc_execute_prompt_stream
+    assert mock_api.call_count == 1
+    assert mock_api.call_args.kwargs["functions"] == [
+        FunctionDefinition(
+            name="my_function",
+            parameters={
+                "type": "object",
+                "properties": {
+                    "foo": {"type": "string"},
+                    "bar": {"type": "integer"},
+                },
+                "required": ["foo", "bar"],
+            },
+        ),
+    ]

{vellum_ai-0.12.5 → vellum_ai-0.12.7}/src/vellum/workflows/nodes/displayable/tests/test_inline_text_prompt_node.py

@@ -75,7 +75,7 @@ def test_inline_text_prompt_node__basic(vellum_adhoc_prompt_client):
     vellum_adhoc_prompt_client.adhoc_execute_prompt_stream.assert_called_once_with(
         blocks=[],
         expand_meta=Ellipsis,
-        functions=Ellipsis,
+        functions=None,
         input_values=[],
         input_variables=[],
         ml_model="gpt-4o",