vellum-ai 0.12.17__py3-none-any.whl → 0.13.0__py3-none-any.whl

vellum_ee/workflows/display/nodes/vellum/conditional_node.py

@@ -4,34 +4,16 @@ from typing import Any, ClassVar, Dict, Generic, List, Optional, Tuple, TypeVar,
 
 from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.expressions.and_ import AndExpression
-from vellum.workflows.expressions.begins_with import BeginsWithExpression
 from vellum.workflows.expressions.between import BetweenExpression
-from vellum.workflows.expressions.contains import ContainsExpression
-from vellum.workflows.expressions.does_not_begin_with import DoesNotBeginWithExpression
-from vellum.workflows.expressions.does_not_contain import DoesNotContainExpression
-from vellum.workflows.expressions.does_not_end_with import DoesNotEndWithExpression
-from vellum.workflows.expressions.does_not_equal import DoesNotEqualExpression
-from vellum.workflows.expressions.ends_with import EndsWithExpression
-from vellum.workflows.expressions.equals import EqualsExpression
-from vellum.workflows.expressions.greater_than import GreaterThanExpression
-from vellum.workflows.expressions.greater_than_or_equal_to import GreaterThanOrEqualToExpression
-from vellum.workflows.expressions.in_ import InExpression
-from vellum.workflows.expressions.is_nil import IsNilExpression
-from vellum.workflows.expressions.is_not_nil import IsNotNilExpression
 from vellum.workflows.expressions.is_not_null import IsNotNullExpression
-from vellum.workflows.expressions.is_not_undefined import IsNotUndefinedExpression
 from vellum.workflows.expressions.is_null import IsNullExpression
-from vellum.workflows.expressions.is_undefined import IsUndefinedExpression
-from vellum.workflows.expressions.less_than import LessThanExpression
-from vellum.workflows.expressions.less_than_or_equal_to import LessThanOrEqualToExpression
 from vellum.workflows.expressions.not_between import NotBetweenExpression
-from vellum.workflows.expressions.not_in import NotInExpression
 from vellum.workflows.expressions.or_ import OrExpression
 from vellum.workflows.nodes.displayable import ConditionalNode
 from vellum.workflows.types.core import ConditionType, JsonObject
 from vellum.workflows.utils.uuids import uuid4_from_hash
 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.nodes.vellum.utils import convert_descriptor_to_operator, create_node_input
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
 from vellum_ee.workflows.display.vellum import NodeInput
 
@@ -113,7 +95,7 @@ but the defined conditions have length {len(condition_ids)}"""
                 )
                 node_inputs.append(expression_node_input)
                 field_node_input_id = expression_node_input.id
-                operator = self._convert_descriptor_to_operator(descriptor)
+                operator = convert_descriptor_to_operator(descriptor)
 
             elif isinstance(descriptor, (BetweenExpression, NotBetweenExpression)):
                 field_node_input = create_node_input(
@@ -127,7 +109,7 @@ but the defined conditions have length {len(condition_ids)}"""
                     value_node_input_id,
                 )
                 node_inputs.extend([field_node_input, value_node_input])
-                operator = self._convert_descriptor_to_operator(descriptor)
+                operator = convert_descriptor_to_operator(descriptor)
                 field_node_input_id = field_node_input.id
                 value_node_input_id = value_node_input.id
 
@@ -147,7 +129,7 @@ but the defined conditions have length {len(condition_ids)}"""
                     node_inputs.append(rhs_node_input)
                     value_node_input_id = rhs_node_input.id
 
-                operator = self._convert_descriptor_to_operator(descriptor)
+                operator = convert_descriptor_to_operator(descriptor)
                 field_node_input_id = lhs_node_input.id
 
             return {
@@ -218,49 +200,10 @@ but the defined conditions have length {len(condition_ids)}"""
                 "version": "2",
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }
 
-    def _convert_descriptor_to_operator(self, descriptor: BaseDescriptor) -> str:
-        if isinstance(descriptor, EqualsExpression):
-            return "="
-        elif isinstance(descriptor, DoesNotEqualExpression):
-            return "!="
-        elif isinstance(descriptor, LessThanExpression):
-            return "<"
-        elif isinstance(descriptor, GreaterThanExpression):
-            return ">"
-        elif isinstance(descriptor, LessThanOrEqualToExpression):
-            return "<="
-        elif isinstance(descriptor, GreaterThanOrEqualToExpression):
-            return ">="
-        elif isinstance(descriptor, ContainsExpression):
-            return "contains"
-        elif isinstance(descriptor, BeginsWithExpression):
-            return "beginsWith"
-        elif isinstance(descriptor, EndsWithExpression):
-            return "endsWith"
-        elif isinstance(descriptor, DoesNotContainExpression):
-            return "doesNotContain"
-        elif isinstance(descriptor, DoesNotBeginWithExpression):
-            return "doesNotBeginWith"
-        elif isinstance(descriptor, DoesNotEndWithExpression):
-            return "doesNotEndWith"
-        elif isinstance(descriptor, (IsNullExpression, IsNilExpression, IsUndefinedExpression)):
-            return "null"
-        elif isinstance(descriptor, (IsNotNullExpression, IsNotNilExpression, IsNotUndefinedExpression)):
-            return "notNull"
-        elif isinstance(descriptor, InExpression):
-            return "in"
-        elif isinstance(descriptor, NotInExpression):
-            return "notIn"
-        elif isinstance(descriptor, BetweenExpression):
-            return "between"
-        elif isinstance(descriptor, NotBetweenExpression):
-            return "notBetween"
-        else:
-            raise ValueError(f"Unsupported descriptor type: {descriptor}")
-
     def get_nested_rule_details_by_path(
         self, rule_ids: List[RuleIdMap], path: List[int]
     ) -> Union[Tuple[str, Optional[str], Optional[str]], None]:

vellum_ee/workflows/display/nodes/vellum/error_node.py

@@ -44,5 +44,6 @@ class BaseErrorNodeDisplay(BaseNodeVellumDisplay[_ErrorNodeType], Generic[_Error
                 "error_output_id": str(self.error_output_id),
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }

vellum_ee/workflows/display/nodes/vellum/final_output_node.py

@@ -45,6 +45,7 @@ class BaseFinalOutputNodeDisplay(BaseNodeVellumDisplay[_FinalOutputNodeType], Ge
             },
             "inputs": [node_input.dict()],
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }
 

vellum_ee/workflows/display/nodes/vellum/guardrail_node.py

@@ -45,5 +45,6 @@ class BaseGuardrailNodeDisplay(BaseNodeVellumDisplay[_GuardrailNodeType], Generi
                 "release_tag": raise_if_descriptor(node.release_tag),
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }

vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py

@@ -59,6 +59,7 @@ class BaseInlinePromptNodeDisplay(BaseNodeVellumDisplay[_InlinePromptNodeType],
                 "ml_model_name": raise_if_descriptor(node.ml_model),
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }
 

vellum_ee/workflows/display/nodes/vellum/inline_subworkflow_node.py

@@ -52,6 +52,7 @@ class BaseInlineSubworkflowNodeDisplay(
                 "output_variables": [workflow_output.dict() for workflow_output in workflow_outputs],
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }
 

vellum_ee/workflows/display/nodes/vellum/map_node.py

@@ -75,5 +75,6 @@ class BaseMapNodeDisplay(BaseNodeVellumDisplay[_MapNodeType], Generic[_MapNodeTy
                 "index_input_id": index_workflow_input_id,
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }

vellum_ee/workflows/display/nodes/vellum/merge_node.py

@@ -45,6 +45,7 @@ class BaseMergeNodeDisplay(BaseNodeVellumDisplay[_MergeNodeType], Generic[_Merge
                 "source_handle_id": str(self.get_source_handle_id(display_context.port_displays)),
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }
 

vellum_ee/workflows/display/nodes/vellum/note_node.py

@@ -26,5 +26,6 @@ class BaseNoteNodeDisplay(BaseNodeVellumDisplay[_NoteNodeType], Generic[_NoteNod
                 "style": json.dumps(self.style) if self.style else None,
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }

vellum_ee/workflows/display/nodes/vellum/prompt_deployment_node.py

@@ -64,5 +64,6 @@ class BasePromptDeploymentNodeDisplay(
                 "release_tag": raise_if_descriptor(node.release_tag),
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }

vellum_ee/workflows/display/nodes/vellum/search_node.py

@@ -65,6 +65,7 @@ class BaseSearchNodeDisplay(BaseNodeVellumDisplay[_SearchNodeType], Generic[_Sea
                 "metadata_filters_node_input_id": str(node_inputs["metadata_filters"].id),
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }
 

vellum_ee/workflows/display/nodes/vellum/subworkflow_deployment_node.py

@@ -56,5 +56,6 @@ class BaseSubworkflowDeploymentNodeDisplay(
                 "release_tag": raise_if_descriptor(node.release_tag),
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }

vellum_ee/workflows/display/nodes/vellum/templating_node.py

@@ -73,5 +73,6 @@ class BaseTemplatingNodeDisplay(BaseNodeVellumDisplay[_TemplatingNodeType], Gene
                 "output_type": inferred_output_type,
             },
             "display_data": self.get_display_data().dict(),
+            "base": self.get_base().dict(),
             "definition": self.get_definition().dict(),
         }

vellum_ee/workflows/display/nodes/vellum/utils.py

@@ -2,7 +2,29 @@ from uuid import UUID
 from typing import Any, List, Optional, Type, Union, cast
 
 from vellum.workflows.descriptors.base import BaseDescriptor
+from vellum.workflows.expressions.begins_with import BeginsWithExpression
+from vellum.workflows.expressions.between import BetweenExpression
 from vellum.workflows.expressions.coalesce_expression import CoalesceExpression
+from vellum.workflows.expressions.contains import ContainsExpression
+from vellum.workflows.expressions.does_not_begin_with import DoesNotBeginWithExpression
+from vellum.workflows.expressions.does_not_contain import DoesNotContainExpression
+from vellum.workflows.expressions.does_not_end_with import DoesNotEndWithExpression
+from vellum.workflows.expressions.does_not_equal import DoesNotEqualExpression
+from vellum.workflows.expressions.ends_with import EndsWithExpression
+from vellum.workflows.expressions.equals import EqualsExpression
+from vellum.workflows.expressions.greater_than import GreaterThanExpression
+from vellum.workflows.expressions.greater_than_or_equal_to import GreaterThanOrEqualToExpression
+from vellum.workflows.expressions.in_ import InExpression
+from vellum.workflows.expressions.is_nil import IsNilExpression
+from vellum.workflows.expressions.is_not_nil import IsNotNilExpression
+from vellum.workflows.expressions.is_not_null import IsNotNullExpression
+from vellum.workflows.expressions.is_not_undefined import IsNotUndefinedExpression
+from vellum.workflows.expressions.is_null import IsNullExpression
+from vellum.workflows.expressions.is_undefined import IsUndefinedExpression
+from vellum.workflows.expressions.less_than import LessThanExpression
+from vellum.workflows.expressions.less_than_or_equal_to import LessThanOrEqualToExpression
+from vellum.workflows.expressions.not_between import NotBetweenExpression
+from vellum.workflows.expressions.not_in import NotInExpression
 from vellum.workflows.nodes.utils import get_wrapped_node, has_wrapped_node
 from vellum.workflows.references import NodeReference, OutputReference
 from vellum.workflows.utils.uuids import uuid4_from_hash
@@ -109,3 +131,44 @@ def create_pointer(
         return ConstantValuePointer(type="CONSTANT_VALUE", data=vellum_variable_value)
     else:
         raise ValueError(f"Pointer type {pointer_type} not supported")
+
+
+def convert_descriptor_to_operator(descriptor: BaseDescriptor) -> str:
+    if isinstance(descriptor, EqualsExpression):
+        return "="
+    elif isinstance(descriptor, DoesNotEqualExpression):
+        return "!="
+    elif isinstance(descriptor, LessThanExpression):
+        return "<"
+    elif isinstance(descriptor, GreaterThanExpression):
+        return ">"
+    elif isinstance(descriptor, LessThanOrEqualToExpression):
+        return "<="
+    elif isinstance(descriptor, GreaterThanOrEqualToExpression):
+        return ">="
+    elif isinstance(descriptor, ContainsExpression):
+        return "contains"
+    elif isinstance(descriptor, BeginsWithExpression):
+        return "beginsWith"
+    elif isinstance(descriptor, EndsWithExpression):
+        return "endsWith"
+    elif isinstance(descriptor, DoesNotContainExpression):
+        return "doesNotContain"
+    elif isinstance(descriptor, DoesNotBeginWithExpression):
+        return "doesNotBeginWith"
+    elif isinstance(descriptor, DoesNotEndWithExpression):
+        return "doesNotEndWith"
+    elif isinstance(descriptor, (IsNullExpression, IsNilExpression, IsUndefinedExpression)):
+        return "null"
+    elif isinstance(descriptor, (IsNotNullExpression, IsNotNilExpression, IsNotUndefinedExpression)):
+        return "notNull"
+    elif isinstance(descriptor, InExpression):
+        return "in"
+    elif isinstance(descriptor, NotInExpression):
+        return "notIn"
+    elif isinstance(descriptor, BetweenExpression):
+        return "between"
+    elif isinstance(descriptor, NotBetweenExpression):
+        return "notBetween"
+    else:
+        raise ValueError(f"Unsupported descriptor type: {descriptor}")

vellum_ee/workflows/display/tests/test_vellum_workflow_display.py

@@ -30,11 +30,8 @@ def test_vellum_workflow_display__serialize_empty_workflow():
             "nodes": [
                 {
                     "data": {"label": "Entrypoint Node", "source_handle_id": "508b8b82-3517-4672-a155-18c9c7b9c545"},
-                    "definition": {
-                        "bases": [],
-                        "module": ["vellum", "workflows", "nodes", "bases", "base"],
-                        "name": "BaseNode",
-                    },
+                    "base": None,
+                    "definition": None,
                     "display_data": {"position": {"x": 0.0, "y": 0.0}},
                     "id": "9eef0c18-f322-4d56-aa89-f088d3e53f6a",
                     "inputs": [],

vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/conftest.py

@@ -1,16 +1,29 @@
 import pytest
 from uuid import uuid4
+from typing import Dict, Tuple, Type
 
+from vellum.workflows.nodes.bases.base import BaseNode
+from vellum.workflows.references.output import OutputReference
+from vellum.workflows.references.workflow_input import WorkflowInputReference
+from vellum.workflows.types.core import JsonObject
+from vellum.workflows.types.generics import NodeType
+from vellum_ee.workflows.display.base import WorkflowInputsDisplayType
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
+from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay
 from vellum_ee.workflows.display.nodes.vellum.base_node import BaseNodeDisplay
-from vellum_ee.workflows.display.types import WorkflowDisplayContext
+from vellum_ee.workflows.display.types import NodeDisplayType, WorkflowDisplayContext
 from vellum_ee.workflows.display.vellum import NodeDisplayData, WorkflowMetaVellumDisplay
 from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
 
 
 @pytest.fixture()
 def serialize_node():
-    def _serialize_node(node_class) -> dict:
+    def _serialize_node(
+        node_class: Type[NodeType],
+        global_workflow_input_displays: Dict[WorkflowInputReference, WorkflowInputsDisplayType] = {},
+        global_node_displays: Dict[Type[BaseNode], NodeDisplayType] = {},
+        global_node_output_displays: Dict[OutputReference, Tuple[Type[BaseNode], NodeOutputDisplay]] = {},
+    ) -> JsonObject:
         node_display_class = get_node_display_class(BaseNodeDisplay, node_class)
         node_display = node_display_class()
 
@@ -22,6 +35,9 @@ def serialize_node():
                 entrypoint_node_display=NodeDisplayData(),
             ),
             node_displays={node_class: node_display},
+            global_workflow_input_displays=global_workflow_input_displays,
+            global_node_displays=global_node_displays,
+            global_node_output_displays=global_node_output_displays,
         )
         return node_display.serialize(context)