Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
from datajunction_server.models.node import NodeType as NodeType_
from datajunction_server.models.reaggregate import parse_reaggregate_spec
from datajunction_server.naming import SEPARATOR
from datajunction_server.sql.parsing.backends.antlr4 import ast, parse
from datajunction_server.sql.decompose import incompatible_functions
from datajunction_server.sql.parsing.backends.antlr4 import parse

NodeType = strawberry.enum(NodeType_)
NodeStatus = strawberry.enum(NodeStatus_)
Expand Down Expand Up @@ -610,13 +611,10 @@ def metric_metadata(
incompatible: set[str] = set()
if needs_ast:
query_ast = parse(root.query)
functions = [func.function() for func in query_ast.find_all(ast.Function)]
expression = str(query_ast.select.projection[0])
incompatible = {
func.__name__.upper()
for func in functions
if Dialect.DRUID not in func.dialects
}
incompatible = set(
incompatible_functions(query_ast, Dialect.DRUID, root.reaggregate),
)
return MetricMetadata( # type: ignore
direction=root.metric_metadata.direction if root.metric_metadata else None,
unit=root.metric_metadata.unit.value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ def build_materialized_cube_node(
async def extract_components_and_parent_columns(
metric_nodes: list[Node],
session: "AsyncSession",
dialect: Dialect = Dialect.SPARK,
) -> tuple[
collections.defaultdict[str, set[str]],
dict[str, tuple[list[MetricComponent], ast.Query]],
Expand All @@ -398,7 +399,7 @@ async def extract_components_and_parent_columns(
parent_columns = collections.defaultdict(set)

async def extract_components_and_columns(metric_node: Node):
extractor = MetricComponentExtractor(metric_node.current.id)
extractor = MetricComponentExtractor(metric_node.current.id, dialect=dialect)
measures, derived_sql = await extractor.extract(session)
metric_ast = parse(metric_node.current.query)
return measures, derived_sql, list(metric_ast.find_all(ast.Column))
Expand Down
1 change: 1 addition & 0 deletions datajunction-server/datajunction_server/internal/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,7 @@ async def get_measures_query(
parent_columns, metric_components = await extract_components_and_parent_columns(
metric_nodes,
session,
dialect=build_criteria.dialect,
)

column_name_regex = r"([A-Za-z0-9_\.]+)(\[[A-Za-z0-9_]+\])?"
Expand Down
37 changes: 24 additions & 13 deletions datajunction-server/datajunction_server/models/metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from __future__ import annotations

from pydantic.main import BaseModel
from pydantic import BaseModel, ValidationError
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession

Expand All @@ -13,21 +13,27 @@
)
from datajunction_server.database.column import Column
from datajunction_server.database.node import Node, NodeRevision
from datajunction_server.errors import DJWarning
from datajunction_server.errors import DJInvalidInputException, DJWarning
from datajunction_server.models.cube_materialization import MetricComponent
from datajunction_server.models.engine import Dialect
from datajunction_server.models.filter_requirements import FilterRequirement
from datajunction_server.models.node import (
DimensionAttributeOutput,
MetricMetadataOutput,
)
from datajunction_server.models.query import ColumnMetadata, V3ColumnMetadata
from datajunction_server.models.filter_requirements import FilterRequirement
from datajunction_server.models.reaggregate import ReaggregateSpec
from datajunction_server.models.reaggregate import (
ReaggregateSpec,
parse_reaggregate_spec,
)
from datajunction_server.models.sql import ScanEstimate, TranspiledSQL
from datajunction_server.models.unit import unit_to_dict
from datajunction_server.naming import SEPARATOR
from datajunction_server.sql.decompose import MetricComponentExtractor
from datajunction_server.sql.parsing.backends.antlr4 import ast, parse
from datajunction_server.sql.decompose import (
MetricComponentExtractor,
incompatible_functions,
)
from datajunction_server.sql.parsing.backends.antlr4 import parse
from datajunction_server.transpilation import transpile_sql
from datajunction_server.typing import UTCDatetime

Expand Down Expand Up @@ -133,12 +139,17 @@ async def parse_node(
Parses a node into a metric.
"""
query_ast = parse(node.current.query)
functions = [func.function() for func in query_ast.find_all(ast.Function)]
incompatible_druid_functions = [
func.__name__.upper()
for func in functions
if Dialect.DRUID not in func.dialects
]
try:
reaggregate = parse_reaggregate_spec(node.current.reaggregate)
except ValidationError as exc:
raise DJInvalidInputException(
f"Metric `{node.name}` has an invalid stored reaggregate declaration",
) from exc
incompatible_druid_functions = incompatible_functions(
query_ast,
Dialect.DRUID,
node.current.reaggregate,
)
upstream_node = (
node.current.non_metric_parents[0].name
if node.current.non_metric_parents
Expand Down Expand Up @@ -171,7 +182,7 @@ async def parse_node(
required_refs,
),
),
reaggregate=node.current.reaggregate,
reaggregate=reaggregate,
fixed_grain=node.current.fixed_grain,
required_filters=node.current.required_filters,
recommended_filters=node.current.recommended_filters,
Expand Down
Loading
Loading