vellum-workflow-server 1.0.5.post2__tar.gz → 1.0.5.post3__tar.gz

{vellum_workflow_server-1.0.5.post2 → vellum_workflow_server-1.0.5.post3}/PKG-INFO

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

{vellum_workflow_server-1.0.5.post2 → vellum_workflow_server-1.0.5.post3}/pyproject.toml

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

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

@@ -111,6 +111,7 @@ def stream_workflow_route() -> Response:
         )
 
     cancel_signal = ThreadingEvent()
+    timeout_signal = ThreadingEvent()
 
     process: Optional[Process] = None
     if ENABLE_PROCESS_WRAPPER:
@@ -119,6 +120,7 @@ def stream_workflow_route() -> Response:
                 executor_context=context,
                 queue=process_output_queue,
                 cancel_signal=cancel_signal,
+                timeout_signal=timeout_signal,
             )
             increment_process_count(1)
         except Exception as e:
@@ -150,6 +152,7 @@ def stream_workflow_route() -> Response:
                     context,
                     disable_redirect=True,
                     cancel_signal=cancel_signal,
+                    timeout_signal=timeout_signal,
                 )
                 yield f"{SPAN_ID_EVENT}:{span_id}"
                 span_id_emitted = True
@@ -201,6 +204,9 @@ def stream_workflow_route() -> Response:
             ):
                 logger.error("Workflow timed out, waiting 5 seconds before ending request...")
                 cancel_signal.set()
+                # We pass this separate signal in so we can get the vembda time_out flag set to true in the vembda
+                # fulfilled event inside of exec. In the future we might have a separate timeout event in wsdk
+                timeout_signal.set()
                 timed_out_time = time.time()
 
             if timed_out_time is not None and timed_out_time + 5 < time.time():

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

@@ -2,6 +2,7 @@ from datetime import datetime
 import json
 import logging
 import os
+from threading import Event as ThreadingEvent
 from uuid import uuid4
 from typing import Optional
 
@@ -47,7 +48,12 @@ def run_code_exec_stream() -> None:
         print(f"{_EVENT_LINE}{initiated_event}")  # noqa: T201
 
         try:
-            stream_iterator, span_id = stream_workflow(context, disable_redirect=True)
+            stream_iterator, span_id = stream_workflow(
+                context,
+                disable_redirect=True,
+                # Timeouts are handled at the code exec level right now so just passing in an unused threading event
+                timeout_signal=ThreadingEvent(),
+            )
             for line in stream_iterator:
                 print(f"{_EVENT_LINE}{json.dumps(line)}")  # noqa: T201
         except WorkflowInitializationException as e:

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

@@ -88,10 +88,15 @@ def _stream_workflow_wrapper(
     executor_context: WorkflowExecutorContext,
     queue: Queue,
     cancel_signal: Optional[ThreadingEvent],
+    timeout_signal: ThreadingEvent,
 ) -> None:
     span_id_emitted = False
     try:
-        stream_iterator, span_id = stream_workflow(executor_context=executor_context, cancel_signal=cancel_signal)
+        stream_iterator, span_id = stream_workflow(
+            executor_context=executor_context,
+            cancel_signal=cancel_signal,
+            timeout_signal=timeout_signal,
+        )
 
         queue.put(f"{SPAN_ID_EVENT}:{span_id}")
         span_id_emitted = True
@@ -119,6 +124,7 @@ def stream_workflow_process_timeout(
     executor_context: WorkflowExecutorContext,
     queue: Queue,
     cancel_signal: Optional[ThreadingEvent],
+    timeout_signal: ThreadingEvent,
 ) -> Process:
     workflow_process = Process(
         target=_stream_workflow_wrapper,
@@ -126,6 +132,7 @@ def stream_workflow_process_timeout(
             executor_context,
             queue,
             cancel_signal,
+            timeout_signal,
         ),
     )
     workflow_process.start()
@@ -150,6 +157,7 @@ def stream_workflow_process_timeout(
 
 def stream_workflow(
     executor_context: WorkflowExecutorContext,
+    timeout_signal: ThreadingEvent,
     disable_redirect: bool = True,
     cancel_signal: Optional[ThreadingEvent] = None,
 ) -> tuple[Iterator[dict], UUID]:
@@ -226,6 +234,7 @@ def stream_workflow(
             executor_context=executor_context,
             stream_generator=call_workflow,
             disable_redirect=disable_redirect,
+            timeout_signal=timeout_signal,
         ),
         stream.span_id,
     )
@@ -265,12 +274,14 @@ def stream_node(
         executor_context=executor_context,
         stream_generator=call_node,
         disable_redirect=disable_redirect,
+        timeout_signal=ThreadingEvent(),
     )
 
 
 def _call_stream(
     executor_context: BaseExecutorContext,
     stream_generator: Callable[[], Generator[dict[str, Any], Any, None]],
+    timeout_signal: ThreadingEvent,
     disable_redirect: bool = True,
 ) -> Iterator[dict]:
     log_redirect: Optional[StringIO] = None
@@ -291,6 +302,7 @@ def _call_stream(
                 log=log_redirect.getvalue() if log_redirect else "",
                 stderr="",
                 container_overhead_latency=executor_context.container_overhead_latency,
+                timed_out=timeout_signal.is_set(),
             ),
             parent=None,
         )