vellum-workflow-server 0.14.72__tar.gz → 0.14.72.post2__tar.gz

{vellum_workflow_server-0.14.72 → vellum_workflow_server-0.14.72.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vellum-workflow-server
-Version: 0.14.72
+Version: 0.14.72.post2
 Summary: 
 License: AGPL
 Requires-Python: >=3.9.0,<4

{vellum_workflow_server-0.14.72 → vellum_workflow_server-0.14.72.post2}/pyproject.toml

@@ -3,7 +3,7 @@ name = "vellum-workflow-server"
 
 [tool.poetry]
 name = "vellum-workflow-server"
-version = "0.14.72"
+version = "0.14.72.post2"
 description = ""
 readme = "README.md"
 authors = []

{vellum_workflow_server-0.14.72 → vellum_workflow_server-0.14.72.post2}/src/workflow_server/api/tests/test_workflow_view.py

@@ -27,10 +27,7 @@ def test_version_route__with_single_node_file(tmp_path):
 from vellum.workflows.nodes import BaseNode
 
 class TestNode(BaseNode):
-    \"""A test node for processing data.
-
-    This is a detailed description of what the node does.
-    \"""
+    \"""A test node for processing data.\"""
 """
     )
 
@@ -50,11 +47,26 @@ class TestNode(BaseNode):
     # AND the node should have the correct metadata
     node = nodes[0]
     assert UUID(node["id"])
-    assert node["module"] == ["vellum_custom_nodes"]
+    assert node["module"] == ["vellum_custom_nodes", "test_node"]
     assert node["name"] == "TestNode"
     assert node["label"] == "Test Node"
     assert "A test node for processing data." in node["description"]
-    assert "This is a detailed description" in node["description"]
+    assert node["exec_config"] == {
+        "adornments": None,
+        "attributes": [],
+        "base": {"module": ["vellum", "workflows", "nodes", "bases", "base"], "name": "BaseNode"},
+        "definition": {"module": ["vellum_custom_nodes", "test_node"], "name": "TestNode"},
+        "display_data": {
+            "comment": {"value": "A test node for processing data."},
+            "position": {"x": 0.0, "y": 0.0},
+        },
+        "id": "7a8b251d-f5ca-462a-b293-071d219460fb",
+        "label": "TestNode",
+        "outputs": [],
+        "ports": [{"id": "a3a0eefd-45d0-4f13-8c58-a836a9f7f9ed", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "a022e36c-9852-4772-9be3-3c6c147fd811", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "type": "GENERIC",
+    }
 
 
 def test_version_route__with_nodes_in_multiple_files(tmp_path):
@@ -102,14 +114,40 @@ class SomeOtherNode(BaseNode):
     assert some_node["label"] == "Some Node"
     assert some_node["description"] == "This is Some Node."
     assert UUID(some_node["id"])
-    assert some_node["module"] == ["vellum_custom_nodes"]
+    assert some_node["module"] == ["vellum_custom_nodes", "first_node"]
+    assert some_node["exec_config"] == {
+        "adornments": None,
+        "attributes": [],
+        "base": {"module": ["vellum", "workflows", "nodes", "bases", "base"], "name": "BaseNode"},
+        "definition": {"module": ["vellum_custom_nodes", "first_node"], "name": "SomeNode"},
+        "display_data": {"comment": {"value": "This is Some Node."}, "position": {"x": 0.0, "y": 0.0}},
+        "id": "1e559c2e-db82-41f0-9ceb-5e89b0c5a0a3",
+        "label": "SomeNode",
+        "outputs": [],
+        "ports": [{"id": "48e39e97-5fd4-471e-b4f2-51d3baf06456", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "e3381fb7-61fc-4c46-ae8e-51fc463b6a59", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "type": "GENERIC",
+    }
 
     # AND the second node should have correct metadata
     some_other_node = nodes[1]
     assert some_other_node["label"] == "Some Other Node"
     assert some_other_node["description"] == "This is Some Other Node."
     assert UUID(some_other_node["id"])
-    assert some_other_node["module"] == ["vellum_custom_nodes"]
+    assert some_other_node["module"] == ["vellum_custom_nodes", "second_node"]
+    assert some_other_node["exec_config"] == {
+        "adornments": None,
+        "attributes": [],
+        "base": {"module": ["vellum", "workflows", "nodes", "bases", "base"], "name": "BaseNode"},
+        "definition": {"module": ["vellum_custom_nodes", "second_node"], "name": "SomeOtherNode"},
+        "display_data": {"comment": {"value": "This is Some Other Node."}, "position": {"x": 0.0, "y": 0.0}},
+        "id": "7aee541b-b245-4c8a-9137-3e4631d5100c",
+        "label": "SomeOtherNode",
+        "outputs": [],
+        "ports": [{"id": "fb66b46a-d970-4bc9-83ea-70c154c57ddd", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "13fa2714-20b3-4bc3-ab79-621a188e3bfa", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "type": "GENERIC",
+    }
 
 
 def test_version_route__no_custom_nodes_dir(tmp_path):
@@ -164,6 +202,37 @@ class HelperClass:
         node_names = {node["name"] for node in nodes}
         assert node_names == {"ProcessingNode", "TransformationNode"}
 
+        # Find and assert each node individually
+        processing_node = next(node for node in nodes if node["name"] == "ProcessingNode")
+        assert processing_node["exec_config"] == {
+            "adornments": None,
+            "attributes": [],
+            "base": {"module": ["vellum", "workflows", "nodes", "bases", "base"], "name": "BaseNode"},
+            "definition": {"module": ["vellum_custom_nodes", "multiple_nodes"], "name": "ProcessingNode"},
+            "display_data": {"comment": {"value": "Processes input data."}, "position": {"x": 0.0, "y": 0.0}},
+            "id": "f92c09f0-0434-46cb-829d-a73f801d6343",
+            "label": "ProcessingNode",
+            "outputs": [],
+            "ports": [{"id": "abaa2984-b312-4491-b069-e689759f72c8", "name": "default", "type": "DEFAULT"}],
+            "trigger": {"id": "35378c2b-f089-44af-ac37-efe4ea42c817", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "type": "GENERIC",
+        }
+
+        transformation_node = next(node for node in nodes if node["name"] == "TransformationNode")
+        assert transformation_node["exec_config"] == {
+            "adornments": None,
+            "attributes": [],
+            "base": {"module": ["vellum", "workflows", "nodes", "bases", "base"], "name": "BaseNode"},
+            "definition": {"module": ["vellum_custom_nodes", "multiple_nodes"], "name": "TransformationNode"},
+            "display_data": {"comment": {"value": "Transforms data format."}, "position": {"x": 0.0, "y": 0.0}},
+            "id": "09ca32f7-c8f2-4469-97e5-1f288f85127a",
+            "label": "TransformationNode",
+            "outputs": [],
+            "ports": [{"id": "88778117-fbfc-4b44-964b-5a4994aa2f24", "name": "default", "type": "DEFAULT"}],
+            "trigger": {"id": "5d096263-7fbf-490a-83b7-e441852b5fb6", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "type": "GENERIC",
+        }
+
 
 def test_version_route__with_invalid_node_file(tmp_path, caplog):
     caplog.set_level(logging.WARNING)
@@ -212,7 +281,20 @@ class BrokenNode(BaseNode)
     assert valid_node["label"] == "Some Node"
     assert valid_node["description"] == "This is Some Node."
     assert UUID(valid_node["id"])
-    assert valid_node["module"] == ["vellum_custom_nodes"]
+    assert valid_node["module"] == ["vellum_custom_nodes", "valid_node"]
+    assert valid_node["exec_config"] == {
+        "adornments": None,
+        "attributes": [],
+        "base": {"module": ["vellum", "workflows", "nodes", "bases", "base"], "name": "BaseNode"},
+        "definition": {"module": ["vellum_custom_nodes", "valid_node"], "name": "SomeNode"},
+        "display_data": {"comment": {"value": "This is Some Node."}, "position": {"x": 0.0, "y": 0.0}},
+        "id": "1e559c2e-db82-41f0-9ceb-5e89b0c5a0a3",
+        "label": "SomeNode",
+        "outputs": [],
+        "ports": [{"id": "48e39e97-5fd4-471e-b4f2-51d3baf06456", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "e3381fb7-61fc-4c46-ae8e-51fc463b6a59", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "type": "GENERIC",
+    }
 
     # AND the error should be logged with full traceback
     assert len(caplog.records) > 0
@@ -221,7 +303,7 @@ class BrokenNode(BaseNode)
     assert "invalid_node.py, line 4" in error_message
 
 
-def test_version_route__with_inputs(tmp_path):
+def test_version_route__with_attributes(tmp_path):
     # GIVEN a temporary custom_nodes directory
     custom_nodes_dir = tmp_path / "vellum_custom_nodes"
     custom_nodes_dir.mkdir()
@@ -230,19 +312,13 @@ def test_version_route__with_inputs(tmp_path):
     node_file = custom_nodes_dir / "addition_node.py"
     node_file.write_text(
         """
-from vellum.workflows.inputs import BaseInputs
 from vellum.workflows.nodes import BaseNode
 
 
-class Inputs(BaseInputs):
-    arg1: int
-    arg2: int
-
-
 class MyAdditionNode(BaseNode):
     \"\"\"Custom node that performs simple addition.\"\"\"
-    arg1: int = Inputs.arg1
-    arg2: int = Inputs.arg2
+    arg1: int
+    arg2: int
 
     class Outputs(BaseNode.Outputs):
         result: int
@@ -271,5 +347,32 @@ class MyAdditionNode(BaseNode):
     assert node["label"] == "My Addition Node"
     assert node["description"] == "Custom node that performs simple addition."
     assert UUID(node["id"])
-    assert node["module"] == ["vellum_custom_nodes"]
+    assert node["module"] == ["vellum_custom_nodes", "addition_node"]
     assert node["name"] == "MyAdditionNode"
+    assert node["exec_config"] == {
+        "adornments": None,
+        "attributes": [
+            {
+                "id": "aed3bcbb-d243-4a77-bb5e-409e9a28e868",
+                "name": "arg1",
+                "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
+            },
+            {
+                "id": "9225d225-a41b-4642-8964-f28f58dcf4bf",
+                "name": "arg2",
+                "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
+            },
+        ],
+        "base": {"module": ["vellum", "workflows", "nodes", "bases", "base"], "name": "BaseNode"},
+        "definition": {"module": ["vellum_custom_nodes", "addition_node"], "name": "MyAdditionNode"},
+        "display_data": {
+            "comment": {"value": "Custom node that performs simple addition."},
+            "position": {"x": 0.0, "y": 0.0},
+        },
+        "id": "195cd69d-3d2d-41e4-a432-16c433cb8d34",
+        "label": "MyAdditionNode",
+        "outputs": [{"id": "3d8e40cb-2aa8-44bd-ae6a-708a9fbc4779", "name": "result", "type": "NUMBER", "value": None}],
+        "ports": [{"id": "9a9e4ef6-febf-4093-a515-217bbb1373db", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "a5298668-d808-4a45-a62e-790943948e8a", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "type": "GENERIC",
+    }

{vellum_workflow_server-0.14.72 → vellum_workflow_server-0.14.72.post2}/src/workflow_server/api/workflow_view.py

@@ -11,10 +11,13 @@ import sys
 import time
 import traceback
 from uuid import uuid4
-from typing import Generator, Iterator, Union
+from typing import Any, Dict, Generator, Iterator, Union, cast
 
 from flask import Blueprint, Response, current_app as app, request, stream_with_context
 from pydantic import ValidationError
+import sentry_sdk
+from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
+from vellum_ee.workflows.display.types import WorkflowDisplayContext
 
 from vellum.workflows.nodes import BaseNode
 from vellum.workflows.utils.names import pascal_to_title_case
@@ -110,6 +113,7 @@ def stream_workflow_route() -> Response:
         )
         increment_process_count(1)
     except Exception as e:
+        sentry_sdk.set_tag("vellum_trace_id", str(context.trace_id))
         logger.exception(e)
 
         vembda_fulfilled_event = VembdaExecutionFulfilledEvent(
@@ -213,6 +217,7 @@ def stream_workflow_route() -> Response:
 
                 continue
             except Exception as e:
+                sentry_sdk.set_tag("vellum_trace_id", str(context.trace_id))
                 logger.exception(e)
                 break
 
@@ -325,6 +330,7 @@ def stream_node_route() -> Response:
                         parent=None,
                     )
                     yield vembda_fulfilled_event.model_dump(mode="json")
+                    sentry_sdk.set_tag("vellum_trace_id", str(context.trace_id))
                     app.logger.exception(stream_future.exception())
                     break
                 else:
@@ -371,16 +377,27 @@ def get_version_route() -> tuple[dict, int]:
             for _, name, _ in pkgutil.iter_modules([custom_nodes_path]):
                 try:
                     module = importlib.import_module(f"{CUSTOM_NODES_DIRECTORY}.{name}")
-                    for label, obj in inspect.getmembers(module):
+                    for _, obj in inspect.getmembers(module):
                         # Look for classes that inherit from BaseNode
                         if inspect.isclass(obj) and obj != BaseNode and issubclass(obj, BaseNode):
+                            node_display_class = get_node_display_class(obj)
+                            exec_config_raw = node_display_class().serialize(WorkflowDisplayContext())
+                            exec_config = cast(Dict[str, Any], exec_config_raw)
+                            module = exec_config["definition"]["module"]
+                            label = exec_config["label"]
+                            description = (
+                                exec_config["display_data"]["comment"]["value"]
+                                if "comment" in exec_config["display_data"]
+                                else ""
+                            )
                             nodes.append(
                                 {
                                     "id": str(uuid4()),
-                                    "module": CUSTOM_NODES_DIRECTORY.split("/"),
+                                    "module": module,
                                     "name": obj.__name__,
                                     "label": pascal_to_title_case(label),
-                                    "description": inspect.getdoc(obj) or "",
+                                    "description": description,
+                                    "exec_config": exec_config,
                                 }
                             )
                 except Exception as e:
@@ -388,6 +405,7 @@ def get_version_route() -> tuple[dict, int]:
 
         resp["nodes"] = nodes
     except Exception as e:
+        sentry_sdk.set_tag("vellum_trace_id", "unknown")
         logger.exception(f"Failed to discover nodes: {str(e)}")
         resp["nodes"] = []
 
@@ -396,10 +414,15 @@ def get_version_route() -> tuple[dict, int]:
 
 def get_workflow_request_context(data: dict) -> WorkflowExecutorContext:
     # not sure if this is the filter we want to pass forward?
+    trace_id = uuid4()
+    if "execution_context" in data and isinstance(data["execution_context"], dict):
+        if "trace_id" in data["execution_context"]:
+            trace_id = data["execution_context"]["trace_id"]
+
     context_data = {
         **data,
         "inputs": convert_json_inputs_to_vellum(data.get("inputs") or []),
-        "trace_id": uuid4(),
+        "trace_id": trace_id,
         "request_start_time": time.time_ns(),
     }
 
@@ -407,10 +430,15 @@ def get_workflow_request_context(data: dict) -> WorkflowExecutorContext:
 
 
 def get_node_request_context(data: dict) -> NodeExecutorContext:
+    trace_id = uuid4()
+    if "execution_context" in data and isinstance(data["execution_context"], dict):
+        if "trace_id" in data["execution_context"]:
+            trace_id = data["execution_context"]["trace_id"]
+
     context_data = {
         **data,
         "inputs": convert_json_inputs_to_vellum(data["inputs"]),
-        "trace_id": uuid4(),
+        "trace_id": trace_id,
         "request_start_time": time.time_ns(),
     }
 

{vellum_workflow_server-0.14.72 → vellum_workflow_server-0.14.72.post2}/src/workflow_server/code_exec_runner.py

@@ -5,6 +5,8 @@ import os
 from uuid import uuid4
 from typing import Optional
 
+import sentry_sdk
+
 from vellum.workflows.exceptions import WorkflowInitializationException
 from workflow_server.api.workflow_view import get_workflow_request_context
 from workflow_server.core.events import (
@@ -69,6 +71,7 @@ def run_code_exec_stream() -> None:
 
             print(f"{_EVENT_LINE}{json.dumps(fulfilled_event)}")  # noqa: T201
     except Exception as e:
+        sentry_sdk.set_tag("vellum_trace_id", str(context.trace_id) if context else "unknown")
         logger.exception(e)
 
         vembda_fulfilled_event = VembdaExecutionFulfilledEvent(

{vellum_workflow_server-0.14.72 → vellum_workflow_server-0.14.72.post2}/src/workflow_server/core/executor.py

@@ -15,6 +15,7 @@ from uuid import uuid4
 from typing import Any, Callable, Generator, Iterator, Optional, Tuple, Type
 
 from pebble import concurrent
+import sentry_sdk
 from vellum_ee.workflows.display.workflows import BaseWorkflowDisplay
 from vellum_ee.workflows.server.virtual_file_loader import VirtualFileFinder
 
@@ -66,6 +67,7 @@ def _stream_node_wrapper(executor_context: NodeExecutorContext, queue: Queue) ->
         for event in stream_node(executor_context=executor_context):
             queue.put(event)
     except Exception as e:
+        sentry_sdk.set_tag("vellum_trace_id", str(executor_context.trace_id))
         logger.exception(e)
         queue.put(
             VembdaExecutionFulfilledEvent(
@@ -104,6 +106,7 @@ def _stream_workflow_wrapper(executor_context: WorkflowExecutorContext, queue: Q
             ).model_dump(mode="json")
         )
     except Exception as e:
+        sentry_sdk.set_tag("vellum_trace_id", str(executor_context.trace_id))
         logger.exception(e)
         queue.put(
             VembdaExecutionFulfilledEvent(
@@ -209,6 +212,7 @@ def stream_workflow(
                         event.body.display_context = display_context
 
                 if event.name.endswith("rejected") and event.body.error.code.name == "INTERNAL_ERROR":  # type: ignore
+                    sentry_sdk.set_tag("vellum_trace_id", str(executor_context.trace_id))
                     logger.exception(event.body.error.message)  # type: ignore
                     event.body.error = WorkflowError(  # type: ignore
                         code=WorkflowErrorCode.INTERNAL_ERROR.value, message="Internal Error"  # type: ignore
@@ -458,6 +462,7 @@ def _gather_workflow(context: WorkflowExecutorContext) -> Tuple[BaseWorkflow, st
         )
         return workflow, namespace
     except Exception as e:
+        sentry_sdk.set_tag("vellum_trace_id", str(context.trace_id))
         logger.exception("Failed to initialize Workflow")
         raise WorkflowInitializationException(f"Failed to initialize workflow: {e}") from e
 
@@ -466,5 +471,6 @@ def _gather_display_context(workflow: BaseWorkflow, namespace: str) -> Optional[
     try:
         return BaseWorkflowDisplay.gather_event_display_context(namespace, workflow.__class__)
     except Exception:
+        sentry_sdk.set_tag("vellum_trace_id", "unknown")
         logger.exception("Unable to Parse Workflow Display Context")
         return None