diff --git a/pyproject.toml b/pyproject.toml index e0fb98375ec8..f264fa4075d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -388,7 +388,6 @@ ignore_missing_imports = true # - python3 -m tools.mypy_helpers.find_easiest_modules [[tool.mypy.overrides]] module = [ - "sentry.snuba.metrics.query_builder", "sentry.testutils.cases", ] disable_error_code = [ diff --git a/src/sentry/snuba/metrics/query_builder.py b/src/sentry/snuba/metrics/query_builder.py index 066d553cc6f3..c280a5981760 100644 --- a/src/sentry/snuba/metrics/query_builder.py +++ b/src/sentry/snuba/metrics/query_builder.py @@ -3,7 +3,7 @@ from collections.abc import Mapping, Sequence from datetime import datetime, timedelta from enum import Enum -from typing import Any, TypedDict, overload +from typing import Any, TypedDict, cast, overload import sentry_sdk from snuba_sdk import ( @@ -43,6 +43,7 @@ from sentry.snuba.metrics.fields.base import ( COMPOSITE_ENTITY_CONSTITUENT_ALIAS, MetricExpressionBase, + MetricOperationParams, generate_bottom_up_dependency_tree_for_metrics, org_id_from_projects, ) @@ -52,7 +53,6 @@ parse_expression, ) from sentry.snuba.metrics.naming_layer.mri import parse_mri_field -from sentry.snuba.metrics.naming_layer.public import PUBLIC_EXPRESSION_REGEX from sentry.snuba.metrics.query import ( DeprecatingMetricsQuery, MetricActionByField, @@ -71,6 +71,8 @@ DerivedMetricParseException, MetricDoesNotExistException, MetricEntity, + MetricOperationType, + OPERATIONS, get_num_intervals, get_timestamp_column_name, require_rhs_condition_resolution, @@ -125,16 +127,20 @@ def parse_field(field: str, allow_mri: bool = False) -> MetricField: def parse_public_field(field: str) -> MetricField: - matches = PUBLIC_EXPRESSION_REGEX.match(field) + operation, metric_name = parse_expression(field) + if operation is not None and operation not in OPERATIONS: + raise InvalidParams(f"Invalid operation '{operation}'. Must be one of {', '.join(OPERATIONS)}") - if matches is not None: - operation = matches[1] - metric_name = matches[2] - else: - operation = None - metric_name = field + return MetricField(cast(MetricOperationType | None, operation), get_mri(metric_name)) - return MetricField(operation, get_mri(metric_name)) + +def _cast_metric_operation_params( + params: ( + dict[str, None | str | int | float | Sequence[tuple[str | int, ...]]] + | None + ), +) -> MetricOperationParams | None: + return cast(MetricOperationParams | None, params) def transform_null_transaction_to_unparameterized(use_case_id, org_id, alias=None): @@ -747,11 +753,14 @@ def translate_meta_results( continue elif alias_type == AliasMetaType.GROUP_BY_METRIC_FIELD: metric_groupby_field = alias_to_metric_group_by_field[record["name"]] - defined_parent_meta_type = get_metric_object_from_metric_field( - metric_groupby_field.field - ).get_meta_type() - - record["type"] = defined_parent_meta_type + if isinstance(metric_groupby_field.field, MetricField): + defined_parent_meta_type = get_metric_object_from_metric_field( + metric_groupby_field.field + ).get_meta_type() + if defined_parent_meta_type is not None: + record["type"] = defined_parent_meta_type + else: + record["type"] = "string" elif alias_type == AliasMetaType.TAG: record["type"] = "string" elif alias_type == AliasMetaType.DATASET_COLUMN or alias_type == AliasMetaType.TIME_COLUMN: @@ -833,7 +842,7 @@ def generate_snql_for_action_by_fields( # This transformation is currently supported only for group by because OrderBy doesn't support the Function type. if is_group_by and metric_action_by_field.field == "transaction": return transform_null_transaction_to_unparameterized( - use_case_id, org_id, metric_action_by_field.alias + use_case_id, org_id, cast(MetricGroupByField, metric_action_by_field).alias ) # Handles the case when we are trying to group or order by `project` for example, but we want @@ -856,7 +865,7 @@ def generate_snql_for_action_by_fields( exp = ( AliasedExpression( exp=Column(name=column_name), - alias=metric_action_by_field.alias, + alias=cast(MetricGroupByField, metric_action_by_field).alias, ) if is_group_by and not is_column else Column(name=column_name) @@ -865,7 +874,12 @@ def generate_snql_for_action_by_fields( if is_order_by: # We return a list in order to use the "extend" method and reduce the number of changes across # the codebase. - exp = [OrderBy(exp=exp, direction=metric_action_by_field.direction)] + exp = [ + OrderBy( + exp=exp, + direction=cast(MetricOrderByField, metric_action_by_field).direction, + ) + ] return exp elif isinstance(metric_action_by_field.field, MetricField): @@ -878,16 +892,16 @@ def generate_snql_for_action_by_fields( return metric_expression.generate_groupby_statements( use_case_id=use_case_id, alias=metric_action_by_field.field.alias, - params=metric_action_by_field.field.params, + params=_cast_metric_operation_params(metric_action_by_field.field.params), projects=projects, )[0] elif is_order_by: return metric_expression.generate_orderby_clause( use_case_id=use_case_id, alias=metric_action_by_field.field.alias, - params=metric_action_by_field.field.params, + params=_cast_metric_operation_params(metric_action_by_field.field.params), projects=projects, - direction=metric_action_by_field.direction, + direction=cast(MetricOrderByField, metric_action_by_field).direction, ) else: raise NotImplementedError( @@ -925,14 +939,18 @@ def _build_where(self) -> list[BooleanCondition | Condition]: Condition( lhs=metric_expression.generate_where_statements( use_case_id=self._use_case_id, - params=condition.lhs.params, + params=_cast_metric_operation_params(condition.lhs.params), projects=self._projects, alias=condition.lhs.alias, )[0], op=condition.op, rhs=( resolve_tag_value(self._use_case_id, self._org_id, condition.rhs) - if require_rhs_condition_resolution(condition.lhs.op) + if ( + condition.lhs.op is not None + and isinstance(condition.rhs, str) + and require_rhs_condition_resolution(condition.lhs.op) + ) else condition.rhs ), ) @@ -1069,6 +1087,8 @@ def __build_totals_and_series_queries( series_limit = self._metrics_query.max_limit if self._use_case_id in [UseCaseID.TRANSACTIONS, UseCaseID.SPANS]: + if self._metrics_query.interval is None: + raise InvalidParams("An interval is required for discover query series.") time_groupby_column = self.__generate_time_groupby_column_for_discover_queries( self._metrics_query.interval ) @@ -1099,17 +1119,19 @@ def __generate_time_groupby_column_for_discover_queries(interval: int) -> Functi def __update_query_dicts_with_component_entities( self, - component_entities: dict[MetricEntity, Sequence[str]], - metric_mri_to_obj_dict: dict[tuple[str | None, str, str], MetricExpressionBase], - fields_in_entities: dict[MetricEntity, list[tuple[str | None, str, str]]], + component_entities: Mapping[MetricEntity | None, Sequence[str]], + metric_mri_to_obj_dict: dict[tuple[MetricOperationType | None, str, str], MetricExpressionBase], + fields_in_entities: dict[MetricEntity, list[tuple[MetricOperationType | None, str, str]]], parent_alias, - ) -> dict[tuple[str | None, str, str], MetricExpressionBase]: + ) -> dict[tuple[MetricOperationType | None, str, str], MetricExpressionBase]: # At this point in time, we are only supporting raw metrics in the metrics attribute of # any instance of DerivedMetric, and so in this case the op will always be None # ToDo(ahmed): In future PR, we might want to allow for dependency metrics to also have an # an aggregate and in this case, we would need to parse the op here op = None for entity, metric_mris in component_entities.items(): + if entity is None: + continue for metric_mri in metric_mris: # The constituents of an instance of CompositeEntityDerivedMetric will have a reference to their parent # alias so that we are able to distinguish the constituents in case we have naming collisions that could @@ -1128,8 +1150,10 @@ def __update_query_dicts_with_component_entities( return metric_mri_to_obj_dict def get_snuba_queries(self): - metric_mri_to_obj_dict: dict[tuple[str | None, str, str], MetricExpressionBase] = {} - fields_in_entities: dict[MetricEntity, list[tuple[str | None, str, str]]] = {} + metric_mri_to_obj_dict: dict[ + tuple[MetricOperationType | None, str, str], MetricExpressionBase + ] = {} + fields_in_entities: dict[MetricEntity, list[tuple[MetricOperationType | None, str, str]]] = {} for select_field in self._metrics_query.select: metric_field_obj = metric_object_factory(select_field.op, select_field.metric_mri) @@ -1196,12 +1220,15 @@ def get_snuba_queries(self): # In order to support on demand metrics which require an interval (e.g. epm), # we want to pass the interval down via params so we can pass it to the associated snql_factory - params = {"interval": self._metrics_query.interval, **(params or {})} + query_interval = self._metrics_query.interval + params = dict(params or {}) + if query_interval is not None: + params["interval"] = query_interval select += metric_field_obj.generate_select_statements( projects=self._projects, use_case_id=self._use_case_id, alias=field[2], - params=params, + params=_cast_metric_operation_params(params or None), ) metric_ids_set |= metric_field_obj.generate_metric_ids( self._projects, self._use_case_id @@ -1255,7 +1282,7 @@ def __init__( self, organization_id: int, metrics_query: DeprecatingMetricsQuery, - fields_in_entities: dict[MetricEntity, list[tuple[str | None, str, str]]], + fields_in_entities: dict[MetricEntity, list[tuple[MetricOperationType | None, str, str]]], intervals: list[datetime], results, use_case_id: UseCaseID, @@ -1436,7 +1463,7 @@ def resolve_tag_value(value: int | str | None) -> str | None: except KeyError: params = None totals[alias] = metric_obj.run_post_query_function( - totals, params=params, alias=alias + totals, params=_cast_metric_operation_params(params), alias=alias ) if series is not None: @@ -1451,7 +1478,7 @@ def resolve_tag_value(value: int | str | None) -> str | None: except KeyError: params = None series[alias][idx] = metric_obj.run_post_query_function( - series, params=params, idx=idx, alias=alias + series, params=_cast_metric_operation_params(params), idx=idx, alias=alias ) # Remove the extra fields added due to the constituent metrics that were added