vellum-ai 0.14.50__tar.gz → 0.14.52__tar.gz

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/PKG-INFO

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

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_cli/__init__.py

@@ -259,6 +259,11 @@ Helpful for running and debugging workflows locally.""",
     help="""Directory to pull the workflow into. If not specified, \
 the workflow will be pulled into the current working directory.""",
 )
+@click.option(
+    "--workspace",
+    type=str,
+    help="The specific Workspace config to use when pulling",
+)
 def workflows_pull(
     module: Optional[str],
     include_json: Optional[bool],
@@ -268,6 +273,7 @@ def workflows_pull(
     strict: Optional[bool],
     include_sandbox: Optional[bool],
     target_directory: Optional[str],
+    workspace: Optional[str],
 ) -> None:
     """
     Pull Workflows from Vellum. If a module is provided, only the Workflow for that module will be pulled.
@@ -283,6 +289,7 @@ def workflows_pull(
         strict=strict,
         include_sandbox=include_sandbox,
         target_directory=target_directory,
+        workspace=workspace,
     )
 
 

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_cli/pull.py

@@ -13,7 +13,13 @@ from vellum.client.core.api_error import ApiError
 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, WorkflowDeploymentConfig, load_vellum_cli_config
+from vellum_cli.config import (
+    DEFAULT_WORKSPACE_CONFIG,
+    VellumCliConfig,
+    WorkflowConfig,
+    WorkflowDeploymentConfig,
+    load_vellum_cli_config,
+)
 from vellum_cli.logger import load_cli_logger
 
 ERROR_LOG_FILE_NAME = "error.log"
@@ -43,6 +49,7 @@ def _resolve_workflow_config(
     module: Optional[str] = None,
     workflow_sandbox_id: Optional[str] = None,
     workflow_deployment: Optional[str] = None,
+    workspace: Optional[str] = None,
 ) -> WorkflowConfigResolutionResult:
     if workflow_sandbox_id and workflow_deployment:
         raise ValueError("Cannot specify both workflow_sandbox_id and workflow_deployment")
@@ -53,6 +60,7 @@ def _resolve_workflow_config(
             workflow_config = WorkflowConfig(
                 workflow_sandbox_id=workflow_sandbox_id,
                 module=module,
+                workspace=workspace or DEFAULT_WORKSPACE_CONFIG.name,
             )
             config.workflows.append(workflow_config)
             return WorkflowConfigResolutionResult(
@@ -132,8 +140,9 @@ def pull_command(
     strict: Optional[bool] = None,
     include_sandbox: Optional[bool] = None,
     target_directory: Optional[str] = None,
+    workspace: Optional[str] = None,
 ) -> None:
-    load_dotenv()
+    load_dotenv(dotenv_path=os.path.join(os.getcwd(), ".env"))
     logger = load_cli_logger()
     config = load_vellum_cli_config()
 
@@ -142,6 +151,7 @@ def pull_command(
         module=module,
         workflow_sandbox_id=workflow_sandbox_id,
         workflow_deployment=workflow_deployment,
+        workspace=workspace,
     )
 
     workflow_config = workflow_config_result.workflow_config
@@ -157,7 +167,20 @@ def pull_command(
     else:
         logger.info(f"Pulling workflow from {pk}...")
 
-    client = create_vellum_client()
+    resolved_workspace = workspace or workflow_config.workspace or DEFAULT_WORKSPACE_CONFIG.name
+    workspace_config = (
+        next((w for w in config.workspaces if w.name == resolved_workspace), DEFAULT_WORKSPACE_CONFIG)
+        if workspace
+        else DEFAULT_WORKSPACE_CONFIG
+    )
+    api_key = os.getenv(workspace_config.api_key)
+    if not api_key:
+        raise ValueError(f"No API key value found in environment for workspace '{workspace_config.name}'.")
+
+    client = create_vellum_client(
+        api_key=api_key,
+        api_url=workspace_config.api_url,
+    )
     query_parameters = {}
 
     if include_json:

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_cli/push.py

@@ -45,8 +45,11 @@ def push_command(
         else config.workflows
     )
 
-    if len(workflow_configs) > 1 and workspace:
-        workflow_configs = [w for w in workflow_configs if w.workspace == workspace]
+    if len(workflow_configs) > 1:
+        if workspace:
+            workflow_configs = [w for w in workflow_configs if w.workspace == workspace]
+        else:
+            workflow_configs = [w for w in workflow_configs if w.workspace == DEFAULT_WORKSPACE_CONFIG.name]
 
     if len(workflow_configs) == 0:
         if module and module_exists(module):

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_cli/tests/test_pull.py

@@ -3,6 +3,7 @@ import io
 import json
 import os
 import tempfile
+from unittest import mock
 from uuid import uuid4
 import zipfile
 
@@ -1284,3 +1285,74 @@ def test_pull__workflow_deployment_with_name_and_id(vellum_client):
         assert lock_data["workflows"][0]["deployments"][0]["label"] == deployment_label
 
     os.chdir(current_dir)
+
+
+def test_pull__workspace_option__uses_different_api_key(mock_module, vellum_client_class):
+    # GIVEN a module and workflow_sandbox_id
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
+    set_pyproject_toml = mock_module.set_pyproject_toml
+    workflow_sandbox_id = str(uuid4())
+
+    # AND a different workspace is set in the pyproject.toml
+    set_pyproject_toml(
+        {
+            "workflows": [],
+            "workspaces": [
+                {
+                    "name": "my_other_workspace",
+                    "api_key": "MY_OTHER_VELLUM_API_KEY",
+                }
+            ],
+        }
+    )
+
+    # AND the .env file has the other api key stored
+    with open(os.path.join(temp_dir, ".env"), "w") as f:
+        f.write(
+            """
+VELLUM_API_KEY=abcdef123456
+MY_OTHER_VELLUM_API_KEY=aaabbbcccddd
+"""
+        )
+
+    # AND the workflow pull API call returns a zip file
+    vellum_client_class.return_value.workflows.pull.return_value = iter(
+        [_zip_file_map({"workflow.py": "print('hello')"})]
+    )
+
+    # WHEN calling `vellum pull` with --workspace
+    runner = CliRunner()
+    result = runner.invoke(
+        cli_main,
+        [
+            "workflows",
+            "pull",
+            module,
+            "--workflow-sandbox-id",
+            workflow_sandbox_id,
+            "--workspace",
+            "my_other_workspace",
+        ],
+    )
+
+    # THEN it should succeed
+    assert result.exit_code == 0, result.output
+
+    # AND we should have called the vellum client with the correct api key
+    vellum_client_class.assert_called_once_with(
+        api_key="aaabbbcccddd",
+        environment=mock.ANY,
+    )
+
+    # AND the vellum lock file should have been updated with the correct workspace
+    with open(os.path.join(temp_dir, "vellum.lock.json")) as f:
+        lock_file_content = json.load(f)
+        assert lock_file_content["workflows"][0]["workspace"] == "my_other_workspace"
+        assert lock_file_content["workflows"][0]["workflow_sandbox_id"] == workflow_sandbox_id
+
+    # AND the workflow.py file is written as expected
+    workflow_py = os.path.join(temp_dir, *module.split("."), "workflow.py")
+    assert os.path.exists(workflow_py)
+    with open(workflow_py) as f:
+        assert f.read() == "print('hello')"

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_cli/tests/test_push.py

@@ -870,3 +870,45 @@ def test_push__create_new_config_for_existing_module(mock_module, vellum_client)
         new_config = new_configs[0]
         assert new_config["workflow_sandbox_id"] == new_workflow_sandbox_id
         assert new_config["workspace"] == "default"
+
+
+def test_push__use_default_workspace_if_not_specified__multiple_workflows_configured(mock_module, vellum_client):
+    # GIVEN a config with a workspace configured
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
+    workflow_sandbox_id = str(uuid4())
+    mock_module.set_pyproject_toml(
+        {
+            "workspaces": [
+                {"name": "my_other_workspace"},
+            ],
+            "workflows": [
+                {"module": module, "workflow_sandbox_id": workflow_sandbox_id, "workspace": "default"},
+                {"module": module, "workflow_sandbox_id": str(uuid4()), "workspace": "my_other_workspace"},
+            ],
+        }
+    )
+
+    # AND a workflow exists in the module successfully
+    _ensure_workflow_py(temp_dir, module)
+
+    # AND the push API call returns successfully
+    vellum_client.workflows.push.return_value = WorkflowPushResponse(
+        workflow_sandbox_id=workflow_sandbox_id,
+    )
+
+    # WHEN calling `vellum push` with a module without a workspace specified
+    runner = CliRunner()
+    result = runner.invoke(cli_main, ["workflows", "push", module])
+
+    # THEN it should succeed
+    assert result.exit_code == 0, result.output
+
+    # AND check that lockfile should maintain that this workflow is using the default workspace
+    with open(os.path.join(temp_dir, "vellum.lock.json")) as f:
+        lock_file_content = json.load(f)
+        configs = [w for w in lock_file_content["workflows"] if w["module"] == module]
+        assert len(configs) == 2
+        config = configs[0]
+        assert config["workflow_sandbox_id"] == workflow_sandbox_id
+        assert config["workspace"] == "default"

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_ee/workflows/display/nodes/base_node_display.py

@@ -133,6 +133,10 @@ class BaseNodeDisplay(Generic[NodeType], metaclass=BaseNodeDisplayMeta):
     # Used by each class extending BaseNodeDisplay to specify which attributes are meant to be serialized
     # as the former `"inputs"` field
     __serializable_inputs__: Set[NodeReference] = set()
+    # Used by each class extending BaseNodeDisplay to specify which attributes are meant to be opted out
+    # of serialization. It's possible that we keep this one as a user facing api in the future, but
+    # don't want to commit to that decision just yet
+    __unserializable_attributes__: Set[NodeReference] = set()
     # END: Attributes for backwards compatible serialization
 
     def serialize(self, display_context: "WorkflowDisplayContext", **kwargs: Any) -> JsonObject:
@@ -145,9 +149,12 @@ class BaseNodeDisplay(Generic[NodeType], metaclass=BaseNodeDisplayMeta):
                 # We don't need to serialize generic node attributes containing a subworkflow
                 continue
 
+            if attribute in self.__unserializable_attributes__:
+                continue
+
             id = (
                 str(self.attribute_ids_by_name[attribute.name])
-                if self.attribute_ids_by_name
+                if self.attribute_ids_by_name.get(attribute.name)
                 else str(uuid4_from_hash(f"{node_id}|{attribute.name}"))
             )
             try:

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py

@@ -19,6 +19,14 @@ _InlinePromptNodeType = TypeVar("_InlinePromptNodeType", bound=InlinePromptNode)
 
 class BaseInlinePromptNodeDisplay(BaseNodeDisplay[_InlinePromptNodeType], Generic[_InlinePromptNodeType]):
     __serializable_inputs__ = {InlinePromptNode.prompt_inputs}
+    __unserializable_attributes__ = {
+        InlinePromptNode.blocks,
+        InlinePromptNode.functions,
+        InlinePromptNode.parameters,
+        InlinePromptNode.settings,
+        InlinePromptNode.expand_meta,
+        InlinePromptNode.request_options,
+    }
 
     def serialize(
         self, display_context: WorkflowDisplayContext, error_output_id: Optional[UUID] = None, **kwargs
@@ -219,16 +227,25 @@ class BaseInlinePromptNodeDisplay(BaseNodeDisplay[_InlinePromptNodeType], Generi
         return block
 
     def _serialize_attributes(self, display_context: "WorkflowDisplayContext"):
-        attribute_instances_by_name = {}
+        attributes = []
         for attribute in self._node:
-            if attribute.name in self.attribute_ids_by_name:
-                attribute_instances_by_name[attribute.name] = attribute.instance
-
-        return [
-            {
-                "id": str(attr_id),
-                "name": attr_name,
-                "value": serialize_value(display_context, attribute_instances_by_name[attr_name]),
-            }
-            for attr_name, attr_id in self.attribute_ids_by_name.items()
-        ]
+            if attribute in self.__unserializable_attributes__:
+                continue
+
+            id = (
+                str(self.attribute_ids_by_name[attribute.name])
+                if self.attribute_ids_by_name.get(attribute.name)
+                else str(uuid4_from_hash(f"{self.node_id}|{attribute.name}"))
+            )
+            try:
+                attributes.append(
+                    {
+                        "id": id,
+                        "name": attribute.name,
+                        "value": serialize_value(display_context, attribute.instance),
+                    }
+                )
+            except ValueError as e:
+                raise ValueError(f"Failed to serialize attribute '{attribute.name}': {e}")
+
+        return attributes

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_ee/workflows/display/nodes/vellum/tests/test_prompt_node.py

@@ -4,6 +4,7 @@ from typing import Type
 
 from vellum.client.types.variable_prompt_block import VariablePromptBlock
 from vellum.workflows import BaseWorkflow
+from vellum.workflows.inputs import BaseInputs
 from vellum.workflows.nodes import BaseNode
 from vellum.workflows.nodes.displayable.inline_prompt_node.node import InlinePromptNode
 from vellum.workflows.ports.port import Port
@@ -145,7 +146,7 @@ def test_serialize_node__prompt_inputs__state_reference():
         ml_model = "gpt-4o"
 
     # AND a workflow with the prompt node
-    class Workflow(BaseWorkflow):
+    class Workflow(BaseWorkflow[BaseInputs, MyState]):
         graph = MyPromptNode
 
     # WHEN the workflow is serialized
@@ -184,6 +185,37 @@ def test_serialize_node__prompt_inputs__state_reference():
         },
     ]
 
+    # AND the prompt attributes should include a dictionary reference with the state reference
+    prompt_inputs_attribute = next(
+        attribute for attribute in my_prompt_node["attributes"] if attribute["name"] == "prompt_inputs"
+    )
+    assert prompt_inputs_attribute == {
+        "id": "3b6e1363-e41b-458e-ad28-95a61fdedac1",
+        "name": "prompt_inputs",
+        "value": {
+            "type": "DICTIONARY_REFERENCE",
+            "entries": [
+                {
+                    "key": "foo",
+                    "value": {
+                        "type": "WORKFLOW_STATE",
+                        "state_variable_id": "45649791-c642-4405-aff9-a1fafd780ea1",
+                    },
+                },
+                {
+                    "key": "bar",
+                    "value": {
+                        "type": "CONSTANT_VALUE",
+                        "value": {
+                            "type": "STRING",
+                            "value": "baz",
+                        },
+                    },
+                },
+            ],
+        },
+    }
+
 
 def test_serialize_node__unreferenced_variable_block__still_serializes():
     # GIVEN a prompt node with an unreferenced variable block

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/ee/vellum_ee/workflows/display/utils/expressions.py

@@ -207,7 +207,7 @@ def serialize_value(display_context: "WorkflowDisplayContext", value: Any) -> Js
     if isinstance(value, StateValueReference):
         state_value_display = display_context.global_state_value_displays[value]
         return {
-            "type": "STATE_VALUE",
+            "type": "WORKFLOW_STATE",
             "state_variable_id": str(state_value_display.id),
         }
 

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/pyproject.toml

@@ -3,7 +3,7 @@ name = "vellum-ai"
 
 [tool.poetry]
 name = "vellum-ai"
-version = "0.14.50"
+version = "0.14.52"
 description = ""
 readme = "README.md"
 authors = []

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/src/vellum/client/__init__.py

@@ -133,11 +133,15 @@ class Vellum:
         self._client_wrapper = SyncClientWrapper(
             environment=environment,
             api_key=api_key,
-            httpx_client=httpx_client
-            if httpx_client is not None
-            else httpx.Client(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
-            if follow_redirects is not None
-            else httpx.Client(timeout=_defaulted_timeout),
+            httpx_client=(
+                httpx_client
+                if httpx_client is not None
+                else (
+                    httpx.Client(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
+                    if follow_redirects is not None
+                    else httpx.Client(timeout=_defaulted_timeout)
+                )
+            ),
             timeout=_defaulted_timeout,
         )
         self.ad_hoc = AdHocClient(client_wrapper=self._client_wrapper)
@@ -1442,7 +1446,9 @@ class Vellum:
             method="POST",
             json={
                 "actuals": convert_and_respect_annotation_metadata(
-                    object_=actuals, annotation=typing.Sequence[SubmitWorkflowExecutionActualRequest], direction="write"
+                    object_=actuals,
+                    annotation=typing.Sequence[SubmitWorkflowExecutionActualRequest],
+                    direction="write",
                 ),
                 "execution_id": execution_id,
                 "external_id": external_id,
@@ -1509,11 +1515,15 @@ class AsyncVellum:
         self._client_wrapper = AsyncClientWrapper(
             environment=environment,
             api_key=api_key,
-            httpx_client=httpx_client
-            if httpx_client is not None
-            else httpx.AsyncClient(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
-            if follow_redirects is not None
-            else httpx.AsyncClient(timeout=_defaulted_timeout),
+            httpx_client=(
+                httpx_client
+                if httpx_client is not None
+                else (
+                    httpx.AsyncClient(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
+                    if follow_redirects is not None
+                    else httpx.AsyncClient(timeout=_defaulted_timeout)
+                )
+            ),
             timeout=_defaulted_timeout,
         )
         self.ad_hoc = AsyncAdHocClient(client_wrapper=self._client_wrapper)
@@ -2906,7 +2916,9 @@ class AsyncVellum:
             method="POST",
             json={
                 "actuals": convert_and_respect_annotation_metadata(
-                    object_=actuals, annotation=typing.Sequence[SubmitWorkflowExecutionActualRequest], direction="write"
+                    object_=actuals,
+                    annotation=typing.Sequence[SubmitWorkflowExecutionActualRequest],
+                    direction="write",
                 ),
                 "execution_id": execution_id,
                 "external_id": external_id,

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/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.50",
+            "X-Fern-SDK-Version": "0.14.52",
         }
         headers["X-API-KEY"] = self.api_key
         return headers

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/src/vellum/client/resources/workflows/client.py

@@ -69,8 +69,7 @@ class WorkflowsClient:
             try:
                 if 200 <= _response.status_code < 300:
                     _chunk_size = request_options.get("chunk_size", None) if request_options is not None else None
-                    for _chunk in _response.iter_bytes(chunk_size=_chunk_size):
-                        yield _chunk
+                    yield from _response.iter_bytes(chunk_size=_chunk_size)
                     return
                 _response.read()
                 if _response.status_code == 400:

{vellum_ai-0.14.50 → vellum_ai-0.14.52}/src/vellum/workflows/nodes/core/map_node/tests/test_node.py

@@ -194,7 +194,7 @@ def test_map_node_parallel_execution_with_workflow():
             thread_ids[self.item] = current_thread_id
 
             # Simulate work
-            time.sleep(0.01)
+            time.sleep(0.1)
 
             end = time.time()
             end_str = datetime.datetime.fromtimestamp(end).strftime("%Y-%m-%d %H:%M:%S.%f")

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

@@ -18,9 +18,9 @@ from vellum import (
 )
 from vellum.client import ApiError, RequestOptions
 from vellum.client.types.chat_message_request import ChatMessageRequest
+from vellum.client.types.prompt_exec_config import PromptExecConfig
 from vellum.client.types.prompt_settings import PromptSettings
 from vellum.client.types.rich_text_child_block import RichTextChildBlock
-from vellum.workflows.constants import OMIT
 from vellum.workflows.context import get_execution_context
 from vellum.workflows.errors import WorkflowErrorCode
 from vellum.workflows.errors.types import vellum_error_to_workflow_error
@@ -56,7 +56,7 @@ class BaseInlinePromptNode(BasePromptNode[StateType], Generic[StateType]):
     functions: Optional[List[Union[FunctionDefinition, Callable]]] = None
 
     parameters: PromptParameters = DEFAULT_PROMPT_PARAMETERS
-    expand_meta: Optional[AdHocExpandMeta] = OMIT
+    expand_meta: Optional[AdHocExpandMeta] = None
 
     settings: Optional[PromptSettings] = None
 
@@ -135,6 +135,23 @@ class BaseInlinePromptNode(BasePromptNode[StateType], Generic[StateType]):
             )
 
     def _process_prompt_event_stream(self) -> Generator[BaseOutput, None, Optional[List[PromptOutput]]]:
+        try:
+            # Compile dict blocks into PromptBlocks
+            exec_config = PromptExecConfig.model_validate(
+                {
+                    "ml_model": "",
+                    "input_variables": [],
+                    "parameters": {},
+                    "blocks": self.blocks,
+                }
+            )
+            self.blocks = exec_config.blocks  # type: ignore
+        except Exception:
+            raise NodeException(
+                message="Failed to compile blocks",
+                code=WorkflowErrorCode.INVALID_INPUTS,
+            )
+
         self._validate()
         try:
             prompt_event_stream = self._get_prompt_event_stream()