datajunction-server 0.0.1a55__tar.gz → 0.0.1a55.dev0__tar.gz

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

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

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

{datajunction_server-0.0.1a55 → datajunction_server-0.0.1a55.dev0}/datajunction_server/api/djsql.py

@@ -78,7 +78,7 @@ async def get_data_for_djsql(  # pylint: disable=R0914, R0913
 
 # pylint: disable=R0914, R0913
 @router.get("/djsql/stream/", response_model=QueryWithResults)
-async def get_data_stream_for_djsql(  # pragma: no cover
+async def get_data_stream_for_djsql(
     query: str,
     *,
     cache_control: Annotated[str, Header()] = "",
@@ -95,9 +95,10 @@ async def get_data_stream_for_djsql(  # pragma: no cover
     """
     Return data for a DJ SQL query using server side events
     """
-    access_control = access.AccessControl(
+    access_control = access.AccessControlStore(
         validate_access=validate_access,
         user=current_user,
+        base_verb=access.ResourceRequestVerb.EXECUTE,
     )
     translated_sql, engine, catalog = await build_sql_for_dj_query(
         session,
@@ -121,7 +122,7 @@ async def get_data_stream_for_djsql(  # pragma: no cover
         headers={"Cache-Control": cache_control},
     )
     return EventSourceResponse(
-        await query_event_stream(
+        query_event_stream(
             query=initial_query_info,
             query_service_client=query_service_client,
             columns=translated_sql.columns,  # type: ignore

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

@@ -580,6 +580,7 @@ async def find_existing_cube(
             materialized and cube.current.materializations and cube.current.availability
         ):
             return cube.current
+
     return None
 
 

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

@@ -1462,19 +1462,19 @@ def build_materialized_cube_node(
         )
         filter_asts.append(temp_select.where)
 
-    if filter_asts:
+    if filter_asts:  # pragma: no cover
         # pylint: disable=no-value-for-parameter
         combined_ast.select.where = ast.BinaryOp.And(*filter_asts)
 
     # Add orderby
-    if orderby:
+    if orderby:  # pragma: no cover
         temp_select = build_temp_select(
             f"select * order by {','.join(orderby)}",
         )
         combined_ast.select.organization = temp_select.organization
 
     # Add limit
-    if limit:
+    if limit:  # pragma: no cover
         combined_ast.select.limit = ast.Number(value=limit)
 
     # Set up FROM clause

{datajunction_server-0.0.1a55 → datajunction_server-0.0.1a55.dev0}/datajunction_server/models/materialization.py

@@ -6,16 +6,15 @@ from pydantic import AnyHttpUrl, BaseModel, validator
 
 from datajunction_server.enum import StrEnum
 from datajunction_server.errors import DJInvalidInputException
-from datajunction_server.models.column import SemanticType
 from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.partition import (
     BackfillOutput,
+    Granularity,
     PartitionColumnOutput,
     PartitionType,
 )
 from datajunction_server.models.query import ColumnMetadata
 from datajunction_server.naming import amenable_name
-from datajunction_server.sql.parsing.types import TimestampType
 
 if TYPE_CHECKING:
     from datajunction_server.database.node import NodeRevision
@@ -313,33 +312,22 @@ class DruidMeasuresCubeConfig(DruidCubeConfigInput, GenericCubeConfig):
         node_name = node_revision.name
         metrics_spec = list(self.metrics_spec().values())
 
-        # Either a temporal partition is configured or a timestamp column must exist on the cube
+        # A temporal partition should be configured on the cube, raise an error if not
         user_defined_temporal_partitions = node_revision.temporal_partition_columns()
-        timestamp_columns = [
-            col.name for col in node_revision.columns if col.type == TimestampType()
-        ]
-        if not user_defined_temporal_partitions and not timestamp_columns:
+        if not user_defined_temporal_partitions:
             raise DJInvalidInputException(  # pragma: no cover
-                "There must be at least one timestamp column or temporal partition configured"
+                "There must be at least one time-based partition configured"
                 " on this cube or it cannot be materialized to Druid.",
             )
 
-        # Select which timestamp column to use: the user-defined temporal partition
-        # if it exists or a timestamp column if it doesn't
+        # Use the user-defined temporal partition if it exists
         user_defined_temporal_partition = None
-        if user_defined_temporal_partitions:
-            user_defined_temporal_partition = user_defined_temporal_partitions[0]
-            timestamp_column = [
-                col.name
-                for col in self.columns  # type: ignore
-                if col.semantic_entity == user_defined_temporal_partition.name
-            ][0]
-        else:
-            timestamp_column = [
-                col.name
-                for col in self.columns  # type: ignore
-                if col.semantic_type == SemanticType.TIMESTAMP
-            ][0]
+        user_defined_temporal_partition = user_defined_temporal_partitions[0]
+        timestamp_column = [
+            col.name
+            for col in self.columns  # type: ignore
+            if col.semantic_entity == user_defined_temporal_partition.name
+        ][0]
 
         druid_datasource_name = (
             self.prefix  # type: ignore
@@ -373,11 +361,11 @@ class DruidMeasuresCubeConfig(DruidCubeConfigInput, GenericCubeConfig):
                 "metricsSpec": metrics_spec,
                 "granularitySpec": {
                     "type": "uniform",
-                    "segmentGranularity": (
+                    "segmentGranularity": str(
                         user_defined_temporal_partition.partition.granularity
                         if user_defined_temporal_partition
-                        else "DAY"
-                    ),
+                        else Granularity.DAY,
+                    ).upper(),
                     "intervals": [],  # this should be set at runtime
                 },
             },

{datajunction_server-0.0.1a55 → datajunction_server-0.0.1a55.dev0}/datajunction_server/sql/functions.py

@@ -3886,11 +3886,11 @@ class Sequence(Function):
 
 @Sequence.register
 def infer_type(  # type: ignore
-    start: ct.IntegerType,
-    end: ct.IntegerType,
-    step: Optional[ct.IntegerType] = None,
+    start: ct.IntegerBase,
+    end: ct.IntegerBase,
+    step: Optional[ct.IntegerBase] = None,
 ) -> ct.ListType:
-    return ct.ListType(element_type=ct.IntegerType())
+    return ct.ListType(element_type=start.type)
 
 
 @Sequence.register

datajunction_server-0.0.1a55.dev0/tests/api/access_test.py

@@ -0,0 +1,39 @@
+"""
+Tests for the data API.
+"""
+import pytest
+
+from datajunction_server.api.main import app
+from datajunction_server.internal.access.authorization import validate_access
+from datajunction_server.models import access
+
+
+class TestDataAccessControl:  # pylint: disable=too-few-public-methods
+    """
+    Test the data access control.
+    """
+
+    @pytest.mark.asyncio
+    async def test_get_metric_data_unauthorized(
+        self,
+        module__client_with_basic,
+    ) -> None:
+        """
+        Test retrieving data for a metric
+        """
+
+        def validate_access_override():
+            def _validate_access(access_control: access.AccessControl):
+                access_control.deny_all()
+
+            return _validate_access
+
+        app.dependency_overrides[validate_access] = validate_access_override
+        response = await module__client_with_basic.get("/data/basic.num_comments/")
+        data = response.json()
+        assert data["message"] == (
+            "Authorization of User `dj` for this request failed."
+            "\nThe following requests were denied:\nread:node/basic.num_comments."
+        )
+        assert response.status_code == 403
+        app.dependency_overrides.clear()

{datajunction_server-0.0.1a55 → datajunction_server-0.0.1a55.dev0}/tests/api/catalog_test.py

@@ -7,30 +7,30 @@ from httpx import AsyncClient
 
 @pytest.mark.asyncio
 async def test_catalog_adding_a_new_catalog(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test adding a catalog
     """
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "dev",
+            "name": "dev-1",
         },
     )
     data = response.json()
     assert response.status_code == 201
-    assert data == {"name": "dev", "engines": []}
+    assert data == {"name": "dev-1", "engines": []}
 
 
 @pytest.mark.asyncio
 async def test_catalog_list(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test listing catalogs
     """
-    response = await client.post(
+    response = await module__client.post(
         "/engines/",
         json={
             "name": "spark",
@@ -40,10 +40,10 @@ async def test_catalog_list(
     )
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "dev",
+            "name": "cat-dev",
             "engines": [
                 {
                     "name": "spark",
@@ -55,29 +55,31 @@ async def test_catalog_list(
     )
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "test",
+            "name": "cat-test",
         },
     )
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "prod",
+            "name": "cat-prod",
         },
     )
     assert response.status_code == 201
 
-    response = await client.get("/catalogs/")
+    response = await module__client.get("/catalogs/")
     assert response.status_code == 200
-    assert sorted(response.json(), key=lambda v: v["name"]) == sorted(
+    filtered_response = [
+        cat for cat in response.json() if cat["name"].startswith("cat-")
+    ]
+    assert sorted(filtered_response, key=lambda v: v["name"]) == sorted(
         [
-            {"name": "unknown", "engines": []},
             {
-                "name": "dev",
+                "name": "cat-dev",
                 "engines": [
                     {
                         "name": "spark",
@@ -87,8 +89,8 @@ async def test_catalog_list(
                     },
                 ],
             },
-            {"name": "test", "engines": []},
-            {"name": "prod", "engines": []},
+            {"name": "cat-test", "engines": []},
+            {"name": "cat-prod", "engines": []},
         ],
         key=lambda v: v["name"],  # type: ignore
     )
@@ -96,28 +98,28 @@ async def test_catalog_list(
 
 @pytest.mark.asyncio
 async def test_catalog_get_catalog(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test getting a catalog
     """
-    response = await client.post(
+    response = await module__client.post(
         "/engines/",
         json={
-            "name": "spark",
+            "name": "one-spark",
             "version": "3.3.1",
             "dialect": "spark",
         },
     )
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "dev",
+            "name": "one-dev",
             "engines": [
                 {
-                    "name": "spark",
+                    "name": "one-spark",
                     "version": "3.3.1",
                     "dialect": "spark",
                 },
@@ -126,30 +128,30 @@ async def test_catalog_get_catalog(
     )
     assert response.status_code == 201
 
-    response = await client.get(
-        "/catalogs/dev",
+    response = await module__client.get(
+        "/catalogs/one-dev",
     )
     assert response.status_code == 200
     data = response.json()
     assert data == {
-        "name": "dev",
+        "name": "one-dev",
         "engines": [
-            {"name": "spark", "uri": None, "version": "3.3.1", "dialect": "spark"},
+            {"name": "one-spark", "uri": None, "version": "3.3.1", "dialect": "spark"},
         ],
     }
 
 
 @pytest.mark.asyncio
 async def test_catalog_adding_a_new_catalog_with_engines(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test adding a catalog with engines
     """
-    response = await client.post(
+    response = await module__client.post(
         "/engines/",
         json={
-            "name": "spark",
+            "name": "two-spark",
             "uri": None,
             "version": "3.3.1",
             "dialect": "spark",
@@ -158,13 +160,13 @@ async def test_catalog_adding_a_new_catalog_with_engines(
     data = response.json()
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "dev",
+            "name": "two-dev",
             "engines": [
                 {
-                    "name": "spark",
+                    "name": "two-spark",
                     "version": "3.3.1",
                     "dialect": "spark",
                 },
@@ -174,10 +176,10 @@ async def test_catalog_adding_a_new_catalog_with_engines(
     data = response.json()
     assert response.status_code == 201
     assert data == {
-        "name": "dev",
+        "name": "two-dev",
         "engines": [
             {
-                "name": "spark",
+                "name": "two-spark",
                 "uri": None,
                 "version": "3.3.1",
                 "dialect": "spark",
@@ -188,15 +190,15 @@ async def test_catalog_adding_a_new_catalog_with_engines(
 
 @pytest.mark.asyncio
 async def test_catalog_adding_a_new_catalog_then_attaching_engines(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test adding a catalog then attaching a catalog
     """
-    response = await client.post(
+    response = await module__client.post(
         "/engines/",
         json={
-            "name": "spark",
+            "name": "spark-3",
             "uri": None,
             "version": "3.3.1",
             "dialect": "spark",
@@ -205,32 +207,32 @@ async def test_catalog_adding_a_new_catalog_then_attaching_engines(
     data = response.json()
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "dev",
+            "name": "dev-3",
         },
     )
     assert response.status_code == 201
 
-    await client.post(
-        "/catalogs/dev/engines/",
+    await module__client.post(
+        "/catalogs/dev-3/engines/",
         json=[
             {
-                "name": "spark",
+                "name": "spark-3",
                 "version": "3.3.1",
                 "dialect": "spark",
             },
         ],
     )
 
-    response = await client.get("/catalogs/dev/")
+    response = await module__client.get("/catalogs/dev-3/")
     data = response.json()
     assert data == {
-        "name": "dev",
+        "name": "dev-3",
         "engines": [
             {
-                "name": "spark",
+                "name": "spark-3",
                 "uri": None,
                 "version": "3.3.1",
                 "dialect": "spark",
@@ -241,15 +243,15 @@ async def test_catalog_adding_a_new_catalog_then_attaching_engines(
 
 @pytest.mark.asyncio
 async def test_catalog_adding_without_duplicating(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test adding a catalog and having existing catalogs not re-added
     """
-    response = await client.post(
+    response = await module__client.post(
         "/engines/",
         json={
-            "name": "spark",
+            "name": "spark-4",
             "uri": None,
             "version": "2.4.4",
             "dialect": "spark",
@@ -258,10 +260,10 @@ async def test_catalog_adding_without_duplicating(
     data = response.json()
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/engines/",
         json={
-            "name": "spark",
+            "name": "spark-4",
             "version": "3.3.0",
             "dialect": "spark",
         },
@@ -269,10 +271,10 @@ async def test_catalog_adding_without_duplicating(
     data = response.json()
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/engines/",
         json={
-            "name": "spark",
+            "name": "spark-4",
             "version": "3.3.1",
             "dialect": "spark",
         },
@@ -280,30 +282,30 @@ async def test_catalog_adding_without_duplicating(
     data = response.json()
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
-            "name": "dev",
+            "name": "dev-4",
             "dialect": "spark",
         },
     )
     assert response.status_code == 201
 
-    response = await client.post(
-        "/catalogs/dev/engines/",
+    response = await module__client.post(
+        "/catalogs/dev-4/engines/",
         json=[
             {
-                "name": "spark",
+                "name": "spark-4",
                 "version": "2.4.4",
                 "dialect": "spark",
             },
             {
-                "name": "spark",
+                "name": "spark-4",
                 "version": "3.3.0",
                 "dialect": "spark",
             },
             {
-                "name": "spark",
+                "name": "spark-4",
                 "version": "3.3.1",
                 "dialect": "spark",
             },
@@ -311,21 +313,21 @@ async def test_catalog_adding_without_duplicating(
     )
     assert response.status_code == 201
 
-    response = await client.post(
-        "/catalogs/dev/engines/",
+    response = await module__client.post(
+        "/catalogs/dev-4/engines/",
         json=[
             {
-                "name": "spark",
+                "name": "spark-4",
                 "version": "2.4.4",
                 "dialect": "spark",
             },
             {
-                "name": "spark",
+                "name": "spark-4",
                 "version": "3.3.0",
                 "dialect": "spark",
             },
             {
-                "name": "spark",
+                "name": "spark-4",
                 "version": "3.3.1",
                 "dialect": "spark",
             },
@@ -334,22 +336,22 @@ async def test_catalog_adding_without_duplicating(
     assert response.status_code == 201
     data = response.json()
     assert data == {
-        "name": "dev",
+        "name": "dev-4",
         "engines": [
             {
-                "name": "spark",
+                "name": "spark-4",
                 "uri": None,
                 "version": "2.4.4",
                 "dialect": "spark",
             },
             {
-                "name": "spark",
+                "name": "spark-4",
                 "uri": None,
                 "version": "3.3.0",
                 "dialect": "spark",
             },
             {
-                "name": "spark",
+                "name": "spark-4",
                 "uri": None,
                 "version": "3.3.1",
                 "dialect": "spark",
@@ -360,12 +362,12 @@ async def test_catalog_adding_without_duplicating(
 
 @pytest.mark.asyncio
 async def test_catalog_raise_on_adding_a_new_catalog_with_nonexistent_engines(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test raising an error when adding a catalog with engines that do not exist
     """
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
             "name": "dev",
@@ -385,12 +387,12 @@ async def test_catalog_raise_on_adding_a_new_catalog_with_nonexistent_engines(
 
 @pytest.mark.asyncio
 async def test_catalog_raise_on_catalog_already_exists(
-    client: AsyncClient,
+    module__client: AsyncClient,
 ) -> None:
     """
     Test raise on catalog already exists
     """
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
             "name": "dev",
@@ -398,7 +400,7 @@ async def test_catalog_raise_on_catalog_already_exists(
     )
     assert response.status_code == 201
 
-    response = await client.post(
+    response = await module__client.post(
         "/catalogs/",
         json={
             "name": "dev",