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

vellum_ee/workflows/display/utils/vellum.py

@@ -1,10 +1,8 @@
-import enum
-import json
-import typing
-from typing import Any, List, Union, cast
+from typing import Any, TypeVar
 
-from vellum import ChatMessage, SearchResult, SearchResultRequest, VellumVariableType
+from vellum.client.types.vellum_variable_type import VellumVariableType
 from vellum.workflows.descriptors.base import BaseDescriptor
+from vellum.workflows.nodes.displayable.bases.utils import primitive_to_vellum_value
 from vellum.workflows.references import OutputReference, WorkflowInputReference
 from vellum.workflows.references.execution_count import ExecutionCountReference
 from vellum.workflows.references.node import NodeReference
@@ -13,25 +11,19 @@ from vellum.workflows.utils.vellum_variables import primitive_type_to_vellum_var
 from vellum.workflows.vellum_client import create_vellum_client
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
 from vellum_ee.workflows.display.vellum import (
-    ChatHistoryVellumValue,
     ConstantValuePointer,
     ExecutionCounterData,
     ExecutionCounterPointer,
     InputVariableData,
     InputVariablePointer,
-    JsonVellumValue,
     NodeInputValuePointerRule,
     NodeOutputData,
     NodeOutputPointer,
-    NumberVellumValue,
-    SearchResultsVellumValue,
-    StringVellumValue,
-    VellumValue,
     WorkspaceSecretData,
     WorkspaceSecretPointer,
 )
 
-_T = typing.TypeVar("_T")
+_T = TypeVar("_T")
 
 
 def infer_vellum_variable_type(value: Any) -> VellumVariableType:
@@ -90,33 +82,3 @@ def create_node_input_value_pointer_rule(
         return ConstantValuePointer(type="CONSTANT_VALUE", data=vellum_value)
 
     raise ValueError(f"Unsupported descriptor type: {value.__class__.__name__}")
-
-
-def primitive_to_vellum_value(value: Any) -> VellumValue:
-    """Converts a python primitive to a VellumVariableValue"""
-
-    if isinstance(value, str):
-        return StringVellumValue(value=value)
-    elif isinstance(value, enum.Enum):
-        return StringVellumValue(value=value.value)
-    elif isinstance(value, (int, float)):
-        return NumberVellumValue(value=value)
-    elif isinstance(value, list) and (
-        all(isinstance(message, ChatMessage) for message in value)
-        or all(isinstance(message, ChatMessage) for message in value)
-    ):
-        chat_messages = cast(Union[List[ChatMessage], List[ChatMessage]], value)
-        return ChatHistoryVellumValue(value=chat_messages)
-    elif isinstance(value, list) and (
-        all(isinstance(search_result, SearchResultRequest) for search_result in value)
-        or all(isinstance(search_result, SearchResult) for search_result in value)
-    ):
-        search_results = cast(Union[List[SearchResultRequest], List[SearchResult]], value)
-        return SearchResultsVellumValue(value=search_results)
-
-    try:
-        json_value = json.dumps(value)
-    except json.JSONDecodeError:
-        raise ValueError(f"Unsupported variable type: {value.__class__.__name__}")
-
-    return JsonVellumValue(value=json.loads(json_value))

vellum_ee/workflows/display/vellum.py

@@ -1,11 +1,13 @@
 from dataclasses import dataclass, field
 from enum import Enum
 from uuid import UUID
-from typing import Any, List, Literal, Optional, Union
+from typing import List, Literal, Optional, Union
 
 from pydantic import Field
 
-from vellum import ChatMessage, PromptParameters, SearchResult, SearchResultRequest, VellumVariable, VellumVariableType
+from vellum import PromptParameters, VellumVariable, VellumVariableType
+from vellum.client.types.array_vellum_value import ArrayVellumValue
+from vellum.client.types.vellum_value import VellumValue
 from vellum.core import UniversalBaseModel
 from vellum_ee.workflows.display.base import (
     EdgeDisplay,
@@ -140,45 +142,14 @@ class WorkflowNodeType(str, Enum):
     ERROR = "ERROR"
 
 
-class StringVellumValue(UniversalBaseModel):
-    type: Literal["STRING"] = "STRING"
-    value: str
-
-
-class NumberVellumValue(UniversalBaseModel):
-    type: Literal["NUMBER"] = "NUMBER"
-    value: Union[int, float]
-
-
-class ChatHistoryVellumValue(UniversalBaseModel):
-    type: Literal["CHAT_HISTORY"] = "CHAT_HISTORY"
-    value: Union[List[ChatMessage], List[ChatMessage]]
-
-
-class SearchResultsVellumValue(UniversalBaseModel):
-    type: Literal["SEARCH_RESULTS"] = "SEARCH_RESULTS"
-    value: Union[List[SearchResultRequest], List[SearchResult]]
-
-
-class JsonVellumValue(UniversalBaseModel):
-    type: Literal["JSON"] = "JSON"
-    value: Optional[Any] = None
-
-
-VellumValue = Union[
-    StringVellumValue,
-    NumberVellumValue,
-    ChatHistoryVellumValue,
-    SearchResultsVellumValue,
-    JsonVellumValue,
-]
-
-
 class ConstantValuePointer(UniversalBaseModel):
     type: Literal["CONSTANT_VALUE"] = "CONSTANT_VALUE"
     data: VellumValue
 
 
+ArrayVellumValue.model_rebuild()
+
+
 class NodeOutputData(UniversalBaseModel):
     node_id: str
     output_id: str

vellum_ee/workflows/display/workflows/vellum_workflow_display.py

@@ -5,6 +5,7 @@ from typing import Dict, List, Optional, Type, cast
 from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.edges import Edge
 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, get_wrapped_node, has_wrapped_node
 from vellum.workflows.ports import Port
@@ -16,7 +17,7 @@ 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.types import PortDisplay
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input
-from vellum_ee.workflows.display.utils.vellum import infer_vellum_variable_type, primitive_to_vellum_value
+from vellum_ee.workflows.display.utils.vellum import infer_vellum_variable_type
 from vellum_ee.workflows.display.vellum import (
     EdgeVellumDisplay,
     EdgeVellumDisplayOverrides,