Harden polling exception text sanitization for broken string subclasses

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

Author: cursoragent

hyperbrowser/client/polling.py

@@ -37,22 +37,27 @@ def _safe_exception_text(exc: Exception) -> str:
         exception_message = str(exc)
     except Exception:
         return f"<unstringifiable {type(exc).__name__}>"
-    sanitized_exception_message = "".join(
-        "?" if ord(character) < 32 or ord(character) == 127 else character
-        for character in exception_message
-    )
-    if sanitized_exception_message.strip():
-        if len(sanitized_exception_message) <= _MAX_EXCEPTION_TEXT_LENGTH:
-            return sanitized_exception_message
-        available_message_length = _MAX_EXCEPTION_TEXT_LENGTH - len(
-            _TRUNCATED_EXCEPTION_TEXT_SUFFIX
-        )
-        if available_message_length <= 0:
-            return _TRUNCATED_EXCEPTION_TEXT_SUFFIX
-        return (
-            f"{sanitized_exception_message[:available_message_length]}"
-            f"{_TRUNCATED_EXCEPTION_TEXT_SUFFIX}"
+    if not isinstance(exception_message, str):
+        return f"<unstringifiable {type(exc).__name__}>"
+    try:
+        sanitized_exception_message = "".join(
+            "?" if ord(character) < 32 or ord(character) == 127 else character
+            for character in exception_message
         )
+        if sanitized_exception_message.strip():
+            if len(sanitized_exception_message) <= _MAX_EXCEPTION_TEXT_LENGTH:
+                return sanitized_exception_message
+            available_message_length = _MAX_EXCEPTION_TEXT_LENGTH - len(
+                _TRUNCATED_EXCEPTION_TEXT_SUFFIX
+            )
+            if available_message_length <= 0:
+                return _TRUNCATED_EXCEPTION_TEXT_SUFFIX
+            return (
+                f"{sanitized_exception_message[:available_message_length]}"
+                f"{_TRUNCATED_EXCEPTION_TEXT_SUFFIX}"
+            )
+    except Exception:
+        return f"<unstringifiable {type(exc).__name__}>"
     return f"<{type(exc).__name__}>"
 
 

tests/test_polling.py

@@ -6744,6 +6744,32 @@ def __str__(self) -> str:
         )
 
 
+def test_poll_until_terminal_status_handles_runtime_errors_with_broken_string_subclasses():
+    class _BrokenRenderedRuntimeError(RuntimeError):
+        class _BrokenString(str):
+            def __iter__(self):
+                raise RuntimeError("cannot iterate rendered runtime message")
+
+        def __str__(self) -> str:
+            return self._BrokenString("broken runtime message")
+
+    with pytest.raises(
+        HyperbrowserPollingError,
+        match=(
+            r"Failed to poll sync poll after 1 attempts: "
+            r"<unstringifiable _BrokenRenderedRuntimeError>"
+        ),
+    ):
+        poll_until_terminal_status(
+            operation_name="sync poll",
+            get_status=lambda: (_ for _ in ()).throw(_BrokenRenderedRuntimeError()),
+            is_terminal_status=lambda value: value == "completed",
+            poll_interval_seconds=0.0,
+            max_wait_seconds=1.0,
+            max_status_failures=1,
+        )
+
+
 def test_retry_operation_handles_unstringifiable_value_errors():
     class _UnstringifiableValueError(ValueError):
         def __str__(self) -> str:
@@ -6764,6 +6790,30 @@ def __str__(self) -> str:
         )
 
 
+def test_retry_operation_handles_value_errors_with_broken_string_subclasses():
+    class _BrokenRenderedValueError(ValueError):
+        class _BrokenString(str):
+            def __iter__(self):
+                raise RuntimeError("cannot iterate rendered value message")
+
+        def __str__(self) -> str:
+            return self._BrokenString("broken value message")
+
+    with pytest.raises(
+        HyperbrowserError,
+        match=(
+            r"sync retry failed after 1 attempts: "
+            r"<unstringifiable _BrokenRenderedValueError>"
+        ),
+    ):
+        retry_operation(
+            operation_name="sync retry",
+            operation=lambda: (_ for _ in ()).throw(_BrokenRenderedValueError()),
+            max_attempts=1,
+            retry_delay_seconds=0.0,
+        )
+
+
 def test_poll_until_terminal_status_handles_unstringifiable_callback_errors():
     class _UnstringifiableCallbackError(RuntimeError):
         def __str__(self) -> str:
@@ -6788,6 +6838,34 @@ def __str__(self) -> str:
         )
 
 
+def test_poll_until_terminal_status_handles_callback_errors_with_broken_string_subclasses():
+    class _BrokenRenderedCallbackError(RuntimeError):
+        class _BrokenString(str):
+            def __iter__(self):
+                raise RuntimeError("cannot iterate rendered callback message")
+
+        def __str__(self) -> str:
+            return self._BrokenString("broken callback message")
+
+    with pytest.raises(
+        HyperbrowserError,
+        match=(
+            r"is_terminal_status failed for callback poll: "
+            r"<unstringifiable _BrokenRenderedCallbackError>"
+        ),
+    ):
+        poll_until_terminal_status(
+            operation_name="callback poll",
+            get_status=lambda: "running",
+            is_terminal_status=lambda value: (_ for _ in ()).throw(
+                _BrokenRenderedCallbackError()
+            ),
+            poll_interval_seconds=0.0,
+            max_wait_seconds=1.0,
+            max_status_failures=1,
+        )
+
+
 def test_poll_until_terminal_status_uses_placeholder_for_blank_error_messages():
     with pytest.raises(
         HyperbrowserPollingError,