Treat concurrent cancellation errors as non-retryable

Co-authored-by: Shri Sukhani <shrisukhani@users.noreply.github.com>

Author: cursoragent

hyperbrowser/client/polling.py

@@ -1,4 +1,5 @@
 import asyncio
+from concurrent.futures import CancelledError as ConcurrentCancelledError
 import inspect
 import math
 from numbers import Real
@@ -113,6 +114,8 @@ def _invoke_non_retryable_callback(
 
 
 def _is_retryable_exception(exc: Exception) -> bool:
+    if isinstance(exc, ConcurrentCancelledError):
+        return False
     if isinstance(exc, _NonRetryablePollingError):
         return False
     if isinstance(exc, (HyperbrowserTimeoutError, HyperbrowserPollingError)):

tests/test_polling.py

@@ -1,4 +1,5 @@
 import asyncio
+from concurrent.futures import CancelledError as ConcurrentCancelledError
 import math
 from fractions import Fraction
 
@@ -160,6 +161,26 @@ def get_status_polling_error() -> str:
     assert polling_attempts["count"] == 1
 
 
+def test_poll_until_terminal_status_does_not_retry_concurrent_cancelled_errors():
+    attempts = {"count": 0}
+
+    def get_status() -> str:
+        attempts["count"] += 1
+        raise ConcurrentCancelledError()
+
+    with pytest.raises(ConcurrentCancelledError):
+        poll_until_terminal_status(
+            operation_name="sync poll concurrent-cancelled passthrough",
+            get_status=get_status,
+            is_terminal_status=lambda value: value == "completed",
+            poll_interval_seconds=0.0001,
+            max_wait_seconds=1.0,
+            max_status_failures=5,
+        )
+
+    assert attempts["count"] == 1
+
+
 def test_poll_until_terminal_status_retries_rate_limit_errors():
     attempts = {"count": 0}
 
@@ -489,6 +510,24 @@ def polling_error_operation() -> str:
     assert polling_attempts["count"] == 1
 
 
+def test_retry_operation_does_not_retry_concurrent_cancelled_errors():
+    attempts = {"count": 0}
+
+    def operation() -> str:
+        attempts["count"] += 1
+        raise ConcurrentCancelledError()
+
+    with pytest.raises(ConcurrentCancelledError):
+        retry_operation(
+            operation_name="sync retry concurrent-cancelled passthrough",
+            operation=operation,
+            max_attempts=5,
+            retry_delay_seconds=0.0001,
+        )
+
+    assert attempts["count"] == 1
+
+
 def test_retry_operation_retries_server_errors():
     attempts = {"count": 0}
 
@@ -726,6 +765,29 @@ async def get_status_polling_error() -> str:
     asyncio.run(run())
 
 
+def test_poll_until_terminal_status_async_does_not_retry_concurrent_cancelled_errors():
+    async def run() -> None:
+        attempts = {"count": 0}
+
+        async def get_status() -> str:
+            attempts["count"] += 1
+            raise ConcurrentCancelledError()
+
+        with pytest.raises(ConcurrentCancelledError):
+            await poll_until_terminal_status_async(
+                operation_name="async poll concurrent-cancelled passthrough",
+                get_status=get_status,
+                is_terminal_status=lambda value: value == "completed",
+                poll_interval_seconds=0.0001,
+                max_wait_seconds=1.0,
+                max_status_failures=5,
+            )
+
+        assert attempts["count"] == 1
+
+    asyncio.run(run())
+
+
 def test_poll_until_terminal_status_async_retries_server_errors():
     async def run() -> None:
         attempts = {"count": 0}
@@ -834,6 +896,27 @@ async def polling_error_operation() -> str:
     asyncio.run(run())
 
 
+def test_retry_operation_async_does_not_retry_concurrent_cancelled_errors():
+    async def run() -> None:
+        attempts = {"count": 0}
+
+        async def operation() -> str:
+            attempts["count"] += 1
+            raise ConcurrentCancelledError()
+
+        with pytest.raises(ConcurrentCancelledError):
+            await retry_operation_async(
+                operation_name="async retry concurrent-cancelled passthrough",
+                operation=operation,
+                max_attempts=5,
+                retry_delay_seconds=0.0001,
+            )
+
+        assert attempts["count"] == 1
+
+    asyncio.run(run())
+
+
 def test_retry_operation_async_retries_server_errors():
     async def run() -> None:
         attempts = {"count": 0}
@@ -1530,6 +1613,28 @@ def get_next_page(page: int) -> dict:
     assert attempts["count"] == 1
 
 
+def test_collect_paginated_results_does_not_retry_concurrent_cancelled_errors():
+    attempts = {"count": 0}
+
+    def get_next_page(page: int) -> dict:
+        attempts["count"] += 1
+        raise ConcurrentCancelledError()
+
+    with pytest.raises(ConcurrentCancelledError):
+        collect_paginated_results(
+            operation_name="sync paginated concurrent-cancelled passthrough",
+            get_next_page=get_next_page,
+            get_current_page_batch=lambda response: response["current"],
+            get_total_page_batches=lambda response: response["total"],
+            on_page_success=lambda response: None,
+            max_wait_seconds=1.0,
+            max_attempts=5,
+            retry_delay_seconds=0.0001,
+        )
+
+    assert attempts["count"] == 1
+
+
 def test_collect_paginated_results_retries_server_errors():
     attempts = {"count": 0}
     collected = []
@@ -1821,6 +1926,31 @@ async def get_next_page(page: int) -> dict:
     asyncio.run(run())
 
 
+def test_collect_paginated_results_async_does_not_retry_concurrent_cancelled_errors():
+    async def run() -> None:
+        attempts = {"count": 0}
+
+        async def get_next_page(page: int) -> dict:
+            attempts["count"] += 1
+            raise ConcurrentCancelledError()
+
+        with pytest.raises(ConcurrentCancelledError):
+            await collect_paginated_results_async(
+                operation_name="async paginated concurrent-cancelled passthrough",
+                get_next_page=get_next_page,
+                get_current_page_batch=lambda response: response["current"],
+                get_total_page_batches=lambda response: response["total"],
+                on_page_success=lambda response: None,
+                max_wait_seconds=1.0,
+                max_attempts=5,
+                retry_delay_seconds=0.0001,
+            )
+
+        assert attempts["count"] == 1
+
+    asyncio.run(run())
+
+
 def test_collect_paginated_results_async_retries_server_errors():
     async def run() -> None:
         attempts = {"count": 0}