datajunction-server 0.0.1a61.dev9__tar.gz → 0.0.1a61.dev11__tar.gz

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.1a61.dev9
+Version: 0.0.1a61.dev11
 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.dev11/datajunction_server/__about__.py

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

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/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.dev9 → datajunction_server-0.0.1a61.dev11}/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,

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/datajunction_server/construction/build_v2.py

@@ -294,13 +294,13 @@ class QueryBuilder:  # pylint: disable=too-many-instance-attributes,too-many-pub
                 self._orderby.append(orderby)
         else:
             for order in orderby or []:
-                if order not in self._orderby:
+                if order not in self._orderby:  # pragma: no cover
                     self._orderby.append(order)
         return self
 
     def limit(self, limit: Optional[int] = None):
         """Set limit for the query builder."""
-        if limit:
+        if limit:  # pragma: no cover
             self._limit = limit
         return self
 
@@ -389,6 +389,8 @@ class QueryBuilder:  # pylint: disable=too-many-instance-attributes,too-many-pub
             self.final_ast = node_ast
         else:
             node_alias, node_ast = await self.build_current_node_ast(node_ast)
+            ctx = CompileContext(self.session, DJException())
+            await node_ast.compile(ctx)
             self.final_ast = self.initialize_final_query_ast(node_ast, node_alias)
             await self.build_dimension_node_joins(node_ast, node_alias)
             self.set_dimension_aliases()
@@ -431,7 +433,6 @@ class QueryBuilder:  # pylint: disable=too-many-instance-attributes,too-many-pub
         ctx = CompileContext(self.session, DJException())
         await node_ast.compile(ctx)
         self.errors.extend(ctx.exception.errors)
-
         node_alias = ast.Name(amenable_name(self.node_revision.name))
         return node_alias, await build_ast(
             self.session,
@@ -555,8 +556,11 @@ class QueryBuilder:  # pylint: disable=too-many-instance-attributes,too-many-pub
 
     async def add_request_by_node_name(self, node_name):
         """Add a node request to the access control validator."""
-        if self._access_control:
-            await self._access_control.add_request_by_node_name(self.session, node_name)
+        if self._access_control:  # pragma: no cover
+            await self._access_control.add_request_by_node_name(  # pragma: no cover
+                self.session,
+                node_name,
+            )
 
     def validate_access(self):
         """Validates access"""
@@ -904,7 +908,7 @@ async def build_ast(  # pylint: disable=too-many-arguments,too-many-locals
 
     new_cte_mapping: Dict[str, ast.Query] = {}
     if ctes_mapping is None:
-        ctes_mapping = new_cte_mapping
+        ctes_mapping = new_cte_mapping  # pragma: no cover
 
     node_to_tables_mapping = get_dj_node_references_from_select(query.select)
     for referenced_node, reference_expressions in node_to_tables_mapping.items():
@@ -936,7 +940,7 @@ async def build_ast(  # pylint: disable=too-many-arguments,too-many-locals
                     )
                     cte_name = ast.Name(amenable_name(referenced_node.name))
                     query_ast = query_ast.to_cte(cte_name, parent_ast=query)
-                    if referenced_node.name not in new_cte_mapping:
+                    if referenced_node.name not in new_cte_mapping:  # pragma: no cover
                         new_cte_mapping[referenced_node.name] = query_ast
 
                 reference_cte = (

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/datajunction_server/models/sql.py

@@ -47,8 +47,10 @@ class GeneratedSQL(BaseModel):
         If no plugin is configured, it will just return the original generated query.
         """
         if values.get("sql_transpilation_library"):
-            plugin = get_transpilation_plugin(values.get("sql_transpilation_library"))
-            values["sql"] = plugin.transpile_sql(
+            plugin = get_transpilation_plugin(  # pragma: no cover
+                values.get("sql_transpilation_library"),
+            )
+            values["sql"] = plugin.transpile_sql(  # pragma: no cover
                 values["sql"],
                 input_dialect=Dialect.SPARK,
                 output_dialect=values["dialect"],

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/datajunction_server/service_clients.py

@@ -149,7 +149,10 @@ class QueryServiceClient:  # pylint: disable=too-few-public-methods
         """
         response = self.requests_session.post(
             "/queries/",
-            headers={**self.requests_session.headers, **request_headers}
+            headers={
+                **self.requests_session.headers,
+                **QueryServiceClient.filtered_headers(request_headers),
+            }
             if request_headers
             else self.requests_session.headers,
             json=query_create.dict(),

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/datajunction_server/sql/parsing/ast.py

@@ -925,11 +925,15 @@ class Column(Aliasable, Named, Expression):
 
         # Check for ctes
         alpha_query = self.get_furthest_parent()
+        direct_table_names = {
+            direct_table.alias_or_name.identifier() for direct_table in direct_tables
+        }
         if isinstance(alpha_query, Query) and alpha_query.ctes:
-            for table in alpha_query.ctes:
-                if table.alias_or_name.identifier(False) == namespace:
-                    if await table.add_ref_column(self, ctx):
-                        found.append(table)
+            for cte in alpha_query.ctes:
+                cte_name = cte.alias_or_name.identifier(False)
+                if cte_name == namespace or cte_name in direct_table_names:
+                    if await cte.add_ref_column(self, ctx):
+                        found.append(cte)
 
         # If nothing was found in the initial AST, traverse through dimensions graph
         # to find another table in DJ that could be its origin

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/tests/api/graphql/find_nodes_test.py

@@ -546,3 +546,98 @@ async def test_find_cubes(
             "type": "CUBE",
         },
     ]
+
+
+@pytest.mark.asyncio
+async def test_find_node_with_revisions(
+    module__client_with_roads: AsyncClient,
+) -> None:
+    """
+    Test finding nodes with revisions
+    """
+
+    query = """
+    {
+        findNodes(nodeTypes: [TRANSFORM]) {
+            name
+            type
+            revisions {
+                displayName
+                dimensionLinks {
+                    dimension {
+                        name
+                    }
+                    joinSql
+                }
+            }
+            currentVersion
+        }
+    }
+    """
+    response = await module__client_with_roads.post("/graphql", json={"query": query})
+    assert response.status_code == 200
+    data = response.json()
+    assert data["data"]["findNodes"] == [
+        {
+            "currentVersion": "v1.0",
+            "name": "default.regional_level_agg",
+            "revisions": [
+                {
+                    "dimensionLinks": [],
+                    "displayName": "Default: Regional Level Agg",
+                },
+            ],
+            "type": "TRANSFORM",
+        },
+        {
+            "currentVersion": "v1.0",
+            "name": "default.national_level_agg",
+            "revisions": [
+                {
+                    "dimensionLinks": [],
+                    "displayName": "Default: National Level Agg",
+                },
+            ],
+            "type": "TRANSFORM",
+        },
+        {
+            "currentVersion": "v1.0",
+            "name": "default.repair_orders_fact",
+            "revisions": [
+                {
+                    "dimensionLinks": [
+                        {
+                            "dimension": {
+                                "name": "default.municipality_dim",
+                            },
+                            "joinSql": "default.repair_orders_fact.municipality_id = "
+                            "default.municipality_dim.municipality_id",
+                        },
+                        {
+                            "dimension": {
+                                "name": "default.hard_hat",
+                            },
+                            "joinSql": "default.repair_orders_fact.hard_hat_id = "
+                            "default.hard_hat.hard_hat_id",
+                        },
+                        {
+                            "dimension": {
+                                "name": "default.hard_hat_to_delete",
+                            },
+                            "joinSql": "default.repair_orders_fact.hard_hat_id = "
+                            "default.hard_hat_to_delete.hard_hat_id",
+                        },
+                        {
+                            "dimension": {
+                                "name": "default.dispatcher",
+                            },
+                            "joinSql": "default.repair_orders_fact.dispatcher_id = "
+                            "default.dispatcher.dispatcher_id",
+                        },
+                    ],
+                    "displayName": "Repair Orders Fact",
+                },
+            ],
+            "type": "TRANSFORM",
+        },
+    ]

{datajunction_server-0.0.1a61.dev9 → datajunction_server-0.0.1a61.dev11}/tests/api/sql_v2_test.py

@@ -75,11 +75,11 @@ async def fix_dimension_links(module__client_with_roads: AsyncClient):
             )
             SELECT
               default_DOT_repair_orders_fact.dispatcher_id
-                AS default_DOT_dispatcher_DOT_dispatcher_id,
+                default_DOT_dispatcher_DOT_dispatcher_id,
               default_DOT_repair_orders_fact.discount
-                AS default_DOT_repair_orders_fact_DOT_discount,
+                default_DOT_repair_orders_fact_DOT_discount,
               default_DOT_repair_orders_fact.price
-                AS default_DOT_repair_orders_fact_DOT_price
+                default_DOT_repair_orders_fact_DOT_price
             FROM default_DOT_repair_orders_fact
             """,
             [
@@ -167,11 +167,11 @@ async def fix_dimension_links(module__client_with_roads: AsyncClient):
             )
             SELECT
               default_DOT_repair_orders_fact.dispatcher_id
-                AS default_DOT_dispatcher_DOT_dispatcher_id,
+                default_DOT_dispatcher_DOT_dispatcher_id,
               default_DOT_repair_orders_fact.discount
-                AS default_DOT_repair_orders_fact_DOT_discount,
+                default_DOT_repair_orders_fact_DOT_discount,
               default_DOT_repair_orders_fact.price
-                AS default_DOT_repair_orders_fact_DOT_price
+                default_DOT_repair_orders_fact_DOT_price
             FROM default_DOT_repair_orders_fact
             """,
             [
@@ -300,15 +300,15 @@ async def fix_dimension_links(module__client_with_roads: AsyncClient):
             )
             SELECT
               default_DOT_repair_orders_fact.total_repair_cost
-                AS default_DOT_repair_orders_fact_DOT_total_repair_cost,
+                default_DOT_repair_orders_fact_DOT_total_repair_cost,
               default_DOT_repair_orders_fact.time_to_dispatch
-                AS default_DOT_repair_orders_fact_DOT_time_to_dispatch,
+                default_DOT_repair_orders_fact_DOT_time_to_dispatch,
               default_DOT_us_state.state_name
-                AS default_DOT_us_state_DOT_state_name,
+                default_DOT_us_state_DOT_state_name,
               default_DOT_dispatcher.company_name
-                AS default_DOT_dispatcher_DOT_company_name,
+                default_DOT_dispatcher_DOT_company_name,
               default_DOT_hard_hat.last_name
-                AS default_DOT_hard_hat_DOT_last_name
+                default_DOT_hard_hat_DOT_last_name
             FROM default_DOT_repair_orders_fact
             INNER JOIN default_DOT_hard_hat
               ON default_DOT_repair_orders_fact.hard_hat_id = default_DOT_hard_hat.hard_hat_id
@@ -478,23 +478,23 @@ async def test_measures_sql_include_all_columns(
         default_DOT_dispatchers.phone
      FROM roads.dispatchers AS default_DOT_dispatchers
     )
-    SELECT  default_DOT_repair_orders_fact.repair_order_id AS default_DOT_repair_orders_fact_DOT_repair_order_id,
-        default_DOT_repair_orders_fact.municipality_id AS default_DOT_repair_orders_fact_DOT_municipality_id,
-        default_DOT_repair_orders_fact.hard_hat_id AS default_DOT_repair_orders_fact_DOT_hard_hat_id,
-        default_DOT_repair_orders_fact.dispatcher_id AS default_DOT_repair_orders_fact_DOT_dispatcher_id,
-        default_DOT_repair_orders_fact.order_date AS default_DOT_repair_orders_fact_DOT_order_date,
-        default_DOT_repair_orders_fact.dispatched_date AS default_DOT_repair_orders_fact_DOT_dispatched_date,
-        default_DOT_repair_orders_fact.required_date AS default_DOT_repair_orders_fact_DOT_required_date,
-        default_DOT_repair_orders_fact.discount AS default_DOT_repair_orders_fact_DOT_discount,
-        default_DOT_repair_orders_fact.price AS default_DOT_repair_orders_fact_DOT_price,
-        default_DOT_repair_orders_fact.quantity AS default_DOT_repair_orders_fact_DOT_quantity,
-        default_DOT_repair_orders_fact.repair_type_id AS default_DOT_repair_orders_fact_DOT_repair_type_id,
-        default_DOT_repair_orders_fact.total_repair_cost AS default_DOT_repair_orders_fact_DOT_total_repair_cost,
-        default_DOT_repair_orders_fact.time_to_dispatch AS default_DOT_repair_orders_fact_DOT_time_to_dispatch,
-        default_DOT_repair_orders_fact.dispatch_delay AS default_DOT_repair_orders_fact_DOT_dispatch_delay,
-        default_DOT_us_state.state_name AS default_DOT_us_state_DOT_state_name,
-        default_DOT_dispatcher.company_name AS default_DOT_dispatcher_DOT_company_name,
-        default_DOT_hard_hat.last_name AS default_DOT_hard_hat_DOT_last_name
+    SELECT  default_DOT_repair_orders_fact.repair_order_id default_DOT_repair_orders_fact_DOT_repair_order_id,
+        default_DOT_repair_orders_fact.municipality_id default_DOT_repair_orders_fact_DOT_municipality_id,
+        default_DOT_repair_orders_fact.hard_hat_id default_DOT_repair_orders_fact_DOT_hard_hat_id,
+        default_DOT_repair_orders_fact.dispatcher_id default_DOT_repair_orders_fact_DOT_dispatcher_id,
+        default_DOT_repair_orders_fact.order_date default_DOT_repair_orders_fact_DOT_order_date,
+        default_DOT_repair_orders_fact.dispatched_date default_DOT_repair_orders_fact_DOT_dispatched_date,
+        default_DOT_repair_orders_fact.required_date default_DOT_repair_orders_fact_DOT_required_date,
+        default_DOT_repair_orders_fact.discount default_DOT_repair_orders_fact_DOT_discount,
+        default_DOT_repair_orders_fact.price default_DOT_repair_orders_fact_DOT_price,
+        default_DOT_repair_orders_fact.quantity default_DOT_repair_orders_fact_DOT_quantity,
+        default_DOT_repair_orders_fact.repair_type_id default_DOT_repair_orders_fact_DOT_repair_type_id,
+        default_DOT_repair_orders_fact.total_repair_cost default_DOT_repair_orders_fact_DOT_total_repair_cost,
+        default_DOT_repair_orders_fact.time_to_dispatch default_DOT_repair_orders_fact_DOT_time_to_dispatch,
+        default_DOT_repair_orders_fact.dispatch_delay default_DOT_repair_orders_fact_DOT_dispatch_delay,
+        default_DOT_us_state.state_name default_DOT_us_state_DOT_state_name,
+        default_DOT_dispatcher.company_name default_DOT_dispatcher_DOT_company_name,
+        default_DOT_hard_hat.last_name default_DOT_hard_hat_DOT_last_name
      FROM default_DOT_repair_orders_fact INNER JOIN default_DOT_hard_hat ON default_DOT_repair_orders_fact.hard_hat_id = default_DOT_hard_hat.hard_hat_id
     INNER JOIN default_DOT_us_state ON default_DOT_hard_hat.state = default_DOT_us_state.state_short
     LEFT JOIN default_DOT_dispatcher ON default_DOT_repair_orders_fact.dispatcher_id = default_DOT_dispatcher.dispatcher_id