datajunction-server 0.0.1a61.dev8__tar.gz → 0.0.1a61.dev10__tar.gz

{datajunction_server-0.0.1a61.dev8 → datajunction_server-0.0.1a61.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.1a61.dev8
+Version: 0.0.1a61.dev10
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>

datajunction_server-0.0.1a61.dev10/datajunction_server/__about__.py

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a61.dev10"

{datajunction_server-0.0.1a61.dev8 → datajunction_server-0.0.1a61.dev10}/datajunction_server/api/graphql/resolvers/nodes.py

@@ -43,8 +43,11 @@ def load_node_options(fields):
     Based on the GraphQL query input fields, builds a list of node load options.
     """
     options = []
+    if "revisions" in fields:
+        node_revision_options = load_node_revision_options(fields["revisions"])
+        options.append(joinedload(DBNode.revisions).options(*node_revision_options))
     if fields.get("current"):
-        node_revision_options = load_node_revision_options(fields)
+        node_revision_options = load_node_revision_options(fields["current"])
         options.append(joinedload(DBNode.current).options(*node_revision_options))
 
     if "tags" in fields:
@@ -52,16 +55,17 @@ def load_node_options(fields):
     return options
 
 
-def load_node_revision_options(fields):
+def load_node_revision_options(node_revision_fields):
     """
     Based on the GraphQL query input fields, builds a list of node revision
     load options.
     """
     options = []
     is_cube_request = (
-        "cube_metrics" in fields["current"] or "cube_dimensions" in fields["current"]
+        "cube_metrics" in node_revision_fields
+        or "cube_dimensions" in node_revision_fields
     )
-    if "columns" in fields["current"] or is_cube_request:
+    if "columns" in node_revision_fields or is_cube_request:
         options.append(
             selectinload(DBNodeRevision.columns).options(
                 joinedload(Column.attributes).joinedload(
@@ -71,17 +75,17 @@ def load_node_revision_options(fields):
                 joinedload(Column.partition),
             ),
         )
-    if "catalog" in fields["current"]:
+    if "catalog" in node_revision_fields:
         options.append(joinedload(DBNodeRevision.catalog))
-    if "parents" in fields["current"]:
+    if "parents" in node_revision_fields:
         options.append(selectinload(DBNodeRevision.parents))
-    if "materializations" in fields["current"]:
+    if "materializations" in node_revision_fields:
         options.append(selectinload(DBNodeRevision.materializations))
-    if "metric_metadata" in fields["current"]:
+    if "metric_metadata" in node_revision_fields:
         options.append(selectinload(DBNodeRevision.metric_metadata))
-    if "availability" in fields["current"]:
+    if "availability" in node_revision_fields:
         options.append(selectinload(DBNodeRevision.availability))
-    if "dimension_links" in fields["current"]:
+    if "dimension_links" in node_revision_fields:
         options.append(
             selectinload(DBNodeRevision.dimension_links).options(
                 joinedload(DimensionLink.dimension).options(
@@ -89,12 +93,12 @@ def load_node_revision_options(fields):
                 ),
             ),
         )
-    if "required_dimensions" in fields["current"]:
+    if "required_dimensions" in node_revision_fields:
         options.append(
             selectinload(DBNodeRevision.required_dimensions),
         )
 
-    if "cube_elements" in fields["current"] or is_cube_request:
+    if "cube_elements" in node_revision_fields or is_cube_request:
         options.append(
             selectinload(DBNodeRevision.cube_elements)
             .selectinload(Column.node_revisions)

{datajunction_server-0.0.1a61.dev8 → datajunction_server-0.0.1a61.dev10}/datajunction_server/api/helpers.py

@@ -458,11 +458,12 @@ async def validate_cube(  # pylint: disable=too-many-locals
         )
 
     dimension_mapping: Dict[str, Node] = {
-        attr: dimension_nodes[node_name] for node_name, attr in dimension_attributes
+        f"{node_name}{SEPARATOR}{attr}": dimension_nodes[node_name]
+        for node_name, attr in dimension_attributes
     }
     dimensions: List[Column] = []
     for node_name, column_name in dimension_attributes:
-        dimension_node = dimension_mapping[column_name]
+        dimension_node = dimension_mapping[f"{node_name}{SEPARATOR}{column_name}"]
         columns = {col.name: col for col in dimension_node.current.columns}  # type: ignore
 
         column_name_without_role = column_name

{datajunction_server-0.0.1a61.dev8 → datajunction_server-0.0.1a61.dev10}/datajunction_server/api/sql.py

@@ -4,7 +4,7 @@ SQL related APIs.
 """
 import logging
 from collections import OrderedDict
-from typing import List, Optional, Tuple, cast
+from typing import Dict, List, Optional, Tuple, cast
 
 from fastapi import BackgroundTasks, Depends, Query
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -25,10 +25,8 @@ from datajunction_server.models import access
 from datajunction_server.models.access import AccessControlStore
 from datajunction_server.models.metric import TranslatedSQL
 from datajunction_server.models.node_type import NodeType
-from datajunction_server.models.sql import GeneratedSQL
 from datajunction_server.models.user import UserOutput
 from datajunction_server.utils import (
-    Settings,
     get_and_update_current_user,
     get_session,
     get_settings,
@@ -123,7 +121,7 @@ async def get_measures_sql_for_cube(
 
 @router.get(
     "/sql/measures/v2/",
-    response_model=List[GeneratedSQL],
+    response_model=Dict[str, TranslatedSQL],
     name="Get Measures SQL",
 )
 async def get_measures_sql_for_cube_v2(
@@ -138,7 +136,6 @@ async def get_measures_sql_for_cube_v2(
             "for the metrics and dimensions in the cube"
         ),
     ),
-    settings: Settings = Depends(get_settings),  # pylint: disable=redefined-outer-name
     session: AsyncSession = Depends(get_session),
     engine_name: Optional[str] = None,
     engine_version: Optional[str] = None,
@@ -146,7 +143,7 @@ async def get_measures_sql_for_cube_v2(
     validate_access: access.ValidateAccessFn = Depends(  # pylint: disable=W0621
         validate_access,
     ),
-) -> List[GeneratedSQL]:
+) -> Dict[str, TranslatedSQL]:
     """
     Return measures SQL for a set of metrics with dimensions and filters.
 
@@ -172,7 +169,6 @@ async def get_measures_sql_for_cube_v2(
         current_user=current_user,
         validate_access=validate_access,
         include_all_columns=include_all_columns,
-        sql_transpilation_library=settings.sql_transpilation_library,
     )
     return measures_query
 

{datajunction_server-0.0.1a61.dev8 → datajunction_server-0.0.1a61.dev10}/datajunction_server/construction/build.py

@@ -757,6 +757,7 @@ async def add_filters_dimensions_orderby_limit_to_query_ast(
                         col,
                     )
                     if dj_node:  # pragma: no cover
+                        await session.refresh(node, ["columns"])
                         await session.refresh(node, ["dimension_links"])
                         rename_dimension_primary_keys_to_foreign_keys(
                             dj_node,