Fix validate_order_by

Author: DevonFulcher

dbtsl/api/graphql/protocol.py

@@ -202,20 +202,17 @@ def get_query_request_variables(environment_id: int, params: QueryParameters) ->
     """Get the GraphQL request variables for a given set of query parameters."""
     strict_params = validate_query_parameters(params)  # type: ignore
 
-    order_by_vars = []
-    for clause in strict_params.order_by or []:
-        if isinstance(clause, OrderByMetric):
-            order_by_vars.append({"metric": {"name": clause.name}, "descending": clause.descending})
-        else:
-            assert isinstance(clause, OrderByGroupBy)
-            order_by_vars.append(
-                {"groupBy": {"name": clause.name, "timeGranularity": clause.grain}, "descending": clause.descending}
-            )
-
     shared_vars = {
         "environmentId": environment_id,
         "where": [{"sql": sql} for sql in strict_params.where] if strict_params.where is not None else None,
-        "orderBy": order_by_vars if strict_params.order_by is not None else None,
+        "orderBy": [
+            {"metric": {"name": clause.name}, "descending": clause.descending}
+            if isinstance(clause, OrderByMetric)
+            else {"groupBy": {"name": clause.name, "timeGranularity": clause.grain}, "descending": clause.descending}
+            for clause in strict_params.order_by
+        ]
+        if strict_params.order_by is not None
+        else None,
         "limit": strict_params.limit,
         "readCache": strict_params.read_cache,
     }

dbtsl/api/shared/query_params.py

@@ -53,8 +53,8 @@ class QueryParameters(TypedDict, total=False):
 class AdhocQueryParametersStrict:
     """The parameters of an adhoc query, strictly validated."""
 
-    metrics: Optional[List[Union[str, OrderByMetric]]]
-    group_by: Optional[List[Union[str, OrderByGroupBy]]]
+    metrics: Optional[List[str]]
+    group_by: Optional[List[Union[GroupByParam, str]]]
     limit: Optional[int]
     order_by: Optional[List[OrderBySpec]]
     where: Optional[List[str]]
@@ -73,8 +73,8 @@ class SavedQueryQueryParametersStrict:
 
 
 def validate_order_by(
-    known_metrics: List[Union[str, OrderByMetric]],
-    known_group_bys: List[Union[str, OrderByGroupBy]],
+    known_metrics: List[str],
+    known_group_bys: List[Union[str, GroupByParam]],
     clause: Union[OrderBySpec, str],
 ) -> OrderBySpec:
     """Validate an order by clause like `-metric_name`."""
@@ -85,19 +85,12 @@ def validate_order_by(
     if descending or clause.startswith("+"):
         clause = clause[1:]
 
-    normalized_known_metrics: list[str] = []
-    for known_metric in known_metrics:
-        if isinstance(known_metric, OrderByMetric):
-            normalized_known_metrics.append(known_metric.name)
-        else:
-            normalized_known_metrics.append(known_metric)
-
-    if clause in normalized_known_metrics:
+    if clause in known_metrics:
         return OrderByMetric(name=clause, descending=descending)
 
     normalized_known_group_bys: list[str] = []
     for known_group_by in known_group_bys:
-        if isinstance(known_group_by, OrderByGroupBy):
+        if isinstance(known_group_by, GroupByParam):
             normalized_known_group_bys.append(known_group_by.name)
         else:
             normalized_known_group_bys.append(known_group_by)