vellum-workflow-server 1.4.1.post1__tar.gz → 1.4.1.post2__tar.gz

{vellum_workflow_server-1.4.1.post1 → vellum_workflow_server-1.4.1.post2}/PKG-INFO

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

{vellum_workflow_server-1.4.1.post1 → vellum_workflow_server-1.4.1.post2}/pyproject.toml

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

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

@@ -10,6 +10,8 @@ from uuid import uuid4
 
 import requests_mock
 
+from vellum.workflows.emitters.base import WorkflowEvent
+from vellum.workflows.emitters.vellum_emitter import VellumEmitter
 from workflow_server.code_exec_runner import run_code_exec_stream
 from workflow_server.server import create_app
 from workflow_server.utils.system_utils import get_active_process_count
@@ -912,3 +914,50 @@ class Workflow(BaseWorkflow):
 
     # AND we get the expected timeout error message
     assert response_data == {"detail": "Request timed out trying to initiate the Workflow"}
+
+
+@pytest.mark.parametrize("non_process_stream_types", [code_exec_stream, flask_stream_disable_process_wrapper])
+def test_stream_workflow_route__vembda_emitting_calls_monitoring_api(non_process_stream_types):
+    """
+    Tests that the monitoring API is called when vembda emitting is enabled.
+    """
+
+    # GIVEN a valid request body with vembda emitting enabled
+    span_id = uuid4()
+    request_body = {
+        "execution_id": str(span_id),
+        "inputs": [],
+        "environment_api_key": "test",
+        "module": "workflow",
+        "timeout": 360,
+        "feature_flags": {"vembda-event-emitting-enabled": True},
+        "files": {
+            "__init__.py": "",
+            "workflow.py": """\
+from vellum.workflows import BaseWorkflow
+
+class Workflow(BaseWorkflow):
+    class Outputs(BaseWorkflow.Outputs):
+        foo = "hello"
+""",
+        },
+    }
+    emitted_events = []
+
+    def send_events(self, events: list[WorkflowEvent]) -> None:
+        for event in events:
+            emitted_events.append(event)
+
+    VellumEmitter._send_events = send_events
+
+    # WHEN we call the stream route with mocked monitoring API
+    status_code, events = non_process_stream_types(request_body)
+
+    # THEN we get a 200 response
+    assert status_code == 200, events
+
+    # AND the expected workflow events were emitted
+    event_names = [event.name for event in emitted_events]
+    assert len(event_names) == 2, "Should include 2 events"
+    assert "workflow.execution.initiated" in event_names, "Should include workflow.execution.initiated event"
+    assert "workflow.execution.fulfilled" in event_names, "Should include workflow.execution.fulfilled event"

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

@@ -122,11 +122,6 @@ def _stream_workflow_wrapper(
         logger.exception(e)
         queue.put(serialize_vembda_rejected_event(executor_context, "Internal Server Error"))
 
-    emitter_thread = next(
-        (t for t in threading.enumerate() if t.name.endswith(".background_thread") and t.is_alive()), None
-    )
-    if emitter_thread:
-        emitter_thread.join()
     queue.put(STREAM_FINISHED_EVENT)
 
     exit(0)
@@ -243,6 +238,16 @@ def stream_workflow(
         finally:
             cancel_watcher_kill_switch.set()
 
+        emitter_thread = next(
+            (t for t in threading.enumerate() if t.name.endswith(".background_thread") and t.is_alive()), None
+        )
+        if emitter_thread:
+            emitter_thread.join()
+
+        timer_thread = next((t for t in threading.enumerate() if t.name.startswith("Thread-")), None)
+        if timer_thread:
+            timer_thread.join()
+
     return (
         _call_stream(
             executor_context=executor_context,