datajunction-server 0.0.1a98.dev0__tar.gz → 0.0.1a98.dev1__tar.gz

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@ exclude: (^datajunction-server/datajunction_server/sql/parsing/backends/grammar/
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.1.0
+  rev: v5.0.0
   hooks:
   - id: trailing-whitespace
   - id: check-ast
@@ -15,7 +15,7 @@ repos:
     exclude: ^templates/
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.4
+  rev: v0.11.10
   hooks:
     - id: ruff
       args: [ --fix ]
@@ -35,7 +35,7 @@ repos:
     - types-tabulate
 
 - repo: https://github.com/asottile/add-trailing-comma
-  rev: v2.2.1
+  rev: v3.1.0
   hooks:
   - id: add-trailing-comma
 

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.1a98.dev0
+Version: 0.0.1a98.dev1
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: Homepage, https://datajunction.io
 Project-URL: Repository, https://github.com/DataJunction/dj

datajunction_server-0.0.1a98.dev1/datajunction_server/__about__.py

@@ -0,0 +1,5 @@
+"""
+Version for Hatch
+"""
+
+__version__ = "0.0.1a98.dev1"

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/attributes.py

@@ -28,7 +28,8 @@ router = SecureAPIRouter(tags=["attributes"])
 
 @router.get("/attributes/", response_model=List[AttributeTypeBase])
 async def list_attributes(
-    *, session: AsyncSession = Depends(get_session)
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> List[AttributeTypeBase]:
     """
     List all available attribute types.
@@ -44,7 +45,9 @@ async def list_attributes(
     name="Add an Attribute Type",
 )
 async def add_attribute_type(
-    data: MutableAttributeTypeFields, *, session: AsyncSession = Depends(get_session)
+    data: MutableAttributeTypeFields,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> AttributeTypeBase:
     """
     Add a new attribute type

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/catalogs.py

@@ -30,7 +30,8 @@ UNKNOWN_CATALOG_ID = 0
 
 @router.get("/catalogs/", response_model=List[CatalogInfo])
 async def list_catalogs(
-    *, session: AsyncSession = Depends(get_session)
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> List[CatalogInfo]:
     """
     List all available catalogs
@@ -44,7 +45,9 @@ async def list_catalogs(
 
 @router.get("/catalogs/{name}/", response_model=CatalogInfo, name="Get a Catalog")
 async def get_catalog(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> CatalogInfo:
     """
     Return a catalog by name

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/cubes.py

@@ -50,7 +50,9 @@ router = SecureAPIRouter(tags=["cubes"])
 
 @router.get("/cubes/{name}/", name="Get a Cube")
 async def get_cube(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> CubeRevisionMetadata:
     """
     Get information on a cube

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/engines.py

@@ -21,7 +21,8 @@ router = SecureAPIRouter(tags=["engines"])
 
 @router.get("/engines/", response_model=List[EngineInfo])
 async def list_engines(
-    *, session: AsyncSession = Depends(get_session)
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> List[EngineInfo]:
     """
     List all available engines
@@ -34,7 +35,10 @@ async def list_engines(
 
 @router.get("/engines/{name}/{version}/", response_model=EngineInfo)
 async def get_an_engine(
-    name: str, version: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    version: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> EngineInfo:
     """
     Return an engine by name and version

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/helpers.py

@@ -201,8 +201,6 @@ async def get_query(
     engine: Optional[Engine] = None,
     access_control: Optional[access.AccessControlStore] = None,
     use_materialized: bool = True,
-    query_parameters: Optional[Dict[str, str]] = None,
-    ignore_errors: bool = True,
 ) -> ast.Query:
     """
     Get a query for a metric, dimensions, and filters
@@ -216,14 +214,12 @@ async def get_query(
         node.current,  # type: ignore
         use_materialized=use_materialized,
     )
-    if ignore_errors:
-        query_builder.ignore_errors()
     query_ast = await (
-        query_builder.with_access_control(access_control)
+        query_builder.ignore_errors()
+        .with_access_control(access_control)
         .with_build_criteria(build_criteria)
         .add_dimensions(dimensions)
         .add_filters(filters)
-        .add_query_parameters(query_parameters)
         .limit(limit)
         .order_by(orderby)
         .build()
@@ -609,7 +605,6 @@ async def build_sql_for_multiple_metrics(
     access_control: Optional[access.AccessControlStore] = None,
     ignore_errors: bool = True,
     use_materialized: bool = True,
-    query_parameters: Optional[Dict[str, str]] = None,
 ) -> Tuple[TranslatedSQL, Engine, Catalog]:
     """
     Build SQL for multiple metrics. Used by both /sql and /data endpoints
@@ -735,7 +730,6 @@ async def build_sql_for_multiple_metrics(
         limit=limit,
         access_control=access_control,
         ignore_errors=ignore_errors,
-        query_parameters=query_parameters,
     )
     columns = [
         assemble_column_metadata(col)  # type: ignore

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/measures.py

@@ -95,7 +95,9 @@ async def list_measures(
 
 @router.get("/measures/{measure_name}", response_model=MeasureOutput)
 async def get_measure(
-    measure_name: str, *, session: AsyncSession = Depends(get_session)
+    measure_name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> MeasureOutput:
     """
     Get info on a measure.
@@ -111,7 +113,9 @@ async def get_measure(
     name="Add a Measure",
 )
 async def add_measure(
-    data: CreateMeasure, *, session: AsyncSession = Depends(get_session)
+    data: CreateMeasure,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> MeasureOutput:
     """
     Add a measure

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/metrics.py

@@ -104,7 +104,9 @@ async def list_metric_metadata() -> MetricMetadataOptions:
 
 @router.get("/metrics/{name}/", response_model=Metric)
 async def get_a_metric(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> Metric:
     """
     Return a metric by name.

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/nodes.py

@@ -327,7 +327,9 @@ async def list_all_nodes_with_details(
 
 @router.get("/nodes/{name}/", response_model=NodeOutput)
 async def get_node(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> NodeOutput:
     """
     Show the active version of the specified node.
@@ -415,7 +417,9 @@ async def restore_node(
 
 @router.get("/nodes/{name}/revisions/", response_model=List[NodeRevisionOutput])
 async def list_node_revisions(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> List[NodeRevisionOutput]:
     """
     List all revisions for the node.
@@ -1436,7 +1440,10 @@ async def update_node(
 
 @router.get("/nodes/similarity/{node1_name}/{node2_name}")
 async def calculate_node_similarity(
-    node1_name: str, node2_name: str, *, session: AsyncSession = Depends(get_session)
+    node1_name: str,
+    node2_name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> JSONResponse:
     """
     Compare two nodes by how similar their queries are
@@ -1511,7 +1518,9 @@ async def list_upstream_nodes(
     name="List All Connected Nodes (Upstreams + Downstreams)",
 )
 async def list_node_dag(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> List[DAGNodeOutput]:
     """
     List all nodes that are part of the DAG of the given node. This means getting all upstreams,
@@ -1548,7 +1557,10 @@ async def list_node_dag(
     name="List All Dimension Attributes",
 )
 async def list_all_dimension_attributes(
-    name: str, *, depth: int = 30, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    depth: int = 30,
+    session: AsyncSession = Depends(get_session),
 ) -> List[DimensionAttributeOutput]:
     """
     List all available dimension attributes for the given node.
@@ -1578,7 +1590,9 @@ async def list_all_dimension_attributes(
     name="List column level lineage of node",
 )
 async def column_lineage(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> List[LineageColumn]:
     """
     List column-level lineage of a node in a graph

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/sql.py

@@ -2,11 +2,10 @@
 SQL related APIs.
 """
 
-import json
 import logging
 from collections import OrderedDict
 from http import HTTPStatus
-from typing import Any, List, Optional, Tuple, cast
+from typing import List, Optional, Tuple, cast
 
 from fastapi import BackgroundTasks, Depends, Query
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -59,7 +58,6 @@ async def get_measures_sql_for_cube_v2(
             "subsequent queries are more efficient."
         ),
     ),
-    qp: str = Query("{}", description="Query parameters"),
     *,
     include_all_columns: bool = Query(
         False,
@@ -108,7 +106,6 @@ async def get_measures_sql_for_cube_v2(
         sql_transpilation_library=settings.sql_transpilation_library,
         use_materialized=use_materialized,
         preagg_requested=preaggregate,
-        query_parameters=json.loads(qp),
     )
     return measures_query
 
@@ -125,7 +122,6 @@ async def build_and_save_node_sql(
     access_control: AccessControlStore,
     ignore_errors: bool = True,
     use_materialized: bool = True,
-    query_parameters: dict[str, Any] | None = None,
 ) -> QueryRequest:
     """
     Build node SQL and save it to query requests
@@ -156,7 +152,6 @@ async def build_and_save_node_sql(
             engine_version=engine.version if engine else None,
             access_control=access_control,
             use_materialized=use_materialized,
-            query_parameters=query_parameters,
         )
         # We save the request for both the cube and the metrics, so that if someone makes either
         # of these types of requests, they'll go to the cached query
@@ -165,8 +160,6 @@ async def build_and_save_node_sql(
             ([node_name], QueryBuildType.NODE),
         ]
         for nodes, query_type in requests_to_save:
-            if query_parameters:
-                continue
             request = await QueryRequest.save_query_request(
                 session=session,
                 nodes=nodes,
@@ -197,7 +190,6 @@ async def build_and_save_node_sql(
             access_control=access_control,
             ignore_errors=ignore_errors,
             use_materialized=use_materialized,
-            query_parameters=query_parameters,
         )
         query = translated_sql.sql
         columns = translated_sql.columns
@@ -212,8 +204,6 @@ async def build_and_save_node_sql(
             engine=engine,
             access_control=access_control,
             use_materialized=use_materialized,
-            query_parameters=query_parameters,
-            ignore_errors=ignore_errors,
         )
         columns = [
             assemble_column_metadata(col)  # type: ignore
@@ -252,7 +242,6 @@ async def get_node_sql(
     background_tasks: BackgroundTasks,
     ignore_errors: bool = True,
     use_materialized: bool = True,
-    query_parameters: dict[str, Any] | None = None,
 ) -> Tuple[TranslatedSQL, QueryRequest]:
     """
     Return SQL for a node.
@@ -294,7 +283,6 @@ async def get_node_sql(
             engine=engine,
             access_control=access_control,
             use_materialized=use_materialized,
-            query_parameters=query_parameters,
         )
         return (
             TranslatedSQL(
@@ -316,7 +304,6 @@ async def get_node_sql(
         access_control=access_control,
         ignore_errors=ignore_errors,
         use_materialized=use_materialized,
-        query_parameters=query_parameters,
     )
     return (
         TranslatedSQL(
@@ -339,7 +326,6 @@ async def get_sql(
     filters: List[str] = Query([]),
     orderby: List[str] = Query([]),
     limit: Optional[int] = None,
-    qp: str = Query("{}", description="Query parameters"),
     *,
     session: AsyncSession = Depends(get_session),
     engine_name: Optional[str] = None,
@@ -369,7 +355,6 @@ async def get_sql(
         background_tasks=background_tasks,
         ignore_errors=ignore_errors,  # type: ignore
         use_materialized=use_materialized,  # type: ignore
-        query_parameters=json.loads(qp),
     )
     return translated_sql
 
@@ -381,7 +366,6 @@ async def get_sql_for_metrics(
     filters: List[str] = Query([]),
     orderby: List[str] = Query([]),
     limit: Optional[int] = None,
-    qp: str = Query("{}", description="Query parameters"),
     *,
     session: AsyncSession = Depends(get_session),
     engine_name: Optional[str] = None,
@@ -418,19 +402,17 @@ async def get_sql_for_metrics(
             http_status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
         )
 
-    if (
-        query_request := await QueryRequest.get_query_request(
-            session,
-            nodes=metrics,
-            dimensions=dimensions,
-            filters=filters,
-            orderby=orderby,
-            limit=limit,
-            engine_name=engine_name,
-            engine_version=engine_version,
-            query_type=QueryBuildType.METRICS,
-        )
-    ) and not qp:
+    if query_request := await QueryRequest.get_query_request(
+        session,
+        nodes=metrics,
+        dimensions=dimensions,
+        filters=filters,
+        orderby=orderby,
+        limit=limit,
+        engine_name=engine_name,
+        engine_version=engine_version,
+        query_type=QueryBuildType.METRICS,
+    ):
         # Update the node SQL in a background task to keep it up-to-date
         background_tasks.add_task(
             build_and_save_sql_for_metrics,
@@ -445,7 +427,6 @@ async def get_sql_for_metrics(
             access_control=access_control,
             ignore_errors=ignore_errors,
             use_materialized=use_materialized,
-            query_parameters=json.loads(qp),
         )
         engine = (
             await get_engine(session, engine_name, engine_version)  # type: ignore
@@ -470,7 +451,6 @@ async def get_sql_for_metrics(
         access_control,
         ignore_errors=ignore_errors,  # type: ignore
         use_materialized=use_materialized,  # type: ignore
-        query_parameters=json.loads(qp),
     )
 
 
@@ -486,7 +466,6 @@ async def build_and_save_sql_for_metrics(
     access_control: Optional[access.AccessControlStore] = None,
     ignore_errors: bool = True,
     use_materialized: bool = True,
-    query_parameters: dict[str, Any] | None = None,
 ):
     """
     Builds and saves SQL for metrics.
@@ -503,7 +482,6 @@ async def build_and_save_sql_for_metrics(
         access_control,
         ignore_errors=ignore_errors,  # type: ignore
         use_materialized=use_materialized,  # type: ignore
-        query_parameters=query_parameters,
     )
 
     await QueryRequest.save_query_request(

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/api/tags.py

@@ -72,7 +72,9 @@ async def get_tag_by_name(
 
 @router.get("/tags/", response_model=List[TagOutput])
 async def list_tags(
-    tag_type: Optional[str] = None, *, session: AsyncSession = Depends(get_session)
+    tag_type: Optional[str] = None,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> List[TagOutput]:
     """
     List all available tags.
@@ -86,7 +88,9 @@ async def list_tags(
 
 @router.get("/tags/{name}/", response_model=TagOutput)
 async def get_a_tag(
-    name: str, *, session: AsyncSession = Depends(get_session)
+    name: str,
+    *,
+    session: AsyncSession = Depends(get_session),
 ) -> TagOutput:
     """
     Return a tag by name.

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/construction/build.py

@@ -4,7 +4,7 @@ import collections
 import logging
 import os
 from concurrent.futures import ThreadPoolExecutor
-from typing import Any, DefaultDict, List, Optional, Set, Tuple
+from typing import DefaultDict, List, Optional, Set, Tuple
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -164,7 +164,6 @@ async def build_metric_nodes(
     build_criteria: Optional[BuildCriteria] = None,
     access_control: Optional[access.AccessControlStore] = None,
     ignore_errors: bool = True,
-    query_parameters: Optional[dict[str, Any]] = None,
 ):
     """
     Build a single query for all metrics in the list, including the specified
@@ -196,7 +195,6 @@ async def build_metric_nodes(
     builder = (
         builder.add_filters(filters)
         .add_dimensions(dimensions)
-        .add_query_parameters(query_parameters)
         .order_by(orderby)
         .limit(limit)
         .with_build_criteria(build_criteria)

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/construction/build_v2.py

@@ -104,7 +104,6 @@ async def get_measures_query(
     sql_transpilation_library: Optional[str] = None,
     use_materialized: bool = True,
     preagg_requested: bool = False,
-    query_parameters: dict[str, Any] = None,
 ) -> List[GeneratedSQL]:
     """
     Builds the measures SQL for a set of metrics with dimensions and filters.
@@ -186,7 +185,6 @@ async def get_measures_query(
             .with_build_criteria(build_criteria)
             .add_dimensions(dimensions)
             .add_filters(filters)
-            .add_query_parameters(query_parameters)
             .order_by(orderby)
             .build()
         )
@@ -299,9 +297,13 @@ def build_preaggregate_query(
     # Find all required GROUP BY columns based on each of the measure's aggregation rules.
     # If the measure supports full aggregation, there are no required group-by columns, but if it
     # supports limited aggregation, we need to aggregate to the specified level.
+    colum_name_to_alias = {
+        col.name.identifier(): (col.alias or col.name).identifier()
+        for col in parent_ast.select.column_mapping.values()
+    }
     required_group_by_columns = [
         ast.Column.from_existing(
-            parent_ast.select.column_mapping[group_by_col],
+            parent_ast.select.column_mapping[colum_name_to_alias[group_by_col]],
             table=from_table,
         )
         for metric in metrics2measures
@@ -378,7 +380,6 @@ class QueryBuilder:
         self.use_materialized = use_materialized
 
         self._filters: List[str] = []
-        self._parameters: dict[str, ast.Value] = {}
         self._required_dimensions: List[str] = [
             required.name for required in self.node_revision.required_dimensions
         ]
@@ -438,16 +439,6 @@ class QueryBuilder:
             self.filter_by(filter_)
         return self
 
-    def add_query_parameters(
-        self, query_parameters: dict[str, ast.Value | Any] | None = None
-    ):
-        """Add parameters to the query builder."""
-        for param, value in (query_parameters or {}).items():
-            self._parameters[param] = QueryBuilder.normalize_query_param_value(
-                param, value
-            )
-        return self
-
     def add_dimension(self, dimension: str):
         """Add dimension to the query builder."""
         if (
@@ -508,13 +499,6 @@ class QueryBuilder:
         """All filters"""
         return self._filters
 
-    @property
-    def parameters(self) -> dict[str, ast.Value]:
-        """
-        Extracts parameters from relevant filters
-        """
-        return self._parameters
-
     @property
     def filter_asts(self) -> List[ast.Expression]:
         """
@@ -609,18 +593,6 @@ class QueryBuilder:
                     order=order,
                 )
 
-        # Replace any parameters in the final AST with their values
-        for param in self.final_ast.find_all(ast.QueryParameter):  # type: ignore
-            if param.name in self.parameters and param.parent:
-                param.parent.replace(param, self.parameters[param.name])
-            else:
-                self.errors.append(
-                    DJQueryBuildError(
-                        code=ErrorCode.MISSING_PARAMETER,
-                        message=f"Missing value for parameter: {param.name}",
-                    )
-                )
-
         # Error validation
         self.validate_access()
         if self.errors and not self._ignore_errors:
@@ -888,24 +860,6 @@ class QueryBuilder:
                     dimension_node_joins[dim_node].requested_dimensions.append(dim)
         return dimension_node_joins
 
-    @classmethod
-    def normalize_query_param_value(cls, param: str, value: ast.Value | Any):
-        match value:
-            case ast.Value():
-                return value
-            case int() | float():
-                return ast.Number(value)
-            case bool():
-                return ast.Boolean(value)
-            case None:
-                return ast.Null()
-            case str():
-                return ast.String(f"'{value}'")
-            case _:
-                raise TypeError(
-                    f"Unsupported parameter type: {type(value)} for param {param}"
-                )
-
 
 class CubeQueryBuilder:
     """
@@ -934,7 +888,6 @@ class CubeQueryBuilder:
         self._dimensions: List[str] = []
         self._orderby: List[str] = []
         self._limit: Optional[int] = None
-        self._parameters: dict[str, ast.Value] = {}
         self._build_criteria: Optional[BuildCriteria] = self.get_default_criteria()
         self._access_control: Optional[access.AccessControlStore] = None
         self._ignore_errors: bool = False
@@ -1015,14 +968,6 @@ class CubeQueryBuilder:
             self.add_dimension(dimension)
         return self
 
-    def add_query_parameters(self, query_parameters: dict[str, Any] | None = None):
-        """Add parameters to the query builder."""
-        for param, value in (query_parameters or {}).items():
-            self._parameters[param] = QueryBuilder.normalize_query_param_value(
-                param, value
-            )
-        return self
-
     def order_by(self, orderby: Optional[Union[str, List[str]]] = None):
         """Set order by for the query builder."""
         if isinstance(orderby, str):
@@ -1068,13 +1013,6 @@ class CubeQueryBuilder:
         """All filters"""
         return self._filters
 
-    @property
-    def parameters(self) -> dict[str, ast.Value]:
-        """
-        Extracts parameters from relevant filters
-        """
-        return self._parameters
-
     async def build(self) -> ast.Query:
         """
         Builds SQL for multiple metrics with the requested set of dimensions,
@@ -1181,7 +1119,6 @@ class CubeQueryBuilder:
                 .with_build_criteria(self._build_criteria)
                 .add_dimensions(self.dimensions)
                 .add_filters(self.filters)
-                .add_query_parameters(self.parameters)
                 .build()
             )
             self.errors.extend(query_builder.errors)
@@ -1577,7 +1514,8 @@ async def needs_dimension_join(
 
 
 def combine_filter_conditions(
-    existing_condition, *new_conditions
+    existing_condition,
+    *new_conditions,
 ) -> Optional[Union[ast.BinaryOp, ast.Expression]]:
     """
     Combines the existing where clause with new filter conditions.

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/construction/exceptions.py

@@ -19,7 +19,9 @@ class CompoundBuildException:
     def __new__(cls, *args, **kwargs):
         if not cls._instance:
             cls._instance = super(CompoundBuildException, cls).__new__(
-                cls, *args, **kwargs
+                cls,
+                *args,
+                **kwargs,
             )
             cls.errors = []
         return cls._instance

{datajunction_server-0.0.1a98.dev0 → datajunction_server-0.0.1a98.dev1}/datajunction_server/construction/utils.py

@@ -34,7 +34,7 @@ async def get_dj_node(
                 await session.execute(
                     query.options(
                         joinedload(Node.current).options(
-                            *NodeRevision.default_load_options()
+                            *NodeRevision.default_load_options(),
                         ),
                     ),
                 )