vellum-ai 0.14.78__tar.gz → 0.14.79__tar.gz

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/PKG-INFO

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

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/ee/vellum_cli/__init__.py

@@ -67,7 +67,7 @@ with the provided module or be available for use. The Workflow Sandbox must also
 @click.option("--deployment-label", type=str, help="Label to use for the Deployment")
 @click.option("--deployment-name", type=str, help="Unique name for the Deployment")
 @click.option("--deployment-description", type=str, help="Description for the Deployment")
-@click.option("--release-tag", type=list, help="Release Tag for the Deployment", multiple=True)
+@click.option("--release-tag", help="Release Tag for the Deployment", multiple=True)
 @click.option(
     "--dry-run",
     is_flag=True,
@@ -117,7 +117,7 @@ def workflows_push(
 @click.option("--deployment-label", type=str, help="Label to use for the Deployment")
 @click.option("--deployment-name", type=str, help="Unique name for the Deployment")
 @click.option("--deployment-description", type=str, help="Description for the Deployment")
-@click.option("--release-tag", type=list, help="Release Tag for the Deployment", multiple=True)
+@click.option("--release-tag", help="Release Tag for the Deployment", multiple=True)
 @click.option(
     "--dry-run",
     is_flag=True,

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/ee/vellum_cli/push.py

@@ -8,6 +8,7 @@ from uuid import UUID
 from typing import List, Optional
 
 from dotenv import load_dotenv
+from pydantic import ValidationError
 
 from vellum.client.core.api_error import ApiError
 from vellum.resources.workflows.client import OMIT
@@ -129,12 +130,26 @@ def push_command(
             workflow_config.deployments[0] if workflow_config.deployments else WorkflowDeploymentConfig()
         )
 
-        deployment_config = WorkflowPushDeploymentConfigRequest(
-            label=deployment_label or cli_deployment_config.label,
-            name=deployment_name or cli_deployment_config.name,
-            description=deployment_description or cli_deployment_config.description,
-            release_tags=release_tags or cli_deployment_config.release_tags,
-        )
+        try:
+            deployment_config = WorkflowPushDeploymentConfigRequest(
+                label=deployment_label or cli_deployment_config.label,
+                name=deployment_name or cli_deployment_config.name,
+                description=deployment_description or cli_deployment_config.description,
+                release_tags=release_tags or cli_deployment_config.release_tags,
+            )
+        except ValidationError as e:
+            for error in e.errors():
+                if "release_tags" in str(error.get("loc", [])):
+                    handle_cli_error(
+                        logger,
+                        title="Invalid release tag format",
+                        message="Release tags must be provided as separate arguments. "
+                        "Use: --release-tag tag1 --release-tag tag2",
+                    )
+                    return
+
+            # Re-raise if it's not a release_tags validation error
+            raise e
 
         # We should check with fern if we could auto-serialize typed fields for us
         # https://app.shortcut.com/vellum/story/5568

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/ee/vellum_cli/tests/test_push.py

@@ -979,3 +979,63 @@ def test_push__use_default_workspace_if_not_specified__multiple_workflows_config
         config = configs[0]
         assert config["workflow_sandbox_id"] == workflow_sandbox_id
         assert config["workspace"] == "default"
+
+
+def test_push__deploy_with_malformed_release_tags_shows_friendly_validation_error(mock_module, vellum_client):
+    # GIVEN a single workflow configured
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
+
+    # AND a workflow exists in the module successfully
+    _ensure_workflow_py(temp_dir, module)
+
+    # AND the push API call would return successfully
+    vellum_client.workflows.push.return_value = WorkflowPushResponse(
+        workflow_sandbox_id=str(uuid4()),
+    )
+
+    # WHEN calling `vellum workflows push` with --deploy and --release-tag
+    runner = CliRunner()
+    result = runner.invoke(cli_main, ["workflows", "push", module, "--deploy", "--release-tag", None])  # type: ignore
+
+    # THEN it should show the friendly error message instead of a raw Pydantic traceback
+    assert "Invalid release tag format" in result.output
+    assert "Release tags must be provided as separate arguments" in result.output
+    assert "--release-tag tag1 --release-tag tag2" in result.output
+
+
+@pytest.mark.usefixtures("info_log_level")
+def test_push__deploy_with_release_tags_success(mock_module, vellum_client):
+    # GIVEN a single workflow configured
+    temp_dir = mock_module.temp_dir
+    module = mock_module.module
+
+    # AND a workflow exists in the module successfully
+    _ensure_workflow_py(temp_dir, module)
+
+    # AND the push API call returns successfully
+    workflow_deployment_id = str(uuid4())
+    vellum_client.workflows.push.return_value = WorkflowPushResponse(
+        workflow_sandbox_id=str(uuid4()),
+        workflow_deployment_id=workflow_deployment_id,
+    )
+
+    # WHEN calling `vellum workflows push` with --deploy and --release-tag
+    runner = CliRunner()
+    result = runner.invoke(cli_main, ["workflows", "push", module, "--deploy", "--release-tag", "v1.0.0"])
+
+    # THEN it should succeed
+    assert result.exit_code == 0, result.output
+
+    # AND we should have called the push API with the correct deployment config
+    vellum_client.workflows.push.assert_called_once()
+    call_args = vellum_client.workflows.push.call_args.kwargs
+
+    # AND the deployment_config should contain the release tags
+    deployment_config_str = call_args["deployment_config"]
+    deployment_config = json.loads(deployment_config_str)
+    assert deployment_config["release_tags"] == ["v1.0.0"]
+
+    # AND should show success message
+    assert "Successfully pushed" in result.output
+    assert "Updated vellum.lock.json file." in result.output

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/ee/vellum_ee/workflows/display/nodes/vellum/base_adornment_node.py

@@ -6,7 +6,7 @@ from typing import Any, Callable, Dict, Generic, Optional, Type, TypeVar, cast
 from vellum.workflows.nodes.bases.base import BaseNode
 from vellum.workflows.nodes.bases.base_adornment_node import BaseAdornmentNode
 from vellum.workflows.nodes.utils import get_wrapped_node
-from vellum.workflows.types.core import JsonArray, JsonObject
+from vellum.workflows.types.core import JsonObject
 from vellum.workflows.types.utils import get_original_base
 from vellum.workflows.utils.uuids import uuid4_from_hash
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
@@ -94,8 +94,8 @@ class BaseAdornmentNodeDisplay(BaseNodeDisplay[_BaseAdornmentNodeType], Generic[
         additional_kwargs = get_additional_kwargs(wrapped_node_display.node_id) if get_additional_kwargs else {}
         serialized_wrapped_node = wrapped_node_display.serialize(display_context, **kwargs, **additional_kwargs)
 
-        adornments = cast(JsonArray, serialized_wrapped_node.get("adornments")) or []
-        serialized_wrapped_node["adornments"] = adornments + [adornment] if adornment else adornments
+        adornments = cast(list, serialized_wrapped_node.get("adornments")) or []
+        serialized_wrapped_node["adornments"] = [adornment] + adornments if adornment else adornments
 
         return serialized_wrapped_node
 

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/ee/vellum_ee/workflows/display/nodes/vellum/tests/test_tool_calling_node.py

@@ -139,8 +139,8 @@ def test_serialize_node__function_configs():
             "foo": {
                 "runtime": "PYTHON_3_11_6",
                 "packages": [
-                    CodeExecutionPackage(name="first_package", version="1.0.0"),
-                    CodeExecutionPackage(name="second_package", version="2.0.0"),
+                    CodeExecutionPackage(name="first_package", version="1.0.0", repository="test-repo"),
+                    CodeExecutionPackage(name="second_package", version="2.0.0", repository="test-repo"),
                 ],
             },
             "bar": {
@@ -179,11 +179,14 @@ def test_serialize_node__function_configs():
                     "foo": {
                         "runtime": "PYTHON_3_11_6",
                         "packages": [
-                            {"version": "1.0.0", "name": "first_package"},
-                            {"version": "2.0.0", "name": "second_package"},
+                            {"version": "1.0.0", "name": "first_package", "repository": "test-repo"},
+                            {"version": "2.0.0", "name": "second_package", "repository": "test-repo"},
                         ],
                     },
-                    "bar": {"runtime": "PYTHON_3_11_6", "packages": [{"version": "3.0.0", "name": "third_package"}]},
+                    "bar": {
+                        "runtime": "PYTHON_3_11_6",
+                        "packages": [{"version": "3.0.0", "name": "third_package", "repository": None}],
+                    },
                 },
             },
         },

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/ee/vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_adornments_serialization.py

@@ -1,4 +1,5 @@
 from uuid import uuid4
+from typing import Any, Dict, List, cast
 
 from deepdiff import DeepDiff
 
@@ -269,6 +270,21 @@ def test_serialize_node__stacked():
             },
             "ports": [{"id": "408cd5fb-3a3e-4eb2-9889-61111bd6a129", "name": "default", "type": "DEFAULT"}],
             "adornments": [
+                {
+                    "id": "3344083c-a32c-4a32-920b-0fb5093448fa",
+                    "label": "TryNode",
+                    "base": {
+                        "name": "TryNode",
+                        "module": ["vellum", "workflows", "nodes", "core", "try_node", "node"],
+                    },
+                    "attributes": [
+                        {
+                            "id": "ab2fbab0-e2a0-419b-b1ef-ce11ecf11e90",
+                            "name": "on_error_code",
+                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
+                        }
+                    ],
+                },
                 {
                     "id": "5be7d260-74f7-4734-b31b-a46a94539586",
                     "label": "RetryNode",
@@ -299,24 +315,41 @@ def test_serialize_node__stacked():
                         },
                     ],
                 },
-                {
-                    "id": "3344083c-a32c-4a32-920b-0fb5093448fa",
-                    "label": "TryNode",
-                    "base": {
-                        "name": "TryNode",
-                        "module": ["vellum", "workflows", "nodes", "core", "try_node", "node"],
-                    },
-                    "attributes": [
-                        {
-                            "id": "ab2fbab0-e2a0-419b-b1ef-ce11ecf11e90",
-                            "name": "on_error_code",
-                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
-                        }
-                    ],
-                },
             ],
             "attributes": [],
             "outputs": [],
         },
         inner_stacked_generic_node,
     )
+
+
+def test_serialize_node__adornment_order_matches_decorator_order():
+    """
+    Tests that adornments are serialized in the same order as decorators are applied.
+    """
+
+    @TryNode.wrap()
+    @RetryNode.wrap(max_attempts=3)
+    class MyNode(BaseNode):
+        pass
+
+    # AND a workflow that uses the decorated node
+    class MyWorkflow(BaseWorkflow):
+        graph = MyNode
+
+    # WHEN we serialize the workflow
+    workflow_display = get_workflow_display(workflow_class=MyWorkflow)
+    exec_config = cast(Dict[str, Any], workflow_display.serialize())
+
+    # THEN the workflow should serialize successfully
+    assert isinstance(exec_config["workflow_raw_data"], dict)
+    assert isinstance(exec_config["workflow_raw_data"]["nodes"], list)
+
+    # AND we should find our decorated node
+    nodes = cast(List[Dict[str, Any]], exec_config["workflow_raw_data"]["nodes"])
+    my_node = [node for node in nodes if isinstance(node, dict) and node["type"] == "GENERIC"][0]
+
+    adornments = cast(List[Dict[str, Any]], my_node["adornments"])
+    assert len(adornments) == 2
+    assert adornments[0]["label"] == "TryNode"
+    assert adornments[1]["label"] == "RetryNode"

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/ee/vellum_ee/workflows/display/tests/workflow_serialization/test_basic_tool_calling_node_serialization.py

@@ -162,7 +162,7 @@ def test_serialize_workflow():
                         "value": {
                             "get_current_weather": {
                                 "runtime": "PYTHON_3_11_6",
-                                "packages": [{"version": "2.26.0", "name": "requests"}],
+                                "packages": [{"version": "2.26.0", "name": "requests", "repository": None}],
                             }
                         },
                     },

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/pyproject.toml

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

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

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/src/vellum/client/types/code_execution_package.py

@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from ..core.pydantic_utilities import UniversalBaseModel
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import typing
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
 
 class CodeExecutionPackage(UniversalBaseModel):
     version: str
     name: str
+    repository: typing.Optional[str] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

{vellum_ai-0.14.78 → vellum_ai-0.14.79}/src/vellum/workflows/types/utils.py

@@ -49,9 +49,12 @@ def resolve_combined_types(
     lhs_types = resolve_types(lhs)
     rhs_types = resolve_types(rhs)
 
-    unique_results = set(lhs_types) | set(rhs_types)
+    result_types: List[Union[Type[_LHS], Type[_RHS]]] = list(lhs_types)
+    for rhs_type in rhs_types:
+        if rhs_type not in result_types:
+            result_types.append(rhs_type)
 
-    return tuple(unique_results)
+    return tuple(result_types)
 
 
 def infer_types(object_: Type, attr_name: str, localns: Optional[Dict[str, Any]] = None) -> Tuple[Type, ...]: