vellum-ai 1.0.11__py3-none-any.whl → 1.1.1__py3-none-any.whl

vellum/client/types/workflow_execution_rejected_event.py

@@ -2,6 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 from .api_request_parent_context import ApiRequestParentContext
+from .external_parent_context import ExternalParentContext
 from .node_parent_context import NodeParentContext
 from .prompt_deployment_parent_context import PromptDeploymentParentContext
 from .span_link import SpanLink

vellum/client/types/workflow_execution_resumed_event.py

@@ -2,6 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 from .api_request_parent_context import ApiRequestParentContext
+from .external_parent_context import ExternalParentContext
 from .node_parent_context import NodeParentContext
 from .prompt_deployment_parent_context import PromptDeploymentParentContext
 from .span_link import SpanLink

vellum/client/types/workflow_execution_snapshotted_event.py

@@ -2,6 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 from .api_request_parent_context import ApiRequestParentContext
+from .external_parent_context import ExternalParentContext
 from .node_parent_context import NodeParentContext
 from .prompt_deployment_parent_context import PromptDeploymentParentContext
 from .span_link import SpanLink

vellum/client/types/workflow_execution_span.py

@@ -2,6 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 from .api_request_parent_context import ApiRequestParentContext
+from .external_parent_context import ExternalParentContext
 from .node_parent_context import NodeParentContext
 from .prompt_deployment_parent_context import PromptDeploymentParentContext
 from .span_link import SpanLink

vellum/client/types/workflow_execution_span_attributes.py

@@ -8,6 +8,7 @@ import pydantic
 
 class WorkflowExecutionSpanAttributes(UniversalBaseModel):
     label: str
+    workflow_id: str
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

vellum/client/types/workflow_execution_streaming_event.py

@@ -2,6 +2,7 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 from .api_request_parent_context import ApiRequestParentContext
+from .external_parent_context import ExternalParentContext
 from .node_parent_context import NodeParentContext
 from .prompt_deployment_parent_context import PromptDeploymentParentContext
 from .span_link import SpanLink

vellum/client/types/workflow_parent_context.py

@@ -27,6 +27,7 @@ class WorkflowParentContext(UniversalBaseModel):
 
 
 from .api_request_parent_context import ApiRequestParentContext  # noqa: E402
+from .external_parent_context import ExternalParentContext  # noqa: E402
 from .node_parent_context import NodeParentContext  # noqa: E402
 from .prompt_deployment_parent_context import PromptDeploymentParentContext  # noqa: E402
 from .span_link import SpanLink  # noqa: E402

vellum/client/types/workflow_sandbox_parent_context.py

@@ -28,6 +28,7 @@ class WorkflowSandboxParentContext(UniversalBaseModel):
 
 
 from .api_request_parent_context import ApiRequestParentContext  # noqa: E402
+from .external_parent_context import ExternalParentContext  # noqa: E402
 from .node_parent_context import NodeParentContext  # noqa: E402
 from .prompt_deployment_parent_context import PromptDeploymentParentContext  # noqa: E402
 from .span_link import SpanLink  # noqa: E402

vellum/{resources/release_reviews/__init__.py → core/http_response.py}

@@ -1,3 +1,3 @@
 # WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
 
-from vellum.client.resources.release_reviews import *
+from vellum.client.core.http_response import *

vellum/{resources/release_reviews/client.py → raw_client.py}

@@ -1,3 +1,3 @@
 # WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
 
-from vellum.client.resources.release_reviews.client import *
+from vellum.client.raw_client import *

vellum/resources/ad_hoc/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.ad_hoc.raw_client import *

vellum/resources/container_images/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.container_images.raw_client import *

vellum/resources/deployments/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.deployments.raw_client import *

vellum/resources/document_indexes/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.document_indexes.raw_client import *

vellum/resources/documents/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.documents.raw_client import *

vellum/resources/folder_entities/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.folder_entities.raw_client import *

vellum/resources/metric_definitions/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.metric_definitions.raw_client import *

vellum/resources/ml_models/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.ml_models.raw_client import *

vellum/resources/organizations/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.organizations.raw_client import *

vellum/resources/prompts/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.prompts.raw_client import *

vellum/resources/sandboxes/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.sandboxes.raw_client import *

vellum/resources/test_suite_runs/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.test_suite_runs.raw_client import *

vellum/resources/test_suites/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.test_suites.raw_client import *

vellum/resources/workflow_deployments/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.workflow_deployments.raw_client import *

vellum/resources/workflow_executions/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.workflow_executions.raw_client import *

vellum/resources/workflow_sandboxes/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.workflow_sandboxes.raw_client import *

vellum/resources/workflows/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.workflows.raw_client import *

vellum/resources/workspace_secrets/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.workspace_secrets.raw_client import *

vellum/resources/workspaces/raw_client.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.resources.workspaces.raw_client import *

vellum/types/external_parent_context.py

@@ -0,0 +1,3 @@
+# WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
+
+from vellum.client.types.external_parent_context import *

vellum/workflows/emitters/vellum_emitter.py

@@ -41,7 +41,7 @@ class VellumEmitter(BaseWorkflowEmitter):
         super().__init__()
         self._timeout = timeout
         self._max_retries = max_retries
-        self._events_endpoint = "events"  # TODO: make this configurable with the correct url
+        self._events_endpoint = "v1/events"  # TODO: make this configurable with the correct url
 
     def emit_event(self, event: WorkflowEvent) -> None:
         """
@@ -90,7 +90,8 @@ class VellumEmitter(BaseWorkflowEmitter):
                 base_url = client._client_wrapper.get_environment().default
                 response = client._client_wrapper.httpx_client.request(
                     method="POST",
-                    path=f"{base_url}/{self._events_endpoint}",  # TODO: will be replaced with the correct url
+                    base_url=base_url,
+                    path=self._events_endpoint,  # TODO: will be replaced with the correct url
                     json=event_data,
                     headers=client._client_wrapper.get_headers(),
                     request_options={"timeout_in_seconds": self._timeout},

vellum/workflows/events/types.py

@@ -80,6 +80,11 @@ class UnknownParentContext(BaseParentContext):
     type: Literal["UNKNOWN"] = "UNKNOWN"
 
 
+# Setting external parent context for external workflows
+class ExternalParentContext(BaseParentContext):
+    type: Literal["EXTERNAL"] = "EXTERNAL"
+
+
 def _cast_parent_context_discriminator(v: Any) -> Any:
     if v in PARENT_CONTEXT_TYPES:
         return v
@@ -138,6 +143,7 @@ ParentContext = Annotated[
         PromptDeploymentParentContext,
         WorkflowSandboxParentContext,
         APIRequestParentContext,
+        ExternalParentContext,
         UnknownParentContext,
     ],
     ParentContextDiscriminator(),

vellum/workflows/nodes/displayable/tests/test_text_prompt_deployment_node.py

@@ -1,4 +1,3 @@
-from unittest import mock
 from uuid import uuid4
 from typing import Any, Iterator, List
 
@@ -64,17 +63,8 @@ def test_text_prompt_deployment_node__basic(vellum_client):
     assert text_output.value == "Hello, world!"
 
     # AND we should have made the expected call to stream the prompt execution
-    vellum_client.execute_prompt_stream.assert_called_once_with(
-        expand_meta=None,
-        expand_raw=None,
-        external_id=None,
-        inputs=[],
-        metadata=None,
-        prompt_deployment_id=None,
-        prompt_deployment_name="my-deployment",
-        raw_overrides=None,
-        release_tag="LATEST",
-        request_options={
-            "additional_body_parameters": {"execution_context": {"parent_context": None, "trace_id": mock.ANY}}
-        },
-    )
+    vellum_client.execute_prompt_stream.assert_called_once()
+    _, call_kwargs = vellum_client.execute_prompt_stream.call_args
+    exec_ctx = call_kwargs["request_options"]["additional_body_parameters"]["execution_context"]
+    assert exec_ctx["parent_context"] is not None
+    assert exec_ctx["parent_context"]["type"] == "EXTERNAL"

vellum/workflows/nodes/displayable/tool_calling_node/node.py

@@ -15,6 +15,7 @@ from vellum.workflows.nodes.displayable.tool_calling_node.utils import (
     create_else_node,
     create_function_node,
     create_mcp_tool_node,
+    create_router_node,
     create_tool_router_node,
     get_function_name,
     get_mcp_tool_name,
@@ -145,6 +146,11 @@ class ToolCallingNode(BaseNode[StateType], Generic[StateType]):
             max_prompt_iterations=self.max_prompt_iterations,
         )
 
+        self.router_node = create_router_node(
+            functions=self.functions,
+            tool_router_node=self.tool_router_node,
+        )
+
         self._function_nodes = {}
         for function in self.functions:
             if isinstance(function, MCPServer):

vellum/workflows/nodes/displayable/tool_calling_node/utils.py

@@ -112,6 +112,18 @@ class ToolRouterNode(InlinePromptNode[ToolCallingState]):
             yield output
 
 
+class RouterNode(BaseNode[ToolCallingState]):
+    """Router node that handles routing to function nodes based on outputs."""
+
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ATTRIBUTES
+
+    def run(self) -> Iterator[BaseOutput]:
+        # Router node doesn't process outputs or create chat messages
+        # It just handles the routing logic via its ports
+        yield from []
+
+
 class DynamicSubworkflowDeploymentNode(SubworkflowDeploymentNode[ToolCallingState], FunctionCallNodeMixin):
     """Node that executes a deployment definition with function call output."""
 
@@ -423,6 +435,69 @@ def create_tool_router_node(
     return node
 
 
+def create_router_node(
+    functions: List[Tool],
+    tool_router_node: Type[ToolRouterNode],
+) -> Type[RouterNode]:
+    """Create a RouterNode with the same ports as ToolRouterNode."""
+
+    if functions and len(functions) > 0:
+        # Create dynamic ports and convert functions in a single loop
+        Ports = type("Ports", (), {})
+
+        def create_port_condition(fn_name):
+            return Port.on_if(
+                LazyReference(
+                    lambda: (
+                        ToolCallingState.current_prompt_output_index.less_than(
+                            tool_router_node.Outputs.results.length()
+                        )
+                        & tool_router_node.Outputs.results[ToolCallingState.current_prompt_output_index]["type"].equals(
+                            "FUNCTION_CALL"
+                        )
+                        & tool_router_node.Outputs.results[ToolCallingState.current_prompt_output_index]["value"][
+                            "name"
+                        ].equals(fn_name)
+                    )
+                )
+            )
+
+        for function in functions:
+            if isinstance(function, ComposioToolDefinition):
+                function_name = get_function_name(function)
+                port = create_port_condition(function_name)
+                setattr(Ports, function_name, port)
+            elif isinstance(function, MCPServer):
+                tool_functions: List[MCPToolDefinition] = hydrate_mcp_tool_definitions(function)
+                for tool_function in tool_functions:
+                    name = get_mcp_tool_name(tool_function)
+                    port = create_port_condition(name)
+                    setattr(Ports, name, port)
+            else:
+                function_name = get_function_name(function)
+                port = create_port_condition(function_name)
+                setattr(Ports, function_name, port)
+
+        # Add the else port for when no function conditions match
+        setattr(Ports, "default", Port.on_else())
+    else:
+        # If no functions exist, create a simple Ports class with just a default port
+        Ports = type("Ports", (), {"default": Port(default=True)})
+
+    node = cast(
+        Type[RouterNode],
+        type(
+            "RouterNode",
+            (RouterNode,),
+            {
+                "Ports": Ports,
+                "__module__": __name__,
+            },
+        ),
+    )
+    return node
+
+
 def create_function_node(
     function: ToolBase,
     tool_router_node: Type[ToolRouterNode],

vellum/workflows/state/context.py

@@ -1,9 +1,11 @@
 from functools import cached_property
 from queue import Queue
+from uuid import uuid4
 from typing import TYPE_CHECKING, Dict, List, Optional, Type
 
 from vellum import Vellum
 from vellum.workflows.context import ExecutionContext, get_execution_context
+from vellum.workflows.events.types import ExternalParentContext
 from vellum.workflows.nodes.mocks import MockNodeExecution, MockNodeExecutionArg
 from vellum.workflows.outputs.base import BaseOutputs
 from vellum.workflows.references.constant import ConstantValueReference
@@ -25,8 +27,17 @@ class WorkflowContext:
         self._event_queue: Optional[Queue["WorkflowEvent"]] = None
         self._node_output_mocks_map: Dict[Type[BaseOutputs], List[MockNodeExecution]] = {}
         self._execution_context = get_execution_context()
-        if not self._execution_context.parent_context and execution_context:
-            self._execution_context = execution_context
+
+        if execution_context is not None:
+
+            self._execution_context.trace_id = execution_context.trace_id
+
+            if execution_context.parent_context is not None:
+                self._execution_context.parent_context = execution_context.parent_context
+
+        if self._execution_context.parent_context is None:
+            self._execution_context.parent_context = ExternalParentContext(span_id=uuid4())
+
         self._generated_files = generated_files
 
     @cached_property

vellum/workflows/types/definition.py

@@ -8,7 +8,6 @@ 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
 
@@ -120,12 +119,13 @@ class ComposioToolDefinition(UniversalBaseModel):
 
 
 class MCPServer(UniversalBaseModel):
+    type: Literal["MCP_SERVER"] = "MCP_SERVER"
     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
+    api_key_header_value: Optional[Union[str, EnvironmentVariableReference]] = None
 
     model_config = {"arbitrary_types_allowed": True}
 

vellum/workflows/types/tests/test_definition.py

@@ -1,7 +1,6 @@
 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
@@ -98,7 +97,7 @@ def test_mcp_tool_definition_creation_api_key():
             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"),
+            api_key_header_value=EnvironmentVariableReference(name="GITHUB_PERSONAL_ACCESS_TOKEN"),
         ),
         parameters={
             "type": "object",
@@ -115,7 +114,7 @@ def test_mcp_tool_definition_creation_api_key():
     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 isinstance(mcp_tool.server.api_key_header_value, EnvironmentVariableReference)
     assert mcp_tool.server.api_key_header_value.name == "GITHUB_PERSONAL_ACCESS_TOKEN"
     assert mcp_tool.parameters == {
         "type": "object",

vellum/workflows/utils/functions.py

@@ -221,7 +221,7 @@ def compile_workflow_deployment_function_definition(
     deployment = deployment_config["deployment"]
     release_tag = deployment_config["release_tag"]
 
-    workflow_deployment_release = vellum_client.release_reviews.retrieve_workflow_deployment_release(
+    workflow_deployment_release = vellum_client.workflow_deployments.retrieve_workflow_deployment_release(
         deployment, release_tag
     )
 

vellum/workflows/utils/tests/test_functions.py

@@ -448,7 +448,7 @@ def test_compile_workflow_deployment_function_definition__just_name():
     mock_release = Mock()
     mock_release.workflow_version.input_variables = []
     mock_release.description = "This is a test deployment"
-    mock_client.release_reviews.retrieve_workflow_deployment_release.return_value = mock_release
+    mock_client.workflow_deployments.retrieve_workflow_deployment_release.return_value = mock_release
 
     deployment_config = {"deployment": "my_deployment", "release_tag": "latest"}
 
@@ -494,7 +494,7 @@ def test_compile_workflow_deployment_function_definition__all_args():
 
     mock_release.workflow_version.input_variables = mock_inputs
     mock_release.description = "This is a test deployment"
-    mock_client.release_reviews.retrieve_workflow_deployment_release.return_value = mock_release
+    mock_client.workflow_deployments.retrieve_workflow_deployment_release.return_value = mock_release
 
     deployment_config = {"deployment": "my_deployment", "release_tag": "latest"}
 
@@ -562,7 +562,7 @@ def test_compile_workflow_deployment_function_definition__defaults():
 
     mock_release.workflow_version.input_variables = mock_inputs
     mock_release.description = "This is a test deployment"
-    mock_client.release_reviews.retrieve_workflow_deployment_release.return_value = mock_release
+    mock_client.workflow_deployments.retrieve_workflow_deployment_release.return_value = mock_release
 
     deployment_config = {"deployment": "my_deployment", "release_tag": "latest"}
 

{vellum_ai-1.0.11.dist-info → vellum_ai-1.1.1.dist-info}/METADATA

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