vellum-ai 0.13.8__py3-none-any.whl → 0.13.10__py3-none-any.whl

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.13.8",
+            "X-Fern-SDK-Version": "0.13.10",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

vellum/plugins/vellum_mypy.py

@@ -19,6 +19,7 @@ from mypy.plugin import AttributeContext, ClassDefContext, FunctionSigContext, M
 from mypy.types import AnyType, CallableType, FunctionLike, Instance, Type as MypyType, TypeAliasType, UnionType
 
 TypeResolver = Callable[[str, List[MypyType]], MypyType]
+NODE_ATTRIBUTE_REGEX = r"^[a-z].*$"
 
 DESCRIPTOR_PATHS: list[tuple[str, str, str]] = [
     (
@@ -49,7 +50,7 @@ DESCRIPTOR_PATHS: list[tuple[str, str, str]] = [
     (
         "vellum.workflows.nodes.bases.base.BaseNode",
         "vellum.workflows.references.node.NodeReference",
-        r"^[a-z].*$",
+        NODE_ATTRIBUTE_REGEX,
     ),
 ]
 
@@ -239,10 +240,13 @@ class VellumMypyPlugin(Plugin):
         the original defined type, and the descriptor version of the type.
         """
 
-        for sym in ctx.cls.info.names.values():
+        for key, sym in ctx.cls.info.names.items():
             if not isinstance(sym.node, Var):
                 continue
 
+            if not re.match(NODE_ATTRIBUTE_REGEX, key):
+                continue
+
             type_ = sym.node.type
             if not type_:
                 continue

vellum/workflows/descriptors/utils.py

@@ -108,7 +108,7 @@ def is_unresolved(value: Any) -> bool:
     if isinstance(value, Mapping):
         return any(is_unresolved(item) for item in value.values())
 
-    if isinstance(value, Sequence):
+    if isinstance(value, Sequence) and not isinstance(value, str):
         return any(is_unresolved(item) for item in value)
 
     if isinstance(value, Set):

vellum/workflows/nodes/bases/base.py

@@ -222,7 +222,6 @@ class BaseNode(Generic[StateType], metaclass=BaseNodeMeta):
     state: StateType
     _context: WorkflowContext
     _inputs: MappingProxyType[NodeReference, Any]
-    _is_wrapped_node: bool = False
 
     class ExternalInputs(BaseInputs):
         __descriptor_class__ = ExternalInputReference
@@ -238,7 +237,7 @@ class BaseNode(Generic[StateType], metaclass=BaseNodeMeta):
 
     class Trigger(metaclass=_BaseNodeTriggerMeta):
         node_class: Type["BaseNode"]
-        merge_behavior = MergeBehavior.AWAIT_ANY
+        merge_behavior = MergeBehavior.AWAIT_ATTRIBUTES
 
         @classmethod
         def should_initiate(

vellum/workflows/nodes/displayable/api_node/node.py

@@ -2,7 +2,7 @@ from typing import Optional, Union
 
 from vellum.workflows.constants import AuthorizationType
 from vellum.workflows.nodes.displayable.bases.api_node import BaseAPINode
-from vellum.workflows.types.core import VellumSecret
+from vellum.workflows.types.core import MergeBehavior, VellumSecret
 
 
 class APINode(BaseAPINode):
@@ -27,6 +27,9 @@ class APINode(BaseAPINode):
     api_key_header_value: Optional[Union[str, VellumSecret]] = None
     bearer_token_value: Optional[Union[str, VellumSecret]] = None
 
+    class Trigger(BaseAPINode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     def run(self) -> BaseAPINode.Outputs:
         headers = self.headers or {}
         header_overrides = {}

vellum/workflows/nodes/displayable/bases/api_node/node.py

@@ -8,7 +8,7 @@ from vellum.workflows.errors.types import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.outputs import BaseOutputs
-from vellum.workflows.types.core import Json, VellumSecret
+from vellum.workflows.types.core import Json, MergeBehavior, VellumSecret
 from vellum.workflows.types.generics import StateType
 
 
@@ -23,6 +23,9 @@ class BaseAPINode(BaseNode, Generic[StateType]):
     headers: Optional[Dict[str, Union[str, VellumSecret]]] - The headers to send in the request.
     """
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     url: str
     method: APIRequestMethod
     data: Optional[str] = None

vellum/workflows/nodes/displayable/bases/base_prompt_node/node.py

@@ -7,7 +7,7 @@ from vellum.workflows.errors.types import WorkflowErrorCode, vellum_error_to_wor
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.outputs.base import BaseOutput, BaseOutputs
-from vellum.workflows.types.core import EntityInputsInterface
+from vellum.workflows.types.core import EntityInputsInterface, MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
@@ -17,6 +17,9 @@ class BasePromptNode(BaseNode, Generic[StateType]):
 
     request_options: Optional[RequestOptions] = None
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BaseOutputs):
         results: List[PromptOutput]
 

vellum/workflows/nodes/displayable/bases/inline_prompt_node/node.py

@@ -23,6 +23,7 @@ from vellum.workflows.events.types import default_serializer
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.displayable.bases.base_prompt_node import BasePromptNode
 from vellum.workflows.nodes.displayable.bases.inline_prompt_node.constants import DEFAULT_PROMPT_PARAMETERS
+from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 from vellum.workflows.utils.functions import compile_function_definition
 
@@ -51,6 +52,9 @@ class BaseInlinePromptNode(BasePromptNode[StateType], Generic[StateType]):
     parameters: PromptParameters = DEFAULT_PROMPT_PARAMETERS
     expand_meta: Optional[AdHocExpandMeta] = OMIT
 
+    class Trigger(BasePromptNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     def _get_prompt_event_stream(self) -> Iterator[AdHocExecutePromptEvent]:
         input_variables, input_values = self._compile_prompt_inputs()
         parent_context = get_parent_context()

vellum/workflows/nodes/displayable/bases/prompt_deployment_node.py

@@ -17,6 +17,7 @@ from vellum.workflows.context import get_parent_context
 from vellum.workflows.errors import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.displayable.bases.base_prompt_node import BasePromptNode
+from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
@@ -47,6 +48,9 @@ class BasePromptDeploymentNode(BasePromptNode, Generic[StateType]):
     expand_raw: Optional[Sequence[str]] = OMIT
     metadata: Optional[Dict[str, Optional[Any]]] = OMIT
 
+    class Trigger(BasePromptNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     def _get_prompt_event_stream(self) -> Iterator[ExecutePromptEvent]:
         current_parent_context = get_parent_context()
         parent_context = current_parent_context.model_dump() if current_parent_context else None

vellum/workflows/nodes/displayable/bases/search_node.py

@@ -17,6 +17,7 @@ from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.displayable.bases.types import SearchFilters
 from vellum.workflows.outputs import BaseOutputs
+from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 DEFAULT_SEARCH_WEIGHTS = 0.8
@@ -81,6 +82,9 @@ class BaseSearchNode(BaseNode[StateType], Generic[StateType]):
 
     request_options: Optional[RequestOptions] = None
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BaseOutputs):
         """
         The outputs of the SearchNode.

vellum/workflows/nodes/displayable/code_execution_node/node.py

@@ -26,7 +26,7 @@ from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.bases.base import BaseNodeMeta
 from vellum.workflows.nodes.displayable.code_execution_node.utils import read_file_from_path
 from vellum.workflows.outputs.base import BaseOutputs
-from vellum.workflows.types.core import EntityInputsInterface, VellumSecret
+from vellum.workflows.types.core import EntityInputsInterface, MergeBehavior, VellumSecret
 from vellum.workflows.types.generics import StateType
 from vellum.workflows.types.utils import get_original_base
 from vellum.workflows.utils.vellum_variables import primitive_type_to_vellum_variable_type
@@ -82,6 +82,9 @@ class CodeExecutionNode(BaseNode[StateType], Generic[StateType, _OutputType], me
 
     request_options: Optional[RequestOptions] = None
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BaseOutputs):
         # We use our mypy plugin to override the _OutputType with the actual output type
         # for downstream references to this output.

vellum/workflows/nodes/displayable/conditional_node/node.py

@@ -6,6 +6,7 @@ from vellum.workflows.ports.node_ports import NodePorts
 from vellum.workflows.ports.port import Port
 from vellum.workflows.ports.utils import validate_ports
 from vellum.workflows.state.base import BaseState
+from vellum.workflows.types import MergeBehavior
 
 
 class ConditionalNode(BaseNode):
@@ -14,6 +15,9 @@ class ConditionalNode(BaseNode):
     Vellum's Conditional Node, and for most cases, you should extend `BaseNode.Ports` directly.
     """
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Ports(NodePorts):
         def __call__(self, outputs: BaseOutputs, state: BaseState) -> Set[Port]:
             all_ports = [port for port in self.__class__]

vellum/workflows/nodes/displayable/final_output_node/node.py

@@ -2,6 +2,7 @@ from typing import Any, Dict, Generic, Tuple, Type, TypeVar, get_args
 
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.bases.base import BaseNodeMeta
+from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 from vellum.workflows.types.utils import get_original_base
 
@@ -41,6 +42,9 @@ class FinalOutputNode(BaseNode[StateType], Generic[StateType, _OutputType], meta
     This provides backward compatibility with Vellum's Final Output Node.
     """
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BaseNode.Outputs):
         # We use our mypy plugin to override the _OutputType with the actual output type
         # for downstream references to this output.

vellum/workflows/nodes/displayable/guardrail_node/node.py

@@ -8,7 +8,7 @@ from vellum.workflows.errors.types import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.outputs.base import BaseOutputs
-from vellum.workflows.types.core import EntityInputsInterface
+from vellum.workflows.types.core import EntityInputsInterface, MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
@@ -29,6 +29,9 @@ class GuardrailNode(BaseNode[StateType], Generic[StateType]):
 
     request_options: Optional[RequestOptions] = None
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BaseOutputs):
         score: float
 

vellum/workflows/nodes/displayable/inline_prompt_node/node.py

@@ -5,6 +5,7 @@ from vellum.workflows.errors import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.displayable.bases import BaseInlinePromptNode as BaseInlinePromptNode
 from vellum.workflows.outputs import BaseOutput
+from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
@@ -21,6 +22,9 @@ class InlinePromptNode(BaseInlinePromptNode[StateType]):
     request_options: Optional[RequestOptions] - The request options to use for the Prompt Execution
     """
 
+    class Trigger(BaseInlinePromptNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BaseInlinePromptNode.Outputs):
         """
         The outputs of the InlinePromptNode.

vellum/workflows/nodes/displayable/merge_node/node.py

@@ -1,4 +1,5 @@
 from vellum.workflows.nodes.bases import BaseNode
+from vellum.workflows.types import MergeBehavior
 
 
 class MergeNode(BaseNode):
@@ -7,4 +8,5 @@ class MergeNode(BaseNode):
     with Vellum's Merge Node, and for most cases, you should extend from `BaseNode.Trigger` directly.
     """
 
-    pass
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY

vellum/workflows/nodes/displayable/note_node/node.py

@@ -1,4 +1,5 @@
 from vellum.workflows.nodes.bases import BaseNode
+from vellum.workflows.types import MergeBehavior
 
 
 class NoteNode(BaseNode):
@@ -6,5 +7,8 @@ class NoteNode(BaseNode):
     A no-op Node purely used to display a note in the Vellum UI.
     """
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     def run(self) -> BaseNode.Outputs:
         raise RuntimeError("NoteNode should never be run")

vellum/workflows/nodes/displayable/prompt_deployment_node/node.py

@@ -4,6 +4,7 @@ from vellum.workflows.errors import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.displayable.bases import BasePromptDeploymentNode as BasePromptDeploymentNode
 from vellum.workflows.outputs import BaseOutput
+from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
@@ -23,6 +24,9 @@ class PromptDeploymentNode(BasePromptDeploymentNode[StateType]):
     request_options: Optional[RequestOptions] - The request options to use for the Prompt Execution
     """
 
+    class Trigger(BasePromptDeploymentNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BasePromptDeploymentNode.Outputs):
         """
         The outputs of the PromptDeploymentNode.

vellum/workflows/nodes/displayable/search_node/node.py

@@ -1,6 +1,7 @@
 from typing import ClassVar
 
 from vellum.workflows.nodes.displayable.bases import BaseSearchNode as BaseSearchNode
+from vellum.workflows.types import MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
@@ -18,6 +19,9 @@ class SearchNode(BaseSearchNode[StateType]):
 
     chunk_separator: ClassVar[str] = "\n\n#####\n\n"
 
+    class Trigger(BaseSearchNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     class Outputs(BaseSearchNode.Outputs):
         """
         The outputs of the SearchNode.

vellum/workflows/nodes/displayable/subworkflow_deployment_node/node.py

@@ -19,7 +19,7 @@ from vellum.workflows.errors.types import workflow_event_error_to_workflow_error
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.nodes.bases.base import BaseNode
 from vellum.workflows.outputs.base import BaseOutput
-from vellum.workflows.types.core import EntityInputsInterface
+from vellum.workflows.types.core import EntityInputsInterface, MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
@@ -49,6 +49,9 @@ class SubworkflowDeploymentNode(BaseNode[StateType], Generic[StateType]):
 
     request_options: Optional[RequestOptions] = None
 
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
     def _compile_subworkflow_inputs(self) -> List[WorkflowRequestInputRequest]:
         # TODO: We may want to consolidate with prompt deployment input compilation
         # https://app.shortcut.com/vellum/story/4117

vellum/workflows/nodes/utils.py

@@ -4,6 +4,7 @@ from types import ModuleType
 from typing import Any, Callable, Optional, Type, TypeVar
 
 from vellum.workflows.nodes import BaseNode
+from vellum.workflows.nodes.bases.base_adornment_node import BaseAdornmentNode
 from vellum.workflows.ports.port import Port
 from vellum.workflows.types.generics import NodeType
 
@@ -12,7 +13,7 @@ ADORNMENT_MODULE_NAME = "<adornment>"
 
 @cache
 def get_unadorned_node(node: Type[BaseNode]) -> Type[BaseNode]:
-    wrapped_node = getattr(node, "__wrapped_node__", None)
+    wrapped_node = get_wrapped_node(node)
     if wrapped_node is not None:
         return get_unadorned_node(wrapped_node)
 
@@ -28,22 +29,11 @@ def get_unadorned_port(port: Port) -> Port:
     return getattr(unadorned_node.Ports, port.name)
 
 
-@cache
-def get_wrapped_node(node: Type[NodeType]) -> Type[BaseNode]:
-    wrapped_node = getattr(node, "__wrapped_node__", None)
-    if wrapped_node is None:
-        raise AttributeError("Wrapped node not found")
-
-    return wrapped_node
-
+def get_wrapped_node(node: Type[NodeType]) -> Optional[Type[BaseNode]]:
+    if not issubclass(node, BaseAdornmentNode):
+        return None
 
-def has_wrapped_node(node: Type[NodeType]) -> bool:
-    try:
-        get_wrapped_node(node)
-    except AttributeError:
-        return False
-
-    return True
+    return node.__wrapped_node__
 
 
 AdornableNode = TypeVar("AdornableNode", bound=BaseNode)
@@ -57,8 +47,6 @@ def create_adornment(
         # https://app.shortcut.com/vellum/story/4116
         from vellum.workflows import BaseWorkflow
 
-        inner_cls._is_wrapped_node = True
-
         class Subworkflow(BaseWorkflow):
             graph = inner_cls
 

{vellum_ai-0.13.8.dist-info → vellum_ai-0.13.10.dist-info}/METADATA

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