vellum-ai 0.14.24__py3-none-any.whl → 0.14.26__py3-none-any.whl

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -13,21 +13,20 @@ from vellum.workflows.events.workflow import NodeEventDisplayContext, WorkflowEv
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.utils import get_unadorned_node, get_wrapped_node
 from vellum.workflows.ports import Port
-from vellum.workflows.references import OutputReference, StateValueReference, WorkflowInputReference
+from vellum.workflows.references import OutputReference, WorkflowInputReference
 from vellum.workflows.types.core import JsonObject
 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,
-    StateValueDisplayOverridesType,
-    StateValueDisplayType,
+    EntrypointDisplay,
+    StateValueDisplay,
     WorkflowInputsDisplayOverridesType,
     WorkflowInputsDisplayType,
     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,9 +34,11 @@ 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,
+    StateValueDisplays,
     WorkflowDisplayContext,
     WorkflowOutputDisplays,
 )
@@ -51,10 +52,6 @@ class BaseWorkflowDisplay(
         WorkflowType,
         WorkflowInputsDisplayType,
         WorkflowInputsDisplayOverridesType,
-        StateValueDisplayType,
-        StateValueDisplayOverridesType,
-        EntrypointDisplayType,
-        EntrypointDisplayOverridesType,
     ]
 ):
     # Used to specify the display data for a workflow.
@@ -64,10 +61,10 @@ class BaseWorkflowDisplay(
     inputs_display: Dict[WorkflowInputReference, WorkflowInputsDisplayOverridesType] = {}
 
     # Used to explicitly specify display data for a workflow's state values.
-    state_value_displays: Dict[StateValueReference, StateValueDisplayOverridesType] = {}
+    state_value_displays: StateValueDisplays = {}
 
     # 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 = {}
@@ -89,13 +86,7 @@ class BaseWorkflowDisplay(
         self,
         workflow: Type[WorkflowType],
         *,
-        parent_display_context: Optional[
-            WorkflowDisplayContext[
-                WorkflowInputsDisplayType,
-                StateValueDisplayType,
-                EntrypointDisplayType,
-            ]
-        ] = None,
+        parent_display_context: Optional[WorkflowDisplayContext[WorkflowInputsDisplayType,]] = None,
         dry_run: bool = False,
     ):
         self._workflow = workflow
@@ -185,12 +176,8 @@ class BaseWorkflowDisplay(
     @cached_property
     def display_context(
         self,
-    ) -> WorkflowDisplayContext[
-        WorkflowInputsDisplayType,
-        StateValueDisplayType,
-        EntrypointDisplayType,
-    ]:
-        workflow_display = self._generate_workflow_meta_display()
+    ) -> WorkflowDisplayContext[WorkflowInputsDisplayType]:
+        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 {}
@@ -235,7 +222,7 @@ class BaseWorkflowDisplay(
             workflow_input_displays[workflow_input] = input_display
             global_workflow_input_displays[workflow_input] = input_display
 
-        state_value_displays: Dict[StateValueReference, StateValueDisplayType] = {}
+        state_value_displays: StateValueDisplays = {}
         global_state_value_displays = (
             copy(self._parent_display_context.global_state_value_displays) if self._parent_display_context else {}
         )
@@ -247,14 +234,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 +277,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 +292,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(
@@ -315,21 +317,46 @@ class BaseWorkflowDisplay(
     ) -> WorkflowInputsDisplayType:
         pass
 
-    @abstractmethod
     def _generate_state_value_display(
-        self, state_value: StateValueReference, overrides: Optional[StateValueDisplayOverridesType] = None
-    ) -> StateValueDisplayType:
-        pass
+        self, state_value: BaseDescriptor, overrides: Optional[StateValueDisplay] = None
+    ) -> StateValueDisplay:
+        state_value_id: UUID
+        name = None
+        color = None
+        if overrides:
+            state_value_id = overrides.id
+            name = overrides.name
+            color = overrides.color
+        else:
+            state_value_id = uuid4_from_hash(f"{self.workflow_id}|state_values|id|{state_value.name}")
+
+        return StateValueDisplay(id=state_value_id, name=name, color=color)
 
-    @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_ee/workflows/display/workflows/vellum_workflow_display.py

@@ -1,9 +1,7 @@
 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,21 +10,12 @@ 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.vellum import WorkflowInputsVellumDisplay, WorkflowInputsVellumDisplayOverrides
 from vellum_ee.workflows.display.workflows.base_workflow_display import BaseWorkflowDisplay
 
 logger = logging.getLogger(__name__)
@@ -37,10 +26,6 @@ class VellumWorkflowDisplay(
         WorkflowType,
         WorkflowInputsVellumDisplay,
         WorkflowInputsVellumDisplayOverrides,
-        StateValueVellumDisplay,
-        StateValueVellumDisplayOverrides,
-        EntrypointVellumDisplay,
-        EntrypointVellumDisplayOverrides,
     ]
 ):
     node_display_base_class = BaseNodeDisplay
@@ -67,20 +52,17 @@ class VellumWorkflowDisplay(
             )
 
         state_variables: JsonArray = []
-        for state_value, state_value_display in self.display_context.state_value_displays.items():
-            default = primitive_to_vellum_value(state_value.instance) if state_value.instance else None
-            required = (
-                state_value_display.required
-                if state_value_display.required is not None
-                else type(None) not in state_value.types
+        for state_value_reference, state_value_display in self.display_context.state_value_displays.items():
+            default = (
+                primitive_to_vellum_value(state_value_reference.instance) if state_value_reference.instance else None
             )
             state_variables.append(
                 {
                     "id": str(state_value_display.id),
-                    "key": state_value_display.name or state_value.name,
-                    "type": infer_vellum_variable_type(state_value),
+                    "key": state_value_display.name or state_value_reference.name,
+                    "type": infer_vellum_variable_type(state_value_reference),
                     "default": default.dict() if default else None,
-                    "required": required,
+                    "required": state_value_reference.instance is None,
                     "extensions": {"color": state_value_display.color},
                 }
             )
@@ -288,25 +270,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:
@@ -323,46 +286,3 @@ class VellumWorkflowDisplay(
             workflow_input_id = uuid4_from_hash(f"{self.workflow_id}|inputs|id|{workflow_input.name}")
 
         return WorkflowInputsVellumDisplay(id=workflow_input_id, name=name, required=required, color=color)
-
-    def _generate_state_value_display(
-        self, state_value: BaseDescriptor, overrides: Optional[StateValueVellumDisplayOverrides] = None
-    ) -> StateValueVellumDisplay:
-        state_value_id: UUID
-        name = None
-        required = None
-        color = None
-        if overrides:
-            state_value_id = overrides.id
-            name = overrides.name
-            required = overrides.required
-            color = overrides.color
-        else:
-            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/client/resources/workflows/types/__init__.py

@@ -1,5 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from .workflows_pull_request_format import WorkflowsPullRequestFormat
-
-__all__ = ["WorkflowsPullRequestFormat"]

vellum/client/resources/workflows/types/workflows_pull_request_format.py

@@ -1,5 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-
-WorkflowsPullRequestFormat = typing.Union[typing.Literal["json", "zip"], typing.Any]

vellum/resources/workflows/types/__init__.py

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

vellum/resources/workflows/types/workflows_pull_request_format.py

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