chore(seer rpc): Pass along error message

src/sentry/seer/assisted_query/issues_tools.py

@@ -479,7 +479,7 @@ def execute_issues_query(
     stats_period: str = "7d",
     sort: str | None = None,
     limit: int = 25,
-) -> list[dict[str, Any]] | None:
+) -> list[dict[str, Any]] | dict[str, Any] | None:
     """
     Execute an issues query by calling the issues endpoint.
 
@@ -492,7 +492,7 @@ def execute_issues_query(
         limit: Number of results to return (default 25)
 
     Returns:
-        List of issues, or None if organization doesn't exist
+        List of issues, dict with error key if 400 error occurred, or None if organization doesn't exist
     """
     try:
         organization = Organization.objects.get(id=org_id)
@@ -515,14 +515,19 @@ def execute_issues_query(
     if sort:
         params["sort"] = sort
 
-    resp = client.get(
-        auth=api_key,
-        user=None,
-        path=f"/organizations/{organization.slug}/issues/",
-        params=params,
-    )
-
-    return resp.data
+    try:
+        resp = client.get(
+            auth=api_key,
+            user=None,
+            path=f"/organizations/{organization.slug}/issues/",
+            params=params,
+        )
+        return resp.data
+    except client.ApiError as e:
+        if e.status_code == 400:
+            error_detail = e.body.get("detail") if isinstance(e.body, dict) else None
+            return {"error": str(error_detail) if error_detail is not None else str(e.body)}
+        raise
 
 
 def get_issues_stats(

src/sentry/seer/explorer/tools.py

@@ -92,14 +92,19 @@ def execute_table_query(
     # Remove None values
     params = {k: v for k, v in params.items() if v is not None}
 
-    # Call sentry API client. This will raise API errors for non-2xx / 3xx status.
-    resp = client.get(
-        auth=ApiKey(organization_id=organization.id, scope_list=["org:read", "project:read"]),
-        user=None,
-        path=f"/organizations/{organization.slug}/events/",
-        params=params,
-    )
-    return {"data": resp.data["data"]}
+    try:
+        resp = client.get(
+            auth=ApiKey(organization_id=organization.id, scope_list=["org:read", "project:read"]),
+            user=None,
+            path=f"/organizations/{organization.slug}/events/",
+            params=params,
+        )
+        return {"data": resp.data["data"]}
+    except client.ApiError as e:
+        if e.status_code == 400:
+            error_detail = e.body.get("detail") if isinstance(e.body, dict) else None
+            return {"error": str(error_detail) if error_detail is not None else str(e.body)}
+        raise
 
 
 def execute_timeseries_query(

tests/sentry/seer/explorer/test_tools.py

@@ -320,6 +320,63 @@ def test_spans_query_nonexistent_organization(self):
         )
         assert table_result is None
 
+    @patch("sentry.seer.explorer.tools.client.get")
+    def test_spans_table_query_error_handling(self, mock_client_get):
+        """Test error handling for API errors: 400 errors return error dict, non-400 errors are re-raised"""
+        # Test 400 error with dict body containing detail
+        error_detail_msg = "Invalid query: field 'invalid_field' does not exist"
+        mock_client_get.side_effect = client.ApiError(400, {"detail": error_detail_msg})
+
+        result = execute_table_query(
+            org_id=self.organization.id,
+            dataset="spans",
+            fields=self.default_span_fields,
+            query="invalid_field:value",
+            stats_period="1h",
+            sort="-timestamp",
+            per_page=10,
+        )
+
+        assert result is not None
+        assert "error" in result
+        assert result["error"] == error_detail_msg
+        assert "data" not in result
+
+        # Test 400 error with string body
+        error_body = "Bad request: malformed query syntax"
+        mock_client_get.side_effect = client.ApiError(400, error_body)
+
+        result = execute_table_query(
+            org_id=self.organization.id,
+            dataset="spans",
+            fields=self.default_span_fields,
+            query="malformed query",
+            stats_period="1h",
+            sort="-timestamp",
+            per_page=10,
+        )
+
+        assert result is not None
+        assert "error" in result
+        assert result["error"] == error_body
+        assert "data" not in result
+
+        # Test non-400 errors are re-raised
+        mock_client_get.side_effect = client.ApiError(500, {"detail": "Internal server error"})
+
+        with pytest.raises(client.ApiError) as exc_info:
+            execute_table_query(
+                org_id=self.organization.id,
+                dataset="spans",
+                fields=self.default_span_fields,
+                query="",
+                stats_period="1h",
+                sort="-timestamp",
+                per_page=10,
+            )
+
+        assert exc_info.value.status_code == 500
+
     def test_spans_timeseries_with_groupby(self):
         """Test timeseries query with group_by parameter for aggregates"""
         result = execute_timeseries_query(