datajunction-server 0.0.1a33__tar.gz → 0.0.1a33.dev0__tar.gz

datajunction_server-0.0.1a33.dev0/.env

@@ -0,0 +1,3 @@
+QUERY_SERVICE=http://host.docker.internal:8002
+INDEX=sqlite:///dj.internal.db?check_same_thread=False
+SECRET=a-fake-secretkey

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

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

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

{datajunction_server-0.0.1a33 → datajunction_server-0.0.1a33.dev0}/datajunction_server/api/catalogs.py

@@ -9,10 +9,11 @@ from typing import List
 from fastapi import Depends, HTTPException
 from sqlmodel import Session, select
 
-from datajunction_server.api.engines import EngineInfo, get_engine
+from datajunction_server.api.engines import EngineInfo
 from datajunction_server.api.helpers import get_catalog_by_name
 from datajunction_server.errors import DJException
 from datajunction_server.internal.access.authentication.http import SecureAPIRouter
+from datajunction_server.internal.engines import get_engine
 from datajunction_server.models.catalog import Catalog, CatalogInfo
 from datajunction_server.utils import get_session, get_settings
 

{datajunction_server-0.0.1a33 → datajunction_server-0.0.1a33.dev0}/datajunction_server/api/data.py

@@ -12,7 +12,6 @@ from sse_starlette.sse import EventSourceResponse
 from datajunction_server.api.helpers import (
     assemble_column_metadata,
     build_sql_for_multiple_metrics,
-    get_engine,
     get_node_by_name,
     get_query,
     query_event_stream,
@@ -28,6 +27,7 @@ from datajunction_server.internal.access.authorization import (
     validate_access,
     validate_access_requests,
 )
+from datajunction_server.internal.engines import get_engine
 from datajunction_server.models import History, User, access
 from datajunction_server.models.history import ActivityType, EntityType
 from datajunction_server.models.metric import TranslatedSQL

{datajunction_server-0.0.1a33 → datajunction_server-0.0.1a33.dev0}/datajunction_server/api/engines.py

@@ -8,8 +8,8 @@ from typing import List
 from fastapi import Depends, HTTPException
 from sqlmodel import Session, select
 
-from datajunction_server.api.helpers import get_engine
 from datajunction_server.internal.access.authentication.http import SecureAPIRouter
+from datajunction_server.internal.engines import get_engine
 from datajunction_server.models.engine import Engine, EngineInfo
 from datajunction_server.utils import get_session, get_settings
 

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

@@ -14,8 +14,6 @@ from datetime import datetime
 from http import HTTPStatus
 from typing import Dict, List, Optional, Set, Tuple, Union
 
-from fastapi import HTTPException
-from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.operators import is_
 from sqlmodel import Session, select
@@ -24,6 +22,7 @@ from datajunction_server.construction.build import (
     build_materialized_cube_node,
     build_metric_nodes,
     build_node,
+    rename_columns,
 )
 from datajunction_server.construction.dj_query import build_dj_query
 from datajunction_server.errors import (
@@ -33,6 +32,7 @@ from datajunction_server.errors import (
     DJNodeNotFound,
     ErrorCode,
 )
+from datajunction_server.internal.engines import get_engine
 from datajunction_server.models import (
     AttributeType,
     Catalog,
@@ -230,46 +230,10 @@ def get_query(  # pylint: disable=too-many-arguments
         build_criteria=build_criteria,
         access_control=access_control,
     )
-
-    # Rename the final columns with the full qualified column name (i.e., node name + column name)
-    projection = []
-    node_columns = {col.name for col in node.current.columns}
-    for expression in query_ast.select.projection:
-        if not isinstance(expression, ast.Alias) and not isinstance(
-            expression,
-            ast.Wildcard,
-        ):
-            alias_name = expression.alias_or_name.identifier(False)  # type: ignore
-            if expression.alias_or_name.name in node_columns:  # type: ignore
-                alias_name = node.name + SEPARATOR + expression.alias_or_name.name  # type: ignore
-            projection.append(
-                ast.Alias(alias=ast.Name(amenable_name(alias_name)), child=expression),
-            )
-        else:
-            projection.append(expression)  # type: ignore
-    query_ast.select.projection = projection  # type: ignore
+    query_ast = rename_columns(query_ast, node.current)
     return query_ast
 
 
-def get_engine(session: Session, name: str, version: str) -> Engine:
-    """
-    Return an Engine instance given an engine name and version
-    """
-    statement = (
-        select(Engine)
-        .where(Engine.name == name)
-        .where(Engine.version == (version or ""))
-    )
-    try:
-        engine = session.exec(statement).one()
-    except NoResultFound as exc:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND,
-            detail=f"Engine not found: `{name}` version `{version}`",
-        ) from exc
-    return engine
-
-
 def get_downstream_nodes(
     session: Session,
     node_name: str,

{datajunction_server-0.0.1a33 → datajunction_server-0.0.1a33.dev0}/datajunction_server/api/nodes.py

@@ -839,7 +839,7 @@ def refresh_source_node(
     session: Session = Depends(get_session),
     query_service_client: QueryServiceClient = Depends(get_query_service_client),
     current_user: Optional[User] = Depends(get_current_user),
-):
+) -> NodeOutput:
     """
     Refresh a source node with the latest columns from the query service.
     """

{datajunction_server-0.0.1a33 → datajunction_server-0.0.1a33.dev0}/datajunction_server/api/sql.py

@@ -10,12 +10,13 @@ from sqlmodel import Session
 from datajunction_server.api.helpers import (
     assemble_column_metadata,
     build_sql_for_multiple_metrics,
-    get_engine,
     get_query,
     validate_orderby,
 )
+from datajunction_server.construction.build import get_measures_query
 from datajunction_server.internal.access.authentication.http import SecureAPIRouter
 from datajunction_server.internal.access.authorization import validate_access
+from datajunction_server.internal.engines import get_engine
 from datajunction_server.models import User, access
 from datajunction_server.models.metric import TranslatedSQL
 from datajunction_server.utils import get_current_user, get_session, get_settings
@@ -25,6 +26,37 @@ settings = get_settings()
 router = SecureAPIRouter(tags=["sql"])
 
 
+@router.get("/sql/measures/", response_model=TranslatedSQL, name="Get Measures SQL")
+def get_measures_sql_for_cube(
+    metrics: List[str] = Query([]),
+    dimensions: List[str] = Query([]),
+    filters: List[str] = Query([]),
+    *,
+    session: Session = Depends(get_session),
+    engine_name: Optional[str] = None,
+    engine_version: Optional[str] = None,
+    current_user: Optional[User] = Depends(get_current_user),
+    validate_access: access.ValidateAccessFn = Depends(  # pylint: disable=W0621
+        validate_access,
+    ),
+) -> TranslatedSQL:
+    """
+    Return the measures SQL for a set of metrics with dimensions and filters.
+    This SQL can be used to produce an intermediate table with all the measures
+    and dimensions needed for an analytics database (e.g., Druid).
+    """
+    return get_measures_query(
+        session=session,
+        metrics=metrics,
+        dimensions=dimensions,
+        filters=filters,
+        engine_name=engine_name,
+        engine_version=engine_version,
+        current_user=current_user,
+        validate_access=validate_access,
+    )
+
+
 @router.get(
     "/sql/{node_name}/",
     response_model=TranslatedSQL,