fix: simplify webhook

Author: justinmerrell

runpod/serverless/modules/rp_fastapi.py

@@ -3,7 +3,6 @@
 
 import os
 import uuid
-import time
 import threading
 from dataclasses import dataclass
 from typing import Union, Optional, Dict, Any
@@ -86,15 +85,18 @@ class StreamOutput:
 
 
 # ------------------------------ Webhook Sender ------------------------------ #
-def _send_webhook(url: str, payload: Dict[str, Any]) -> None:
+def _send_webhook(url: str, payload: Dict[str, Any]) -> bool:
     """
-    Sends a webhook to the provided URL. Retries once if the first attempt fails.
+    Sends a webhook to the provided URL.
 
     Args:
         url (str): The URL to send the webhook to.
         payload (Dict[str, Any]): The JSON payload to send.
+
+    Returns:
+        bool: True if the request was successful, False otherwise.
     """
-    def attempt_send(session, url, payload):
+    with requests.Session() as session:
         try:
             response = session.post(url, json=payload, timeout=10)
             response.raise_for_status()  # Raises exception for 4xx/5xx responses
@@ -103,19 +105,6 @@ def attempt_send(session, url, payload):
             print(f"Request to {url} failed: {err}")
             return False
 
-    with requests.Session() as session:
-        if attempt_send(session, url, payload):
-            return True
-
-        print("Retrying...")
-        time.sleep(1)  # Wait for 1 second before retrying
-
-        if attempt_send(session, url, payload):
-            return True
-
-        print("Failed to send webhook after retry.")
-        return False
-
 
 # ---------------------------------------------------------------------------- #
 #                                  API Worker                                  #

tests/test_serverless/test_modules/test_fastapi.py

@@ -141,7 +141,8 @@ def test_runsync(self):
         with patch(f"{module_location}.FastAPI", Mock()), \
                 patch(f"{module_location}.APIRouter", return_value=Mock()), \
                 patch(f"{module_location}.uvicorn", Mock()), \
-                patch(f"{module_location}.uuid.uuid4", return_value="123"):
+                patch(f"{module_location}.uuid.uuid4", return_value="123"), \
+                patch(f"{module_location}.threading") as mock_threading:
 
             default_input_object = rp_fastapi.DefaultRequest(
                 input={"test_input": "test_input"}
@@ -183,9 +184,8 @@ def generator_handler(job):
             assert "error" in error_runsync_return
 
             # Test webhook caller sent
-            with patch(f"{module_location}.threading") as mock_thread:
-                asyncio.run(worker_api._sim_runsync(input_object_with_webhook))
-                assert mock_thread.Thread.called
+            asyncio.run(worker_api._sim_runsync(input_object_with_webhook))
+            assert mock_threading.Thread.called
 
         loop.close()
 
@@ -201,7 +201,7 @@ def test_stream(self):
                 patch(f"{module_location}.APIRouter", return_value=Mock()), \
                 patch(f"{module_location}.uvicorn", Mock()), \
                 patch(f"{module_location}.uuid.uuid4", return_value="123"), \
-                patch(f"{module_location}.threading"):
+                patch(f"{module_location}.threading") as mock_threading:
 
             default_input_object = rp_fastapi.DefaultRequest(
                 input={"test_input": "test_input"}
@@ -232,10 +232,9 @@ def test_stream(self):
             }
 
             # Test webhook caller sent
-            with patch(f"{module_location}.threading", return_value=True) as mock_threading:
-                asyncio.run(worker_api._sim_run(input_object_with_webhook))
-                asyncio.run(worker_api._sim_stream("test-123"))
-                assert mock_threading.Thread.called
+            asyncio.run(worker_api._sim_run(input_object_with_webhook))
+            asyncio.run(worker_api._sim_stream("test-123"))
+            assert mock_threading.Thread.called
 
             # Test with generator handler
             def generator_handler(job):
@@ -265,7 +264,7 @@ def test_status(self):
                 patch(f"{module_location}.APIRouter", return_value=Mock()), \
                 patch(f"{module_location}.uvicorn", Mock()), \
                 patch(f"{module_location}.uuid.uuid4", return_value="123"), \
-                patch(f"{module_location}.threading"):
+                patch(f"{module_location}.threading") as mock_threading:
 
             worker_api = rp_fastapi.WorkerAPI({"handler": self.handler})
 
@@ -296,10 +295,9 @@ def test_status(self):
             }
 
             # Test webhook caller sent
-            with patch(f"{module_location}.threading", return_value=True) as mock_threading:
-                asyncio.run(worker_api._sim_run(input_object_with_webhook))
-                asyncio.run(worker_api._sim_status("test-123"))
-                assert mock_threading.Thread.called
+            asyncio.run(worker_api._sim_run(input_object_with_webhook))
+            asyncio.run(worker_api._sim_status("test-123"))
+            assert mock_threading.Thread.called
 
             # Test with generator handler
             def generator_handler(job):