vellum-workflow-server 1.3.2__py3-none-any.whl → 1.3.2.post2__py3-none-any.whl

{vellum_workflow_server-1.3.2.dist-info → vellum_workflow_server-1.3.2.post2.dist-info}/METADATA

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

{vellum_workflow_server-1.3.2.dist-info → vellum_workflow_server-1.3.2.post2.dist-info}/RECORD

@@ -6,14 +6,14 @@ workflow_server/api/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 workflow_server/api/tests/test_input_display_mapping.py,sha256=drBZqMudFyB5wgiUOcMgRXz7E7ge-Qgxbstw4E4f0zE,2211
 workflow_server/api/tests/test_workflow_view.py,sha256=gwb53E44LBm06XHY1UwfHqKG-UfwwICh_IYPtowN_kE,19085
 workflow_server/api/tests/test_workflow_view_stream_workflow_route.py,sha256=1vr9NI894zdJmmnsy_wBSqaJG83RwnYSmqucknYf9bI,26304
-workflow_server/api/workflow_view.py,sha256=5embr0m7UNbo9dGrr8bLd1lG9ER76WzFas8Y3qYQakg,21463
+workflow_server/api/workflow_view.py,sha256=osYa14kdP3LI3HZzh2Nw16-GhI0bHXwCFgasUkfRjeI,21104
 workflow_server/code_exec_runner.py,sha256=lBnMIorPZL8zZBye6TjeCIs06WTJM7P2HR07B1fjJJI,2533
 workflow_server/config.py,sha256=DyTty8NrAwvtx-esM3KthnpsNh-nKdWNlovWQOgiGpg,1417
 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=XRYvyFo8YQd3Kb1mBWlD42drKmnTIUinN_4hNvd5wMw,18107
-workflow_server/core/utils.py,sha256=lgzxkAEjEXPxGXXQlUYTYuCdHht-eDJJmHj5AhEb3_o,1500
+workflow_server/core/executor.py,sha256=M_LyVOcPDzAA3u1WBLMpz9gftjc_RtO3hYida6tkSJo,18383
+workflow_server/core/utils.py,sha256=cmwHbKCfXqtUutBD3akGus0Ga7a1xG3zlOw-jEMx6mI,1795
 workflow_server/core/workflow_executor_context.py,sha256=w3OhV_AXpgh7AxpjEsc0vo-IJypgJcgr5DXJCqGptOU,1587
 workflow_server/server.py,sha256=QBU12AaAfAgLqfCDBd24qIJl_mbheiq0-hfcWV7rZM4,1234
 workflow_server/start.py,sha256=qpIg0SgIgz8RNyc8Cu9LxyzXdOXZRv9qq3M3uSBbgD0,2180
@@ -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=qwK5Rmy3RQyjtlUrYAuGuDlBeRzZKsf1yS-y2IpUizQ,6452
 workflow_server/utils/utils.py,sha256=Wqqn-1l2ugkGgy5paWWdt0AVxAyPMQCYcnRSSOMjXlA,4355
-vellum_workflow_server-1.3.2.dist-info/METADATA,sha256=Ss_O3_W6yf_njLNTRgZM1ULtPRspPUDyMSI1pT0gdtk,2267
-vellum_workflow_server-1.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_workflow_server-1.3.2.dist-info/entry_points.txt,sha256=uB_0yPkr7YV6RhEXzvFReUM8P4OQBlVXD6TN6eb9-oc,277
-vellum_workflow_server-1.3.2.dist-info/RECORD,,
+vellum_workflow_server-1.3.2.post2.dist-info/METADATA,sha256=Rtx3m9gGzSbqVwGDgj0FNnqHotW6r7DZPZNIhbrDKuI,2273
+vellum_workflow_server-1.3.2.post2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_workflow_server-1.3.2.post2.dist-info/entry_points.txt,sha256=uB_0yPkr7YV6RhEXzvFReUM8P4OQBlVXD6TN6eb9-oc,277
+vellum_workflow_server-1.3.2.post2.dist-info/RECORD,,

workflow_server/api/workflow_view.py

@@ -36,7 +36,11 @@ from workflow_server.core.events import (
     VembdaExecutionInitiatedEvent,
 )
 from workflow_server.core.executor import stream_node_pebble_timeout, stream_workflow, stream_workflow_process_timeout
-from workflow_server.core.utils import create_vembda_rejected_event, serialize_vembda_rejected_event
+from workflow_server.core.utils import (
+    create_vembda_rejected_event,
+    is_events_emitting_enabled,
+    serialize_vembda_rejected_event,
+)
 from workflow_server.core.workflow_executor_context import (
     DEFAULT_TIMEOUT_SECONDS,
     NodeExecutorContext,
@@ -60,17 +64,6 @@ CUSTOM_NODES_DIRECTORY = "vellum_custom_nodes"
 WORKFLOW_INITIATION_TIMEOUT_SECONDS = 60
 
 
-def _events_emission_enabled(context: Union[WorkflowExecutorContext, NodeExecutorContext]) -> bool:
-    flags = context.feature_flags
-    if not (flags and flags.get("vembda-event-emitting-enabled")):
-        return False
-    try:
-        module = importlib.import_module("vellum.workflows.events.emitters.vellum")
-        return hasattr(module, "VellumEmitter")
-    except Exception:
-        return False
-
-
 @bp.route("/stream", methods=["POST"])
 def stream_workflow_route() -> Response:
     data = request.get_json()
@@ -107,7 +100,7 @@ def stream_workflow_route() -> Response:
     headers = {
         "X-Vellum-SDK-Version": vembda_initiated_event.body.sdk_version,
         "X-Vellum-Server-Version": vembda_initiated_event.body.server_version,
-        "X-Vellum-Events-Emitted": str(_events_emission_enabled(context)),
+        "X-Vellum-Events-Emitted": str(is_events_emitting_enabled(context)),
     }
 
     # We can exceed the concurrency count currently with long running workflows due to a knative issue. So here
@@ -414,7 +407,7 @@ def stream_node_route() -> Response:
     headers = {
         "X-Vellum-SDK-Version": vembda_initiated_event.body.sdk_version,
         "X-Vellum-Server-Version": vembda_initiated_event.body.server_version,
-        "X-Vellum-Events-Emitted": str(_events_emission_enabled(context)),
+        "X-Vellum-Events-Emitted": str(is_events_emitting_enabled(context)),
     }
 
     resp = Response(

workflow_server/core/executor.py

@@ -8,6 +8,7 @@ import os
 import random
 import string
 import sys
+import threading
 from threading import Event as ThreadingEvent
 import time
 from traceback import format_exc
@@ -43,7 +44,7 @@ from workflow_server.core.events import (
     VembdaExecutionFulfilledBody,
     VembdaExecutionFulfilledEvent,
 )
-from workflow_server.core.utils import serialize_vembda_rejected_event
+from workflow_server.core.utils import is_events_emitting_enabled, serialize_vembda_rejected_event
 from workflow_server.core.workflow_executor_context import (
     DEFAULT_TIMEOUT_SECONDS,
     BaseExecutorContext,
@@ -120,6 +121,12 @@ 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)
@@ -207,6 +214,7 @@ def stream_workflow(
             event_filter=all_workflow_event_filter,
             cancel_signal=cancel_signal,
             entrypoint_nodes=[run_from_node] if run_from_node else None,
+            previous_execution_id=executor_context.previous_execution_id,
         )
 
     except Exception:
@@ -344,7 +352,7 @@ def _create_workflow(executor_context: WorkflowExecutorContext, namespace: str)
     )
 
     # Determine whether to enable the Vellum Emitter for event publishing
-    use_vellum_emitter = bool((executor_context.feature_flags or {}).get("vembda-event-emitting-enabled"))
+    use_vellum_emitter = is_events_emitting_enabled(executor_context)
     emitters: list["BaseWorkflowEmitter"] = []
     if use_vellum_emitter:
         emitters = [VellumEmitter()]

workflow_server/core/utils.py

@@ -38,3 +38,13 @@ def create_vembda_rejected_event(executor_context: Optional[BaseExecutorContext]
 
 def serialize_vembda_rejected_event(executor_context: Optional[BaseExecutorContext], error_message: str) -> str:
     return _create_vembda_rejected_event_base(executor_context, error_message).model_dump_json()
+
+
+def is_events_emitting_enabled(executor_context: Optional[BaseExecutorContext]) -> bool:
+    if not executor_context:
+        return False
+
+    if not executor_context.feature_flags:
+        return False
+
+    return executor_context.feature_flags.get("vembda-event-emitting-enabled") or False