vellum-ai 1.5.4__py3-none-any.whl → 1.5.6__py3-none-any.whl

vellum/client/types/integration_name.py

@@ -0,0 +1,20 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+IntegrationName = typing.Union[
+    typing.Literal[
+        "SLACK",
+        "NOTION",
+        "GOOGLE",
+        "CALENDLY",
+        "HUBSPOT",
+        "LINEAR",
+        "GITHUB",
+        "GOOGLE_SHEETS",
+        "GOOGLE_CALENDAR",
+        "GOOGLE_DRIVE",
+        "GMAIL",
+    ],
+    typing.Any,
+]

vellum/client/types/integration_provider.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+IntegrationProvider = typing.Literal["COMPOSIO"]

vellum/client/types/integration_read.py

@@ -0,0 +1,30 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .components_schemas_composio_integration_exec_config import ComponentsSchemasComposioIntegrationExecConfig
+from .integration_name import IntegrationName
+from .integration_provider import IntegrationProvider
+
+
+class IntegrationRead(UniversalBaseModel):
+    id: str
+    label: typing.Optional[str] = None
+    icon_url: str
+    name: IntegrationName
+    provider: IntegrationProvider = "COMPOSIO"
+    exec_config: ComponentsSchemasComposioIntegrationExecConfig = pydantic.Field()
+    """
+    Integration provider specific information needed for filtering tools.
+    """
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/client/types/paginated_slim_integration_auth_config_read_list.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .slim_integration_auth_config_read import SlimIntegrationAuthConfigRead
+
+
+class PaginatedSlimIntegrationAuthConfigReadList(UniversalBaseModel):
+    count: typing.Optional[int] = None
+    next: typing.Optional[str] = None
+    previous: typing.Optional[str] = None
+    results: typing.Optional[typing.List[SlimIntegrationAuthConfigRead]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/client/types/paginated_slim_integration_read_list.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .slim_integration_read import SlimIntegrationRead
+
+
+class PaginatedSlimIntegrationReadList(UniversalBaseModel):
+    count: typing.Optional[int] = None
+    next: typing.Optional[str] = None
+    previous: typing.Optional[str] = None
+    results: typing.Optional[typing.List[SlimIntegrationRead]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/client/types/paginated_slim_tool_definition_list.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .components_schemas_slim_composio_tool_definition import ComponentsSchemasSlimComposioToolDefinition
+
+
+class PaginatedSlimToolDefinitionList(UniversalBaseModel):
+    count: typing.Optional[int] = None
+    next: typing.Optional[str] = None
+    previous: typing.Optional[str] = None
+    results: typing.Optional[typing.List[ComponentsSchemasSlimComposioToolDefinition]] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/client/types/slim_composio_tool_definition.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .tool_definition_integration import ToolDefinitionIntegration
+
+
+class SlimComposioToolDefinition(UniversalBaseModel):
+    provider: typing.Literal["COMPOSIO"] = "COMPOSIO"
+    integration: ToolDefinitionIntegration
+    name: str
+    description: str
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/client/types/slim_integration_auth_config_read.py

@@ -0,0 +1,29 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .integration_auth_config_integration import IntegrationAuthConfigIntegration
+from .integration_auth_config_integration_credential import IntegrationAuthConfigIntegrationCredential
+from .integration_credential_access_type import IntegrationCredentialAccessType
+
+
+class SlimIntegrationAuthConfigRead(UniversalBaseModel):
+    """
+    A slim representation of an Integration Auth Config.
+    """
+
+    id: str
+    integration: IntegrationAuthConfigIntegration
+    integration_credentials: typing.Optional[typing.List[IntegrationAuthConfigIntegrationCredential]] = None
+    default_access_type: typing.Optional[IntegrationCredentialAccessType] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/client/types/slim_integration_read.py

@@ -0,0 +1,25 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .integration_name import IntegrationName
+from .integration_provider import IntegrationProvider
+
+
+class SlimIntegrationRead(UniversalBaseModel):
+    id: str
+    label: typing.Optional[str] = None
+    icon_url: str
+    name: IntegrationName
+    provider: IntegrationProvider = "COMPOSIO"
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/client/types/tool_definition_integration.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .integration_name import IntegrationName
+from .integration_provider import IntegrationProvider
+
+
+class ToolDefinitionIntegration(UniversalBaseModel):
+    id: str
+    provider: IntegrationProvider = "COMPOSIO"
+    name: IntegrationName
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum/resources/integration_auth_configs/__init__.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.integration_auth_configs import *

vellum/resources/integration_auth_configs/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.integration_auth_configs.client import *

vellum/resources/integration_auth_configs/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.integration_auth_configs.raw_client import *

vellum/resources/integration_providers/__init__.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.integration_providers import *

vellum/resources/integration_providers/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.integration_providers.client import *

vellum/resources/integration_providers/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.integration_providers.raw_client import *

vellum/types/components_schemas_composio_integration_exec_config.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.components_schemas_composio_integration_exec_config import *

vellum/types/components_schemas_slim_composio_tool_definition.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.components_schemas_slim_composio_tool_definition import *

vellum/types/composio_integration_exec_config.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.composio_integration_exec_config import *

vellum/types/integration_auth_config_integration.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.integration_auth_config_integration import *

vellum/types/integration_auth_config_integration_credential.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.integration_auth_config_integration_credential import *

vellum/types/integration_credential_access_type.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.integration_credential_access_type import *

vellum/types/integration_name.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.integration_name import *

vellum/types/integration_provider.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.integration_provider import *

vellum/types/integration_read.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.integration_read import *

vellum/types/paginated_slim_integration_auth_config_read_list.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.paginated_slim_integration_auth_config_read_list import *

vellum/types/paginated_slim_integration_read_list.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.paginated_slim_integration_read_list import *

vellum/types/paginated_slim_tool_definition_list.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.paginated_slim_tool_definition_list import *

vellum/types/slim_composio_tool_definition.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.slim_composio_tool_definition import *

vellum/types/slim_integration_auth_config_read.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.slim_integration_auth_config_read import *

vellum/types/slim_integration_read.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.slim_integration_read import *

vellum/types/tool_definition_integration.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.tool_definition_integration import *

vellum/workflows/integrations/tests/test_vellum_integration_service.py

@@ -1,6 +1,9 @@
 import pytest
 from unittest import mock
+from uuid import uuid4
 
+from vellum import ToolDefinitionIntegration
+from vellum.client.types.components_schemas_composio_tool_definition import ComponentsSchemasComposioToolDefinition
 from vellum.workflows.constants import VellumIntegrationProviderType
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.integrations.vellum_integration_service import VellumIntegrationService
@@ -10,23 +13,27 @@ from vellum.workflows.types.definition import VellumIntegrationToolDetails
 def test_vellum_integration_service_get_tool_definition_success(vellum_client):
     """Test that tool definitions are successfully retrieved from Vellum API"""
     mock_client = vellum_client
-    mock_client.integrations = mock.MagicMock()
-
-    mock_response = mock.MagicMock()
-    mock_response.name = "GITHUB_CREATE_AN_ISSUE"
-    mock_response.description = "Create a new issue in a GitHub repository"
-    mock_response.parameters = {
-        "type": "object",
-        "properties": {
-            "repo": {"type": "string", "description": "Repository name"},
-            "title": {"type": "string", "description": "Issue title"},
-            "body": {"type": "string", "description": "Issue body"},
+    tool_definition_response = ComponentsSchemasComposioToolDefinition(
+        integration=ToolDefinitionIntegration(
+            id=str(uuid4()),
+            provider="COMPOSIO",
+            name="GITHUB",
+        ),
+        name="GITHUB_CREATE_AN_ISSUE",
+        description="Create a new issue in a GitHub repository",
+        input_parameters={
+            "type": "object",
+            "properties": {
+                "repo": {"type": "string", "description": "Repository name"},
+                "title": {"type": "string", "description": "Issue title"},
+                "body": {"type": "string", "description": "Issue body"},
+            },
+            "required": ["repo", "title"],
         },
-        "required": ["repo", "title"],
-    }
-    mock_response.provider = "COMPOSIO"
+        output_parameters={},
+    )
 
-    mock_client.integrations.retrieve_integration_tool_definition.return_value = mock_response
+    mock_client.integrations.retrieve_integration_tool_definition.return_value = tool_definition_response
 
     # WHEN we request a tool definition
     service = VellumIntegrationService(client=mock_client)
@@ -50,8 +57,8 @@ def test_vellum_integration_service_get_tool_definition_success(vellum_client):
 
     # AND the API should have been called with the correct parameters
     mock_client.integrations.retrieve_integration_tool_definition.assert_called_once_with(
-        integration="GITHUB",
-        provider="COMPOSIO",
+        integration_name="GITHUB",
+        integration_provider="COMPOSIO",
         tool_name="GITHUB_CREATE_AN_ISSUE",
     )
 
@@ -111,8 +118,8 @@ def test_vellum_integration_service_execute_tool_success(vellum_client):
 
     # AND the API should have been called with correct parameters
     mock_client.integrations.execute_integration_tool.assert_called_once_with(
-        integration="GITHUB",
-        provider="COMPOSIO",
+        integration_name="GITHUB",
+        integration_provider="COMPOSIO",
         tool_name="GITHUB_CREATE_AN_ISSUE",
         arguments={
             "repo": "user/repo",

vellum/workflows/integrations/vellum_integration_service.py

@@ -40,8 +40,8 @@ class VellumIntegrationService:
         """
         try:
             response = self._client.integrations.retrieve_integration_tool_definition(
-                integration=integration,
-                provider=provider,
+                integration_name=integration,
+                integration_provider=provider,
                 tool_name=tool_name,
             )
 
@@ -50,7 +50,7 @@ class VellumIntegrationService:
                 integration=integration,
                 name=response.name,
                 description=response.description,
-                parameters=response.parameters,
+                parameters=response.input_parameters,
             )
         except Exception as e:
             error_message = f"Failed to retrieve tool definition for {tool_name}: {str(e)}"
@@ -82,8 +82,8 @@ class VellumIntegrationService:
         """
         try:
             response = self._client.integrations.execute_integration_tool(
-                integration=integration,
-                provider=provider,
+                integration_name=integration,
+                integration_provider=provider,
                 tool_name=tool_name,
                 arguments=arguments,
             )

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

@@ -1,6 +1,6 @@
 from typing import Any, ClassVar, Dict, Generic, Iterator, List, Optional, Set, Union
 
-from vellum import ChatMessage, PromptBlock
+from vellum import ChatMessage, PromptBlock, PromptOutput
 from vellum.client.types.prompt_parameters import PromptParameters
 from vellum.client.types.prompt_settings import PromptSettings
 from vellum.prompts.constants import DEFAULT_PROMPT_PARAMETERS
@@ -82,6 +82,7 @@ class ToolCallingNode(BaseNode[StateType], Generic[StateType]):
                 class Outputs(BaseWorkflow.Outputs):
                     text: str = self.tool_prompt_node.Outputs.text
                     chat_history: List[ChatMessage] = ToolCallingState.chat_history
+                    results: List[PromptOutput] = self.tool_prompt_node.Outputs.results
 
             subworkflow = ToolCallingWorkflow(
                 parent_state=self.state,
@@ -97,9 +98,6 @@ class ToolCallingNode(BaseNode[StateType], Generic[StateType]):
         exception: Optional[NodeException] = None
         fulfilled_output_names: Set[str] = set()
 
-        # Yield initiated event for chat_history
-        yield BaseOutput(name="chat_history")
-
         for event in subworkflow_stream:
             self._context._emit_subworkflow_event(event)
 

vellum/workflows/types/definition.py

@@ -166,7 +166,7 @@ class ComposioToolDefinition(UniversalBaseModel):
 
 
 class VellumIntegrationToolDefinition(UniversalBaseModel):
-    type: Literal["INTEGRATION"] = "INTEGRATION"
+    type: Literal["VELLUM_INTEGRATION"] = "VELLUM_INTEGRATION"
 
     # Core identification
     provider: VellumIntegrationProviderType

vellum/workflows/types/tests/test_definition.py

@@ -1,9 +1,15 @@
 import pytest
 from uuid import UUID
 
-from vellum.workflows.constants import AuthorizationType
+from vellum.workflows.constants import AuthorizationType, VellumIntegrationProviderType
 from vellum.workflows.references.environment_variable import EnvironmentVariableReference
-from vellum.workflows.types.definition import ComposioToolDefinition, DeploymentDefinition, MCPServer, MCPToolDefinition
+from vellum.workflows.types.definition import (
+    ComposioToolDefinition,
+    DeploymentDefinition,
+    MCPServer,
+    MCPToolDefinition,
+    VellumIntegrationToolDefinition,
+)
 
 
 @pytest.mark.parametrize(
@@ -143,3 +149,35 @@ def test_mcp_tool_definition_creation_no_authorization():
     assert mcp_tool.server.bearer_token_value is None
     assert mcp_tool.server.api_key_header_key is None
     assert mcp_tool.server.api_key_header_value is None
+
+
+def test_vellum_integration_tool_definition_creation():
+    """Test that VellumIntegrationToolDefinition can be created with required fields."""
+    vellum_tool = VellumIntegrationToolDefinition(
+        provider=VellumIntegrationProviderType.COMPOSIO,
+        integration="GITHUB",
+        name="create_issue",
+        description="Create a new issue in a GitHub repository",
+    )
+
+    assert vellum_tool.type == "VELLUM_INTEGRATION"
+    assert vellum_tool.provider == VellumIntegrationProviderType.COMPOSIO
+    assert vellum_tool.integration == "GITHUB"
+    assert vellum_tool.name == "create_issue"
+    assert vellum_tool.description == "Create a new issue in a GitHub repository"
+
+
+def test_vellum_integration_tool_definition_with_different_provider():
+    """Test VellumIntegrationToolDefinition with a different provider."""
+    vellum_tool = VellumIntegrationToolDefinition(
+        provider=VellumIntegrationProviderType.COMPOSIO,
+        integration="SLACK",
+        name="send_message",
+        description="Send a message to a Slack channel",
+    )
+
+    assert vellum_tool.type == "VELLUM_INTEGRATION"
+    assert vellum_tool.provider == VellumIntegrationProviderType.COMPOSIO
+    assert vellum_tool.integration == "SLACK"
+    assert vellum_tool.name == "send_message"
+    assert vellum_tool.description == "Send a message to a Slack channel"

{vellum_ai-1.5.4.dist-info → vellum_ai-1.5.6.dist-info}/METADATA

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