Normalize string status codes in retry classification

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

Author: cursoragent

hyperbrowser/client/polling.py

@@ -172,6 +172,22 @@ def _is_executor_shutdown_runtime_error(exc: Exception) -> bool:
     )
 
 
+def _normalize_status_code_for_retry(status_code: object) -> Optional[int]:
+    if isinstance(status_code, bool):
+        return None
+    if isinstance(status_code, int):
+        return status_code
+    if isinstance(status_code, str):
+        normalized_status = status_code.strip()
+        if not normalized_status:
+            return None
+        try:
+            return int(normalized_status, 10)
+        except ValueError:
+            return None
+    return None
+
+
 def _is_retryable_exception(exc: Exception) -> bool:
     if isinstance(exc, ConcurrentBrokenExecutor):
         return False
@@ -194,11 +210,14 @@ def _is_retryable_exception(exc: Exception) -> bool:
     if isinstance(exc, (HyperbrowserTimeoutError, HyperbrowserPollingError)):
         return False
     if isinstance(exc, HyperbrowserError) and exc.status_code is not None:
-        if isinstance(exc.status_code, bool) or not isinstance(exc.status_code, int):
+        normalized_status_code = _normalize_status_code_for_retry(exc.status_code)
+        if normalized_status_code is None:
             return True
         if (
-            _CLIENT_ERROR_STATUS_MIN <= exc.status_code < _CLIENT_ERROR_STATUS_MAX
-            and exc.status_code not in _RETRYABLE_CLIENT_ERROR_STATUS_CODES
+            _CLIENT_ERROR_STATUS_MIN
+            <= normalized_status_code
+            < _CLIENT_ERROR_STATUS_MAX
+            and normalized_status_code not in _RETRYABLE_CLIENT_ERROR_STATUS_CODES
         ):
             return False
     return True

tests/test_polling.py

@@ -124,6 +124,26 @@ def get_status() -> str:
     assert attempts["count"] == 1
 
 
+def test_poll_until_terminal_status_does_not_retry_numeric_string_client_errors():
+    attempts = {"count": 0}
+
+    def get_status() -> str:
+        attempts["count"] += 1
+        raise HyperbrowserError("client failure", status_code="400")  # type: ignore[arg-type]
+
+    with pytest.raises(HyperbrowserError, match="client failure"):
+        poll_until_terminal_status(
+            operation_name="sync poll numeric-string client error",
+            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_does_not_retry_stop_iteration_errors():
     attempts = {"count": 0}
 
@@ -367,7 +387,7 @@ async def get_status() -> str:
             if attempts["count"] < 3:
                 raise HyperbrowserError(
                     "malformed status code",
-                    status_code="400",  # type: ignore[arg-type]
+                    status_code="invalid-status",  # type: ignore[arg-type]
                 )
             return "completed"
 
@@ -559,6 +579,29 @@ def operation() -> str:
     assert attempts["count"] == 1
 
 
+def test_retry_operation_retries_numeric_string_rate_limit_errors():
+    attempts = {"count": 0}
+
+    def operation() -> str:
+        attempts["count"] += 1
+        if attempts["count"] < 3:
+            raise HyperbrowserError(
+                "rate limited",
+                status_code=" 429 ",  # type: ignore[arg-type]
+            )
+        return "ok"
+
+    result = retry_operation(
+        operation_name="sync retry numeric-string rate limit",
+        operation=operation,
+        max_attempts=5,
+        retry_delay_seconds=0.0001,
+    )
+
+    assert result == "ok"
+    assert attempts["count"] == 3
+
+
 def test_retry_operation_does_not_retry_stop_iteration_errors():
     attempts = {"count": 0}
 
@@ -733,7 +776,7 @@ def operation() -> str:
         if attempts["count"] < 3:
             raise HyperbrowserError(
                 "malformed status code",
-                status_code="400",  # type: ignore[arg-type]
+                status_code="invalid-status",  # type: ignore[arg-type]
             )
         return "ok"
 
@@ -882,6 +925,32 @@ async def get_status() -> str:
     asyncio.run(run())
 
 
+def test_poll_until_terminal_status_async_does_not_retry_numeric_string_client_errors():
+    async def run() -> None:
+        attempts = {"count": 0}
+
+        async def get_status() -> str:
+            attempts["count"] += 1
+            raise HyperbrowserError(
+                "client failure",
+                status_code="404",  # type: ignore[arg-type]
+            )
+
+        with pytest.raises(HyperbrowserError, match="client failure"):
+            await poll_until_terminal_status_async(
+                operation_name="async poll numeric-string client error",
+                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_does_not_retry_stop_async_iteration_errors():
     async def run() -> None:
         attempts = {"count": 0}
@@ -1086,6 +1155,32 @@ async def operation() -> str:
     asyncio.run(run())
 
 
+def test_retry_operation_async_retries_numeric_string_rate_limit_errors():
+    async def run() -> None:
+        attempts = {"count": 0}
+
+        async def operation() -> str:
+            attempts["count"] += 1
+            if attempts["count"] < 3:
+                raise HyperbrowserError(
+                    "rate limited",
+                    status_code="429",  # type: ignore[arg-type]
+                )
+            return "ok"
+
+        result = await retry_operation_async(
+            operation_name="async retry numeric-string rate limit",
+            operation=operation,
+            max_attempts=5,
+            retry_delay_seconds=0.0001,
+        )
+
+        assert result == "ok"
+        assert attempts["count"] == 3
+
+    asyncio.run(run())
+
+
 def test_retry_operation_async_does_not_retry_stop_async_iteration_errors():
     async def run() -> None:
         attempts = {"count": 0}