vellum-ai 0.14.39__py3-none-any.whl → 0.14.41__py3-none-any.whl

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.39",
+            "X-Fern-SDK-Version": "0.14.41",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

vellum/client/reference.md

@@ -1206,6 +1206,143 @@ client.submit_workflow_execution_actuals(
 </details>
 
 ## AdHoc
+<details><summary><code>client.ad_hoc.<a href="src/vellum/resources/ad_hoc/client.py">adhoc_execute_prompt</a>(...)</code></summary>
+<dl>
+<dd>
+
+#### 🔌 Usage
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+```python
+from vellum import (
+    JinjaPromptBlock,
+    PromptParameters,
+    PromptRequestStringInput,
+    Vellum,
+    VellumVariable,
+)
+
+client = Vellum(
+    api_key="YOUR_API_KEY",
+)
+client.ad_hoc.adhoc_execute_prompt(
+    ml_model="ml_model",
+    input_values=[
+        PromptRequestStringInput(
+            key="key",
+            value="value",
+        )
+    ],
+    input_variables=[
+        VellumVariable(
+            id="id",
+            key="key",
+            type="STRING",
+        )
+    ],
+    parameters=PromptParameters(),
+    blocks=[
+        JinjaPromptBlock(
+            template="template",
+        )
+    ],
+)
+
+```
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### ⚙️ Parameters
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+**ml_model:** `str` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**input_values:** `typing.Sequence[PromptRequestInput]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**input_variables:** `typing.Sequence[VellumVariable]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**parameters:** `PromptParameters` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**blocks:** `typing.Sequence[PromptBlock]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**settings:** `typing.Optional[PromptSettings]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**functions:** `typing.Optional[typing.Sequence[FunctionDefinition]]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**expand_meta:** `typing.Optional[AdHocExpandMeta]` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.
+    
+</dd>
+</dl>
+</dd>
+</dl>
+
+
+</dd>
+</dl>
+</details>
+
 <details><summary><code>client.ad_hoc.<a href="src/vellum/resources/ad_hoc/client.py">adhoc_execute_prompt_stream</a>(...)</code></summary>
 <dl>
 <dd>
@@ -2110,7 +2247,7 @@ client.deployments.update_deployment_release_tag(
 <dl>
 <dd>
 
-**history_item_id:** `typing.Optional[str]` — The ID of the Deployment History Item to tag
+**history_item_id:** `typing.Optional[str]` — The ID of the Release to tag
     
 </dd>
 </dl>

vellum/client/resources/ad_hoc/client.py

@@ -13,12 +13,12 @@ from ...core.request_options import RequestOptions
 from ...types.ad_hoc_execute_prompt_event import AdHocExecutePromptEvent
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.pydantic_utilities import parse_obj_as
-import json
 from ...errors.bad_request_error import BadRequestError
 from ...errors.forbidden_error import ForbiddenError
 from ...errors.internal_server_error import InternalServerError
 from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError
+import json
 from ...core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
@@ -29,6 +29,157 @@ class AdHocClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def adhoc_execute_prompt(
+        self,
+        *,
+        ml_model: str,
+        input_values: typing.Sequence[PromptRequestInput],
+        input_variables: typing.Sequence[VellumVariable],
+        parameters: PromptParameters,
+        blocks: typing.Sequence[PromptBlock],
+        settings: typing.Optional[PromptSettings] = OMIT,
+        functions: typing.Optional[typing.Sequence[FunctionDefinition]] = OMIT,
+        expand_meta: typing.Optional[AdHocExpandMeta] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AdHocExecutePromptEvent:
+        """
+        Parameters
+        ----------
+        ml_model : str
+
+        input_values : typing.Sequence[PromptRequestInput]
+
+        input_variables : typing.Sequence[VellumVariable]
+
+        parameters : PromptParameters
+
+        blocks : typing.Sequence[PromptBlock]
+
+        settings : typing.Optional[PromptSettings]
+
+        functions : typing.Optional[typing.Sequence[FunctionDefinition]]
+
+        expand_meta : typing.Optional[AdHocExpandMeta]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AdHocExecutePromptEvent
+
+
+        Examples
+        --------
+        from vellum import (
+            JinjaPromptBlock,
+            PromptParameters,
+            PromptRequestStringInput,
+            Vellum,
+            VellumVariable,
+        )
+
+        client = Vellum(
+            api_key="YOUR_API_KEY",
+        )
+        client.ad_hoc.adhoc_execute_prompt(
+            ml_model="ml_model",
+            input_values=[
+                PromptRequestStringInput(
+                    key="key",
+                    value="value",
+                )
+            ],
+            input_variables=[
+                VellumVariable(
+                    id="id",
+                    key="key",
+                    type="STRING",
+                )
+            ],
+            parameters=PromptParameters(),
+            blocks=[
+                JinjaPromptBlock(
+                    template="template",
+                )
+            ],
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v1/ad-hoc/execute-prompt",
+            base_url=self._client_wrapper.get_environment().default,
+            method="POST",
+            json={
+                "ml_model": ml_model,
+                "input_values": convert_and_respect_annotation_metadata(
+                    object_=input_values, annotation=typing.Sequence[PromptRequestInput], direction="write"
+                ),
+                "input_variables": convert_and_respect_annotation_metadata(
+                    object_=input_variables, annotation=typing.Sequence[VellumVariable], direction="write"
+                ),
+                "parameters": convert_and_respect_annotation_metadata(
+                    object_=parameters, annotation=PromptParameters, direction="write"
+                ),
+                "settings": convert_and_respect_annotation_metadata(
+                    object_=settings, annotation=PromptSettings, direction="write"
+                ),
+                "blocks": convert_and_respect_annotation_metadata(
+                    object_=blocks, annotation=typing.Sequence[PromptBlock], direction="write"
+                ),
+                "functions": convert_and_respect_annotation_metadata(
+                    object_=functions, annotation=typing.Sequence[FunctionDefinition], direction="write"
+                ),
+                "expand_meta": convert_and_respect_annotation_metadata(
+                    object_=expand_meta, annotation=AdHocExpandMeta, direction="write"
+                ),
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    AdHocExecutePromptEvent,
+                    parse_obj_as(
+                        type_=AdHocExecutePromptEvent,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 400:
+                raise BadRequestError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 403:
+                raise ForbiddenError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 500:
+                raise InternalServerError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
     def adhoc_execute_prompt_stream(
         self,
         *,
@@ -195,6 +346,165 @@ class AsyncAdHocClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def adhoc_execute_prompt(
+        self,
+        *,
+        ml_model: str,
+        input_values: typing.Sequence[PromptRequestInput],
+        input_variables: typing.Sequence[VellumVariable],
+        parameters: PromptParameters,
+        blocks: typing.Sequence[PromptBlock],
+        settings: typing.Optional[PromptSettings] = OMIT,
+        functions: typing.Optional[typing.Sequence[FunctionDefinition]] = OMIT,
+        expand_meta: typing.Optional[AdHocExpandMeta] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AdHocExecutePromptEvent:
+        """
+        Parameters
+        ----------
+        ml_model : str
+
+        input_values : typing.Sequence[PromptRequestInput]
+
+        input_variables : typing.Sequence[VellumVariable]
+
+        parameters : PromptParameters
+
+        blocks : typing.Sequence[PromptBlock]
+
+        settings : typing.Optional[PromptSettings]
+
+        functions : typing.Optional[typing.Sequence[FunctionDefinition]]
+
+        expand_meta : typing.Optional[AdHocExpandMeta]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AdHocExecutePromptEvent
+
+
+        Examples
+        --------
+        import asyncio
+
+        from vellum import (
+            AsyncVellum,
+            JinjaPromptBlock,
+            PromptParameters,
+            PromptRequestStringInput,
+            VellumVariable,
+        )
+
+        client = AsyncVellum(
+            api_key="YOUR_API_KEY",
+        )
+
+
+        async def main() -> None:
+            await client.ad_hoc.adhoc_execute_prompt(
+                ml_model="ml_model",
+                input_values=[
+                    PromptRequestStringInput(
+                        key="key",
+                        value="value",
+                    )
+                ],
+                input_variables=[
+                    VellumVariable(
+                        id="id",
+                        key="key",
+                        type="STRING",
+                    )
+                ],
+                parameters=PromptParameters(),
+                blocks=[
+                    JinjaPromptBlock(
+                        template="template",
+                    )
+                ],
+            )
+
+
+        asyncio.run(main())
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v1/ad-hoc/execute-prompt",
+            base_url=self._client_wrapper.get_environment().default,
+            method="POST",
+            json={
+                "ml_model": ml_model,
+                "input_values": convert_and_respect_annotation_metadata(
+                    object_=input_values, annotation=typing.Sequence[PromptRequestInput], direction="write"
+                ),
+                "input_variables": convert_and_respect_annotation_metadata(
+                    object_=input_variables, annotation=typing.Sequence[VellumVariable], direction="write"
+                ),
+                "parameters": convert_and_respect_annotation_metadata(
+                    object_=parameters, annotation=PromptParameters, direction="write"
+                ),
+                "settings": convert_and_respect_annotation_metadata(
+                    object_=settings, annotation=PromptSettings, direction="write"
+                ),
+                "blocks": convert_and_respect_annotation_metadata(
+                    object_=blocks, annotation=typing.Sequence[PromptBlock], direction="write"
+                ),
+                "functions": convert_and_respect_annotation_metadata(
+                    object_=functions, annotation=typing.Sequence[FunctionDefinition], direction="write"
+                ),
+                "expand_meta": convert_and_respect_annotation_metadata(
+                    object_=expand_meta, annotation=AdHocExpandMeta, direction="write"
+                ),
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    AdHocExecutePromptEvent,
+                    parse_obj_as(
+                        type_=AdHocExecutePromptEvent,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 400:
+                raise BadRequestError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 403:
+                raise ForbiddenError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            if _response.status_code == 500:
+                raise InternalServerError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
     async def adhoc_execute_prompt_stream(
         self,
         *,

vellum/client/resources/deployments/client.py

@@ -351,7 +351,7 @@ class DeploymentsClient:
             The name of the Release Tag associated with this Deployment that you'd like to update.
 
         history_item_id : typing.Optional[str]
-            The ID of the Deployment History Item to tag
+            The ID of the Release to tag
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -895,7 +895,7 @@ class AsyncDeploymentsClient:
             The name of the Release Tag associated with this Deployment that you'd like to update.
 
         history_item_id : typing.Optional[str]
-            The ID of the Deployment History Item to tag
+            The ID of the Release to tag
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.

vellum/workflows/nodes/bases/tests/test_base_node.py

@@ -4,11 +4,13 @@ from typing import Optional
 
 from vellum.client.types.string_vellum_value_request import StringVellumValueRequest
 from vellum.core.pydantic_utilities import UniversalBaseModel
+from vellum.workflows.constants import undefined
 from vellum.workflows.descriptors.tests.test_utils import FixtureState
 from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.nodes import FinalOutputNode
 from vellum.workflows.nodes.bases.base import BaseNode
 from vellum.workflows.outputs.base import BaseOutputs
+from vellum.workflows.references.output import OutputReference
 from vellum.workflows.state.base import BaseState, StateMeta
 
 
@@ -259,3 +261,25 @@ def test_resolve_value__for_falsy_values(falsy_value, expected_type):
 
     # THEN the output has the correct value
     assert falsy_output.value == falsy_value
+
+
+def test_node_outputs__inherits_instance():
+    # GIVEN a node with two outputs, one with and one without a default instance
+    class MyNode(BaseNode):
+        class Outputs:
+            foo: str
+            bar = "hello"
+
+    # AND a node that inherits from MyNode
+    class InheritedNode(MyNode):
+        pass
+
+    # WHEN we reference each output
+    foo_output = InheritedNode.Outputs.foo
+    bar_output = InheritedNode.Outputs.bar
+
+    # THEN the output reference instances are correct
+    assert isinstance(foo_output, OutputReference)
+    assert foo_output.instance is undefined
+    assert isinstance(bar_output, OutputReference)
+    assert bar_output.instance == "hello"

vellum/workflows/nodes/core/try_node/node.py

@@ -4,7 +4,6 @@ from vellum.workflows.context import execution_context, get_parent_context
 from vellum.workflows.errors.types import WorkflowError, WorkflowErrorCode
 from vellum.workflows.events.workflow import is_workflow_event
 from vellum.workflows.exceptions import NodeException
-from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.bases.base_adornment_node import BaseAdornmentNode
 from vellum.workflows.nodes.utils import create_adornment
 from vellum.workflows.outputs.base import BaseOutput, BaseOutputs
@@ -24,7 +23,7 @@ class TryNode(BaseAdornmentNode[StateType], Generic[StateType]):
 
     on_error_code: Optional[WorkflowErrorCode] = None
 
-    class Outputs(BaseNode.Outputs):
+    class Outputs(BaseAdornmentNode.Outputs):
         error: Optional[WorkflowError] = None
 
     def run(self) -> Iterator[BaseOutput]:

vellum/workflows/nodes/experimental/tool_calling_node/__init__.py

@@ -0,0 +1,3 @@
+from vellum.workflows.nodes.experimental.tool_calling_node.node import ToolCallingNode
+
+__all__ = ["ToolCallingNode"]