Handle request errors without request objects safely

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

Author: cursoragent

hyperbrowser/transport/async_transport.py

@@ -6,7 +6,7 @@
 from hyperbrowser.header_utils import normalize_headers
 from hyperbrowser.version import __version__
 from .base import APIResponse, AsyncTransportStrategy
-from .error_utils import extract_error_message
+from .error_utils import extract_error_message, extract_request_error_context
 
 
 class AsyncTransport(AsyncTransportStrategy):
@@ -67,8 +67,7 @@ async def _handle_response(self, response: httpx.Response) -> APIResponse:
                 original_error=e,
             )
         except httpx.RequestError as e:
-            request_method = e.request.method if e.request is not None else "UNKNOWN"
-            request_url = str(e.request.url) if e.request is not None else "unknown URL"
+            request_method, request_url = extract_request_error_context(e)
             raise HyperbrowserError(
                 f"Request {request_method} {request_url} failed", original_error=e
             )

hyperbrowser/transport/error_utils.py

@@ -33,3 +33,13 @@ def extract_error_message(response: httpx.Response, fallback_error: Exception) -
     if isinstance(error_data, str):
         return error_data
     return _stringify_error_value(response.text or str(fallback_error))
+
+
+def extract_request_error_context(error: httpx.RequestError) -> tuple[str, str]:
+    try:
+        request = error.request
+    except RuntimeError:
+        request = None
+    if request is None:
+        return "UNKNOWN", "unknown URL"
+    return request.method, str(request.url)

hyperbrowser/transport/sync.py

@@ -6,7 +6,7 @@
 from hyperbrowser.header_utils import normalize_headers
 from hyperbrowser.version import __version__
 from .base import APIResponse, SyncTransportStrategy
-from .error_utils import extract_error_message
+from .error_utils import extract_error_message, extract_request_error_context
 
 
 class SyncTransport(SyncTransportStrategy):
@@ -55,8 +55,7 @@ def _handle_response(self, response: httpx.Response) -> APIResponse:
                 original_error=e,
             )
         except httpx.RequestError as e:
-            request_method = e.request.method if e.request is not None else "UNKNOWN"
-            request_url = str(e.request.url) if e.request is not None else "unknown URL"
+            request_method, request_url = extract_request_error_context(e)
             raise HyperbrowserError(
                 f"Request {request_method} {request_url} failed", original_error=e
             )

tests/test_transport_response_handling.py

@@ -21,6 +21,11 @@ def raise_for_status(self) -> None:
         raise httpx.RequestError("network down", request=self._request)
 
 
+class _RequestErrorNoRequestResponse:
+    def raise_for_status(self) -> None:
+        raise httpx.RequestError("network down")
+
+
 def test_sync_handle_response_with_non_json_success_body_returns_status_only():
     transport = SyncTransport(api_key="test-key")
     try:
@@ -81,6 +86,31 @@ async def run() -> None:
     asyncio.run(run())
 
 
+def test_sync_handle_response_with_request_error_without_request_context():
+    transport = SyncTransport(api_key="test-key")
+    try:
+        with pytest.raises(
+            HyperbrowserError, match="Request UNKNOWN unknown URL failed"
+        ):
+            transport._handle_response(_RequestErrorNoRequestResponse())
+    finally:
+        transport.close()
+
+
+def test_async_handle_response_with_request_error_without_request_context():
+    async def run() -> None:
+        transport = AsyncTransport(api_key="test-key")
+        try:
+            with pytest.raises(
+                HyperbrowserError, match="Request UNKNOWN unknown URL failed"
+            ):
+                await transport._handle_response(_RequestErrorNoRequestResponse())
+        finally:
+            await transport.close()
+
+    asyncio.run(run())
+
+
 def test_sync_handle_response_with_error_and_non_json_body_raises_hyperbrowser_error():
     transport = SyncTransport(api_key="test-key")
     try: