datajunction-server 0.0.1a37.dev3__tar.gz → 0.0.1a37.dev5__tar.gz

{datajunction_server-0.0.1a37.dev3 → datajunction_server-0.0.1a37.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datajunction-server
-Version: 0.0.1a37.dev3
+Version: 0.0.1a37.dev5
 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.1a37.dev5/datajunction_server/__about__.py

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a37.dev5"

{datajunction_server-0.0.1a37.dev3 → datajunction_server-0.0.1a37.dev5}/datajunction_server/api/helpers.py

@@ -3,7 +3,6 @@
 Helpers for API endpoints
 """
 import asyncio
-import collections
 import http.client
 import json
 import logging
@@ -291,21 +290,55 @@ def get_upstream_nodes(
     node_type: NodeType = None,
 ) -> List[Node]:
     """
-    Gets all upstream parents of the given node, filterable by node type.
+    Gets all upstreams of the given node, filterable by node type.
+    Uses a recursive CTE query to build out all parents of the node.
     """
-    node = get_node_by_name(session=session, name=node_name)
-    queue = collections.deque([node])
-    all_parents = set()
-    while queue:
-        node = queue.pop()
-        for parent in node.current.parents:
-            all_parents.add(parent)
-        for parent in node.current.parents:
-            queue.append(parent)
+    node = get_node_by_name(
+        session=session,
+        name=node_name,
+        include_inactive=False,
+        with_current=True,
+    )
+
+    dag = (
+        select(
+            NodeRelationship.child_id,
+            NodeRevision.id,
+        )
+        .where(NodeRelationship.child_id == node.current.id)
+        .join(Node, NodeRelationship.parent_id == Node.id)
+        .join(
+            NodeRevision,
+            (Node.id == NodeRevision.node_id)
+            & (Node.current_version == NodeRevision.version),
+        )
+    ).cte("dag", recursive=True)
+
+    paths = dag.union_all(
+        select(
+            dag.c.child_id,
+            NodeRevision.id,
+        )
+        .join(NodeRelationship, dag.c.id == NodeRelationship.child_id)
+        .join(Node, NodeRelationship.parent_id == Node.id)
+        .join(
+            NodeRevision,
+            (Node.id == NodeRevision.node_id)
+            & (Node.current_version == NodeRevision.version),
+        ),
+    )
+
+    statement = (
+        select(NodeRevision)
+        .join(paths, paths.c.id == NodeRevision.id)
+        .options(joinedload(NodeRevision.node).joinedload(Node.current))
+    )
+
+    results = session.exec(statement).unique().all()
 
     return [
-        upstream
-        for upstream in all_parents
+        upstream.node
+        for upstream in results
         if upstream.type == node_type or node_type is None
     ]
 

{datajunction_server-0.0.1a37.dev3 → datajunction_server-0.0.1a37.dev5}/datajunction_server/internal/nodes.py

@@ -18,7 +18,11 @@ from datajunction_server.api.helpers import (
     validate_cube,
     validate_node_data,
 )
-from datajunction_server.errors import DJDoesNotExistException, DJException
+from datajunction_server.errors import (
+    DJDoesNotExistException,
+    DJException,
+    DJNodeNotFound,
+)
 from datajunction_server.internal.materializations import (
     create_new_materialization,
     schedule_materialization_jobs,
@@ -1184,7 +1188,13 @@ def get_cube_revision_metadata(session: Session, name: str):
             joinedload(NodeRevision.cube_elements).joinedload(Column.node_revisions),
         )
     )
-    cube = session.execute(statement).unique().first()[0]
+    result = session.execute(statement).unique().first()
+    if not result:
+        raise DJNodeNotFound(  # pragma: no cover
+            message=f"A cube node with name `{name}` does not exist.",
+            http_status_code=404,
+        )
+    cube = result[0]
     return CubeRevisionMetadata(
         id=cube.id,
         node_id=cube.node_id,

datajunction_server-0.0.1a37.dev3/datajunction_server/__about__.py

@@ -1,4 +0,0 @@
-"""
-Version for Hatch
-"""
-__version__ = "0.0.1a37.dev3"