vellum-ai 0.11.1__tar.gz → 0.11.3__tar.gz

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/PKG-INFO

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

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/ee/vellum_ee/workflows/display/base.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from uuid import UUID
-from typing import Optional, TypeVar
+from typing import TypeVar
 
 
 @dataclass
@@ -20,8 +20,6 @@ WorkflowMetaDisplayOverridesType = TypeVar("WorkflowMetaDisplayOverridesType", b
 @dataclass
 class WorkflowInputsDisplayOverrides:
     id: UUID
-    required: Optional[bool] = None
-    color: Optional[str] = None
 
 
 @dataclass

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/ee/vellum_ee/workflows/display/nodes/vellum/merge_node.py

@@ -1,5 +1,5 @@
 from uuid import UUID
-from typing import Any, ClassVar, Generic, List, Optional, TypeVar
+from typing import Any, ClassVar, Generic, List, Optional, Type, TypeVar
 
 from vellum.workflows.nodes.displayable import MergeNode
 from vellum.workflows.types.core import JsonObject
@@ -14,6 +14,10 @@ _MergeNodeType = TypeVar("_MergeNodeType", bound=MergeNode)
 class BaseMergeNodeDisplay(BaseNodeVellumDisplay[_MergeNodeType], Generic[_MergeNodeType]):
     target_handle_ids: ClassVar[List[UUID]]
 
+    def __init__(self, node: Type[_MergeNodeType]):
+        super().__init__(node)
+        self._target_handle_iterator = 0
+
     def serialize(self, display_context: WorkflowDisplayContext, **kwargs: Any) -> JsonObject:
         node = self._node
         node_id = self.node_id
@@ -46,3 +50,18 @@ class BaseMergeNodeDisplay(BaseNodeVellumDisplay[_MergeNodeType], Generic[_Merge
 
     def get_target_handle_ids(self) -> Optional[List[UUID]]:
         return self._get_explicit_node_display_attr("target_handle_ids", List[UUID])
+
+    def get_target_handle_id_by_source_node_id(self, source_node_id: UUID) -> UUID:
+        target_handle_ids = self.get_target_handle_ids()
+        if target_handle_ids is None:
+            return uuid4_from_hash(f"{self.node_id}|target_handle|{source_node_id}")
+
+        # Edges call this method to know which handle to connect to
+        # We use the order of the edges to determine the handle id. This is quite brittle to the order of the
+        # edges matching the order of the Merge Node's data.target_handles attribute. We should look into a
+        # longer term solution, or cutover Merge Nodes to Generic Nodes soon
+        target_handle_id = target_handle_ids[self._target_handle_iterator]
+        self._target_handle_iterator += 1
+        if self._target_handle_iterator >= len(self.target_handle_ids):
+            self._target_handle_iterator = 0
+        return target_handle_id

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/ee/vellum_ee/workflows/display/nodes/vellum/templating_node.py

@@ -1,5 +1,5 @@
 from uuid import UUID
-from typing import ClassVar, Dict, Generic, Optional, TypeVar
+from typing import ClassVar, Generic, Optional, TypeVar
 
 from vellum.workflows.nodes.core.templating_node import TemplatingNode
 from vellum.workflows.types.core import JsonObject
@@ -11,10 +11,11 @@ from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
 _TemplatingNodeType = TypeVar("_TemplatingNodeType", bound=TemplatingNode)
 
+TEMPLATE_INPUT_NAME = "template"
+
 
 class BaseTemplatingNodeDisplay(BaseNodeVellumDisplay[_TemplatingNodeType], Generic[_TemplatingNodeType]):
     template_input_id: ClassVar[Optional[UUID]] = None
-    input_ids_by_name: ClassVar[Dict[str, UUID]] = {}
 
     def serialize(
         self, display_context: WorkflowDisplayContext, error_output_id: Optional[UUID] = None, **kwargs
@@ -22,12 +23,21 @@ class BaseTemplatingNodeDisplay(BaseNodeVellumDisplay[_TemplatingNodeType], Gene
         node = self._node
         node_id = self.node_id
 
+        template_input_id = self.template_input_id or next(
+            (
+                input_id
+                for input_name, input_id in self.node_input_ids_by_name.items()
+                if input_name == TEMPLATE_INPUT_NAME
+            ),
+            None,
+        )
+
         template_node_input = create_node_input(
             node_id=node_id,
             input_name="template",
             value=node.template,
             display_context=display_context,
-            input_id=self.template_input_id,
+            input_id=template_input_id,
         )
         template_node_inputs = raise_if_descriptor(node.inputs)
         template_inputs = [
@@ -36,9 +46,10 @@ class BaseTemplatingNodeDisplay(BaseNodeVellumDisplay[_TemplatingNodeType], Gene
                 input_name=variable_name,
                 value=variable_value,
                 display_context=display_context,
-                input_id=self.input_ids_by_name.get("template"),
+                input_id=self.node_input_ids_by_name.get(variable_name),
             )
             for variable_name, variable_value in template_node_inputs.items()
+            if variable_name != TEMPLATE_INPUT_NAME
         ]
         node_inputs = [template_node_input, *template_inputs]
 

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/ee/vellum_ee/workflows/display/tests/workflow_serialization/test_basic_merge_node_serialization.py

@@ -218,7 +218,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "59243c65-053f-4ea6-9157-3f3edb1477bf",
                 "source_handle_id": "b9c5f52b-b714-46e8-a09c-38b4e770dd36",
                 "target_node_id": "37c10e8a-771b-432b-a767-31f5007851f0",
-                "target_handle_id": "0efd256f-f5f6-45fe-9adb-651780f5e63d",
+                "target_handle_id": "42eeb66c-9792-4609-8c71-3a56f668f4dc",
                 "type": "DEFAULT",
             },
             {
@@ -226,7 +226,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "127ef456-91bc-43c6-bd8b-1772db5e3cb5",
                 "source_handle_id": "b0bd17f3-4ce6-4232-9666-ec8afa161bf2",
                 "target_node_id": "37c10e8a-771b-432b-a767-31f5007851f0",
-                "target_handle_id": "0efd256f-f5f6-45fe-9adb-651780f5e63d",
+                "target_handle_id": "f40ff7fb-de1b-4aa4-ba3c-7630f7357cbf",
                 "type": "DEFAULT",
             },
             {

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/ee/vellum_ee/workflows/display/vellum.py

@@ -74,7 +74,9 @@ class WorkflowMetaVellumDisplay(WorkflowMetaVellumDisplayOverrides):
 
 @dataclass
 class WorkflowInputsVellumDisplayOverrides(WorkflowInputsDisplay, WorkflowInputsDisplayOverrides):
-    pass
+    name: Optional[str] = None
+    required: Optional[bool] = None
+    color: Optional[str] = None
 
 
 @dataclass
@@ -115,8 +117,6 @@ class WorkflowOutputVellumDisplayOverrides(WorkflowOutputDisplay, WorkflowOutput
     target_handle_id: UUID
     display_data: NodeDisplayData
     edge_id: UUID
-    # source_node_id: Optional[UUID]
-    # source_handle_id: Optional[UUID]
 
 
 @dataclass

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/ee/vellum_ee/workflows/display/workflows/vellum_workflow_display.py

@@ -12,6 +12,7 @@ from vellum.workflows.references import WorkflowInputReference
 from vellum.workflows.references.output import OutputReference
 from vellum.workflows.types.core import JsonArray, JsonObject
 from vellum.workflows.types.generics import WorkflowType
+from vellum_ee.workflows.display.nodes import BaseMergeNodeDisplay
 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
@@ -66,7 +67,7 @@ class VellumWorkflowDisplay(
             input_variables.append(
                 {
                     "id": str(workflow_input_display.id),
-                    "key": workflow_input.name,
+                    "key": workflow_input_display.name or workflow_input.name,
                     "type": infer_vellum_variable_type(workflow_input),
                     "default": default.dict() if default else None,
                     "required": required,
@@ -366,7 +367,12 @@ class VellumWorkflowDisplay(
 
         target_node_display = node_displays[target_node]
         target_node_id = target_node_display.node_id
-        target_handle_id = target_node_display.get_target_handle_id()
+
+        target_handle_id: UUID
+        if isinstance(target_node_display, BaseMergeNodeDisplay):
+            target_handle_id = target_node_display.get_target_handle_id_by_source_node_id(source_node_id)
+        else:
+            target_handle_id = target_node_display.get_target_handle_id()
 
         return self._generate_edge_display_from_source(
             source_node_id, source_handle_id, target_node_id, target_handle_id, overrides

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/pyproject.toml

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

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/__init__.py

@@ -319,6 +319,7 @@ from .types import (
     SentenceChunkingRequest,
     SlimDeploymentRead,
     SlimDocument,
+    SlimDocumentDocumentToDocumentIndex,
     SlimWorkflowDeployment,
     StreamingAdHocExecutePromptEvent,
     StreamingExecutePromptEvent,
@@ -851,6 +852,7 @@ __all__ = [
     "SentenceChunkingRequest",
     "SlimDeploymentRead",
     "SlimDocument",
+    "SlimDocumentDocumentToDocumentIndex",
     "SlimWorkflowDeployment",
     "StreamingAdHocExecutePromptEvent",
     "StreamingExecutePromptEvent",

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/client/core/client_wrapper.py

@@ -17,7 +17,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "0.11.1",
+            "X-Fern-SDK-Version": "0.11.2",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/client/types/__init__.py

@@ -330,6 +330,7 @@ from .sentence_chunking import SentenceChunking
 from .sentence_chunking_request import SentenceChunkingRequest
 from .slim_deployment_read import SlimDeploymentRead
 from .slim_document import SlimDocument
+from .slim_document_document_to_document_index import SlimDocumentDocumentToDocumentIndex
 from .slim_workflow_deployment import SlimWorkflowDeployment
 from .streaming_ad_hoc_execute_prompt_event import StreamingAdHocExecutePromptEvent
 from .streaming_execute_prompt_event import StreamingExecutePromptEvent
@@ -839,6 +840,7 @@ __all__ = [
     "SentenceChunkingRequest",
     "SlimDeploymentRead",
     "SlimDocument",
+    "SlimDocumentDocumentToDocumentIndex",
     "SlimWorkflowDeployment",
     "StreamingAdHocExecutePromptEvent",
     "StreamingExecutePromptEvent",

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/client/types/document_document_to_document_index.py

@@ -8,6 +8,10 @@ from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class DocumentDocumentToDocumentIndex(UniversalBaseModel):
+    """
+    A detailed representation of the link between a Document and a Document Index it's a member of.
+    """
+
     id: str = pydantic.Field()
     """
     Vellum-generated ID that uniquely identifies this link.
@@ -29,6 +33,8 @@ class DocumentDocumentToDocumentIndex(UniversalBaseModel):
     - `FAILED` - Failed
     """
 
+    extracted_text_file_url: typing.Optional[str] = None
+
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
     else:

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/client/types/slim_document.py

@@ -7,7 +7,7 @@ import datetime as dt
 from .document_processing_state import DocumentProcessingState
 from .processing_failure_reason_enum import ProcessingFailureReasonEnum
 from .document_status import DocumentStatus
-from .document_document_to_document_index import DocumentDocumentToDocumentIndex
+from .slim_document_document_to_document_index import SlimDocumentDocumentToDocumentIndex
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
@@ -58,7 +58,7 @@ class SlimDocument(UniversalBaseModel):
     A previously supplied JSON object containing metadata that can be filtered on when searching.
     """
 
-    document_to_document_indexes: typing.List[DocumentDocumentToDocumentIndex]
+    document_to_document_indexes: typing.List[SlimDocumentDocumentToDocumentIndex]
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

vellum_ai-0.11.3/src/vellum/client/types/slim_document_document_to_document_index.py

@@ -0,0 +1,43 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import pydantic
+import typing
+from .indexing_state_enum import IndexingStateEnum
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+
+
+class SlimDocumentDocumentToDocumentIndex(UniversalBaseModel):
+    """
+    A slim representation of the link between a Document and a Document Index it's a member of.
+    """
+
+    id: str = pydantic.Field()
+    """
+    Vellum-generated ID that uniquely identifies this link.
+    """
+
+    document_index_id: str = pydantic.Field()
+    """
+    Vellum-generated ID that uniquely identifies the index this document is included in.
+    """
+
+    indexing_state: typing.Optional[IndexingStateEnum] = pydantic.Field(default=None)
+    """
+    An enum value representing where this document is along its indexing lifecycle for this index.
+    
+    - `AWAITING_PROCESSING` - Awaiting Processing
+    - `QUEUED` - Queued
+    - `INDEXING` - Indexing
+    - `INDEXED` - Indexed
+    - `FAILED` - Failed
+    """
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

vellum_ai-0.11.3/src/vellum/types/slim_document_document_to_document_index.py

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

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/workflows/descriptors/base.py

@@ -30,7 +30,7 @@ if TYPE_CHECKING:
     from vellum.workflows.nodes.bases import BaseNode
     from vellum.workflows.state.base import BaseState
 
-_T = TypeVar("_T")
+_T = TypeVar("_T", covariant=True)
 _O = TypeVar("_O")
 _O2 = TypeVar("_O2")
 

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/workflows/nodes/bases/tests/test_base_node.py

@@ -25,7 +25,7 @@ def test_base_node__node_resolution__unset_pydantic_fields():
     assert node.data.dict() == my_data.dict()
 
 
-def test_base_node__node_resolution__descriptor_in_dict():
+def test_base_node__node_resolution__descriptors_in_dict():
     # GIVEN an Input and State class
     class Inputs(BaseInputs):
         hello: str

{vellum_ai-0.11.1 → vellum_ai-0.11.3}/src/vellum/workflows/nodes/core/map_node/node.py

@@ -3,14 +3,18 @@ from queue import Empty, Queue
 from threading import Thread
 from typing import TYPE_CHECKING, Callable, Dict, Generic, List, Optional, Tuple, Type, TypeVar, Union, overload
 
+from vellum.workflows.context import execution_context, get_parent_context
 from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.errors.types import VellumErrorCode
+from vellum.workflows.events.types import ParentContext
 from vellum.workflows.exceptions import NodeException
 from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.outputs import BaseOutputs
 from vellum.workflows.state.base import BaseState
+from vellum.workflows.state.context import WorkflowContext
 from vellum.workflows.types.generics import NodeType, StateType
+from vellum.workflows.workflows.event_filters import all_workflow_event_filter
 
 if TYPE_CHECKING:
     from vellum.workflows import BaseWorkflow
@@ -53,7 +57,15 @@ class MapNode(BaseNode, Generic[StateType, MapNodeItemType]):
         fulfilled_iterations: List[bool] = []
         for index, item in enumerate(self.items):
             fulfilled_iterations.append(False)
-            thread = Thread(target=self._run_subworkflow, kwargs={"item": item, "index": index})
+            parent_context = get_parent_context() or self._context.parent_context
+            thread = Thread(
+                target=self._context_run_subworkflow,
+                kwargs={
+                    "item": item,
+                    "index": index,
+                    "parent_context": parent_context,
+                },
+            )
             thread.start()
 
         try:
@@ -62,6 +74,7 @@ class MapNode(BaseNode, Generic[StateType, MapNodeItemType]):
             while map_node_event := self._event_queue.get():
                 index = map_node_event[0]
                 terminal_event = map_node_event[1]
+                self._context._emit_subworkflow_event(terminal_event)
 
                 if terminal_event.name == "workflow.execution.fulfilled":
                     workflow_output_vars = vars(terminal_event.outputs)
@@ -85,12 +98,22 @@ class MapNode(BaseNode, Generic[StateType, MapNodeItemType]):
                     )
         except Empty:
             pass
-
         return self.Outputs(**mapped_items)
 
+    def _context_run_subworkflow(
+        self, *, item: MapNodeItemType, index: int, parent_context: Optional[ParentContext] = None
+    ) -> None:
+        parent_context = parent_context or self._context.parent_context
+        with execution_context(parent_context=parent_context):
+            self._run_subworkflow(item=item, index=index)
+
     def _run_subworkflow(self, *, item: MapNodeItemType, index: int) -> None:
-        subworkflow = self.subworkflow(parent_state=self.state, context=self._context)
-        events = subworkflow.stream(inputs=self.SubworkflowInputs(index=index, item=item, all_items=self.items))
+        context = WorkflowContext(_vellum_client=self._context._vellum_client)
+        subworkflow = self.subworkflow(parent_state=self.state, context=context)
+        events = subworkflow.stream(
+            inputs=self.SubworkflowInputs(index=index, item=item, all_items=self.items),
+            event_filter=all_workflow_event_filter,
+        )
 
         for event in events:
             self._event_queue.put((index, event))

vellum_ai-0.11.3/src/vellum/workflows/nodes/core/templating_node/tests/test_templating_node.py

@@ -0,0 +1,42 @@
+import json
+
+from vellum.workflows.nodes.bases.base import BaseNode
+from vellum.workflows.nodes.core.templating_node.node import TemplatingNode
+
+
+def test_templating_node__dict_output():
+    # GIVEN a templating node with a dict input that just returns it
+    class TemplateNode(TemplatingNode):
+        template = "{{ data }}"
+        inputs = {
+            "data": {
+                "key": "value",
+            }
+        }
+
+    # WHEN the node is run
+    node = TemplateNode()
+    outputs = node.run()
+
+    # THEN the output is json serializable
+    assert json.loads(outputs.result) == {"key": "value"}
+
+
+def test_templating_node__execution_count_reference():
+    # GIVEN a random node
+    class OtherNode(BaseNode):
+        pass
+
+    # AND a templating node that references the execution count of the random node
+    class TemplateNode(TemplatingNode):
+        template = "{{ total }}"
+        inputs = {
+            "total": OtherNode.Execution.count,
+        }
+
+    # WHEN the node is run
+    node = TemplateNode()
+    outputs = node.run()
+
+    # THEN the output is just the total
+    assert outputs.result == "0"

vellum_ai-0.11.1/src/vellum/workflows/nodes/core/templating_node/tests/test_templating_node.py

@@ -1,21 +0,0 @@
-import json
-
-from vellum.workflows.nodes.core.templating_node.node import TemplatingNode
-
-
-def test_templating_node__dict_output():
-    # GIVEN a templating node with a dict input that just returns it
-    class TemplateNode(TemplatingNode):
-        template = "{{ data }}"
-        inputs = {
-            "data": {
-                "key": "value",
-            }
-        }
-
-    # WHEN the node is run
-    node = TemplateNode()
-    outputs = node.run()
-
-    # THEN the output is json serializable
-    assert json.loads(outputs.result) == {"key": "value"}