Use fallback request context for transport request errors

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

Author: cursoragent

hyperbrowser/transport/async_transport.py

@@ -6,7 +6,11 @@
 from hyperbrowser.header_utils import merge_headers
 from hyperbrowser.version import __version__
 from .base import APIResponse, AsyncTransportStrategy
-from .error_utils import extract_error_message, extract_request_error_context
+from .error_utils import (
+    extract_error_message,
+    extract_request_error_context,
+    format_request_failure_message,
+)
 
 
 class AsyncTransport(AsyncTransportStrategy):
@@ -81,7 +85,10 @@ async def post(
             return await self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"POST request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="POST", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise
@@ -102,7 +109,10 @@ async def get(
             return await self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"GET request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="GET", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise
@@ -117,7 +127,10 @@ async def put(self, url: str, data: Optional[dict] = None) -> APIResponse:
             return await self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"PUT request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="PUT", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise
@@ -132,7 +145,10 @@ async def delete(self, url: str) -> APIResponse:
             return await self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"DELETE request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="DELETE", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise

hyperbrowser/transport/error_utils.py

@@ -43,3 +43,14 @@ def extract_request_error_context(error: httpx.RequestError) -> tuple[str, str]:
     if request is None:
         return "UNKNOWN", "unknown URL"
     return request.method, str(request.url)
+
+
+def format_request_failure_message(
+    error: httpx.RequestError, *, fallback_method: str, fallback_url: str
+) -> str:
+    request_method, request_url = extract_request_error_context(error)
+    effective_method = (
+        request_method if request_method != "UNKNOWN" else fallback_method
+    )
+    effective_url = request_url if request_url != "unknown URL" else fallback_url
+    return f"Request {effective_method} {effective_url} failed"

hyperbrowser/transport/sync.py

@@ -6,7 +6,11 @@
 from hyperbrowser.header_utils import merge_headers
 from hyperbrowser.version import __version__
 from .base import APIResponse, SyncTransportStrategy
-from .error_utils import extract_error_message, extract_request_error_context
+from .error_utils import (
+    extract_error_message,
+    extract_request_error_context,
+    format_request_failure_message,
+)
 
 
 class SyncTransport(SyncTransportStrategy):
@@ -72,7 +76,10 @@ def post(
             return self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"POST request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="POST", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise
@@ -93,7 +100,10 @@ def get(
             return self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"GET request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="GET", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise
@@ -108,7 +118,10 @@ def put(self, url: str, data: Optional[dict] = None) -> APIResponse:
             return self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"PUT request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="PUT", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise
@@ -123,7 +136,10 @@ def delete(self, url: str) -> APIResponse:
             return self._handle_response(response)
         except httpx.RequestError as e:
             raise HyperbrowserError(
-                f"DELETE request to {url} failed", original_error=e
+                format_request_failure_message(
+                    e, fallback_method="DELETE", fallback_url=url
+                ),
+                original_error=e,
             ) from e
         except HyperbrowserError:
             raise

tests/test_transport_response_handling.py

@@ -222,7 +222,7 @@ def failing_post(*args, **kwargs):
     transport.client.post = failing_post  # type: ignore[assignment]
     try:
         with pytest.raises(
-            HyperbrowserError, match="POST request to https://example.com/post failed"
+            HyperbrowserError, match="Request POST https://example.com/post failed"
         ):
             transport.post("https://example.com/post", data={"ok": True})
     finally:
@@ -261,7 +261,7 @@ async def failing_get(*args, **kwargs):
         try:
             with pytest.raises(
                 HyperbrowserError,
-                match="GET request to https://example.com/get failed",
+                match="Request GET https://example.com/get failed",
             ):
                 await transport.get("https://example.com/get")
         finally:
@@ -310,3 +310,43 @@ async def failing_put(*args, **kwargs):
             await transport.close()
 
     asyncio.run(run())
+
+
+def test_sync_transport_request_error_without_request_uses_fallback_url():
+    transport = SyncTransport(api_key="test-key")
+    original_get = transport.client.get
+
+    def failing_get(*args, **kwargs):
+        raise httpx.RequestError("network down")
+
+    transport.client.get = failing_get  # type: ignore[assignment]
+    try:
+        with pytest.raises(
+            HyperbrowserError, match="Request GET https://example.com/fallback failed"
+        ):
+            transport.get("https://example.com/fallback")
+    finally:
+        transport.client.get = original_get  # type: ignore[assignment]
+        transport.close()
+
+
+def test_async_transport_request_error_without_request_uses_fallback_url():
+    async def run() -> None:
+        transport = AsyncTransport(api_key="test-key")
+        original_delete = transport.client.delete
+
+        async def failing_delete(*args, **kwargs):
+            raise httpx.RequestError("network down")
+
+        transport.client.delete = failing_delete  # type: ignore[assignment]
+        try:
+            with pytest.raises(
+                HyperbrowserError,
+                match="Request DELETE https://example.com/fallback failed",
+            ):
+                await transport.delete("https://example.com/fallback")
+        finally:
+            transport.client.delete = original_delete  # type: ignore[assignment]
+            await transport.close()
+
+    asyncio.run(run())