vellum-workflow-server 1.4.0.post1__py3-none-any.whl → 1.4.1.post2__py3-none-any.whl

{vellum_workflow_server-1.4.0.post1.dist-info → vellum_workflow_server-1.4.1.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vellum-workflow-server
-Version: 1.4.0.post1
+Version: 1.4.1.post2
 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.4.0)
+Requires-Dist: vellum-ai (==1.4.1)
 Description-Content-Type: text/markdown
 
 # Vellum Workflow Runner Server

{vellum_workflow_server-1.4.0.post1.dist-info → vellum_workflow_server-1.4.1.post2.dist-info}/RECORD

@@ -5,14 +5,14 @@ workflow_server/api/healthz_view.py,sha256=itiRvBDBXncrw8Kbbc73UZLwqMAhgHOR3uSre
 workflow_server/api/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 workflow_server/api/tests/test_input_display_mapping.py,sha256=drBZqMudFyB5wgiUOcMgRXz7E7ge-Qgxbstw4E4f0zE,2211
 workflow_server/api/tests/test_workflow_view.py,sha256=RlAw1tHeIlnOXGrFQN-w3EOLPZkhp6Dfy6d1r7kU5oc,22573
-workflow_server/api/tests/test_workflow_view_stream_workflow_route.py,sha256=Qo8u6mPyRCmE2jamY1yIh8l44hgo4-Nwlq03z61ND5g,27031
-workflow_server/api/workflow_view.py,sha256=4XaBbhzQte4bRbbUPhrqAXDBXTXoc67Twzr1Pp5bPpw,21800
+workflow_server/api/tests/test_workflow_view_stream_workflow_route.py,sha256=taNOFnToCIMolJbr1bJNG88ZiB47YOTZb4fFxkE-rx4,28820
+workflow_server/api/workflow_view.py,sha256=_WhjNgimTPoS10C-npRWDfJixzg4eHTJ5xIKACStZf4,21943
 workflow_server/code_exec_runner.py,sha256=lBnMIorPZL8zZBye6TjeCIs06WTJM7P2HR07B1fjJJI,2533
 workflow_server/config.py,sha256=qmmTr6ty3ZN5LDOFs3TfUxYshYe6Mmn_LanplHHeE9Q,1796
 workflow_server/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 workflow_server/core/cancel_workflow.py,sha256=Ffkc3mzmrdMEUcD-sHfEhX4IwVrka-E--SxKA1dUfIU,2185
 workflow_server/core/events.py,sha256=24MA66DVQuaLJJcZrS8IL1Zq4Ohi9CoouKZ5VgoH3Cs,1402
-workflow_server/core/executor.py,sha256=srpxx2xkjAE0QNBo1sfQV6Ovwyq3tWQdjicTySxSrpc,18092
+workflow_server/core/executor.py,sha256=BqGEHVIo8w-wn-_Gfz0gFcZLXbj3VFPH3BmoHqoCJa8,18475
 workflow_server/core/utils.py,sha256=aIpSINstLGslP2PIoDLM82_1GlJ1uC_0AIrP-V7Yobo,3230
 workflow_server/core/workflow_executor_context.py,sha256=w3OhV_AXpgh7AxpjEsc0vo-IJypgJcgr5DXJCqGptOU,1587
 workflow_server/server.py,sha256=QBU12AaAfAgLqfCDBd24qIJl_mbheiq0-hfcWV7rZM4,1234
@@ -28,7 +28,7 @@ workflow_server/utils/tests/test_sentry_integration.py,sha256=LGmWiaLhFrx-jslrRj
 workflow_server/utils/tests/test_system_utils.py,sha256=_4GwXvVvU5BrATxUEWwQIPg0bzQXMWBtiBmjP8MTxJM,4314
 workflow_server/utils/tests/test_utils.py,sha256=0Nq6du8o-iBtTrip9_wgHES53JSiJbVdSXaBnPobw3s,6930
 workflow_server/utils/utils.py,sha256=ZPoM1Suhid22dpB8oEFLux8wx-9iyzmSfWuYxSCrgWk,4774
-vellum_workflow_server-1.4.0.post1.dist-info/METADATA,sha256=fY2l-73g7b-QbDRuJzHYfA40CIhE3t5o6CaXCdidCKI,2273
-vellum_workflow_server-1.4.0.post1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_workflow_server-1.4.0.post1.dist-info/entry_points.txt,sha256=uB_0yPkr7YV6RhEXzvFReUM8P4OQBlVXD6TN6eb9-oc,277
-vellum_workflow_server-1.4.0.post1.dist-info/RECORD,,
+vellum_workflow_server-1.4.1.post2.dist-info/METADATA,sha256=IO3NXiuPcht-UfZP1Zz8z97yIRaPkYsoMcVvhWp0jFc,2273
+vellum_workflow_server-1.4.1.post2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_workflow_server-1.4.1.post2.dist-info/entry_points.txt,sha256=uB_0yPkr7YV6RhEXzvFReUM8P4OQBlVXD6TN6eb9-oc,277
+vellum_workflow_server-1.4.1.post2.dist-info/RECORD,,

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"

workflow_server/api/workflow_view.py

@@ -23,6 +23,7 @@ from vellum_ee.workflows.display.types import WorkflowDisplayContext
 from vellum_ee.workflows.display.workflows import BaseWorkflowDisplay
 from vellum_ee.workflows.server.virtual_file_loader import VirtualFileFinder
 
+from vellum.workflows import BaseWorkflow
 from vellum.workflows.exceptions import WorkflowInitializationException
 from vellum.workflows.nodes import BaseNode
 from workflow_server.config import ENABLE_PROCESS_WRAPPER, MEMORY_LIMIT_MB
@@ -458,7 +459,10 @@ def serialize_route() -> Response:
             try:
                 result = BaseWorkflowDisplay.serialize_module(namespace, client=client)
             except Exception as e:
-                raise WorkflowInitializationException(str(e)) from e
+                raise WorkflowInitializationException(
+                    message=str(e),
+                    workflow_definition=BaseWorkflow,
+                ) from e
 
             return Response(
                 json.dumps(result.model_dump()),

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)
@@ -174,7 +169,7 @@ def stream_workflow(
     cancel_signal: Optional[ThreadingEvent] = None,
 ) -> tuple[Iterator[dict], UUID]:
     workflow, namespace = _gather_workflow(executor_context)
-    workflow_inputs = _get_workflow_inputs(executor_context)
+    workflow_inputs = _get_workflow_inputs(executor_context, workflow.__class__)
     display_context = _gather_display_context(workflow, namespace)
     workflow_state = (
         workflow.deserialize_state(
@@ -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,
@@ -258,21 +263,18 @@ def stream_node(
     executor_context: NodeExecutorContext,
     disable_redirect: bool = True,
 ) -> Iterator[dict]:
-    namespace = _get_file_namespace(executor_context)
-
     def call_node() -> Generator[dict[str, Any], Any, None]:
-        sys.meta_path.append(VirtualFileFinder(executor_context.files, namespace))
-        workflow_context = _create_workflow_context(executor_context)
+        workflow, namespace = _gather_workflow(executor_context)
         node_module = importlib.import_module(f"{namespace}.{executor_context.node_module}")
 
         Node = getattr(node_module, executor_context.node_name)
 
-        workflow_inputs = _get_workflow_inputs(executor_context)
+        workflow_inputs = _get_workflow_inputs(executor_context, workflow.__class__)
         workflow_state = _get_workflow_state(executor_context, workflow_inputs=workflow_inputs)
 
         node = Node(
             state=workflow_state,
-            context=workflow_context,
+            context=workflow._context,
         )
 
         executor_context.stream_start_time = time.time_ns()
@@ -339,7 +341,7 @@ def _call_stream(
         yield vembda_fulfilled_event.model_dump(mode="json")
 
 
-def _create_workflow(executor_context: WorkflowExecutorContext, namespace: str) -> BaseWorkflow:
+def _create_workflow(executor_context: BaseExecutorContext, namespace: str) -> BaseWorkflow:
     workflow_context = _create_workflow_context(executor_context)
     Workflow = BaseWorkflow.load_from_module(namespace)
     VembdaExecutionFulfilledEvent.model_rebuild(
@@ -431,7 +433,9 @@ def _dump_event(event: BaseEvent, executor_context: BaseExecutorContext, client:
     return dump
 
 
-def _get_workflow_inputs(executor_context: BaseExecutorContext) -> Optional[BaseInputs]:
+def _get_workflow_inputs(
+    executor_context: BaseExecutorContext, workflow_class: Type[BaseWorkflow]
+) -> Optional[BaseInputs]:
     if not executor_context.inputs:
         return None
 
@@ -443,17 +447,22 @@ def _get_workflow_inputs(executor_context: BaseExecutorContext) -> Optional[Base
     try:
         inputs_module = importlib.import_module(inputs_module_path)
     except Exception as e:
-        raise WorkflowInitializationException(f"Failed to initialize workflow inputs: {e}") from e
+        raise WorkflowInitializationException(
+            message=f"Failed to initialize workflow inputs: {e}",
+            workflow_definition=workflow_class,
+        ) from e
 
     if not hasattr(inputs_module, "Inputs"):
         raise WorkflowInitializationException(
-            f"Inputs module {inputs_module_path} does not have a required Inputs class"
+            message=f"Inputs module {inputs_module_path} does not have a required Inputs class",
+            workflow_definition=workflow_class,
         )
 
     if not issubclass(inputs_module.Inputs, BaseInputs):
         raise WorkflowInitializationException(
-            f"""The class {inputs_module_path}.Inputs was expected to be a subclass of BaseInputs, \
-but found {inputs_module.Inputs.__class__.__name__}"""
+            message=f"""The class {inputs_module_path}.Inputs was expected to be a subclass of BaseInputs, \
+but found {inputs_module.Inputs.__class__.__name__}""",
+            workflow_definition=workflow_class,
         )
 
     return inputs_module.Inputs(**executor_context.inputs)
@@ -493,7 +502,7 @@ def _get_run_from_node(executor_context: WorkflowExecutorContext, workflow: Base
     return None
 
 
-def _gather_workflow(context: WorkflowExecutorContext) -> Tuple[BaseWorkflow, str]:
+def _gather_workflow(context: BaseExecutorContext) -> Tuple[BaseWorkflow, str]:
     try:
         namespace = _get_file_namespace(context)
         if namespace != LOCAL_WORKFLOW_MODULE:
@@ -505,7 +514,10 @@ def _gather_workflow(context: WorkflowExecutorContext) -> Tuple[BaseWorkflow, st
         return workflow, namespace
     except Exception as e:
         logger.exception("Failed to initialize Workflow")
-        raise WorkflowInitializationException(f"Failed to initialize workflow: {e}") from e
+        raise WorkflowInitializationException(
+            message=f"Failed to initialize workflow: {e}",
+            workflow_definition=BaseWorkflow,
+        ) from e
 
 
 def _gather_display_context(workflow: BaseWorkflow, namespace: str) -> Optional["WorkflowEventDisplayContext"]: