Wrap declared-attribute inspection failures in tools

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

Author: cursoragent

hyperbrowser/tools/__init__.py

@@ -38,14 +38,18 @@
 )
 
 
-def _has_declared_attribute(value: Any, attribute_name: str) -> bool:
+def _has_declared_attribute(
+    value: Any, attribute_name: str, *, error_message: str
+) -> bool:
     try:
         inspect.getattr_static(value, attribute_name)
         return True
     except AttributeError:
         return False
-    except Exception:
-        return False
+    except HyperbrowserError:
+        raise
+    except Exception as exc:
+        raise HyperbrowserError(error_message, original_error=exc) from exc
 
 
 def _format_tool_param_key_for_error(key: str) -> str:
@@ -224,7 +228,11 @@ def _read_tool_response_data(response: Any, *, tool_name: str) -> Any:
     try:
         return response.data
     except AttributeError as exc:
-        if _has_declared_attribute(response, "data"):
+        if _has_declared_attribute(
+            response,
+            "data",
+            error_message=f"Failed to inspect {tool_name} response data field",
+        ):
             raise HyperbrowserError(
                 f"Failed to read {tool_name} response data",
                 original_error=exc,
@@ -277,7 +285,13 @@ def _read_optional_tool_response_field(
         try:
             field_value = getattr(response_data, field_name)
         except AttributeError as exc:
-            if _has_declared_attribute(response_data, field_name):
+            if _has_declared_attribute(
+                response_data,
+                field_name,
+                error_message=(
+                    f"Failed to inspect {tool_name} response field '{field_name}'"
+                ),
+            ):
                 raise HyperbrowserError(
                     f"Failed to read {tool_name} response field '{field_name}'",
                     original_error=exc,
@@ -330,7 +344,13 @@ def _read_crawl_page_field(page: Any, *, field_name: str, page_index: int) -> An
     try:
         return getattr(page, field_name)
     except AttributeError as exc:
-        if _has_declared_attribute(page, field_name):
+        if _has_declared_attribute(
+            page,
+            field_name,
+            error_message=(
+                f"Failed to inspect crawl tool page field '{field_name}' at index {page_index}"
+            ),
+        ):
             raise HyperbrowserError(
                 f"Failed to read crawl tool page field '{field_name}' at index {page_index}",
                 original_error=exc,

tests/test_tools_response_handling.py

@@ -5,6 +5,7 @@
 
 import pytest
 
+import hyperbrowser.tools as tools_module
 from hyperbrowser.exceptions import HyperbrowserError
 from hyperbrowser.tools import (
     BrowserUseTool,
@@ -143,6 +144,26 @@ def data(self):
     assert exc_info.value.original_error is not None
 
 
+def test_scrape_tool_wraps_declared_data_inspection_failures(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    class _MissingDataResponse:
+        pass
+
+    def _raise_runtime_error(_obj: object, _attr: str):
+        raise RuntimeError("attribute inspection exploded")
+
+    monkeypatch.setattr(tools_module.inspect, "getattr_static", _raise_runtime_error)
+    client = _SyncScrapeClient(_MissingDataResponse())  # type: ignore[arg-type]
+
+    with pytest.raises(
+        HyperbrowserError, match="Failed to inspect scrape tool response data field"
+    ) as exc_info:
+        WebsiteScrapeTool.runnable(client, {"url": "https://example.com"})
+
+    assert exc_info.value.original_error is not None
+
+
 def test_scrape_tool_supports_mapping_response_objects():
     client = _SyncScrapeClient({"data": {"markdown": "from response mapping"}})  # type: ignore[arg-type]
 
@@ -332,6 +353,27 @@ def markdown(self):
     assert exc_info.value.original_error is not None
 
 
+def test_scrape_tool_wraps_declared_markdown_inspection_failures(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    class _MissingMarkdownData:
+        pass
+
+    def _raise_runtime_error(_obj: object, _attr: str):
+        raise RuntimeError("attribute inspection exploded")
+
+    monkeypatch.setattr(tools_module.inspect, "getattr_static", _raise_runtime_error)
+    client = _SyncScrapeClient(_Response(data=_MissingMarkdownData()))
+
+    with pytest.raises(
+        HyperbrowserError,
+        match="Failed to inspect scrape tool response field 'markdown'",
+    ) as exc_info:
+        WebsiteScrapeTool.runnable(client, {"url": "https://example.com"})
+
+    assert exc_info.value.original_error is not None
+
+
 def test_scrape_tool_decodes_utf8_bytes_markdown_field():
     client = _SyncScrapeClient(_Response(data=SimpleNamespace(markdown=b"hello")))
 
@@ -552,6 +594,27 @@ def markdown(self):
     assert exc_info.value.original_error is not None
 
 
+def test_crawl_tool_wraps_declared_page_field_inspection_failures(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    class _MissingMarkdownPage:
+        pass
+
+    def _raise_runtime_error(_obj: object, _attr: str):
+        raise RuntimeError("attribute inspection exploded")
+
+    monkeypatch.setattr(tools_module.inspect, "getattr_static", _raise_runtime_error)
+    client = _SyncCrawlClient(_Response(data=[_MissingMarkdownPage()]))
+
+    with pytest.raises(
+        HyperbrowserError,
+        match="Failed to inspect crawl tool page field 'markdown' at index 0",
+    ) as exc_info:
+        WebsiteCrawlTool.runnable(client, {"url": "https://example.com"})
+
+    assert exc_info.value.original_error is not None
+
+
 def test_crawl_tool_rejects_non_object_page_items():
     client = _SyncCrawlClient(_Response(data=[123]))