typing

Author: shruthilayaj

src/sentry/api/endpoints/organization_events.py

@@ -518,11 +518,13 @@ def get_rpc_config():
                     request.GET.get("disableAggregateExtrapolation", "0") == "1"
                 )
 
-                extrapolation_mode = request.GET.get("extrapolationMode", None)
-                if extrapolation_mode and extrapolation_mode not in EXTRAPOLATION_MODE_MAP:
-                    raise InvalidSearchQuery(f"Unknown extrapolation mode: {extrapolation_mode}")
-                elif extrapolation_mode:
-                    extrapolation_mode = EXTRAPOLATION_MODE_MAP[extrapolation_mode]
+                requested_mode = request.GET.get("extrapolationMode", None)
+                if requested_mode is not None and requested_mode not in EXTRAPOLATION_MODE_MAP:
+                    raise InvalidSearchQuery(f"Unknown extrapolation mode: {requested_mode}")
+
+                extrapolation_mode = (
+                    EXTRAPOLATION_MODE_MAP[requested_mode] if requested_mode else None
+                )
 
                 if scoped_dataset == Spans:
                     return SearchResolverConfig(

src/sentry/api/endpoints/organization_events_stats.py

@@ -245,12 +245,13 @@ def get_rpc_config():
                 if scoped_dataset not in RPC_DATASETS:
                     raise NotImplementedError
 
-                extrapolation_mode = request.GET.get("extrapolationMode", None)
+                requested_mode = request.GET.get("extrapolationMode", None)
+                if requested_mode is not None and requested_mode not in EXTRAPOLATION_MODE_MAP:
+                    raise InvalidSearchQuery(f"Unknown extrapolation mode: {requested_mode}")
 
-                if extrapolation_mode and extrapolation_mode not in EXTRAPOLATION_MODE_MAP:
-                    raise InvalidSearchQuery(f"Unknown extrapolation mode: {extrapolation_mode}")
-                elif extrapolation_mode:
-                    extrapolation_mode = EXTRAPOLATION_MODE_MAP[extrapolation_mode]
+                extrapolation_mode = (
+                    EXTRAPOLATION_MODE_MAP[requested_mode] if requested_mode else None
+                )
 
                 if scoped_dataset == TraceMetrics:
                     # tracemetrics uses aggregate conditions

src/sentry/api/endpoints/organization_events_timeseries.py

@@ -224,11 +224,11 @@ def get_rpc_config():
             if dataset not in RPC_DATASETS:
                 raise NotImplementedError
 
-            extrapolation_mode = request.GET.get("extrapolationMode", None)
-            if extrapolation_mode and extrapolation_mode not in EXTRAPOLATION_MODE_MAP:
-                raise InvalidSearchQuery(f"Unknown extrapolation mode: {extrapolation_mode}")
-            elif extrapolation_mode:
-                extrapolation_mode = EXTRAPOLATION_MODE_MAP[extrapolation_mode]
+            requested_mode = request.GET.get("extrapolationMode", None)
+            if requested_mode is not None and requested_mode not in EXTRAPOLATION_MODE_MAP:
+                raise InvalidSearchQuery(f"Unknown extrapolation mode: {requested_mode}")
+
+            extrapolation_mode = EXTRAPOLATION_MODE_MAP[requested_mode] if requested_mode else None
 
             if dataset == TraceMetrics:
                 # tracemetrics uses aggregate conditions

src/sentry/search/eap/columns.py

@@ -202,7 +202,7 @@ class ResolvedAggregate(ResolvedFunction):
     # The internal rpc alias for this column
     internal_name: Function.ValueType
     # Whether to enable extrapolation
-    extrapolation_mode_override: ExtrapolationMode.ValueType | None = None
+    extrapolation_mode: ExtrapolationMode.ValueType
     is_aggregate: bool = field(default=True, init=False)
     # Only for aggregates, we only support functions with 1 argument right now
     argument: AttributeKey | None = None
@@ -223,7 +223,7 @@ class ResolvedConditionalAggregate(ResolvedFunction):
     # The internal rpc alias for this column
     internal_name: Function.ValueType
     # Whether to enable extrapolation
-    extrapolation_mode_override: ExtrapolationMode.ValueType | None = None
+    extrapolation_mode: ExtrapolationMode.ValueType
     # The condition to filter on
     filter: TraceItemFilter
     # The attribute to conditionally aggregate on