vellum-ai 0.14.26__tar.gz → 0.14.27__tar.gz

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/PKG-INFO

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

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/ee/vellum_ee/workflows/tests/test_server.py

@@ -1,3 +1,4 @@
+import pytest
 import sys
 from uuid import uuid4
 from typing import Type, cast
@@ -69,3 +70,56 @@ class StartNode(BaseNode):
     # AND the lazy reference has the correct name
     assert start_node.foo.instance
     assert start_node.foo.instance.name == "StartNode.Outputs.bar"
+
+
+@pytest.mark.skip(reason="Code execution inspect and get read file from path needs to be fixed")
+def test_load_from_module__ts_code_in_file_loader():
+    # GIVEN a workflow module with only a code execution node
+    files = {
+        "__init__.py": "",
+        "workflow.py": """\
+from vellum.workflows import BaseWorkflow
+from .nodes.code_execution_node import CodeExecutionNode
+
+class Workflow(BaseWorkflow):
+    graph = CodeExecutionNode
+""",
+        "nodes/__init__.py": """\
+from .code_execution_node import CodeExecutionNode
+
+__all__ = ["CodeExecutionNode"]
+""",
+        "nodes/code_execution_node.py": """\
+from typing import Any
+
+from vellum.workflows.nodes.displayable import CodeExecutionNode as BaseCodeExecutionNode
+from vellum.workflows.state import BaseState
+
+class CodeExecutionNode(BaseCodeExecutionNode[BaseState, Any]):
+    filepath = "./script.ts"
+    code_inputs = {}
+    runtime = "TYPESCRIPT_5_3_3"
+    packages = []
+""",
+        "nodes/code_execution_node/script.ts": """async function main(inputs: {
+  text: string,
+}): any {
+  const matches = inputs.text.match(/\\((.+?)\\)/gs);
+  return matches;
+}""",
+    }
+
+    namespace = str(uuid4())
+
+    # AND the virtual file loader is registered
+    sys.meta_path.append(VirtualFileFinder(files, namespace))
+
+    # WHEN the workflow is loaded
+    Workflow = BaseWorkflow.load_from_module(namespace)
+    workflow = Workflow()
+
+    # THEN the workflow is successfully initialized
+    assert workflow
+
+    event = workflow.run()
+    assert event.name == "workflow.execution.fulfilled"

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vellum-ai"
-version = "0.14.26"
+version = "0.14.27"
 description = ""
 readme = "README.md"
 authors = []

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/src/vellum/__init__.py

@@ -300,6 +300,7 @@ from .types import (
     PromptDeploymentExpandMetaRequest,
     PromptDeploymentInputRequest,
     PromptDeploymentParentContext,
+    PromptExecConfig,
     PromptExecutionMeta,
     PromptNodeExecutionMeta,
     PromptNodeResult,
@@ -589,6 +590,7 @@ from .resources import (
     metric_definitions,
     ml_models,
     organizations,
+    prompts,
     sandboxes,
     test_suite_runs,
     test_suites,
@@ -910,6 +912,7 @@ __all__ = [
     "PromptDeploymentExpandMetaRequest",
     "PromptDeploymentInputRequest",
     "PromptDeploymentParentContext",
+    "PromptExecConfig",
     "PromptExecutionMeta",
     "PromptNodeExecutionMeta",
     "PromptNodeResult",
@@ -1193,6 +1196,7 @@ __all__ = [
     "metric_definitions",
     "ml_models",
     "organizations",
+    "prompts",
     "sandboxes",
     "test_suite_runs",
     "test_suites",

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/src/vellum/client/__init__.py

@@ -13,6 +13,7 @@ from .resources.folder_entities.client import FolderEntitiesClient
 from .resources.metric_definitions.client import MetricDefinitionsClient
 from .resources.ml_models.client import MlModelsClient
 from .resources.organizations.client import OrganizationsClient
+from .resources.prompts.client import PromptsClient
 from .resources.sandboxes.client import SandboxesClient
 from .resources.test_suite_runs.client import TestSuiteRunsClient
 from .resources.test_suites.client import TestSuitesClient
@@ -69,6 +70,7 @@ from .resources.folder_entities.client import AsyncFolderEntitiesClient
 from .resources.metric_definitions.client import AsyncMetricDefinitionsClient
 from .resources.ml_models.client import AsyncMlModelsClient
 from .resources.organizations.client import AsyncOrganizationsClient
+from .resources.prompts.client import AsyncPromptsClient
 from .resources.sandboxes.client import AsyncSandboxesClient
 from .resources.test_suite_runs.client import AsyncTestSuiteRunsClient
 from .resources.test_suites.client import AsyncTestSuitesClient
@@ -145,6 +147,7 @@ class Vellum:
         self.metric_definitions = MetricDefinitionsClient(client_wrapper=self._client_wrapper)
         self.ml_models = MlModelsClient(client_wrapper=self._client_wrapper)
         self.organizations = OrganizationsClient(client_wrapper=self._client_wrapper)
+        self.prompts = PromptsClient(client_wrapper=self._client_wrapper)
         self.sandboxes = SandboxesClient(client_wrapper=self._client_wrapper)
         self.test_suite_runs = TestSuiteRunsClient(client_wrapper=self._client_wrapper)
         self.test_suites = TestSuitesClient(client_wrapper=self._client_wrapper)
@@ -1486,6 +1489,7 @@ class AsyncVellum:
         self.metric_definitions = AsyncMetricDefinitionsClient(client_wrapper=self._client_wrapper)
         self.ml_models = AsyncMlModelsClient(client_wrapper=self._client_wrapper)
         self.organizations = AsyncOrganizationsClient(client_wrapper=self._client_wrapper)
+        self.prompts = AsyncPromptsClient(client_wrapper=self._client_wrapper)
         self.sandboxes = AsyncSandboxesClient(client_wrapper=self._client_wrapper)
         self.test_suite_runs = AsyncTestSuiteRunsClient(client_wrapper=self._client_wrapper)
         self.test_suites = AsyncTestSuitesClient(client_wrapper=self._client_wrapper)

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/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.26",
+            "X-Fern-SDK-Version": "0.14.27",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/src/vellum/client/core/jsonable_encoder.py

@@ -45,7 +45,7 @@ def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any]
             encoder = getattr(obj.__config__, "json_encoders", {})  # type: ignore # Pydantic v1
         if custom_encoder:
             encoder.update(custom_encoder)
-        obj_dict = obj.dict(by_alias=True)
+        obj_dict = obj.model_dump(mode="json")
         if "__root__" in obj_dict:
             obj_dict = obj_dict["__root__"]
         if "root" in obj_dict:

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/src/vellum/client/resources/__init__.py

@@ -10,6 +10,7 @@ from . import (
     metric_definitions,
     ml_models,
     organizations,
+    prompts,
     sandboxes,
     test_suite_runs,
     test_suites,
@@ -42,6 +43,7 @@ __all__ = [
     "metric_definitions",
     "ml_models",
     "organizations",
+    "prompts",
     "sandboxes",
     "test_suite_runs",
     "test_suites",

vellum_ai-0.14.27/src/vellum/client/resources/prompts/client.py

@@ -0,0 +1,197 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ...core.client_wrapper import SyncClientWrapper
+import typing
+from ...core.request_options import RequestOptions
+from ...types.prompt_exec_config import PromptExecConfig
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pydantic_utilities import parse_obj_as
+from ...errors.bad_request_error import BadRequestError
+from ...errors.not_found_error import NotFoundError
+from json.decoder import JSONDecodeError
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper
+
+
+class PromptsClient:
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    def pull(
+        self,
+        id: str,
+        *,
+        prompt_variant_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> PromptExecConfig:
+        """
+        Used to pull the definition of a Prompt from Vellum.
+
+        Parameters
+        ----------
+        id : str
+            The ID of the Prompt to pull from. Prompt Sandbox IDs are currently supported.
+
+        prompt_variant_id : typing.Optional[str]
+            The ID of the Prompt Variant within a Prompt Sandbox to pull. Must be included if providing the ID of a Prompt Sandbox.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        PromptExecConfig
+
+
+        Examples
+        --------
+        from vellum import Vellum
+
+        client = Vellum(
+            api_key="YOUR_API_KEY",
+        )
+        client.prompts.pull(
+            id="id",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v1/prompts/{jsonable_encoder(id)}/pull",
+            base_url=self._client_wrapper.get_environment().default,
+            method="GET",
+            params={
+                "prompt_variant_id": prompt_variant_id,
+            },
+            headers={
+                "Accept": "application/json",
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    PromptExecConfig,
+                    parse_obj_as(
+                        type_=PromptExecConfig,  # 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 == 404:
+                raise NotFoundError(
+                    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)
+
+
+class AsyncPromptsClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    async def pull(
+        self,
+        id: str,
+        *,
+        prompt_variant_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> PromptExecConfig:
+        """
+        Used to pull the definition of a Prompt from Vellum.
+
+        Parameters
+        ----------
+        id : str
+            The ID of the Prompt to pull from. Prompt Sandbox IDs are currently supported.
+
+        prompt_variant_id : typing.Optional[str]
+            The ID of the Prompt Variant within a Prompt Sandbox to pull. Must be included if providing the ID of a Prompt Sandbox.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        PromptExecConfig
+
+
+        Examples
+        --------
+        import asyncio
+
+        from vellum import AsyncVellum
+
+        client = AsyncVellum(
+            api_key="YOUR_API_KEY",
+        )
+
+
+        async def main() -> None:
+            await client.prompts.pull(
+                id="id",
+            )
+
+
+        asyncio.run(main())
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v1/prompts/{jsonable_encoder(id)}/pull",
+            base_url=self._client_wrapper.get_environment().default,
+            method="GET",
+            params={
+                "prompt_variant_id": prompt_variant_id,
+            },
+            headers={
+                "Accept": "application/json",
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    PromptExecConfig,
+                    parse_obj_as(
+                        type_=PromptExecConfig,  # 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 == 404:
+                raise NotFoundError(
+                    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)

vellum_ai-0.14.27/src/vellum/client/resources/workspaces/__init__.py

@@ -0,0 +1,2 @@
+# This file was auto-generated by Fern from our API Definition.
+

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/src/vellum/client/types/__init__.py

@@ -308,6 +308,7 @@ from .prompt_block_state import PromptBlockState
 from .prompt_deployment_expand_meta_request import PromptDeploymentExpandMetaRequest
 from .prompt_deployment_input_request import PromptDeploymentInputRequest
 from .prompt_deployment_parent_context import PromptDeploymentParentContext
+from .prompt_exec_config import PromptExecConfig
 from .prompt_execution_meta import PromptExecutionMeta
 from .prompt_node_execution_meta import PromptNodeExecutionMeta
 from .prompt_node_result import PromptNodeResult
@@ -892,6 +893,7 @@ __all__ = [
     "PromptDeploymentExpandMetaRequest",
     "PromptDeploymentInputRequest",
     "PromptDeploymentParentContext",
+    "PromptExecConfig",
     "PromptExecutionMeta",
     "PromptNodeExecutionMeta",
     "PromptNodeResult",

vellum_ai-0.14.27/src/vellum/client/types/prompt_exec_config.py

@@ -0,0 +1,37 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from __future__ import annotations
+from ..core.pydantic_utilities import UniversalBaseModel
+from .array_vellum_value import ArrayVellumValue
+from .chat_message_prompt_block import ChatMessagePromptBlock
+import typing
+from .vellum_variable import VellumVariable
+from .prompt_parameters import PromptParameters
+from .prompt_settings import PromptSettings
+from .prompt_block import PromptBlock
+from .function_definition import FunctionDefinition
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+from ..core.pydantic_utilities import update_forward_refs
+
+
+class PromptExecConfig(UniversalBaseModel):
+    ml_model: str
+    input_variables: typing.List[VellumVariable]
+    parameters: PromptParameters
+    settings: typing.Optional[PromptSettings] = None
+    blocks: typing.List[PromptBlock]
+    functions: typing.Optional[typing.List[FunctionDefinition]] = 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
+
+
+update_forward_refs(ArrayVellumValue, PromptExecConfig=PromptExecConfig)
+update_forward_refs(ChatMessagePromptBlock, PromptExecConfig=PromptExecConfig)

vellum_ai-0.14.27/src/vellum/resources/prompts/__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.prompts import *

vellum_ai-0.14.27/src/vellum/resources/prompts/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.client import *

vellum_ai-0.14.27/src/vellum/types/prompt_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.prompt_exec_config import *

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/src/vellum/workflows/nodes/displayable/guardrail_node/node.py

@@ -52,19 +52,18 @@ class GuardrailNode(BaseNode[StateType], Generic[StateType]):
                 message="Metric execution must have one output named 'score' with type 'float'",
                 code=WorkflowErrorCode.INVALID_OUTPUTS,
             )
-
-        log = metric_outputs.get("log")
-
-        if log is not None and not isinstance(log, str):
-            raise NodeException(
-                message="Metric execution log output must be of type 'str'",
-                code=WorkflowErrorCode.INVALID_OUTPUTS,
-            )
-        if log:
-            metric_outputs.pop("log")
-
         metric_outputs.pop("score")
 
+        if "log" in metric_outputs:
+            log = metric_outputs.pop("log") or ""
+            if not isinstance(log, str):
+                raise NodeException(
+                    message="Metric execution log output must be of type 'str'",
+                    code=WorkflowErrorCode.INVALID_OUTPUTS,
+                )
+        else:
+            log = None
+
         return self.Outputs(score=score, log=log, **metric_outputs)
 
     def _compile_metric_inputs(self) -> List[MetricDefinitionInput]:

vellum_ai-0.14.27/src/vellum/workflows/nodes/displayable/guardrail_node/test_node.py

@@ -0,0 +1,38 @@
+import pytest
+
+from vellum import TestSuiteRunMetricNumberOutput
+from vellum.client.types.metric_definition_execution import MetricDefinitionExecution
+from vellum.client.types.test_suite_run_metric_string_output import TestSuiteRunMetricStringOutput
+from vellum.workflows.nodes.displayable.guardrail_node.node import GuardrailNode
+
+
+@pytest.mark.parametrize("log_value", [None, ""], ids=["None", "Empty"])
+def test_run_guardrail_node__empty_log(vellum_client, log_value):
+    """Confirm that we can successfully invoke a Guardrail Node"""
+
+    # GIVEN a Guardrail Node
+    class MyGuard(GuardrailNode):
+        metric_definition = "example_metric_definition"
+        metric_inputs = {}
+
+    # AND we know that the guardrail node will return a blank log
+    mock_metric_execution = MetricDefinitionExecution(
+        outputs=[
+            TestSuiteRunMetricNumberOutput(
+                name="score",
+                value=0.6,
+            ),
+            TestSuiteRunMetricStringOutput(
+                name="log",
+                value=log_value,
+            ),
+        ],
+    )
+    vellum_client.metric_definitions.execute_metric_definition.return_value = mock_metric_execution
+
+    # WHEN we run the Guardrail Node
+    outputs = MyGuard().run()
+
+    # THEN the workflow should have completed successfully
+    assert outputs.score == 0.6
+    assert outputs.log == ""

{vellum_ai-0.14.26 → vellum_ai-0.14.27}/src/vellum/workflows/runner/runner.py

@@ -321,6 +321,7 @@ class WorkflowRunner(Generic[StateType]):
                 )
             )
         except NodeException as e:
+            logger.info(e)
             self._workflow_event_inner_queue.put(
                 NodeExecutionRejectedEvent(
                     trace_id=node.state.meta.trace_id,
@@ -333,6 +334,7 @@ class WorkflowRunner(Generic[StateType]):
                 )
             )
         except WorkflowInitializationException as e:
+            logger.info(e)
             self._workflow_event_inner_queue.put(
                 NodeExecutionRejectedEvent(
                     trace_id=node.state.meta.trace_id,