vellum-ai 1.0.7__tar.gz → 1.0.8__tar.gz

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/PKG-INFO

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

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/ee/vellum_cli/push.py

@@ -95,8 +95,9 @@ def push_command(
         and workflow_config.workflow_sandbox_id
         and workflow_config.workflow_sandbox_id != workflow_sandbox_id
     ):
-        raise ValueError(
-            f"Workflow sandbox id '{workflow_sandbox_id}' is already associated with '{workflow_config.module}'."
+        logger.warning(
+            f"Workflow sandbox id '{workflow_sandbox_id}' is already associated with '{workflow_config.module}'. "
+            f"Continuing with the provided workflow sandbox id '{workflow_sandbox_id}'."
         )
 
     client = create_vellum_client(

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/pyproject.toml

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

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/src/vellum/client/core/client_wrapper.py

@@ -25,10 +25,10 @@ class BaseClientWrapper:
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "vellum-ai/1.0.7",
+            "User-Agent": "vellum-ai/1.0.8",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "1.0.7",
+            "X-Fern-SDK-Version": "1.0.8",
         }
         if self._api_version is not None:
             headers["X-API-Version"] = self._api_version

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/src/vellum/workflows/nodes/displayable/tool_calling_node/tests/test_utils.py

@@ -15,7 +15,7 @@ from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.displayable.tool_calling_node.utils import create_tool_router_node, get_function_name
 from vellum.workflows.outputs.base import BaseOutputs
 from vellum.workflows.state.base import BaseState
-from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition
+from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition, MCPServer, MCPToolDefinition
 
 
 def test_get_function_name_callable():
@@ -69,6 +69,19 @@ def test_get_function_name_subworkflow_deployment_uuid():
     assert result == "57f09bebb46340e0bf9ec972e664352f"
 
 
+def test_get_function_name_mcp_tool_definition():
+    """Test MCPToolDefinition function name generation."""
+    mcp_tool = MCPToolDefinition(
+        name="create_repository",
+        server=MCPServer(name="github", url="https://api.github.com"),
+        parameters={"repository_name": "string", "description": "string"},
+    )
+
+    result = get_function_name(mcp_tool)
+
+    assert result == "create_repository"
+
+
 @pytest.mark.parametrize(
     "toolkit,action,description,expected_result",
     [

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/src/vellum/workflows/nodes/displayable/tool_calling_node/utils.py

@@ -28,7 +28,7 @@ from vellum.workflows.references.lazy import LazyReference
 from vellum.workflows.state import BaseState
 from vellum.workflows.state.encoder import DefaultStateEncoder
 from vellum.workflows.types.core import EntityInputsInterface, MergeBehavior, Tool
-from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition
+from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition, MCPToolDefinition
 from vellum.workflows.types.generics import is_workflow_class
 
 CHAT_HISTORY_VARIABLE = "chat_history"
@@ -379,6 +379,8 @@ def create_function_node(
             },
         )
         return node
+    elif isinstance(function, MCPToolDefinition):
+        pass
     elif is_workflow_class(function):
         node = type(
             f"DynamicInlineSubworkflowNode_{function.__name__}",
@@ -410,5 +412,7 @@ def get_function_name(function: Tool) -> str:
         return name.replace("-", "")
     elif isinstance(function, ComposioToolDefinition):
         return function.name
+    elif isinstance(function, MCPToolDefinition):
+        return function.name
     else:
         return snake_case(function.__name__)

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/src/vellum/workflows/types/core.py

@@ -13,7 +13,7 @@ from typing import (  # type: ignore[attr-defined]
 )
 
 from vellum.client.core.pydantic_utilities import UniversalBaseModel
-from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition
+from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition, MCPToolDefinition
 
 if TYPE_CHECKING:
     from vellum.workflows.workflows.base import BaseWorkflow
@@ -50,4 +50,4 @@ class ConditionType(Enum):
 
 
 # Type alias for functions that can be called in tool calling nodes
-Tool = Union[Callable[..., Any], DeploymentDefinition, Type["BaseWorkflow"], ComposioToolDefinition]
+Tool = Union[Callable[..., Any], DeploymentDefinition, Type["BaseWorkflow"], ComposioToolDefinition, MCPToolDefinition]

{vellum_ai-1.0.7 → vellum_ai-1.0.8}/src/vellum/workflows/types/definition.py

@@ -8,6 +8,9 @@ from pydantic import BeforeValidator
 
 from vellum.client.core.pydantic_utilities import UniversalBaseModel
 from vellum.client.types.code_resource_definition import CodeResourceDefinition as ClientCodeResourceDefinition
+from vellum.client.types.vellum_secret import VellumSecret
+from vellum.workflows.constants import AuthorizationType
+from vellum.workflows.references.environment_variable import EnvironmentVariableReference
 
 
 def serialize_type_encoder(obj: type) -> Dict[str, Any]:
@@ -118,3 +121,21 @@ class ComposioToolDefinition(UniversalBaseModel):
     def name(self) -> str:
         """Generate a function name for this tool"""
         return self.action.lower()
+
+
+class MCPServer(UniversalBaseModel):
+    name: str
+    url: str
+    authorization_type: AuthorizationType = AuthorizationType.BEARER_TOKEN
+    bearer_token_value: Optional[Union[str, EnvironmentVariableReference]] = None
+    api_key_header_key: Optional[str] = None
+    api_key_header_value: Optional[Union[str, VellumSecret]] = None
+
+    model_config = {"arbitrary_types_allowed": True}
+
+
+class MCPToolDefinition(UniversalBaseModel):
+    name: str
+    server: MCPServer
+    description: Optional[str] = None
+    parameters: Dict[str, Any] = {}

vellum_ai-1.0.8/src/vellum/workflows/types/tests/test_definition.py

@@ -0,0 +1,124 @@
+import pytest
+from uuid import UUID
+
+from vellum.client.types.vellum_secret import VellumSecret
+from vellum.workflows.constants import AuthorizationType
+from vellum.workflows.references.environment_variable import EnvironmentVariableReference
+from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition, MCPServer, MCPToolDefinition
+
+
+@pytest.mark.parametrize(
+    "deployment_value, expected_deployment_id, expected_deployment_name",
+    [
+        # Valid UUID string
+        (
+            "57f09beb-b463-40e0-bf9e-c972e664352f",
+            UUID("57f09beb-b463-40e0-bf9e-c972e664352f"),
+            None,
+        ),
+        # Name string
+        (
+            "tool-calling-subworkflow",
+            None,
+            "tool-calling-subworkflow",
+        ),
+    ],
+    ids=[
+        "valid_uuid",
+        "valid_name",
+    ],
+)
+def test_deployment_definition(deployment_value, expected_deployment_id, expected_deployment_name):
+    """Test that DeploymentDefinition properties correctly identify and extract UUID vs name."""
+    deployment = DeploymentDefinition(deployment=deployment_value)
+
+    assert deployment.deployment_id == expected_deployment_id
+    assert deployment.deployment_name == expected_deployment_name
+
+
+def test_composio_tool_definition_creation():
+    """Test that ComposioToolDefinition can be created with required fields."""
+    composio_tool = ComposioToolDefinition(
+        toolkit="GITHUB", action="GITHUB_CREATE_AN_ISSUE", description="Create a new issue in a GitHub repository"
+    )
+
+    assert composio_tool.toolkit == "GITHUB"
+    assert composio_tool.action == "GITHUB_CREATE_AN_ISSUE"
+    assert composio_tool.description == "Create a new issue in a GitHub repository"
+    assert composio_tool.display_name is None
+    assert composio_tool.name == "github_create_an_issue"
+
+
+def test_mcp_tool_definition_creation_bearer_token():
+    """Test that MCPToolDefinition can be created with required fields."""
+    mcp_tool = MCPToolDefinition(
+        name="create_repository",
+        server=MCPServer(
+            name="github",
+            url="https://api.githubcopilot.com/mcp/",
+            authorization_type=AuthorizationType.BEARER_TOKEN,
+            bearer_token_value=EnvironmentVariableReference(name="GITHUB_PERSONAL_ACCESS_TOKEN"),
+        ),
+        parameters={
+            "type": "object",
+            "properties": {
+                "repository_name": {"type": "string", "description": "Repository name"},
+                "description": {"type": "string", "description": "Repository description"},
+            },
+            "required": ["repository_name"],
+        },
+    )
+
+    assert mcp_tool.name == "create_repository"
+    assert mcp_tool.server.name == "github"
+    assert mcp_tool.server.url == "https://api.githubcopilot.com/mcp/"
+    assert mcp_tool.server.authorization_type == AuthorizationType.BEARER_TOKEN
+    assert mcp_tool.parameters == {
+        "type": "object",
+        "properties": {
+            "repository_name": {"type": "string", "description": "Repository name"},
+            "description": {"type": "string", "description": "Repository description"},
+        },
+        "required": ["repository_name"],
+    }
+
+    assert isinstance(mcp_tool.server.bearer_token_value, EnvironmentVariableReference)
+    assert mcp_tool.server.bearer_token_value.name == "GITHUB_PERSONAL_ACCESS_TOKEN"
+
+
+def test_mcp_tool_definition_creation_api_key():
+    """Test that MCPToolDefinition can be created with required fields."""
+    mcp_tool = MCPToolDefinition(
+        name="create_repository",
+        server=MCPServer(
+            name="github",
+            url="https://api.githubcopilot.com/mcp/",
+            authorization_type=AuthorizationType.API_KEY,
+            api_key_header_key="Authorization",
+            api_key_header_value=VellumSecret(name="GITHUB_PERSONAL_ACCESS_TOKEN"),
+        ),
+        parameters={
+            "type": "object",
+            "properties": {
+                "repository_name": {"type": "string", "description": "Repository name"},
+                "description": {"type": "string", "description": "Repository description"},
+            },
+            "required": ["repository_name"],
+        },
+    )
+
+    assert mcp_tool.name == "create_repository"
+    assert mcp_tool.server.name == "github"
+    assert mcp_tool.server.url == "https://api.githubcopilot.com/mcp/"
+    assert mcp_tool.server.authorization_type == AuthorizationType.API_KEY
+    assert mcp_tool.server.api_key_header_key == "Authorization"
+    assert isinstance(mcp_tool.server.api_key_header_value, VellumSecret)
+    assert mcp_tool.server.api_key_header_value.name == "GITHUB_PERSONAL_ACCESS_TOKEN"
+    assert mcp_tool.parameters == {
+        "type": "object",
+        "properties": {
+            "repository_name": {"type": "string", "description": "Repository name"},
+            "description": {"type": "string", "description": "Repository description"},
+        },
+        "required": ["repository_name"],
+    }

vellum_ai-1.0.7/src/vellum/workflows/types/tests/test_definition.py

@@ -1,46 +0,0 @@
-import pytest
-from uuid import UUID
-
-from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition
-
-
-@pytest.mark.parametrize(
-    "deployment_value, expected_deployment_id, expected_deployment_name",
-    [
-        # Valid UUID string
-        (
-            "57f09beb-b463-40e0-bf9e-c972e664352f",
-            UUID("57f09beb-b463-40e0-bf9e-c972e664352f"),
-            None,
-        ),
-        # Name string
-        (
-            "tool-calling-subworkflow",
-            None,
-            "tool-calling-subworkflow",
-        ),
-    ],
-    ids=[
-        "valid_uuid",
-        "valid_name",
-    ],
-)
-def test_deployment_definition(deployment_value, expected_deployment_id, expected_deployment_name):
-    """Test that DeploymentDefinition properties correctly identify and extract UUID vs name."""
-    deployment = DeploymentDefinition(deployment=deployment_value)
-
-    assert deployment.deployment_id == expected_deployment_id
-    assert deployment.deployment_name == expected_deployment_name
-
-
-def test_composio_tool_definition_creation():
-    """Test that ComposioToolDefinition can be created with required fields."""
-    composio_tool = ComposioToolDefinition(
-        toolkit="GITHUB", action="GITHUB_CREATE_AN_ISSUE", description="Create a new issue in a GitHub repository"
-    )
-
-    assert composio_tool.toolkit == "GITHUB"
-    assert composio_tool.action == "GITHUB_CREATE_AN_ISSUE"
-    assert composio_tool.description == "Create a new issue in a GitHub repository"
-    assert composio_tool.display_name is None
-    assert composio_tool.name == "github_create_an_issue"