vellum-ai 1.7.9__py3-none-any.whl → 1.7.10__py3-none-any.whl

vellum/client/core/client_wrapper.py

@@ -27,10 +27,10 @@ class BaseClientWrapper:
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "vellum-ai/1.7.9",
+            "User-Agent": "vellum-ai/1.7.10",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "1.7.9",
+            "X-Fern-SDK-Version": "1.7.10",
             **(self.get_custom_headers() or {}),
         }
         if self._api_version is not None:

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

@@ -4,9 +4,11 @@ from typing import ClassVar, Generator, Generic, Iterator, List, Optional, Union
 from vellum import AdHocExecutePromptEvent, ExecutePromptEvent, PromptOutput
 from vellum.client.core import RequestOptions
 from vellum.client.core.api_error import ApiError
+from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.errors.types import WorkflowErrorCode, vellum_error_to_workflow_error
 from vellum.workflows.events.node import NodeExecutionStreamingEvent
 from vellum.workflows.exceptions import NodeException
+from vellum.workflows.expressions.coalesce_expression import CoalesceExpression
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.outputs.base import BaseOutput, BaseOutputs
 from vellum.workflows.references.output import OutputReference
@@ -14,6 +16,16 @@ from vellum.workflows.types.core import EntityInputsInterface, MergeBehavior
 from vellum.workflows.types.generics import StateType
 
 
+def _contains_reference_to_output(reference: BaseDescriptor, target_reference: OutputReference) -> bool:
+    if reference == target_reference:
+        return True
+    if isinstance(reference, CoalesceExpression):
+        return _contains_reference_to_output(reference.lhs, target_reference) or _contains_reference_to_output(
+            reference.rhs, target_reference
+        )
+    return False
+
+
 class BasePromptNode(BaseNode[StateType], Generic[StateType]):
     # Inputs that are passed to the Prompt
     prompt_inputs: ClassVar[Optional[EntityInputsInterface]] = None
@@ -112,10 +124,7 @@ class BasePromptNode(BaseNode[StateType], Generic[StateType]):
         if not target_node_output:
             return False
 
-        if not isinstance(target_node_output.instance, OutputReference):
+        if not isinstance(target_node_output.instance, BaseDescriptor):
             return False
 
-        if target_node_output.instance.name != "text":
-            return False
-
-        return True
+        return _contains_reference_to_output(target_node_output.instance, event.node_definition.Outputs.text)

{vellum_ai-1.7.9.dist-info → vellum_ai-1.7.10.dist-info}/METADATA

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

{vellum_ai-1.7.9.dist-info → vellum_ai-1.7.10.dist-info}/RECORD

@@ -111,7 +111,7 @@ vellum_ee/workflows/display/tests/workflow_serialization/test_basic_try_node_ser
 vellum_ee/workflows/display/tests/workflow_serialization/test_complex_terminal_node_serialization.py,sha256=exT7U-axwtYgFylagScflSQLJEND51qIAx2UATju6JM,6023
 vellum_ee/workflows/display/tests/workflow_serialization/test_final_output_node_map_reference_serialization.py,sha256=vl3pxUJlrYRA8zzFJ-gRm7fe-5fviLNSIsUC7imnMqk,3502
 vellum_ee/workflows/display/tests/workflow_serialization/test_manual_trigger_serialization.py,sha256=L4bJWW94eq5cl6pjIaX7pQrDHoF67Gudfx-41dmmd10,2330
-vellum_ee/workflows/display/tests/workflow_serialization/test_slack_trigger_serialization.py,sha256=lBCzNJHmP_Z7_QEnzBO2FYvjJzVm8-lHxb9buivrqZk,4971
+vellum_ee/workflows/display/tests/workflow_serialization/test_slack_trigger_serialization.py,sha256=HCZKF2_wOrn05s94PKWBP8cLl6Uw8j3y7Ec83xxQfLM,2258
 vellum_ee/workflows/display/tests/workflow_serialization/test_terminal_node_any_serialization.py,sha256=4WAmSEJZlDBLPhsD1f4GwY9ahB9F6qJKGnL6j7ZYlzQ,1740
 vellum_ee/workflows/display/tests/workflow_serialization/test_web_search_node_serialization.py,sha256=vbDFBrWUPeeW7cxjNA6SXrsHlYcbOAhlQ4C45Vdnr1c,3428
 vellum_ee/workflows/display/tests/workflow_serialization/test_workflow_input_parameterization_error.py,sha256=vAdmn3YTBDpo55znbydQxsgg9ASqHcvsUPwiBR_7wfo,1461
@@ -155,14 +155,14 @@ vellum_ee/workflows/tests/local_workflow/workflow.py,sha256=A4qOzOPNwePYxWbcAgIP
 vellum_ee/workflows/tests/test_display_meta.py,sha256=PkXJVnMZs9GNooDkd59n4YTBAX3XGPQWeSSVbhehVFM,5112
 vellum_ee/workflows/tests/test_registry.py,sha256=B8xRIuEyLWfSqrYoPldNQXhKPfe50PllvtAZoI8-uPs,6066
 vellum_ee/workflows/tests/test_serialize_module.py,sha256=zleQTcGZa5_nzwu4zpFoqEHhk7pb64hGrhObR4anhPQ,4471
-vellum_ee/workflows/tests/test_server.py,sha256=RmLE2s9Cs7NejvWf7aPRNuAeEER-hGk-9Q9fYrn5wps,26013
+vellum_ee/workflows/tests/test_server.py,sha256=Ao2htC5i6drtnx1b2HHFM1O-OzVGuTi6PsJorzKF_mM,26284
 vellum_ee/workflows/tests/test_virtual_files.py,sha256=TJEcMR0v2S8CkloXNmCHA0QW0K6pYNGaIjraJz7sFvY,2762
 vellum/__init__.py,sha256=6dkyRHmIKuQPzL_z3QLVUrbkAF-HJKDhDSMCnf4ZsKw,49502
 vellum/client/README.md,sha256=flqu57ubZNTfpq60CdLtJC9gp4WEkyjb_n_eZ4OYf9w,6497
 vellum/client/__init__.py,sha256=rMnKRqL5-356SBc-rfm56MkO87PuAi2mtcfBszcJU1M,74316
 vellum/client/core/__init__.py,sha256=lTcqUPXcx4112yLDd70RAPeqq6tu3eFMe1pKOqkW9JQ,1562
 vellum/client/core/api_error.py,sha256=44vPoTyWN59gonCIZMdzw7M1uspygiLnr3GNFOoVL2Q,614
-vellum/client/core/client_wrapper.py,sha256=SDfeITPfYIuFYtFxDzo3M3ePxfx4Mu0Yw6Y3QEnkCts,2840
+vellum/client/core/client_wrapper.py,sha256=9c4zn6yMqgyXRP7ix8lzAHvyY9fwno1tGUAQ2N1anrI,2842
 vellum/client/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 vellum/client/core/file.py,sha256=d4NNbX8XvXP32z8KpK2Xovv33nFfruIrpz0QWxlgpZk,2663
 vellum/client/core/force_multipart.py,sha256=awxh5MtcRYe74ehY8U76jzv6fYM_w_D3Rur7KQQzSDk,429
@@ -1924,7 +1924,7 @@ vellum/workflows/nodes/displayable/bases/api_node/node.py,sha256=cOYaIqimzDL6TuX
 vellum/workflows/nodes/displayable/bases/api_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/nodes/displayable/bases/api_node/tests/test_node.py,sha256=5C59vn_yg4r5EWioKIr658Jr1MSGX3YF4yKJokY37Xc,4726
 vellum/workflows/nodes/displayable/bases/base_prompt_node/__init__.py,sha256=Org3xTvgp1pA0uUXFfnJr29D3HzCey2lEdYF4zbIUgo,70
-vellum/workflows/nodes/displayable/bases/base_prompt_node/node.py,sha256=w02vgydiwNoKru324QLSkH3BiGUvHTgKbf05BEx945s,4657
+vellum/workflows/nodes/displayable/bases/base_prompt_node/node.py,sha256=ZIAXMreHcs3OR-djlkXgqF6tw7-Qfl8KUvjmJ7qRU3U,5204
 vellum/workflows/nodes/displayable/bases/inline_prompt_node/__init__.py,sha256=Hl35IAoepRpE-j4cALaXVJIYTYOF3qszyVbxTj4kS1s,82
 vellum/workflows/nodes/displayable/bases/inline_prompt_node/node.py,sha256=ITxAa1HWF6OPdcKg0DdTK7YP94ezzzWVyZzCRMiybIg,18638
 vellum/workflows/nodes/displayable/bases/inline_prompt_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -2079,8 +2079,8 @@ vellum/workflows/workflows/event_filters.py,sha256=GSxIgwrX26a1Smfd-6yss2abGCnad
 vellum/workflows/workflows/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/workflows/tests/test_base_workflow.py,sha256=Boa-_m9ii2Qsa1RvVM-VYniF7zCpzGgEGy-OnPZkrHg,23941
 vellum/workflows/workflows/tests/test_context.py,sha256=VJBUcyWVtMa_lE5KxdhgMu0WYNYnUQUDvTF7qm89hJ0,2333
-vellum_ai-1.7.9.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-1.7.9.dist-info/METADATA,sha256=W9uh0R7Qv8FtGnts5F2-3PAMz4ki8JwFXCa43kinV8U,5547
-vellum_ai-1.7.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-1.7.9.dist-info/entry_points.txt,sha256=xVavzAKN4iF_NbmhWOlOkHluka0YLkbN_pFQ9pW3gLI,117
-vellum_ai-1.7.9.dist-info/RECORD,,
+vellum_ai-1.7.10.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-1.7.10.dist-info/METADATA,sha256=vdfRtdqtbtZRBcpr0kWHkp5NLGNlT28vVlfm4GtK6cQ,5548
+vellum_ai-1.7.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-1.7.10.dist-info/entry_points.txt,sha256=xVavzAKN4iF_NbmhWOlOkHluka0YLkbN_pFQ9pW3gLI,117
+vellum_ai-1.7.10.dist-info/RECORD,,

vellum_ee/workflows/display/tests/workflow_serialization/test_slack_trigger_serialization.py

@@ -1,148 +1,13 @@
-"""Tests for serialization of workflows with SlackTrigger."""
-
-from vellum.workflows import BaseWorkflow
-from vellum.workflows.inputs.base import BaseInputs
-from vellum.workflows.nodes.bases.base import BaseNode
-from vellum.workflows.state.base import BaseState
-from vellum.workflows.triggers.slack import SlackTrigger
 from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
 
+from tests.workflows.basic_trigger_slack.workflow import SlackTriggerWorkflow
 
-class Inputs(BaseInputs):
-    input: str
-
-
-class SimpleNode(BaseNode):
-    class Outputs(BaseNode.Outputs):
-        output = Inputs.input
-
-
-def test_slack_trigger_serialization() -> None:
-    """Workflow with SlackTrigger serializes with triggers field."""
-
-    class TestWorkflow(BaseWorkflow[Inputs, BaseState]):
-        graph = SlackTrigger >> SimpleNode
-
-        class Outputs(BaseWorkflow.Outputs):
-            output = SimpleNode.Outputs.output
-
-    result = get_workflow_display(workflow_class=TestWorkflow).serialize()
-
-    # Validate triggers structure
-    assert "triggers" in result
-    triggers = result["triggers"]
-    assert isinstance(triggers, list)
-    assert len(triggers) == 1
-
-    trigger = triggers[0]
-    assert isinstance(trigger, dict)
-    assert trigger["type"] == "SLACK_MESSAGE"
-    assert "id" in trigger
-
-    # Validate attributes
-    assert "attributes" in trigger
-    attributes = trigger["attributes"]
-    assert isinstance(attributes, list)
-    assert len(attributes) == 6
-
-    attribute_names = set()
-    for attribute in attributes:
-        assert isinstance(attribute, dict)
-        assert "name" in attribute
-        assert isinstance(attribute["name"], str)
-        attribute_names.add(attribute["name"])
-    assert attribute_names == {
-        "message",
-        "channel",
-        "user",
-        "timestamp",
-        "thread_ts",
-        "event_type",
-    }
-
-    for attribute in attributes:
-        assert isinstance(attribute, dict)
-        assert attribute["value"] is None
-        assert isinstance(attribute["id"], str)
-        assert attribute["id"]
-
-
-def test_slack_trigger_multiple_entrypoints() -> None:
-    """SlackTrigger with multiple entrypoints."""
-
-    class NodeA(BaseNode):
-        class Outputs(BaseNode.Outputs):
-            output = Inputs.input
 
-    class NodeB(BaseNode):
-        class Outputs(BaseNode.Outputs):
-            output = Inputs.input
+def test_serialize_slack_trigger_workflow():
+    workflow_display = get_workflow_display(workflow_class=SlackTriggerWorkflow)
+    serialized_workflow: dict = workflow_display.serialize()
 
-    class MultiWorkflow(BaseWorkflow[Inputs, BaseState]):
-        graph = SlackTrigger >> {NodeA, NodeB}
-
-        class Outputs(BaseWorkflow.Outputs):
-            output_a = NodeA.Outputs.output
-            output_b = NodeB.Outputs.output
-
-    result = get_workflow_display(workflow_class=MultiWorkflow).serialize()
-
-    # Validate triggers
-    assert "triggers" in result
-    triggers = result["triggers"]
-    assert isinstance(triggers, list)
-    assert len(triggers) == 1
-
-    trigger = triggers[0]
-    assert isinstance(trigger, dict)
-    assert trigger["type"] == "SLACK_MESSAGE"
-
-    # Validate attributes
-    assert "attributes" in trigger
-    attributes = trigger["attributes"]
-    assert isinstance(attributes, list)
-    attribute_names = set()
-    for attribute in attributes:
-        assert isinstance(attribute, dict)
-        assert "name" in attribute
-        assert isinstance(attribute["name"], str)
-        attribute_names.add(attribute["name"])
-
-    assert attribute_names == {
-        "message",
-        "channel",
-        "user",
-        "timestamp",
-        "thread_ts",
-        "event_type",
-    }
-
-    # Validate nodes
-    assert "workflow_raw_data" in result
-    workflow_data = result["workflow_raw_data"]
-    assert isinstance(workflow_data, dict)
-    assert "nodes" in workflow_data
-    nodes = workflow_data["nodes"]
-    assert isinstance(nodes, list)
-
-    generic_nodes = [node for node in nodes if isinstance(node, dict) and node.get("type") == "GENERIC"]
-    assert len(generic_nodes) >= 2
-
-
-def test_serialized_slack_workflow_structure() -> None:
-    """Verify complete structure of serialized workflow with SlackTrigger."""
-
-    class TestWorkflow(BaseWorkflow[Inputs, BaseState]):
-        graph = SlackTrigger >> SimpleNode
-
-        class Outputs(BaseWorkflow.Outputs):
-            output = SimpleNode.Outputs.output
-
-    result = get_workflow_display(workflow_class=TestWorkflow).serialize()
-
-    # Validate top-level structure
-    assert isinstance(result, dict)
-    assert set(result.keys()) == {
+    assert serialized_workflow.keys() == {
         "workflow_raw_data",
         "input_variables",
         "state_variables",
@@ -150,18 +15,38 @@ def test_serialized_slack_workflow_structure() -> None:
         "triggers",
     }
 
-    # Validate workflow_raw_data structure
-    workflow_raw_data = result["workflow_raw_data"]
-    assert isinstance(workflow_raw_data, dict)
-    assert set(workflow_raw_data.keys()) == {
-        "nodes",
-        "edges",
-        "display_data",
-        "definition",
-        "output_values",
-    }
-
-    # Validate definition
-    definition = workflow_raw_data["definition"]
-    assert isinstance(definition, dict)
-    assert definition["name"] == "TestWorkflow"
+    triggers = serialized_workflow["triggers"]
+    assert triggers == [
+        {
+            "id": "45855aa4-27a0-426b-b399-a8ff2932a684",
+            "type": "SLACK_MESSAGE",
+            "attributes": [
+                {"id": "9d4bd7d7-314d-48b8-a483-f964ac3ca28a", "name": "channel", "type": "STRING", "value": None},
+                {"id": "af4aac3c-74f2-4250-801b-f2dbd7745277", "name": "event_type", "type": "STRING", "value": None},
+                {"id": "bdf8965f-b2f1-4f83-9a5a-e1532d73c795", "name": "message", "type": "STRING", "value": None},
+                {"id": "5a910518-f875-497c-ab5f-680eecce2d1d", "name": "thread_ts", "type": "STRING", "value": None},
+                {"id": "4aadb9ec-aabf-4a58-a9bb-41e89e8a20cb", "name": "timestamp", "type": "STRING", "value": None},
+                {"id": "c16971a0-73a3-4b81-93dc-2bcaafa3585a", "name": "user", "type": "STRING", "value": None},
+            ],
+        }
+    ]
+
+    workflow_raw_data = serialized_workflow["workflow_raw_data"]
+    nodes = workflow_raw_data["nodes"]
+
+    process_node = next(node for node in nodes if node["type"] == "GENERIC" and node["label"] == "Process Message Node")
+    assert "outputs" in process_node
+    assert process_node["outputs"] == [
+        {
+            "id": "a1208db6-2daf-48a4-acee-71c8b1f42656",
+            "name": "processed_message",
+            "type": "STRING",
+            "value": {
+                "type": "TRIGGER_ATTRIBUTE",
+                "trigger_id": "45855aa4-27a0-426b-b399-a8ff2932a684",
+                "attribute_id": "bdf8965f-b2f1-4f83-9a5a-e1532d73c795",
+            },
+        }
+    ]
+
+    assert triggers[0]["id"] == process_node["outputs"][0]["value"]["trigger_id"]

vellum_ee/workflows/tests/test_server.py

@@ -145,6 +145,11 @@ class CodeExecutionNode(BaseCodeExecutionNode[BaseState, int]):
     # AND we get the code execution result
     assert event.body.outputs == {"final_output": 5.0}
 
+    # AND the workflow definition module is correctly serialized as a list
+    serialized_event = event.model_dump(mode="json")
+    workflow_definition = serialized_event["body"]["workflow_definition"]
+    assert workflow_definition["module"] == [namespace, "workflow"]
+
 
 def test_load_from_module__simple_code_execution_node_with_try(
     vellum_client,