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

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

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

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

@@ -6,17 +6,17 @@ 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=d46UNMZUJbIKLiTJkjIsVpgqCJMwCe4LL6RjFkfx_Y4,29178
 workflow_server/api/tests/test_workflow_view_stream_workflow_route.py,sha256=FaEIgGsbq8M7ZF2opVjBdGCYeRPF_vqsUhFTruLInxA,31358
-workflow_server/api/workflow_view.py,sha256=qayjwq18DSbmuMa6ROksc68v4XLcQOr7hAH3yRV5mlQ,21443
-workflow_server/code_exec_runner.py,sha256=E-HsjAL53L-znSMPg7lDiQNzyCjL6W076ZoWWbrSRrU,2217
+workflow_server/api/workflow_view.py,sha256=pqqgeQMVU3YjozjP26Q_f9qSsL_pjkpOQctsq_xwHfE,20447
+workflow_server/code_exec_runner.py,sha256=5uTjHJ231aX6vMwPKRvLcQdbsIxhjTsGMk8G0MEnasU,2152
 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=Bw6luelJs84-_fBIG9VvxYFxeha4DmwxDpslVeqr2I8,18411
 workflow_server/core/utils.py,sha256=si0NB4Suurc-mn8NYdn59xM9CkPrfOP1aWEVrZvifDI,1929
-workflow_server/core/workflow_executor_context.py,sha256=w0nFhtu54GX36ZzmaqLTD3-ssPtoFd9QX02dPgeIbBM,3615
+workflow_server/core/workflow_executor_context.py,sha256=u6tK6YgKlMrFXEYNBgWF1FMJ9NmN9HgOsPvptoA4b_c,4517
 workflow_server/server.py,sha256=QBU12AaAfAgLqfCDBd24qIJl_mbheiq0-hfcWV7rZM4,1234
-workflow_server/start.py,sha256=pkwRcms6I4tkVHP06LdrZY6rG_DFHfBx4ioY5X91W5k,2264
+workflow_server/start.py,sha256=9mhcSy3dGyv_cEs3rtJZ4ZjPStdQJd6SzE0cQb043fo,2342
 workflow_server/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 workflow_server/utils/exit_handler.py,sha256=_FacDVi4zc3bfTA3D2mJsISePlJ8jpLrnGVo5-xZQFs,743
 workflow_server/utils/log_proxy.py,sha256=nugi6fOgAYKX2X9DIc39TG366rsmmDUPoEtG3gzma_Y,3088
@@ -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.6.2.dist-info/METADATA,sha256=TL2lhfKRkMxIroio5iX2-j1gCua8PuNUwVYGcC33tew,2267
-vellum_workflow_server-1.6.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_workflow_server-1.6.2.dist-info/entry_points.txt,sha256=uB_0yPkr7YV6RhEXzvFReUM8P4OQBlVXD6TN6eb9-oc,277
-vellum_workflow_server-1.6.2.dist-info/RECORD,,
+vellum_workflow_server-1.6.2.post2.dist-info/METADATA,sha256=s4UeyRNN714wmbwgllsSN3JlQnVIhW24ioPdqW7wySs,2273
+vellum_workflow_server-1.6.2.post2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_workflow_server-1.6.2.post2.dist-info/entry_points.txt,sha256=uB_0yPkr7YV6RhEXzvFReUM8P4OQBlVXD6TN6eb9-oc,277
+vellum_workflow_server-1.6.2.post2.dist-info/RECORD,,

workflow_server/api/workflow_view.py

@@ -16,7 +16,7 @@ import traceback
 from uuid import uuid4
 from typing import Any, Dict, Generator, Iterator, Optional, Union, cast
 
-from flask import Blueprint, Response, current_app as app, has_request_context, request, stream_with_context
+from flask import Blueprint, Response, current_app as app, request, stream_with_context
 from pydantic import ValidationError
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
 from vellum_ee.workflows.display.types import WorkflowDisplayContext
@@ -56,7 +56,7 @@ from workflow_server.utils.system_utils import (
     remove_active_span_id,
     wait_for_available_process,
 )
-from workflow_server.utils.utils import convert_json_inputs_to_vellum, get_version
+from workflow_server.utils.utils import get_version
 
 bp = Blueprint("exec", __name__)
 logger = logging.getLogger(__name__)
@@ -72,7 +72,7 @@ def stream_workflow_route() -> Response:
     data = request.get_json()
 
     try:
-        context = get_workflow_request_context(data)
+        context = WorkflowExecutorContext.model_validate(data)
     except ValidationError as e:
         error_message = e.errors()[0]["msg"]
         error_location = e.errors()[0]["loc"]
@@ -354,7 +354,7 @@ def stream_node_route() -> Response:
     data = request.get_json()
 
     try:
-        context = get_node_request_context(data)
+        context = NodeExecutorContext.model_validate(data)
     except ValidationError as e:
         error_message = e.errors()[0]["msg"]
         error_location = e.errors()[0]["loc"]
@@ -533,36 +533,6 @@ def get_version_route() -> tuple[dict, int]:
     return resp, 200
 
 
-def get_workflow_request_context(data: dict) -> WorkflowExecutorContext:
-    context_data = {
-        **data,
-        "inputs": convert_json_inputs_to_vellum(data.get("inputs") or []),
-        "request_start_time": time.time_ns(),
-    }
-
-    if has_request_context():
-        api_version_header = request.headers.get("x-api-version")
-        if api_version_header:
-            context_data["api_version"] = api_version_header
-
-    return WorkflowExecutorContext.model_validate(context_data)
-
-
-def get_node_request_context(data: dict) -> NodeExecutorContext:
-    context_data = {
-        **data,
-        "inputs": convert_json_inputs_to_vellum(data["inputs"]),
-        "request_start_time": time.time_ns(),
-    }
-
-    if has_request_context():
-        api_version_header = request.headers.get("x-api-version")
-        if api_version_header:
-            context_data["api_version"] = api_version_header
-
-    return NodeExecutorContext.model_validate(context_data)
-
-
 def startup_error_generator(
     vembda_initiated_event: VembdaExecutionInitiatedEvent, message: str, context: WorkflowExecutorContext
 ) -> Generator[str, None, None]:

workflow_server/code_exec_runner.py

@@ -6,7 +6,6 @@ from threading import Event as ThreadingEvent
 from uuid import uuid4
 from typing import Optional
 
-from workflow_server.api.workflow_view import get_workflow_request_context
 from workflow_server.core.events import VembdaExecutionInitiatedBody, VembdaExecutionInitiatedEvent
 from workflow_server.core.executor import stream_workflow
 from workflow_server.core.utils import serialize_vembda_rejected_event
@@ -31,7 +30,7 @@ def run_code_exec_stream() -> None:
         input_json = split_input[0]
 
         input_data = json.loads(input_json)
-        context = get_workflow_request_context(input_data)
+        context = WorkflowExecutorContext.model_validate(input_data)
 
         print("--vellum-output-start--")  # noqa: T201
 

workflow_server/core/workflow_executor_context.py

@@ -1,18 +1,21 @@
 from dataclasses import field
 from functools import cached_property
 import os
+import time
 from uuid import UUID
 from typing import Any, Optional
 from typing_extensions import Self
 
-from pydantic import model_validator
+from flask import has_request_context, request
+from pydantic import Field, field_validator, model_validator
 
 from vellum import ApiVersionEnum, Vellum, VellumEnvironment
 from vellum.client.core import UniversalBaseModel
 from vellum.workflows.context import ExecutionContext
 from workflow_server.config import IS_VPC, VELLUM_API_URL_HOST, VELLUM_API_URL_PORT
+from workflow_server.utils.utils import convert_json_inputs_to_vellum
 
-DEFAULT_TIMEOUT_SECONDS = 60 * 30
+DEFAULT_TIMEOUT_SECONDS = int(os.getenv("REVISION_TIMEOUT_SECONDS", 1800))
 
 
 def create_vellum_client(
@@ -55,7 +58,7 @@ def create_vellum_client(
 
 
 class BaseExecutorContext(UniversalBaseModel):
-    inputs: dict
+    inputs: dict = Field(default_factory=dict)
     state: Optional[dict] = None
     timeout: int = DEFAULT_TIMEOUT_SECONDS
     files: dict[str, str]
@@ -64,7 +67,7 @@ class BaseExecutorContext(UniversalBaseModel):
     execution_id: UUID
     module: str
     execution_context: ExecutionContext = field(default_factory=ExecutionContext)
-    request_start_time: int
+    request_start_time: int = Field(default_factory=lambda: time.time_ns())
     stream_start_time: int = 0
     vembda_public_url: Optional[str] = None
     node_output_mocks: Optional[list[Any]] = None
@@ -72,6 +75,26 @@ class BaseExecutorContext(UniversalBaseModel):
     previous_execution_id: Optional[UUID] = None
     feature_flags: Optional[dict[str, bool]] = None
 
+    @field_validator("inputs", mode="before")
+    @classmethod
+    def convert_inputs(cls, v: Any) -> dict:
+        if v is None:
+            return {}
+        if isinstance(v, list):
+            return convert_json_inputs_to_vellum(v)
+        return v
+
+    @field_validator("api_version", mode="before")
+    @classmethod
+    def extract_api_version_from_headers(cls, v: Any) -> Any:
+        if v is not None:
+            return v
+        if has_request_context():
+            api_version_header = request.headers.get("x-api-version")
+            if api_version_header:
+                return api_version_header
+        return v
+
     @property
     def container_overhead_latency(self) -> int:
         return self.stream_start_time - self.request_start_time if self.stream_start_time else -1

workflow_server/start.py

@@ -53,10 +53,10 @@ def start() -> None:
         "max_requests": 120 if ENABLE_PROCESS_WRAPPER else 20,
         "max_requests_jitter": 30 if ENABLE_PROCESS_WRAPPER else 10,
         "worker_class": "gthread",
-        "timeout": int(os.getenv("GUNICORN_TIMEOUT", 1800)),
+        "timeout": int(os.getenv("GUNICORN_TIMEOUT", os.getenv("REVISION_TIMEOUT_SECONDS", 1800))),
         "logger_class": CustomGunicornLogger,
         "accesslog": "-",
         "on_exit": gunicorn_exit_handler,
-        "graceful_timeout": int(os.getenv("GUNICORN_TIMEOUT", 1800)),
+        "graceful_timeout": int(os.getenv("GUNICORN_TIMEOUT", os.getenv("REVISION_TIMEOUT_SECONDS", 1800))),
     }
     StandaloneApplication(app, options).run()