vellum-workflow-server 1.7.5.post1__tar.gz → 1.7.5.post3__tar.gz

{vellum_workflow_server-1.7.5.post1 → vellum_workflow_server-1.7.5.post3}/PKG-INFO

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

{vellum_workflow_server-1.7.5.post1 → vellum_workflow_server-1.7.5.post3}/pyproject.toml

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

{vellum_workflow_server-1.7.5.post1 → vellum_workflow_server-1.7.5.post3}/src/workflow_server/api/workflow_view.py

@@ -22,6 +22,7 @@ from vellum_ee.workflows.server.virtual_file_loader import VirtualFileFinder
 
 from vellum.workflows.exceptions import WorkflowInitializationException
 from vellum.workflows.nodes import BaseNode
+from vellum.workflows.vellum_client import create_vellum_client
 from workflow_server.config import ENABLE_PROCESS_WRAPPER, MEMORY_LIMIT_MB
 from workflow_server.core.events import (
     SPAN_ID_EVENT,
@@ -47,7 +48,6 @@ from workflow_server.core.workflow_executor_context import (
     DEFAULT_TIMEOUT_SECONDS,
     NodeExecutorContext,
     WorkflowExecutorContext,
-    create_vellum_client,
 )
 from workflow_server.utils.oom_killer import get_is_oom_killed
 from workflow_server.utils.system_utils import (

{vellum_workflow_server-1.7.5.post1 → vellum_workflow_server-1.7.5.post3}/src/workflow_server/config.py

@@ -27,6 +27,11 @@ MEMORY_LIMIT_MB = int(os.getenv("MEMORY_LIMIT_MB", "2048"))
 PORT = os.getenv("PORT", "8000")
 VELLUM_API_URL_HOST = os.getenv("VELLUM_API_URL_HOST", "localhost")
 VELLUM_API_URL_PORT = os.getenv("VELLUM_API_URL_PORT", 8000)
+
+# Set VELLUM_API_URL for SDK when using local Vellum API
+if os.getenv("USE_LOCAL_VELLUM_API") == "true" and "VELLUM_API_URL" not in os.environ:
+    os.environ["VELLUM_API_URL"] = "http://{}:{}".format(VELLUM_API_URL_HOST, VELLUM_API_URL_PORT)
+
 CONCURRENCY = int(os.getenv("CONCURRENCY", "8"))
 CONTAINER_IMAGE = os.getenv("CONTAINER_IMAGE", "python-workflow-runtime:latest")
 ENABLE_PROCESS_WRAPPER = os.getenv("ENABLE_PROCESS_WRAPPER", "true").lower() == "true"

{vellum_workflow_server-1.7.5.post1 → vellum_workflow_server-1.7.5.post3}/src/workflow_server/core/workflow_executor_context.py

@@ -9,54 +9,15 @@ from typing_extensions import Self
 from flask import has_request_context, request
 from pydantic import Field, field_validator, model_validator
 
-from vellum import ApiVersionEnum, Vellum, VellumEnvironment
+from vellum import ApiVersionEnum, Vellum
 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 vellum.workflows.vellum_client import create_vellum_client
 from workflow_server.utils.utils import convert_json_inputs_to_vellum
 
 DEFAULT_TIMEOUT_SECONDS = int(os.getenv("MAX_WORKFLOW_RUNTIME_SECONDS", 1800))
 
 
-def create_vellum_client(
-    api_key: str,
-    api_version: Optional[ApiVersionEnum] = None,
-) -> Vellum:
-    """
-    Create a VellumClient with proper environment configuration.
-
-    Args:
-        api_key: The API key for the Vellum client
-        api_version: Optional API version to use
-
-    Returns:
-        Configured Vellum client instance
-
-    Note: Ideally we replace this with `vellum.workflows.vellum_client.create_vellum_client`
-    """
-    if IS_VPC:
-        environment = VellumEnvironment(
-            default=os.getenv("VELLUM_DEFAULT_API_URL", VellumEnvironment.PRODUCTION.default),
-            documents=os.getenv("VELLUM_DOCUMENTS_API_URL", VellumEnvironment.PRODUCTION.documents),
-            predict=os.getenv("VELLUM_PREDICT_API_URL", VellumEnvironment.PRODUCTION.predict),
-        )
-    elif os.getenv("USE_LOCAL_VELLUM_API") == "true":
-        VELLUM_API_URL = f"http://{VELLUM_API_URL_HOST}:{VELLUM_API_URL_PORT}"
-        environment = VellumEnvironment(
-            default=VELLUM_API_URL,
-            documents=VELLUM_API_URL,
-            predict=VELLUM_API_URL,
-        )
-    else:
-        environment = VellumEnvironment.PRODUCTION
-
-    return Vellum(
-        api_key=api_key,
-        environment=environment,
-        api_version=api_version,
-    )
-
-
 class BaseExecutorContext(UniversalBaseModel):
     inputs: dict = Field(default_factory=dict)
     state: Optional[dict] = None

{vellum_workflow_server-1.7.5.post1 → vellum_workflow_server-1.7.5.post3}/src/workflow_server/utils/sentry.py

@@ -37,11 +37,32 @@ def _tag_trace_id(event: dict) -> None:
     event["tags"]["vellum_trace_id"] = trace_id
 
 
+def _apply_custom_tags(event: dict, hint: dict) -> None:
+    """
+    Extracts 'sentry_tags' from logger exception's extra data and adds them to the event tags.
+
+    Modifies the event dictionary in place.
+    """
+    record = hint.get("log_record")
+    if not record:
+        return
+
+    sentry_tags = getattr(record, "sentry_tags", None)
+    if not sentry_tags or not isinstance(sentry_tags, dict):
+        return
+
+    if "tags" not in event:
+        event["tags"] = {}
+
+    event["tags"].update(sentry_tags)
+
+
 def before_send(event: dict, hint: dict) -> Optional[dict]:
     if "exc_info" in hint:
         _, _, _ = hint["exc_info"]
 
     _tag_trace_id(event)
+    _apply_custom_tags(event, hint)
 
     return event
 

vellum_workflow_server-1.7.5.post3/src/workflow_server/utils/tests/test_sentry_integration.py

@@ -0,0 +1,143 @@
+import pytest
+import logging
+from uuid import uuid4
+
+from workflow_server.server import create_app
+
+
+@pytest.fixture
+def mock_sentry_capture_envelope(mocker):
+    mock_transport = mocker.patch("sentry_sdk.client.make_transport")
+    return mock_transport.return_value.capture_envelope
+
+
+def test_sentry_integration_with_workflow_endpoints(monkeypatch, mock_sentry_capture_envelope):
+    # GIVEN sentry is configured
+    monkeypatch.setenv("SENTRY_DSN", "https://test-dsn@sentry.io/1234567890")
+
+    # AND our /workflow/stream endpoint raises an exception
+    def mock_get_version():
+        raise Exception("Test exception")
+
+    monkeypatch.setattr("workflow_server.api.workflow_view.get_version", mock_get_version)
+
+    # AND we have a mock trace_id
+    trace_id = str(uuid4())
+
+    # AND we have a mock request body
+    body = {
+        "execution_id": uuid4(),
+        "inputs": [],
+        "environment_api_key": "test",
+        "module": "workflow",
+        "timeout": 360,
+        "files": {
+            "__init__.py": "",
+            "workflow.py": """\
+from vellum.workflows import BaseWorkflow
+
+class Workflow(BaseWorkflow):
+    pass
+""",
+        },
+        "execution_context": {
+            "trace_id": trace_id,
+            "parent_context": {
+                "type": "API_REQUEST",
+                "span_id": str(uuid4()),
+                "parent": None,
+            },
+        },
+    }
+
+    # WHEN we call the /workflow/version endpoint
+    flask_app = create_app()
+
+    with flask_app.test_client() as test_client:
+        response = test_client.post("/workflow/stream", json=body)
+
+        # THEN we get a 500 error
+        assert response.status_code == 500
+
+        # AND sentry captures the error with the correct data
+        assert mock_sentry_capture_envelope.call_count == 1
+        envelope = mock_sentry_capture_envelope.call_args[0][0]
+        event = envelope.get_event()
+        assert event["level"] == "error"
+        assert "Test exception" in event["exception"]["values"][0]["value"]
+
+        # AND the trace_id is tagged
+        assert event["tags"]["vellum_trace_id"] == trace_id
+
+
+def test_sentry_integration_applies_custom_tags_from_logger_extra(monkeypatch, mock_sentry_capture_envelope):
+    """Test that Sentry events include custom tags from logger exception extra data."""
+
+    # GIVEN sentry is configured
+    monkeypatch.setenv("SENTRY_DSN", "https://test-dsn@sentry.io/1234567890")
+
+    # AND we have a function that will log with custom sentry_tags when called
+    def mock_get_version():
+        logger = logging.getLogger(__name__)
+        try:
+            raise Exception("Test exception with custom tags")
+        except Exception:
+            logger.exception(
+                "Failed during workflow execution",
+                extra={
+                    "sentry_tags": {
+                        "operation": "stream",
+                        "test_tag": "test_value",
+                        "numeric_tag": "12345",
+                    }
+                },
+            )
+            raise
+
+    monkeypatch.setattr("workflow_server.api.workflow_view.get_version", mock_get_version)
+
+    # AND we have a valid request body
+    body = {
+        "execution_id": str(uuid4()),
+        "inputs": [],
+        "environment_api_key": "test",
+        "module": "workflow",
+        "timeout": 360,
+        "files": {
+            "__init__.py": "",
+            "workflow.py": """\
+from vellum.workflows import BaseWorkflow
+
+class Workflow(BaseWorkflow):
+    pass
+""",
+        },
+        "execution_context": {
+            "trace_id": str(uuid4()),
+            "parent_context": {
+                "type": "API_REQUEST",
+                "span_id": str(uuid4()),
+                "parent": None,
+            },
+        },
+    }
+
+    # WHEN we call an endpoint that triggers the error
+    flask_app = create_app()
+
+    with flask_app.test_client() as test_client:
+        response = test_client.post("/workflow/stream", json=body)
+
+        # THEN we get a 500 error
+        assert response.status_code == 500
+
+        # AND sentry captures the error
+        assert mock_sentry_capture_envelope.call_count == 1
+        envelope = mock_sentry_capture_envelope.call_args[0][0]
+        event = envelope.get_event()
+
+        # AND the custom tags are included in the event
+        assert "tags" in event
+        assert event["tags"]["operation"] == "stream"
+        assert event["tags"]["test_tag"] == "test_value"
+        assert event["tags"]["numeric_tag"] == "12345"

vellum_workflow_server-1.7.5.post1/src/workflow_server/utils/tests/test_sentry_integration.py

@@ -1,69 +0,0 @@
-import pytest
-from uuid import uuid4
-
-from workflow_server.server import create_app
-
-
-@pytest.fixture
-def mock_sentry_capture_envelope(mocker):
-    mock_transport = mocker.patch("sentry_sdk.client.make_transport")
-    return mock_transport.return_value.capture_envelope
-
-
-def test_sentry_integration_with_workflow_endpoints(monkeypatch, mock_sentry_capture_envelope):
-    # GIVEN sentry is configured
-    monkeypatch.setenv("SENTRY_DSN", "https://test-dsn@sentry.io/1234567890")
-
-    # AND our /workflow/stream endpoint raises an exception
-    def mock_get_version():
-        raise Exception("Test exception")
-
-    monkeypatch.setattr("workflow_server.api.workflow_view.get_version", mock_get_version)
-
-    # AND we have a mock trace_id
-    trace_id = str(uuid4())
-
-    # AND we have a mock request body
-    body = {
-        "execution_id": uuid4(),
-        "inputs": [],
-        "environment_api_key": "test",
-        "module": "workflow",
-        "timeout": 360,
-        "files": {
-            "__init__.py": "",
-            "workflow.py": """\
-from vellum.workflows import BaseWorkflow
-
-class Workflow(BaseWorkflow):
-    pass
-""",
-        },
-        "execution_context": {
-            "trace_id": trace_id,
-            "parent_context": {
-                "type": "API_REQUEST",
-                "span_id": str(uuid4()),
-                "parent": None,
-            },
-        },
-    }
-
-    # WHEN we call the /workflow/version endpoint
-    flask_app = create_app()
-
-    with flask_app.test_client() as test_client:
-        response = test_client.post("/workflow/stream", json=body)
-
-        # THEN we get a 500 error
-        assert response.status_code == 500
-
-        # AND sentry captures the error with the correct data
-        assert mock_sentry_capture_envelope.call_count == 1
-        envelope = mock_sentry_capture_envelope.call_args[0][0]
-        event = envelope.get_event()
-        assert event["level"] == "error"
-        assert "Test exception" in event["exception"]["values"][0]["value"]
-
-        # AND the trace_id is tagged
-        assert event["tags"]["vellum_trace_id"] == trace_id