vellum-workflow-server 1.9.1.post2__tar.gz → 1.9.7.post1__tar.gz

{vellum_workflow_server-1.9.1.post2 → vellum_workflow_server-1.9.7.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vellum-workflow-server
-Version: 1.9.1.post2
+Version: 1.9.7.post1
 Summary: 
 License: AGPL
 Requires-Python: >=3.9.0,<4
@@ -29,7 +29,7 @@ Requires-Dist: pyjwt (==2.10.0)
 Requires-Dist: python-dotenv (==1.0.1)
 Requires-Dist: retrying (==1.3.4)
 Requires-Dist: sentry-sdk[flask] (==2.20.0)
-Requires-Dist: vellum-ai (==1.9.1)
+Requires-Dist: vellum-ai (==1.9.7)
 Description-Content-Type: text/markdown
 
 # Vellum Workflow Runner Server

{vellum_workflow_server-1.9.1.post2 → vellum_workflow_server-1.9.7.post1}/pyproject.toml

@@ -3,7 +3,7 @@ name = "vellum-workflow-server"
 
 [tool.poetry]
 name = "vellum-workflow-server"
-version = "1.9.1.post2"
+version = "1.9.7.post1"
 description = ""
 readme = "README.md"
 authors = []
@@ -45,7 +45,7 @@ flask = "2.3.3"
 orderly-set = "5.2.2"
 pebble = "5.0.7"
 gunicorn = "23.0.0"
-vellum-ai = "1.9.1"
+vellum-ai = "1.9.7"
 python-dotenv = "1.0.1"
 retrying = "1.3.4"
 sentry-sdk = {extras = ["flask"], version = "2.20.0"}

{vellum_workflow_server-1.9.1.post2 → vellum_workflow_server-1.9.7.post1}/src/workflow_server/api/tests/test_workflow_view.py

@@ -63,11 +63,11 @@ class TestNode(BaseNode):
             "comment": {"expanded": True, "value": "A test node for processing data."},
             "position": {"x": 0.0, "y": 0.0},
         },
-        "id": "7a8b251d-f5ca-462a-b293-071d219460fb",
+        "id": "6f4c9178-9f46-4723-bcb7-0bd59db54eca",
         "label": "Test Node",
         "outputs": [],
-        "ports": [{"id": "a3a0eefd-45d0-4f13-8c58-a836a9f7f9ed", "name": "default", "type": "DEFAULT"}],
-        "trigger": {"id": "a022e36c-9852-4772-9be3-3c6c147fd811", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "ports": [{"id": "4394823f-79a8-4dbc-99ae-06a1df6c7408", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "07240af1-67c6-4460-b53d-53f0b0f1b90e", "merge_behavior": "AWAIT_ATTRIBUTES"},
         "type": "GENERIC",
     }
 
@@ -127,11 +127,11 @@ class SomeOtherNode(BaseNode):
             "comment": {"expanded": True, "value": "This is Some Node."},
             "position": {"x": 0.0, "y": 0.0},
         },
-        "id": "1e559c2e-db82-41f0-9ceb-5e89b0c5a0a3",
+        "id": "89e84bac-5a5f-4f64-8083-7d3ebec98be1",
         "label": "Some Node",
         "outputs": [],
-        "ports": [{"id": "48e39e97-5fd4-471e-b4f2-51d3baf06456", "name": "default", "type": "DEFAULT"}],
-        "trigger": {"id": "e3381fb7-61fc-4c46-ae8e-51fc463b6a59", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "ports": [{"id": "2983ea5c-1d29-483a-b896-53098f5de4f1", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "6996efb0-5a20-4719-8835-34fe6552764a", "merge_behavior": "AWAIT_ATTRIBUTES"},
         "type": "GENERIC",
     }
 
@@ -150,11 +150,11 @@ class SomeOtherNode(BaseNode):
             "comment": {"expanded": True, "value": "This is Some Other Node."},
             "position": {"x": 0.0, "y": 0.0},
         },
-        "id": "7aee541b-b245-4c8a-9137-3e4631d5100c",
+        "id": "3cdbba02-8a34-4e0f-8b94-770a944dcaa3",
         "label": "Some Other Node",
         "outputs": [],
-        "ports": [{"id": "fb66b46a-d970-4bc9-83ea-70c154c57ddd", "name": "default", "type": "DEFAULT"}],
-        "trigger": {"id": "13fa2714-20b3-4bc3-ab79-621a188e3bfa", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "ports": [{"id": "1839bde5-2ad4-4723-b21b-2c55fa833a7a", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "c36df8a8-5624-45be-99c9-826cf511a951", "merge_behavior": "AWAIT_ATTRIBUTES"},
         "type": "GENERIC",
     }
 
@@ -222,11 +222,11 @@ class HelperClass:
                 "comment": {"expanded": True, "value": "Processes input data."},
                 "position": {"x": 0.0, "y": 0.0},
             },
-            "id": "f92c09f0-0434-46cb-829d-a73f801d6343",
+            "id": "7121bcb9-98a1-4907-bf9b-9734d773fd15",
             "label": "Processing Node",
             "outputs": [],
-            "ports": [{"id": "abaa2984-b312-4491-b069-e689759f72c8", "name": "default", "type": "DEFAULT"}],
-            "trigger": {"id": "35378c2b-f089-44af-ac37-efe4ea42c817", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "de27da74-30e9-4e7b-95c2-92bdfc5bf042", "name": "default", "type": "DEFAULT"}],
+            "trigger": {"id": "e02bd85e-8b03-4b21-8b3e-f411042334ce", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "type": "GENERIC",
         }
 
@@ -240,11 +240,11 @@ class HelperClass:
                 "comment": {"expanded": True, "value": "Transforms data format."},
                 "position": {"x": 0.0, "y": 0.0},
             },
-            "id": "09ca32f7-c8f2-4469-97e5-1f288f85127a",
+            "id": "6a785cb0-f631-4f03-94c6-e82331c14c1a",
             "label": "Transformation Node",
             "outputs": [],
-            "ports": [{"id": "88778117-fbfc-4b44-964b-5a4994aa2f24", "name": "default", "type": "DEFAULT"}],
-            "trigger": {"id": "5d096263-7fbf-490a-83b7-e441852b5fb6", "merge_behavior": "AWAIT_ATTRIBUTES"},
+            "ports": [{"id": "67a13ea0-fd6b-44dc-af46-c72da06aa11f", "name": "default", "type": "DEFAULT"}],
+            "trigger": {"id": "08d4e317-baa8-478f-b278-99362e50e6b4", "merge_behavior": "AWAIT_ATTRIBUTES"},
             "type": "GENERIC",
         }
 
@@ -306,11 +306,11 @@ class BrokenNode(BaseNode)
             "comment": {"expanded": True, "value": "This is Some Node."},
             "position": {"x": 0.0, "y": 0.0},
         },
-        "id": "1e559c2e-db82-41f0-9ceb-5e89b0c5a0a3",
+        "id": "a2706730-074b-4ea3-968a-25e68af1caed",
         "label": "Some Node",
         "outputs": [],
-        "ports": [{"id": "48e39e97-5fd4-471e-b4f2-51d3baf06456", "name": "default", "type": "DEFAULT"}],
-        "trigger": {"id": "e3381fb7-61fc-4c46-ae8e-51fc463b6a59", "merge_behavior": "AWAIT_ATTRIBUTES"},
+        "ports": [{"id": "e0ee3653-e071-4b91-9dfc-5e1dca9c665b", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "8d931b01-30ca-4c0d-b1b7-7c18379c83e6", "merge_behavior": "AWAIT_ATTRIBUTES"},
         "type": "GENERIC",
     }
 
@@ -371,12 +371,12 @@ class MyAdditionNode(BaseNode):
         "adornments": None,
         "attributes": [
             {
-                "id": "aed3bcbb-d243-4a77-bb5e-409e9a28e868",
+                "id": "4223b340-447f-46c2-b35d-30ef16c5ae17",
                 "name": "arg1",
                 "value": None,
             },
             {
-                "id": "9225d225-a41b-4642-8964-f28f58dcf4bf",
+                "id": "1de0f46a-95f6-4cd0-bb0f-e2414054d507",
                 "name": "arg2",
                 "value": None,
             },
@@ -387,11 +387,11 @@ class MyAdditionNode(BaseNode):
             "comment": {"expanded": True, "value": "Custom node that performs simple addition."},
             "position": {"x": 0.0, "y": 0.0},
         },
-        "id": "195cd69d-3d2d-41e4-a432-16c433cb8d34",
+        "id": "2464b610-fb6d-495b-b17c-933ee147f19f",
         "label": "My Addition Node",
-        "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"},
+        "outputs": [{"id": "f39d85c9-e7bf-45e1-bb67-f16225db0118", "name": "result", "type": "NUMBER", "value": None}],
+        "ports": [{"id": "bc489295-cd8a-4aa2-88bb-34446374100d", "name": "default", "type": "DEFAULT"}],
+        "trigger": {"id": "ff580cad-73d6-44fe-8f2c-4b8dc990ee70", "merge_behavior": "AWAIT_ATTRIBUTES"},
         "type": "GENERIC",
         "should_file_merge": True,
     }

{vellum_workflow_server-1.9.1.post2 → vellum_workflow_server-1.9.7.post1}/src/workflow_server/api/tests/test_workflow_view_stream_workflow_route.py

@@ -5,6 +5,7 @@ import io
 import json
 from queue import Empty
 import re
+import time
 from unittest import mock
 from uuid import uuid4
 
@@ -133,6 +134,8 @@ class Workflow(BaseWorkflow):
 
     with mock.patch("builtins.open", mock.mock_open(read_data="104857600")):
         # WHEN we call the stream route
+        ts_ns = time.time_ns()
+        request_body["vembda_service_initiated_timestamp"] = ts_ns
         status_code, events = both_stream_types(request_body)
 
     # THEN we get a 200 response
@@ -177,6 +180,15 @@ class Workflow(BaseWorkflow):
     assert "is_new_server" in server_metadata
     assert server_metadata["is_new_server"] is False
 
+    # AND the initiated event should have initiated_latency within a reasonable range
+    assert "initiated_latency" in server_metadata, "initiated_latency should be present in server_metadata"
+    initiated_latency = server_metadata["initiated_latency"]
+    assert isinstance(initiated_latency, int), "initiated_latency should be an integer (nanoseconds)"
+    # Latency should be positive and less than 60 seconds (60_000_000_000 nanoseconds) for CI
+    assert (
+        0 < initiated_latency < 60_000_000_000
+    ), f"initiated_latency should be between 0 and 60 seconds, got {initiated_latency} ns"
+
     assert events[2]["name"] == "workflow.execution.fulfilled", events[2]
     assert events[2]["body"]["workflow_definition"]["module"] == ["test", "workflow"]
 

{vellum_workflow_server-1.9.1.post2 → vellum_workflow_server-1.9.7.post1}/src/workflow_server/api/workflow_view.py

@@ -528,6 +528,7 @@ def serialize_route() -> Response:
     files = data.get("files", {})
     workspace_api_key = data.get("workspace_api_key")
     is_new_server = data.get("is_new_server", False)
+    module = data.get("module")
 
     if not files:
         return Response(
@@ -540,7 +541,7 @@ def serialize_route() -> Response:
 
     # Generate a unique namespace for this serialization request
     namespace = get_random_namespace()
-    virtual_finder = VirtualFileFinder(files, namespace)
+    virtual_finder = VirtualFileFinder(files, namespace, source_module=module)
 
     headers = {
         "X-Vellum-Is-New-Server": str(is_new_server).lower(),

{vellum_workflow_server-1.9.1.post2 → vellum_workflow_server-1.9.7.post1}/src/workflow_server/core/executor.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from io import StringIO
 import json
 import logging
@@ -191,6 +191,7 @@ def stream_workflow(
             previous_execution_id=executor_context.previous_execution_id,
             timeout=executor_context.timeout,
             trigger=trigger,
+            execution_id=executor_context.workflow_span_id,
         )
     except WorkflowInitializationException as e:
         cancel_watcher_kill_switch.set()
@@ -358,7 +359,9 @@ def _call_stream(
 def _create_workflow(executor_context: BaseExecutorContext) -> Tuple[BaseWorkflow, str]:
     namespace = _get_file_namespace(executor_context)
     if namespace != LOCAL_WORKFLOW_MODULE:
-        sys.meta_path.append(VirtualFileFinder(executor_context.files, namespace))
+        sys.meta_path.append(
+            VirtualFileFinder(executor_context.files, namespace, source_module=executor_context.module)
+        )
 
     workflow_context = _create_workflow_context(executor_context)
     Workflow = BaseWorkflow.load_from_module(namespace)
@@ -449,6 +452,14 @@ def _enrich_event(event: WorkflowEvent, executor_context: Optional[BaseExecutorC
 
             if executor_context is not None:
                 metadata["is_new_server"] = executor_context.is_new_server
+
+                if executor_context.vembda_service_initiated_timestamp is not None and event.timestamp is not None:
+                    event_ts = event.timestamp
+                    if event_ts.tzinfo is None:
+                        event_ts = event_ts.replace(tzinfo=timezone.utc)
+                    event_ts_ns = int(event_ts.timestamp() * 1_000_000_000)
+                    initiated_latency = event_ts_ns - executor_context.vembda_service_initiated_timestamp
+                    metadata["initiated_latency"] = initiated_latency
         elif event.name == "workflow.execution.fulfilled" and is_deployment:
             metadata = {}
             memory_mb = get_memory_in_use_mb()

{vellum_workflow_server-1.9.1.post2 → vellum_workflow_server-1.9.7.post1}/src/workflow_server/core/workflow_executor_context.py

@@ -40,6 +40,7 @@ class BaseExecutorContext(UniversalBaseModel):
     # The actual 'execution id' of the workflow that we pass into the workflow
     # when running in async mode.
     workflow_span_id: Optional[UUID] = None
+    vembda_service_initiated_timestamp: Optional[int] = None
 
     @field_validator("inputs", mode="before")
     @classmethod

vellum_workflow_server-1.9.7.post1/src/workflow_server/utils/exit_handler.py

@@ -0,0 +1,56 @@
+from datetime import datetime
+import logging
+import multiprocessing
+import signal
+from time import sleep
+from typing import Any
+
+from workflow_server.config import IS_ASYNC_MODE, is_development
+from workflow_server.utils.system_utils import get_active_process_count
+
+logger = logging.getLogger(__name__)
+process_killed_switch = multiprocessing.Event()
+
+
+def _wait_for_workers() -> None:
+    # Would be annoying to have this on for dev since would prevent reload restarts. Also disabling this
+    # for non async mode for now since it shouldn't be needed anyway cus we keep the requests open.
+    if is_development() and not IS_ASYNC_MODE:
+        return
+
+    start_time = datetime.now()
+    loops = 0
+
+    while get_active_process_count() > 0:
+        if loops % 30 == 0:
+            logger.info("Waiting for workflow processes to finish...")
+
+        # TODO needa pass in max workflow time here for VPC
+        if (datetime.now() - start_time).total_seconds() > 1800:
+            logger.warning("Max elapsed time waiting for workflow processes to complete exceeded, shutting down")
+            exit(1)
+
+        sleep(1)
+        loops += 1
+
+
+def gunicorn_exit_handler(_worker: Any) -> None:
+    logger.info("Received gunicorn kill signal")
+    process_killed_switch.set()
+    _wait_for_workers()
+
+
+def exit_handler(_signal: int, _frame: Any) -> None:
+    """
+    Gunicorn overrides this signal handler but theres periods where the gunicorn server
+    hasn't initialized or for local dev where this will get called.
+    """
+    process_killed_switch.set()
+    logger.warning("Received kill signal")
+    _wait_for_workers()
+    exit(1)
+
+
+def init_signal_handlers() -> None:
+    signal.signal(signal.SIGTERM, exit_handler)
+    signal.signal(signal.SIGINT, exit_handler)

vellum_workflow_server-1.9.1.post2/src/workflow_server/utils/exit_handler.py

@@ -1,27 +0,0 @@
-import logging
-import multiprocessing
-import signal
-from typing import Any
-
-logger = logging.getLogger(__name__)
-process_killed_switch = multiprocessing.Event()
-
-
-def gunicorn_exit_handler(_worker: Any) -> None:
-    process_killed_switch.set()
-    logger.warning("Received gunicorn kill signal")
-
-
-def exit_handler(_signal: int, _frame: Any) -> None:
-    """
-    Gunicorn overrides this signal handler but theres periods where the gunicorn server
-    hasn't initialized or for local dev where this will get called.
-    """
-    process_killed_switch.set()
-    logger.warning("Received kill signal")
-    exit(1)
-
-
-def init_signal_handlers() -> None:
-    signal.signal(signal.SIGTERM, exit_handler)
-    signal.signal(signal.SIGINT, exit_handler)