Expand numeric-like URL fallback normalization and wrapper coverage

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

Author: cursoragent

hyperbrowser/transport/error_utils.py

@@ -5,10 +5,24 @@
 import httpx
 
 _HTTP_METHOD_TOKEN_PATTERN = re.compile(r"^[!#$%&'*+\-.^_`|~0-9A-Z]+$")
+_NUMERIC_LIKE_URL_PATTERN = re.compile(
+    r"^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$"
+)
 _MAX_ERROR_MESSAGE_LENGTH = 2000
 _MAX_REQUEST_URL_DISPLAY_LENGTH = 1000
 _MAX_REQUEST_METHOD_LENGTH = 50
-_INVALID_URL_SENTINELS = {"none", "null", "undefined", "nan"}
+_INVALID_URL_SENTINELS = {
+    "none",
+    "null",
+    "undefined",
+    "nan",
+    "inf",
+    "+inf",
+    "-inf",
+    "infinity",
+    "+infinity",
+    "-infinity",
+}
 
 
 def _normalize_request_method(method: Any) -> str:
@@ -36,7 +50,9 @@ def _normalize_request_url(url: Any) -> str:
     if not normalized_url:
         return "unknown URL"
     lowered_url = normalized_url.lower()
-    if lowered_url in _INVALID_URL_SENTINELS or normalized_url.isdigit():
+    if lowered_url in _INVALID_URL_SENTINELS or _NUMERIC_LIKE_URL_PATTERN.fullmatch(
+        normalized_url
+    ):
         return "unknown URL"
     if any(character.isspace() for character in normalized_url):
         return "unknown URL"

tests/test_transport_error_utils.py

@@ -256,7 +256,21 @@ def test_format_request_failure_message_normalizes_numeric_fallback_url_values()
     assert message == "Request GET unknown URL failed"
 
 
-@pytest.mark.parametrize("sentinel_url", ["none", "null", "undefined", "nan"])
+@pytest.mark.parametrize(
+    "sentinel_url",
+    [
+        "none",
+        "null",
+        "undefined",
+        "nan",
+        "inf",
+        "+inf",
+        "-inf",
+        "infinity",
+        "+infinity",
+        "-infinity",
+    ],
+)
 def test_format_request_failure_message_normalizes_sentinel_fallback_url_values(
     sentinel_url: str,
 ):
@@ -269,6 +283,19 @@ def test_format_request_failure_message_normalizes_sentinel_fallback_url_values(
     assert message == "Request GET unknown URL failed"
 
 
+@pytest.mark.parametrize("numeric_like_url", ["1", "1.5", "-1.25", "+2", ".75", "1e3"])
+def test_format_request_failure_message_normalizes_numeric_like_url_strings(
+    numeric_like_url: str,
+):
+    message = format_request_failure_message(
+        httpx.RequestError("network down"),
+        fallback_method="GET",
+        fallback_url=numeric_like_url,
+    )
+
+    assert message == "Request GET unknown URL failed"
+
+
 def test_format_request_failure_message_supports_url_like_fallback_values():
     message = format_request_failure_message(
         httpx.RequestError("network down"),
@@ -297,7 +324,21 @@ def test_format_generic_request_failure_message_normalizes_numeric_url_values():
     assert message == "Request GET unknown URL failed"
 
 
-@pytest.mark.parametrize("sentinel_url", ["none", "null", "undefined", "nan"])
+@pytest.mark.parametrize(
+    "sentinel_url",
+    [
+        "none",
+        "null",
+        "undefined",
+        "nan",
+        "inf",
+        "+inf",
+        "-inf",
+        "infinity",
+        "+infinity",
+        "-infinity",
+    ],
+)
 def test_format_generic_request_failure_message_normalizes_sentinel_url_values(
     sentinel_url: str,
 ):
@@ -309,6 +350,18 @@ def test_format_generic_request_failure_message_normalizes_sentinel_url_values(
     assert message == "Request GET unknown URL failed"
 
 
+@pytest.mark.parametrize("numeric_like_url", ["1", "1.5", "-1.25", "+2", ".75", "1e3"])
+def test_format_generic_request_failure_message_normalizes_numeric_like_url_strings(
+    numeric_like_url: str,
+):
+    message = format_generic_request_failure_message(
+        method="GET",
+        url=numeric_like_url,
+    )
+
+    assert message == "Request GET unknown URL failed"
+
+
 def test_format_generic_request_failure_message_supports_url_like_values():
     message = format_generic_request_failure_message(
         method="GET",

tests/test_transport_response_handling.py

@@ -410,6 +410,22 @@ def failing_get(*args, **kwargs):
         transport.close()
 
 
+def test_sync_transport_wraps_unexpected_errors_with_numeric_like_string_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("1.5")
+    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")
@@ -495,6 +511,27 @@ async def failing_put(*args, **kwargs):
     asyncio.run(run())
 
 
+def test_async_transport_wraps_unexpected_errors_with_numeric_like_string_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("1e6")
+        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
@@ -579,6 +616,22 @@ def failing_get(*args, **kwargs):
         transport.close()
 
 
+def test_sync_transport_request_error_without_request_uses_unknown_url_for_numeric_like_string_input():
+    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 unknown URL failed"):
+            transport.get("1.5")
+    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")
@@ -684,3 +737,24 @@ async def failing_delete(*args, **kwargs):
             await transport.close()
 
     asyncio.run(run())
+
+
+def test_async_transport_request_error_without_request_uses_unknown_url_for_numeric_like_string_input():
+    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 unknown URL failed"
+            ):
+                await transport.delete("1e6")
+        finally:
+            transport.client.delete = original_delete  # type: ignore[assignment]
+            await transport.close()
+
+    asyncio.run(run())