vellum-ai 0.14.24__tar.gz → 0.14.25__tar.gz

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/PKG-INFO

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

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/ee/vellum_ee/workflows/display/base.py

@@ -35,10 +35,6 @@ class WorkflowMetaDisplayOverrides(WorkflowMetaDisplay):
     pass
 
 
-WorkflowMetaDisplayType = TypeVar("WorkflowMetaDisplayType", bound=WorkflowMetaDisplay)
-WorkflowMetaDisplayOverridesType = TypeVar("WorkflowMetaDisplayOverridesType", bound=WorkflowMetaDisplayOverrides)
-
-
 @dataclass
 class WorkflowInputsDisplayOverrides:
     id: UUID
@@ -82,19 +78,16 @@ class EdgeDisplayOverrides(EdgeDisplay):
 
 
 @dataclass
-class EntrypointDisplayOverrides:
+class EntrypointDisplay:
     id: UUID
+    edge_display: EdgeDisplay
 
 
 @dataclass
-class EntrypointDisplay(EntrypointDisplayOverrides):
+class EntrypointDisplayOverrides(EntrypointDisplay):
     pass
 
 
-EntrypointDisplayType = TypeVar("EntrypointDisplayType", bound=EntrypointDisplay)
-EntrypointDisplayOverridesType = TypeVar("EntrypointDisplayOverridesType", bound=EntrypointDisplayOverrides)
-
-
 @dataclass
 class WorkflowOutputDisplay:
     id: UUID

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/ee/vellum_ee/workflows/display/nodes/base_node_display.py

@@ -31,6 +31,7 @@ from vellum.workflows.expressions.is_undefined import IsUndefinedExpression
 from vellum.workflows.expressions.not_between import NotBetweenExpression
 from vellum.workflows.expressions.parse_json import ParseJsonExpression
 from vellum.workflows.nodes.bases.base import BaseNode
+from vellum.workflows.nodes.displayable.bases.utils import primitive_to_vellum_value
 from vellum.workflows.nodes.utils import get_wrapped_node
 from vellum.workflows.ports import Port
 from vellum.workflows.references import OutputReference
@@ -50,7 +51,7 @@ from vellum_ee.workflows.display.editor.types import NodeDisplayData
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
 from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay, PortDisplayOverrides
 from vellum_ee.workflows.display.utils.expressions import get_child_descriptor
-from vellum_ee.workflows.display.utils.vellum import convert_descriptor_to_operator, primitive_to_vellum_value
+from vellum_ee.workflows.display.utils.vellum import convert_descriptor_to_operator
 
 if TYPE_CHECKING:
     from vellum_ee.workflows.display.types import WorkflowDisplayContext

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/ee/vellum_ee/workflows/display/types.py

@@ -8,7 +8,7 @@ from vellum.workflows.ports import Port
 from vellum.workflows.references import OutputReference, StateValueReference, WorkflowInputReference
 from vellum_ee.workflows.display.base import (
     EdgeDisplay,
-    EntrypointDisplayType,
+    EntrypointDisplay,
     StateValueDisplayType,
     WorkflowInputsDisplayType,
     WorkflowMetaDisplay,
@@ -24,6 +24,7 @@ WorkflowDisplayType = TypeVar("WorkflowDisplayType", bound="BaseWorkflowDisplay"
 
 NodeDisplays = Dict[Type[BaseNode], BaseNodeDisplay]
 NodeOutputDisplays = Dict[OutputReference, Tuple[Type[BaseNode], NodeOutputDisplay]]
+EntrypointDisplays = Dict[Type[BaseNode], EntrypointDisplay]
 WorkflowOutputDisplays = Dict[BaseDescriptor, WorkflowOutputDisplay]
 EdgeDisplays = Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay]
 PortDisplays = Dict[Port, PortDisplay]
@@ -34,7 +35,6 @@ class WorkflowDisplayContext(
     Generic[
         WorkflowInputsDisplayType,
         StateValueDisplayType,
-        EntrypointDisplayType,
     ]
 ):
     workflow_display_class: Type["BaseWorkflowDisplay"]
@@ -48,7 +48,7 @@ class WorkflowDisplayContext(
     node_displays: NodeDisplays = field(default_factory=dict)
     global_node_displays: NodeDisplays = field(default_factory=dict)
     global_node_output_displays: NodeOutputDisplays = field(default_factory=dict)
-    entrypoint_displays: Dict[Type[BaseNode], EntrypointDisplayType] = field(default_factory=dict)
+    entrypoint_displays: EntrypointDisplays = field(default_factory=dict)
     workflow_output_displays: WorkflowOutputDisplays = field(default_factory=dict)
     edge_displays: EdgeDisplays = field(default_factory=dict)
     port_displays: PortDisplays = field(default_factory=dict)

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/ee/vellum_ee/workflows/display/vellum.py

@@ -4,9 +4,7 @@ from typing import List, Literal, Optional
 
 from vellum.core import UniversalBaseModel
 from vellum_ee.workflows.display.base import (
-    EdgeDisplay,
     EdgeDisplayOverrides,
-    EntrypointDisplay,
     EntrypointDisplayOverrides,
     StateValueDisplay,
     StateValueDisplayOverrides,
@@ -93,13 +91,21 @@ class EdgeVellumDisplay(EdgeVellumDisplayOverrides):
 
 
 @dataclass
-class EntrypointVellumDisplayOverrides(EntrypointDisplay, EntrypointDisplayOverrides):
-    edge_display: EdgeDisplay
+class EntrypointVellumDisplayOverrides(EntrypointDisplayOverrides):
+    """
+    DEPRECATED: Use EntrypointDisplay instead. Will be removed in 0.15.0
+    """
+
+    pass
 
 
 @dataclass
 class EntrypointVellumDisplay(EntrypointVellumDisplayOverrides):
-    edge_display: EdgeDisplay
+    """
+    DEPRECATED: Use EntrypointDisplay instead. Will be removed in 0.15.0
+    """
+
+    pass
 
 
 @dataclass

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/ee/vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -19,8 +19,7 @@ from vellum.workflows.types.generics import WorkflowType
 from vellum.workflows.utils.uuids import uuid4_from_hash
 from vellum_ee.workflows.display.base import (
     EdgeDisplay,
-    EntrypointDisplayOverridesType,
-    EntrypointDisplayType,
+    EntrypointDisplay,
     StateValueDisplayOverridesType,
     StateValueDisplayType,
     WorkflowInputsDisplayOverridesType,
@@ -28,6 +27,7 @@ from vellum_ee.workflows.display.base import (
     WorkflowMetaDisplay,
     WorkflowOutputDisplay,
 )
+from vellum_ee.workflows.display.editor.types import NodeDisplayData
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
@@ -35,6 +35,7 @@ from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDispl
 from vellum_ee.workflows.display.nodes.utils import raise_if_descriptor
 from vellum_ee.workflows.display.types import (
     EdgeDisplays,
+    EntrypointDisplays,
     NodeDisplays,
     NodeOutputDisplays,
     PortDisplays,
@@ -53,8 +54,6 @@ class BaseWorkflowDisplay(
         WorkflowInputsDisplayOverridesType,
         StateValueDisplayType,
         StateValueDisplayOverridesType,
-        EntrypointDisplayType,
-        EntrypointDisplayOverridesType,
     ]
 ):
     # Used to specify the display data for a workflow.
@@ -67,7 +66,7 @@ class BaseWorkflowDisplay(
     state_value_displays: Dict[StateValueReference, StateValueDisplayOverridesType] = {}
 
     # Used to explicitly specify display data for a workflow's entrypoints.
-    entrypoint_displays: Dict[Type[BaseNode], EntrypointDisplayOverridesType] = {}
+    entrypoint_displays: EntrypointDisplays = {}
 
     # Used to explicitly specify display data for a workflow's outputs.
     output_displays: WorkflowOutputDisplays = {}
@@ -93,7 +92,6 @@ class BaseWorkflowDisplay(
             WorkflowDisplayContext[
                 WorkflowInputsDisplayType,
                 StateValueDisplayType,
-                EntrypointDisplayType,
             ]
         ] = None,
         dry_run: bool = False,
@@ -188,9 +186,8 @@ class BaseWorkflowDisplay(
     ) -> WorkflowDisplayContext[
         WorkflowInputsDisplayType,
         StateValueDisplayType,
-        EntrypointDisplayType,
     ]:
-        workflow_display = self._generate_workflow_meta_display()
+        workflow_meta_display = self._generate_workflow_meta_display()
 
         global_node_output_displays: NodeOutputDisplays = (
             copy(self._parent_display_context.global_node_output_displays) if self._parent_display_context else {}
@@ -247,14 +244,14 @@ class BaseWorkflowDisplay(
             state_value_displays[state_value] = state_value_display
             global_state_value_displays[state_value] = state_value_display
 
-        entrypoint_displays: Dict[Type[BaseNode], EntrypointDisplayType] = {}
+        entrypoint_displays: EntrypointDisplays = {}
         for entrypoint in self._workflow.get_entrypoints():
             if entrypoint in entrypoint_displays:
                 continue
 
             entrypoint_display_overrides = self.entrypoint_displays.get(entrypoint)
             entrypoint_displays[entrypoint] = self._generate_entrypoint_display(
-                entrypoint, workflow_display, node_displays, overrides=entrypoint_display_overrides
+                entrypoint, workflow_meta_display, node_displays, overrides=entrypoint_display_overrides
             )
 
         edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay] = {}
@@ -290,7 +287,7 @@ class BaseWorkflowDisplay(
             )
 
         return WorkflowDisplayContext(
-            workflow_display=workflow_display,
+            workflow_display=workflow_meta_display,
             workflow_input_displays=workflow_input_displays,
             global_workflow_input_displays=global_workflow_input_displays,
             state_value_displays=state_value_displays,
@@ -305,9 +302,24 @@ class BaseWorkflowDisplay(
             workflow_display_class=self.__class__,
         )
 
-    @abstractmethod
     def _generate_workflow_meta_display(self) -> WorkflowMetaDisplay:
-        pass
+        overrides = self.workflow_display
+        if overrides:
+            return WorkflowMetaDisplay(
+                entrypoint_node_id=overrides.entrypoint_node_id,
+                entrypoint_node_source_handle_id=overrides.entrypoint_node_source_handle_id,
+                entrypoint_node_display=overrides.entrypoint_node_display,
+                display_data=overrides.display_data,
+            )
+
+        entrypoint_node_id = uuid4_from_hash(f"{self.workflow_id}|entrypoint_node_id")
+        entrypoint_node_source_handle_id = uuid4_from_hash(f"{self.workflow_id}|entrypoint_node_source_handle_id")
+
+        return WorkflowMetaDisplay(
+            entrypoint_node_id=entrypoint_node_id,
+            entrypoint_node_source_handle_id=entrypoint_node_source_handle_id,
+            entrypoint_node_display=NodeDisplayData(),
+        )
 
     @abstractmethod
     def _generate_workflow_input_display(
@@ -321,15 +333,31 @@ class BaseWorkflowDisplay(
     ) -> StateValueDisplayType:
         pass
 
-    @abstractmethod
     def _generate_entrypoint_display(
         self,
         entrypoint: Type[BaseNode],
         workflow_display: WorkflowMetaDisplay,
         node_displays: Dict[Type[BaseNode], BaseNodeDisplay],
-        overrides: Optional[EntrypointDisplayOverridesType] = None,
-    ) -> EntrypointDisplayType:
-        pass
+        overrides: Optional[EntrypointDisplay] = None,
+    ) -> EntrypointDisplay:
+        entrypoint_node_id = workflow_display.entrypoint_node_id
+
+        edge_display_overrides = overrides.edge_display if overrides else None
+        entrypoint_id = (
+            edge_display_overrides.id
+            if edge_display_overrides
+            else uuid4_from_hash(f"{self.workflow_id}|id|{entrypoint_node_id}")
+        )
+
+        entrypoint_target = get_unadorned_node(entrypoint)
+        target_node_display = node_displays[entrypoint_target]
+        target_node_id = target_node_display.node_id
+
+        edge_display = edge_display_overrides or self._generate_edge_display_from_source(
+            entrypoint_node_id, target_node_id
+        )
+
+        return EntrypointDisplay(id=entrypoint_id, edge_display=edge_display)
 
     def _generate_workflow_output_display(self, output: BaseDescriptor) -> WorkflowOutputDisplay:
         output_id = uuid4_from_hash(f"{self.workflow_id}|id|{output.name}")

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/ee/vellum_ee/workflows/display/workflows/vellum_workflow_display.py

@@ -1,9 +1,8 @@
 import logging
 from uuid import UUID
-from typing import Dict, Optional, Type, cast
+from typing import Optional, cast
 
 from vellum.workflows.descriptors.base import BaseDescriptor
-from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.displayable.bases.utils import primitive_to_vellum_value
 from vellum.workflows.nodes.displayable.final_output_node import FinalOutputNode
 from vellum.workflows.nodes.utils import get_unadorned_node, get_unadorned_port
@@ -12,20 +11,16 @@ from vellum.workflows.references.output import OutputReference
 from vellum.workflows.types.core import JsonArray, JsonObject
 from vellum.workflows.types.generics import WorkflowType
 from vellum.workflows.utils.uuids import uuid4_from_hash
-from vellum_ee.workflows.display.base import WorkflowMetaDisplay
+from vellum_ee.workflows.display.editor.types import NodeDisplayData
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input
 from vellum_ee.workflows.display.utils.vellum import infer_vellum_variable_type
 from vellum_ee.workflows.display.vellum import (
-    EntrypointVellumDisplay,
-    EntrypointVellumDisplayOverrides,
-    NodeDisplayData,
     StateValueVellumDisplay,
     StateValueVellumDisplayOverrides,
     WorkflowInputsVellumDisplay,
     WorkflowInputsVellumDisplayOverrides,
-    WorkflowMetaVellumDisplay,
 )
 from vellum_ee.workflows.display.workflows.base_workflow_display import BaseWorkflowDisplay
 
@@ -39,8 +34,6 @@ class VellumWorkflowDisplay(
         WorkflowInputsVellumDisplayOverrides,
         StateValueVellumDisplay,
         StateValueVellumDisplayOverrides,
-        EntrypointVellumDisplay,
-        EntrypointVellumDisplayOverrides,
     ]
 ):
     node_display_base_class = BaseNodeDisplay
@@ -288,25 +281,6 @@ class VellumWorkflowDisplay(
             "output_variables": output_variables,
         }
 
-    def _generate_workflow_meta_display(self) -> WorkflowMetaVellumDisplay:
-        overrides = self.workflow_display
-        if overrides:
-            return WorkflowMetaVellumDisplay(
-                entrypoint_node_id=overrides.entrypoint_node_id,
-                entrypoint_node_source_handle_id=overrides.entrypoint_node_source_handle_id,
-                entrypoint_node_display=overrides.entrypoint_node_display,
-                display_data=overrides.display_data,
-            )
-
-        entrypoint_node_id = uuid4_from_hash(f"{self.workflow_id}|entrypoint_node_id")
-        entrypoint_node_source_handle_id = uuid4_from_hash(f"{self.workflow_id}|entrypoint_node_source_handle_id")
-
-        return WorkflowMetaVellumDisplay(
-            entrypoint_node_id=entrypoint_node_id,
-            entrypoint_node_source_handle_id=entrypoint_node_source_handle_id,
-            entrypoint_node_display=NodeDisplayData(),
-        )
-
     def _generate_workflow_input_display(
         self, workflow_input: WorkflowInputReference, overrides: Optional[WorkflowInputsVellumDisplayOverrides] = None
     ) -> WorkflowInputsVellumDisplay:
@@ -340,29 +314,3 @@ class VellumWorkflowDisplay(
             state_value_id = uuid4_from_hash(f"{self.workflow_id}|state_values|id|{state_value.name}")
 
         return StateValueVellumDisplay(id=state_value_id, name=name, required=required, color=color)
-
-    def _generate_entrypoint_display(
-        self,
-        entrypoint: Type[BaseNode],
-        workflow_display: WorkflowMetaDisplay,
-        node_displays: Dict[Type[BaseNode], BaseNodeDisplay],
-        overrides: Optional[EntrypointVellumDisplayOverrides] = None,
-    ) -> EntrypointVellumDisplay:
-        entrypoint_node_id = workflow_display.entrypoint_node_id
-
-        edge_display_overrides = overrides.edge_display if overrides else None
-        entrypoint_id = (
-            edge_display_overrides.id
-            if edge_display_overrides
-            else uuid4_from_hash(f"{self.workflow_id}|id|{entrypoint_node_id}")
-        )
-
-        entrypoint_target = get_unadorned_node(entrypoint)
-        target_node_display = node_displays[entrypoint_target]
-        target_node_id = target_node_display.node_id
-
-        edge_display = edge_display_overrides or self._generate_edge_display_from_source(
-            entrypoint_node_id, target_node_id
-        )
-
-        return EntrypointVellumDisplay(id=entrypoint_id, edge_display=edge_display)

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/pyproject.toml

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

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

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/src/vellum/client/types/workflow_execution_event_error_code.py

@@ -11,6 +11,7 @@ WorkflowExecutionEventErrorCode = typing.Union[
         "NODE_EXECUTION",
         "LLM_PROVIDER",
         "INVALID_TEMPLATE",
+        "INVALID_INPUTS",
         "USER_DEFINED_ERROR",
     ],
     typing.Any,

{vellum_ai-0.14.24 → vellum_ai-0.14.25}/src/vellum/workflows/nodes/displayable/guardrail_node/node.py

@@ -34,6 +34,7 @@ class GuardrailNode(BaseNode[StateType], Generic[StateType]):
 
     class Outputs(BaseOutputs):
         score: float
+        log: Optional[str]
 
     def run(self) -> Outputs:
         metric_execution = self._context.vellum_client.metric_definitions.execute_metric_definition(
@@ -52,8 +53,19 @@ class GuardrailNode(BaseNode[StateType], Generic[StateType]):
                 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")
-        return self.Outputs(score=score, **metric_outputs)
+
+        return self.Outputs(score=score, log=log, **metric_outputs)
 
     def _compile_metric_inputs(self) -> List[MetricDefinitionInput]:
         # TODO: We may want to consolidate with prompt deployment input compilation