Normalize generic transport failure messages with safe URL fallback

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

Author: cursoragent

hyperbrowser/transport/async_transport.py

@@ -9,6 +9,7 @@
 from .error_utils import (
     extract_error_message,
     extract_request_error_context,
+    format_generic_request_failure_message,
     format_request_failure_message,
 )
 
@@ -99,7 +100,8 @@ async def post(
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request POST {url} failed", original_error=e
+                format_generic_request_failure_message(method="POST", url=url),
+                original_error=e,
             ) from e
 
     async def get(
@@ -123,7 +125,8 @@ async def get(
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request GET {url} failed", original_error=e
+                format_generic_request_failure_message(method="GET", url=url),
+                original_error=e,
             ) from e
 
     async def put(self, url: str, data: Optional[dict] = None) -> APIResponse:
@@ -141,7 +144,8 @@ async def put(self, url: str, data: Optional[dict] = None) -> APIResponse:
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request PUT {url} failed", original_error=e
+                format_generic_request_failure_message(method="PUT", url=url),
+                original_error=e,
             ) from e
 
     async def delete(self, url: str) -> APIResponse:
@@ -159,5 +163,6 @@ async def delete(self, url: str) -> APIResponse:
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request DELETE {url} failed", original_error=e
+                format_generic_request_failure_message(method="DELETE", url=url),
+                original_error=e,
             ) from e

hyperbrowser/transport/error_utils.py

@@ -146,3 +146,9 @@ def format_request_failure_message(
     effective_url = request_url if request_url != "unknown URL" else fallback_url
     effective_url = _normalize_request_url(effective_url)
     return f"Request {effective_method} {effective_url} failed"
+
+
+def format_generic_request_failure_message(*, method: str, url: object) -> str:
+    normalized_method = _normalize_request_method(method)
+    normalized_url = _normalize_request_url(url)
+    return f"Request {normalized_method} {normalized_url} failed"

hyperbrowser/transport/sync.py

@@ -9,6 +9,7 @@
 from .error_utils import (
     extract_error_message,
     extract_request_error_context,
+    format_generic_request_failure_message,
     format_request_failure_message,
 )
 
@@ -90,7 +91,8 @@ def post(
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request POST {url} failed", original_error=e
+                format_generic_request_failure_message(method="POST", url=url),
+                original_error=e,
             ) from e
 
     def get(
@@ -114,7 +116,8 @@ def get(
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request GET {url} failed", original_error=e
+                format_generic_request_failure_message(method="GET", url=url),
+                original_error=e,
             ) from e
 
     def put(self, url: str, data: Optional[dict] = None) -> APIResponse:
@@ -132,7 +135,8 @@ def put(self, url: str, data: Optional[dict] = None) -> APIResponse:
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request PUT {url} failed", original_error=e
+                format_generic_request_failure_message(method="PUT", url=url),
+                original_error=e,
             ) from e
 
     def delete(self, url: str) -> APIResponse:
@@ -150,5 +154,6 @@ def delete(self, url: str) -> APIResponse:
             raise
         except Exception as e:
             raise HyperbrowserError(
-                f"Request DELETE {url} failed", original_error=e
+                format_generic_request_failure_message(method="DELETE", url=url),
+                original_error=e,
             ) from e

tests/test_transport_error_utils.py

@@ -3,6 +3,7 @@
 from hyperbrowser.transport.error_utils import (
     extract_error_message,
     extract_request_error_context,
+    format_generic_request_failure_message,
     format_request_failure_message,
 )
 
@@ -234,6 +235,24 @@ def test_format_request_failure_message_rejects_overlong_fallback_methods():
     assert message == "Request UNKNOWN https://example.com/fallback failed"
 
 
+def test_format_generic_request_failure_message_normalizes_invalid_url_objects():
+    message = format_generic_request_failure_message(
+        method="GET",
+        url=object(),
+    )
+
+    assert message == "Request GET unknown URL failed"
+
+
+def test_format_generic_request_failure_message_normalizes_invalid_method_values():
+    message = format_generic_request_failure_message(
+        method="GET /invalid",
+        url="https://example.com/path",
+    )
+
+    assert message == "Request UNKNOWN https://example.com/path failed"
+
+
 def test_format_request_failure_message_truncates_very_long_fallback_urls():
     very_long_url = "https://example.com/" + ("a" * 1200)
     message = format_request_failure_message(

tests/test_transport_response_handling.py

@@ -331,6 +331,22 @@ def failing_delete(*args, **kwargs):
         transport.close()
 
 
+def test_sync_transport_wraps_unexpected_errors_with_invalid_url_fallback():
+    transport = SyncTransport(api_key="test-key")
+    original_get = transport.client.get
+
+    def failing_get(*args, **kwargs):
+        raise RuntimeError("boom")
+
+    transport.client.get = failing_get  # type: ignore[assignment]
+    try:
+        with pytest.raises(HyperbrowserError, match="Request GET unknown URL failed"):
+            transport.get(None)  # type: ignore[arg-type]
+    finally:
+        transport.client.get = original_get  # type: ignore[assignment]
+        transport.close()
+
+
 def test_async_transport_put_wraps_unexpected_errors_with_url_context():
     async def run() -> None:
         transport = AsyncTransport(api_key="test-key")
@@ -353,6 +369,27 @@ async def failing_put(*args, **kwargs):
     asyncio.run(run())
 
 
+def test_async_transport_wraps_unexpected_errors_with_invalid_url_fallback():
+    async def run() -> None:
+        transport = AsyncTransport(api_key="test-key")
+        original_put = transport.client.put
+
+        async def failing_put(*args, **kwargs):
+            raise RuntimeError("boom")
+
+        transport.client.put = failing_put  # type: ignore[assignment]
+        try:
+            with pytest.raises(
+                HyperbrowserError, match="Request PUT unknown URL failed"
+            ):
+                await transport.put(None)  # type: ignore[arg-type]
+        finally:
+            transport.client.put = original_put  # type: ignore[assignment]
+            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