datajunction-server 0.0.1a50__tar.gz → 0.0.1a50.dev0__tar.gz

{datajunction_server-0.0.1a50 → datajunction_server-0.0.1a50.dev0}/PKG-INFO

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

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a50.dev0"

{datajunction_server-0.0.1a50 → datajunction_server-0.0.1a50.dev0}/datajunction_server/internal/nodes.py

@@ -71,6 +71,7 @@ from datajunction_server.models.node import (
     UpdateNode,
 )
 from datajunction_server.models.node_type import NodeType
+from datajunction_server.naming import from_amenable_name
 from datajunction_server.service_clients import QueryServiceClient
 from datajunction_server.sql.dag import (
     get_downstream_nodes,
@@ -1389,7 +1390,14 @@ async def get_cube_revision_metadata(session: AsyncSession, name: str):
             http_status_code=404,
         )
     cube = result[0]
-    cube.cube_elements = sorted(cube.cube_elements, key=lambda elem: elem.order)
+
+    # Preserve the ordering of elements
+    element_ordering = {col.name: col.order for col in cube.columns}
+    cube.cube_elements = sorted(
+        cube.cube_elements,
+        key=lambda elem: element_ordering.get(from_amenable_name(elem.name), 0),
+    )
+
     cube_metadata = CubeRevisionMetadata.from_orm(cube)
     cube_metadata.tags = cube.node.tags
     return cube_metadata

{datajunction_server-0.0.1a50 → datajunction_server-0.0.1a50.dev0}/tests/api/cubes_test.py

@@ -380,102 +380,99 @@ def repairs_cube_elements():
     """
     Fixture of repairs cube elements
     """
-    return sorted(
-        [
-            {
-                "display_name": "City",
-                "name": "city",
-                "node_name": "default.hard_hat",
-                "type": "dimension",
-                "partition": None,
-            },
-            {
-                "display_name": "Company Name",
-                "name": "company_name",
-                "node_name": "default.dispatcher",
-                "type": "dimension",
-                "partition": None,
-            },
-            {
-                "display_name": "Country",
-                "name": "country",
-                "node_name": "default.hard_hat",
-                "type": "dimension",
-                "partition": None,
-            },
-            {
-                "display_name": "Hire Date",
-                "name": "hire_date",
-                "node_name": "default.hard_hat",
-                "partition": None,
-                "type": "dimension",
-            },
-            {
-                "display_name": "Default: Avg Repair Price",
-                "name": "default_DOT_avg_repair_price",
-                "node_name": "default.avg_repair_price",
-                "type": "metric",
-                "partition": None,
-            },
-            {
-                "display_name": "Default: Discounted Orders Rate",
-                "name": "default_DOT_discounted_orders_rate",
-                "node_name": "default.discounted_orders_rate",
-                "type": "metric",
-                "partition": None,
-            },
-            {
-                "display_name": "Default: Double Total Repair Cost",
-                "name": "default_DOT_double_total_repair_cost",
-                "node_name": "default.double_total_repair_cost",
-                "type": "metric",
-                "partition": None,
-            },
-            {
-                "display_name": "Default: Num Repair Orders",
-                "name": "default_DOT_num_repair_orders",
-                "node_name": "default.num_repair_orders",
-                "type": "metric",
-                "partition": None,
-            },
-            {
-                "display_name": "Default: Total Repair Cost",
-                "name": "default_DOT_total_repair_cost",
-                "node_name": "default.total_repair_cost",
-                "type": "metric",
-                "partition": None,
-            },
-            {
-                "display_name": "Default: Total Repair Order Discounts",
-                "name": "default_DOT_total_repair_order_discounts",
-                "node_name": "default.total_repair_order_discounts",
-                "type": "metric",
-                "partition": None,
-            },
-            {
-                "display_name": "Local Region",
-                "name": "local_region",
-                "node_name": "default.municipality_dim",
-                "type": "dimension",
-                "partition": None,
-            },
-            {
-                "display_name": "Postal Code",
-                "name": "postal_code",
-                "node_name": "default.hard_hat",
-                "type": "dimension",
-                "partition": None,
-            },
-            {
-                "display_name": "State",
-                "name": "state",
-                "node_name": "default.hard_hat",
-                "type": "dimension",
-                "partition": None,
-            },
-        ],
-        key=lambda x: x["name"],
-    )
+    return [
+        {
+            "display_name": "Default: Discounted Orders Rate",
+            "name": "default_DOT_discounted_orders_rate",
+            "node_name": "default.discounted_orders_rate",
+            "partition": None,
+            "type": "metric",
+        },
+        {
+            "display_name": "Company Name",
+            "name": "company_name",
+            "node_name": "default.dispatcher",
+            "partition": None,
+            "type": "dimension",
+        },
+        {
+            "display_name": "Local Region",
+            "name": "local_region",
+            "node_name": "default.municipality_dim",
+            "partition": None,
+            "type": "dimension",
+        },
+        {
+            "display_name": "Hire Date",
+            "name": "hire_date",
+            "node_name": "default.hard_hat",
+            "partition": None,
+            "type": "dimension",
+        },
+        {
+            "display_name": "City",
+            "name": "city",
+            "node_name": "default.hard_hat",
+            "partition": None,
+            "type": "dimension",
+        },
+        {
+            "display_name": "State",
+            "name": "state",
+            "node_name": "default.hard_hat",
+            "partition": None,
+            "type": "dimension",
+        },
+        {
+            "display_name": "Postal Code",
+            "name": "postal_code",
+            "node_name": "default.hard_hat",
+            "partition": None,
+            "type": "dimension",
+        },
+        {
+            "display_name": "Country",
+            "name": "country",
+            "node_name": "default.hard_hat",
+            "partition": None,
+            "type": "dimension",
+        },
+        {
+            "display_name": "Default: Num Repair Orders",
+            "name": "default_DOT_num_repair_orders",
+            "node_name": "default.num_repair_orders",
+            "partition": None,
+            "type": "metric",
+        },
+        {
+            "display_name": "Default: Avg Repair Price",
+            "name": "default_DOT_avg_repair_price",
+            "node_name": "default.avg_repair_price",
+            "partition": None,
+            "type": "metric",
+        },
+        {
+            "display_name": "Default: Total Repair Cost",
+            "name": "default_DOT_total_repair_cost",
+            "node_name": "default.total_repair_cost",
+            "partition": None,
+            "type": "metric",
+        },
+        {
+            "display_name": "Default: Total Repair Order Discounts",
+            "name": "default_DOT_total_repair_order_discounts",
+            "node_name": "default.total_repair_order_discounts",
+            "partition": None,
+            "type": "metric",
+        },
+        {
+            "display_name": "Default: Double Total Repair Cost",
+            "name": "default_DOT_double_total_repair_cost",
+            "node_name": "default.double_total_repair_cost",
+            "partition": None,
+            "type": "metric",
+        },
+    ]
 
 
 @pytest.mark.asyncio
@@ -589,6 +586,10 @@ async def test_create_cube(
     assert results["display_name"] == "Default: Repairs Cube"
     assert results["description"] == "Cube of various metrics related to repairs"
 
+    response = await client_with_repairs_cube.get("/cubes/default.repairs_cube")
+    cube = response.json()
+
+    # Make sure it matches the original metrics order
     metrics = [
         "default.discounted_orders_rate",
         "default.num_repair_orders",
@@ -597,6 +598,11 @@ async def test_create_cube(
         "default.total_repair_order_discounts",
         "default.double_total_repair_cost",
     ]
+    assert cube["cube_node_metrics"] == metrics
+    assert [
+        elem["node_name"] for elem in cube["cube_elements"] if elem["type"] == "metric"
+    ] == metrics
+
     metrics_query = "&".join([f"metrics={metric}" for metric in metrics])
     dimensions = [
         "default.hard_hat.country",
@@ -739,9 +745,7 @@ async def test_cube_materialization_sql_and_measures(
     """
     response = await client_with_repairs_cube.get("/cubes/default.repairs_cube/")
     data = response.json()
-    assert (
-        sorted(data["cube_elements"], key=lambda x: x["name"]) == repairs_cube_elements
-    )
+    assert data["cube_elements"] == repairs_cube_elements
     expected_materialization_query = """WITH
 default_DOT_repair_orders_fact AS (SELECT  default_DOT_repair_orders_fact.repair_order_id default_DOT_repair_orders_fact_DOT_repair_order_id,
     default_DOT_repair_orders_fact.discount default_DOT_repair_orders_fact_DOT_discount,
@@ -1454,9 +1458,7 @@ async def test_changing_node_upstream_from_cube(
 
     response = await client_with_repairs_cube.get("/cubes/default.repairs_cube/")
     data = response.json()
-    assert (
-        sorted(data["cube_elements"], key=lambda x: x["name"]) == repairs_cube_elements
-    )
+    assert data["cube_elements"] == repairs_cube_elements
 
     # Verify effects on cube after updating a node upstream from the cube
     await client_with_repairs_cube.patch(
@@ -1473,9 +1475,7 @@ FROM default.repair_order_details""",
 
     response = await client_with_repairs_cube.get("/cubes/default.repairs_cube/")
     data = response.json()
-    assert (
-        sorted(data["cube_elements"], key=lambda x: x["name"]) == repairs_cube_elements
-    )
+    assert data["cube_elements"] == repairs_cube_elements
 
 
 def assert_updated_repairs_cube(data):

datajunction_server-0.0.1a50/datajunction_server/__about__.py

@@ -1,4 +0,0 @@
-"""
-Version for Hatch
-"""
-__version__ = "0.0.1a50"