Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
feat: NAT egress proxy for webhook delivery via static IPs (#5392)
Shuchang Zheng49e2bbd7b1c0
diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.pyindex cc9a1a4d0..2c3eb69c3 100644--- a/skyvern/forge/agent.py+++ b/skyvern/forge/agent.py@@ -13,7 +13,6 @@ from datetime import UTC, datetimefrom pathlib import Pathfrom typing import Any, Tuple, cast-import httpximport structlogfrom openai.types.responses.response import Response as OpenAIResponsefrom opentelemetry import trace as otel_trace@@ -3612,13 +3611,14 @@ class ForgeAgent:headers=signed_data.headers,)- async with httpx.AsyncClient() as client:- resp = await client.post(- task.webhook_callback_url,- data=signed_data.signed_payload,- headers=signed_data.headers,- timeout=httpx.Timeout(30.0),- )+ resp = await app.AGENT_FUNCTION.deliver_webhook(+ url=task.webhook_callback_url,+ payload=signed_data.signed_payload,+ headers=signed_data.headers,+ timeout_seconds=30.0,+ organization_id=task.organization_id,+ run_id=task.task_id,+ )if resp.status_code >= 200 and resp.status_code < 300:LOG.info("Webhook sent successfully",diff --git a/skyvern/forge/agent_functions.py b/skyvern/forge/agent_functions.pyindex 6b1e12a58..c1384aaaa 100644--- a/skyvern/forge/agent_functions.py+++ b/skyvern/forge/agent_functions.py@@ -4,6 +4,7 @@ import hashlibfrom datetime import timedeltafrom typing import Any, Dict, List+import httpximport structlogfrom playwright.async_api import Frame, Page@@ -618,6 +619,28 @@ class AgentFunction:async def post_action_execution(self, action: Action) -> None:pass+ async def deliver_webhook(+ self,+ url: str,+ payload: str,+ headers: dict[str, str],+ timeout_seconds: float = 30.0,+ organization_id: str | None = None,+ run_id: str | None = None,+ ) -> httpx.Response:+ """Deliver a webhook POST request to *url*.++ Returns the upstream ``httpx.Response``. Cloud override routes NAT-org+ traffic through the egress proxy so it egresses from a static IP.+ """+ async with httpx.AsyncClient() as client:+ return await client.post(+ url,+ content=payload,+ headers=headers,+ timeout=httpx.Timeout(timeout_seconds),+ )+def get_copilot_security_rules(self) -> str:"""Return security guardrails for the workflow copilot system prompt.diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.pyindex 0380d5cfe..bc7c83436 100644--- a/skyvern/forge/sdk/workflow/service.py+++ b/skyvern/forge/sdk/workflow/service.py@@ -12,7 +12,6 @@ from datetime import UTC, datetime, timedeltafrom hashlib import sha256from typing import Any, Literal, cast-import httpximport structlogfrom sqlalchemy.exc import IntegrityError, SQLAlchemyError@@ -4576,13 +4575,14 @@ class WorkflowService:headers=signed_data.headers,)try:- async with httpx.AsyncClient() as client:- resp = await client.post(- url=workflow_run.webhook_callback_url,- data=signed_data.signed_payload,- headers=signed_data.headers,- timeout=httpx.Timeout(30.0),- )+ resp = await app.AGENT_FUNCTION.deliver_webhook(+ url=workflow_run.webhook_callback_url,+ payload=signed_data.signed_payload,+ headers=signed_data.headers,+ timeout_seconds=30.0,+ organization_id=workflow_run.organization_id,+ run_id=workflow_run.workflow_run_id,+ )if resp.status_code >= 200 and resp.status_code < 300:LOG.info("Webhook sent successfully",diff --git a/skyvern/services/task_v2_service.py b/skyvern/services/task_v2_service.pyindex e3f7a34f5..b9f6781af 100644--- a/skyvern/services/task_v2_service.py+++ b/skyvern/services/task_v2_service.py@@ -3,7 +3,6 @@ import stringfrom datetime import UTC, datetimefrom typing import Any-import httpximport structlogfrom opentelemetry import trace as otel_tracefrom sqlalchemy.exc import OperationalError@@ -2067,13 +2066,14 @@ async def send_task_v2_webhook(task_v2: TaskV2) -> None:payload_length=len(payload),header_keys=sorted(headers.keys()),)- timeout = httpx.Timeout(30.0)- async with httpx.AsyncClient(timeout=timeout) as client:- resp = await client.post(- task_v2.webhook_callback_url,- data=payload,- headers=headers,- )+ resp = await app.AGENT_FUNCTION.deliver_webhook(+ url=task_v2.webhook_callback_url,+ payload=payload,+ headers=headers,+ timeout_seconds=30.0,+ organization_id=task_v2.organization_id,+ run_id=task_v2.observer_cruise_id,+ )if resp.status_code >= 200 and resp.status_code < 300:LOG.info("Task v2 webhook sent successfully",diff --git a/skyvern/services/webhook_service.py b/skyvern/services/webhook_service.pyindex ef511fff4..847abd49a 100644--- a/skyvern/services/webhook_service.py+++ b/skyvern/services/webhook_service.py@@ -250,6 +250,8 @@ async def replay_run_webhook(url=validated_url,payload=signed_data.signed_payload,headers=signed_data.headers,+ organization_id=organization_id,+ run_id=run_id,)return RunWebhookReplayResponse(@@ -465,7 +467,11 @@ async def _get_api_key(organization_id: str) -> str:async def _deliver_webhook(- url: str, payload: str, headers: dict[str, str]+ url: str,+ payload: str,+ headers: dict[str, str],+ organization_id: str | None = None,+ run_id: str | None = None,) -> tuple[int | None, int, str | None, str | None]:start = perf_counter()status_code: int | None = None@@ -473,8 +479,14 @@ async def _deliver_webhook(error: str | None = Nonetry:- async with httpx.AsyncClient() as client:- response = await client.post(url, content=payload, headers=headers, timeout=httpx.Timeout(60.0))+ response = await app.AGENT_FUNCTION.deliver_webhook(+ url=url,+ payload=payload,+ headers=headers,+ timeout_seconds=60.0,+ organization_id=organization_id,+ run_id=run_id,+ )status_code = response.status_codebody_text = response.text or ""if len(body_text) > RESPONSE_BODY_TRUNCATION_LIMIT: