From df929caac34231f9204eacaa7310a8123ca1ac2c Mon Sep 17 00:00:00 2001
From: Kayvan Zahiri <123409429+Kayvan-Zahiri@users.noreply.github.com>
Date: Fri, 16 Oct 2026 12:22:46 -0700
Subject: [PATCH] fix: stop endpoint output streams after job cancellation

---
 runpod/endpoint/helpers.py                   |  6 +--
 tests/test_endpoint/test_cancelled_stream.py | 52 ++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_endpoint/test_cancelled_stream.py

diff --git a/runpod/endpoint/helpers.py b/runpod/endpoint/helpers.py
index cbdb83f9b..458c8fecf 100644
--- a/runpod/endpoint/helpers.py
+++ b/runpod/endpoint/helpers.py
@@ -1,6 +1,6 @@
-""" Helper functions for the Runpod Endpoint API. """
+"""Helper functions for the Runpod Endpoint API."""
 
-FINAL_STATES = ["COMPLETED", "FAILED", "TIMED_OUT"]
+FINAL_STATES = ["COMPLETED", "FAILED", "TIMED_OUT", "CANCELLED"]
 
 # Exception Messages
 UNAUTHORIZED_MSG = "401 Unauthorized | Make sure Runpod API key is set and valid."
@@ -14,4 +14,4 @@
 
 def is_completed(status: str) -> bool:
     """Returns true if status is one of the possible final states for a serverless request."""
-    return status in ["COMPLETED", "FAILED", "TIMED_OUT", "CANCELLED"]
+    return status in FINAL_STATES
diff --git a/tests/test_endpoint/test_cancelled_stream.py b/tests/test_endpoint/test_cancelled_stream.py
new file mode 100644
index 000000000..ddb342c78
--- /dev/null
+++ b/tests/test_endpoint/test_cancelled_stream.py
@@ -0,0 +1,52 @@
+"""Cancelled jobs are terminal for sync and async output streams."""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+from runpod.endpoint.runner import Job as SyncJob
+from runpod.endpoint.asyncio.asyncio_runner import Job as AsyncJob
+
+
+@pytest.mark.parametrize("status", ["CANCELLED", "COMPLETED", "FAILED", "TIMED_OUT"])
+@pytest.mark.parametrize("chunks", [[], [{"output": "last chunk"}]])
+def test_sync_stream_stops_on_terminal_status(status, chunks):
+    client = MagicMock()
+    job = SyncJob("endpoint", "job", client)
+    responses = [{"status": status, "stream": chunks}]
+    if chunks:
+        responses.append({"status": status, "stream": []})
+    client.get.side_effect = responses
+    with patch("runpod.endpoint.runner.time.sleep"):
+        assert list(job.stream()) == [c["output"] for c in chunks]
+    assert client.get.call_count == len(responses)
+
+
+@pytest.mark.parametrize("status", ["CANCELLED", "COMPLETED", "FAILED", "TIMED_OUT"])
+@pytest.mark.parametrize("chunks", [[], [{"output": "last chunk"}]])
+@pytest.mark.asyncio
+async def test_async_stream_stops_on_terminal_status(status, chunks):
+    session = MagicMock()
+    responses = [{"status": status, "stream": chunks}]
+    if chunks:
+        responses.append({"status": status, "stream": []})
+    session.get = AsyncMock()
+    session.get.return_value.json = AsyncMock(side_effect=responses)
+    job = AsyncJob("endpoint", "job", session, {})
+    with patch(
+        "runpod.endpoint.asyncio.asyncio_runner.asyncio.sleep", new_callable=AsyncMock
+    ):
+        assert [c async for c in job.stream()] == [c["output"] for c in chunks]
+    assert session.get.await_count == len(responses)
+
+
+def test_run_sync_returns_cancelled_result_without_polling():
+    from runpod.endpoint.runner import Endpoint
+
+    with patch("runpod.endpoint.runner.RunPodClient") as client_class:
+        client = client_class.return_value
+        client.post.return_value = {"id": "job", "status": "CANCELLED", "output": None}
+        client.get.side_effect = AssertionError("Terminal run must not poll")
+        endpoint = Endpoint("endpoint", api_key="test-only")
+        assert endpoint.run_sync({"input": {"value": 1}}) is None
+        client.get.assert_not_called()