ref(metrics): catch assertionerror and invalidparams in metrics api (#72204)

Author: shellmayr

src/sentry/api/endpoints/organization_metrics_query.py

@@ -10,6 +10,7 @@
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import OrganizationEndpoint, OrganizationMetricsPermission
 from sentry.api.utils import get_date_range_from_params
+from sentry.exceptions import InvalidParams
 from sentry.sentry_metrics.querying.data import (
     MetricsAPIQueryResultsTransformer,
     MQLQuery,
@@ -176,6 +177,10 @@ def post(self, request: Request, organization) -> Response:
             ).apply_transformer(MetricsAPIQueryResultsTransformer())
         except InvalidMetricsQueryError as e:
             return Response(status=400, data={"detail": str(e)})
+        except InvalidParams as e:
+            return Response(status=400, data={"detail": str(e)})
+        except AssertionError as e:
+            return Response(status=400, data={"detail": str(e)})
         except LatestReleaseNotFoundError as e:
             return Response(status=404, data={"detail": str(e)})
         except MetricsQueryExecutionError as e:

tests/sentry/api/endpoints/test_organization_metrics_query.py

@@ -126,3 +126,33 @@ def test_recursion_error_query(self):
                 "includeSeries": "false",
             },
         )
+
+    def test_formula_with_only_number(self):
+        response = self.get_response(
+            self.project.organization.slug,
+            queries=[{"name": "query_1", "mql": "avg(d:transactions/duration@millisecond)"}],
+            formulas=[{"mql": "100"}],
+            qs_params={
+                "statsPeriod": "3h",
+                "interval": "1h",
+                "project": [self.project.id],
+                "environment": [],
+                "includeSeries": "false",
+            },
+        )
+        assert response.status_code == 400
+
+    def test_formula_with_number_equation_and_span_metric(self):
+        response = self.get_response(
+            self.project.organization.slug,
+            queries=[{"name": "a", "mql": "avg(d:spans/webvital.inp@millisecond)"}],
+            formulas=[{"mql": "$a"}, {"mql": "1 * 200"}],
+            qs_params={
+                "statsPeriod": "3h",
+                "interval": "1h",
+                "project": [self.project.id],
+                "environment": [],
+                "includeSeries": "false",
+            },
+        )
+        assert response.status_code == 400