datajunction-server 0.0.1a36__tar.gz → 0.0.1a37.dev0__tar.gz

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datajunction-server
-Version: 0.0.1a36
+Version: 0.0.1a37.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.1a37.dev0/alembic/versions/2023_11_21_1611-d1a8716cf2d2_add_materialization_strategy_and_job_.py

@@ -0,0 +1,69 @@
+"""Add materialization strategy and job type
+
+Revision ID: d1a8716cf2d2
+Revises: 87cf9c00ac00
+Create Date: 2023-11-21 16:11:01.741721+00:00
+
+"""
+# pylint: disable=no-member, invalid-name, missing-function-docstring, unused-import, no-name-in-module
+
+import sqlalchemy as sa
+import sqlmodel
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "d1a8716cf2d2"
+down_revision = "87cf9c00ac00"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("materialization", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "strategy",
+                sa.Enum(
+                    "FULL",
+                    "SNAPSHOT",
+                    "INCREMENTAL_TIME",
+                    "VIEW",
+                    name="materializationstrategy",
+                ),
+                nullable=True,
+            ),
+        )
+        batch_op.drop_constraint("node_revision_engine_uniq", type_="unique")
+        batch_op.create_unique_constraint(
+            "name_node_revision_uniq",
+            ["name", "node_revision_id"],
+        )
+        batch_op.drop_constraint(
+            "fk_materialization_engine_id_engine",
+            type_="foreignkey",
+        )
+        batch_op.drop_column("engine_id")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("materialization", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("engine_id", sa.INTEGER(), nullable=False))
+        batch_op.create_foreign_key(
+            "fk_materialization_engine_id_engine",
+            "engine",
+            ["engine_id"],
+            ["id"],
+        )
+        batch_op.drop_constraint("name_node_revision_uniq", type_="unique")
+        batch_op.create_unique_constraint(
+            "node_revision_engine_uniq",
+            ["name", "node_revision_id", "engine_id"],
+        )
+        batch_op.drop_column("strategy")
+
+    # ### end Alembic commands ###

datajunction_server-0.0.1a37.dev0/curl-format.txt

@@ -0,0 +1,9 @@
+     time_namelookup:  %{time_namelookup}s\n
+        time_connect:  %{time_connect}s\n
+     time_appconnect:  %{time_appconnect}s\n
+    time_pretransfer:  %{time_pretransfer}s\n
+       time_redirect:  %{time_redirect}s\n
+  time_starttransfer:  %{time_starttransfer}s\n
+                     ----------\n
+          time_total:  %{time_total}s\n
+

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

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

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/attributes.py

@@ -15,7 +15,7 @@ from datajunction_server.models.attribute import (
     AttributeType,
     MutableAttributeTypeFields,
 )
-from datajunction_server.models.node import NodeType
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.utils import get_session, get_settings
 
 _logger = logging.getLogger(__name__)

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/client.py

@@ -10,7 +10,8 @@ from sqlmodel import Session
 
 from datajunction_server.api.helpers import get_node_by_name
 from datajunction_server.internal.access.authentication.http import SecureAPIRouter
-from datajunction_server.models.node import NodeType
+from datajunction_server.models.materialization import MaterializationJobTypeEnum
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.utils import get_session, get_settings
 
 _logger = logging.getLogger(__name__)
@@ -125,10 +126,8 @@ def client_code_for_adding_materialization(
     "{node.name}"
 )
 materialization = MaterializationConfig(
-    engine=Engine(
-        name="{materialization.engine.name}",
-        version="{materialization.engine.version}",
-    ),
+    job="{MaterializationJobTypeEnum.find_match(materialization.job).name.lower()}",
+    strategy="{materialization.strategy}",
     schedule="{materialization.schedule}",
     config={with_b.strip()},
 )

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/cubes.py

@@ -18,7 +18,7 @@ from datajunction_server.models.cube import (
     DimensionValues,
 )
 from datajunction_server.models.metric import TranslatedSQL
-from datajunction_server.models.node import NodeType
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.query import QueryCreate
 from datajunction_server.service_clients import QueryServiceClient
 from datajunction_server.utils import (

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

@@ -31,11 +31,8 @@ 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
-from datajunction_server.models.node import (
-    AvailabilityState,
-    AvailabilityStateBase,
-    NodeType,
-)
+from datajunction_server.models.node import AvailabilityState, AvailabilityStateBase
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.query import QueryCreate, QueryWithResults
 from datajunction_server.service_clients import QueryServiceClient
 from datajunction_server.utils import (

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/dimensions.py

@@ -16,7 +16,8 @@ from datajunction_server.internal.access.authorization import (
     validate_access_requests,
 )
 from datajunction_server.models import User, access
-from datajunction_server.models.node import NodeRevisionOutput, NodeType
+from datajunction_server.models.node import NodeRevisionOutput
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.sql.dag import (
     get_nodes_with_common_dimensions,
     get_nodes_with_dimension,

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/health.py

@@ -2,13 +2,13 @@
 Application healthchecks.
 """
 
-import enum
 from typing import List
 
 from fastapi import APIRouter, Depends
 from sqlalchemy import select
 from sqlmodel import Session, SQLModel
 
+from datajunction_server.enum import StrEnum
 from datajunction_server.utils import get_session, get_settings
 
 settings = get_settings()
@@ -16,7 +16,7 @@ settings = get_settings()
 router = APIRouter(tags=["health"])
 
 
-class HealthcheckStatus(str, enum.Enum):
+class HealthcheckStatus(StrEnum):
     """
     Possible health statuses.
     """

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

@@ -61,8 +61,8 @@ from datajunction_server.models.node import (
     NodeRevision,
     NodeRevisionBase,
     NodeStatus,
-    NodeType,
 )
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.query import ColumnMetadata, QueryWithResults
 from datajunction_server.service_clients import QueryServiceClient
 from datajunction_server.sql.dag import get_nodes_with_dimension
@@ -953,9 +953,11 @@ async def query_event_stream(  # pylint: disable=too-many-arguments
             break
 
         # Check the current state of the query
-        query_next = query_service_client.get_query(query_id=query_id)  # type: ignore
-        if query_next.state in END_JOB_STATES:
-            _logger.info(
+        query_next = query_service_client.get_query(  # type: ignore # pragma: no cover
+            query_id=query_id,
+        )
+        if query_next.state in END_JOB_STATES:  # pragma: no cover
+            _logger.info(  # pragma: no cover
                 "query end state detected (%s), sending final event to the client",
                 query_next.state,
             )

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/main.py

@@ -79,6 +79,7 @@ app = FastAPI(
     },
     dependencies=dependencies,
 )
+
 app.add_middleware(
     CORSMiddleware,
     allow_origins=settings.cors_origin_whitelist,

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/materializations.py

@@ -21,13 +21,16 @@ from datajunction_server.internal.materializations import (
 )
 from datajunction_server.materialization.jobs import MaterializationJob
 from datajunction_server.models import access
+from datajunction_server.models.base import labelize
 from datajunction_server.models.history import ActivityType, EntityType, History
 from datajunction_server.models.materialization import (
     MaterializationConfigInfoUnified,
     MaterializationInfo,
+    MaterializationJobTypeEnum,
+    MaterializationStrategy,
     UpsertMaterialization,
 )
-from datajunction_server.models.node import NodeType
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.partition import Backfill, PartitionBackfill
 from datajunction_server.models.user import User
 from datajunction_server.service_clients import QueryServiceClient
@@ -44,6 +47,27 @@ settings = get_settings()
 router = SecureAPIRouter(tags=["materializations"])
 
 
+@router.get(
+    "/materialization/info",
+    status_code=200,
+    name="Materialization Jobs Info",
+)
+def materialization_jobs_info() -> JSONResponse:
+    """
+    Materialization job types and strategies
+    """
+    return JSONResponse(
+        status_code=200,
+        content={
+            "job_types": [value.value.dict() for value in MaterializationJobTypeEnum],
+            "strategies": [
+                {"name": value, "label": labelize(value)}
+                for value in MaterializationStrategy
+            ],
+        },
+    )
+
+
 @router.post(
     "/nodes/{node_name}/materialization/",
     status_code=201,
@@ -73,6 +97,14 @@ def upsert_materialization(  # pylint: disable=too-many-locals
     current_revision = node.current
     old_materializations = {mat.name: mat for mat in current_revision.materializations}
 
+    if data.strategy == MaterializationStrategy.INCREMENTAL_TIME:
+        if not node.current.temporal_partition_columns():
+            raise DJException(  # pragma: no cover
+                http_status_code=HTTPStatus.BAD_REQUEST,
+                message="Cannot create materialization with strategy "
+                f"`{data.strategy}` without specifying a time partition column!",
+            )
+
     # Create a new materialization
     new_materialization = create_new_materialization(
         session,
@@ -204,9 +236,10 @@ def list_node_materializations(
                 node.current.version,  # type: ignore
                 materialization.name,  # type: ignore
             )
+            if materialization.strategy != MaterializationStrategy.INCREMENTAL_TIME:
+                info.urls = [info.urls[0]]
             materialization = MaterializationConfigInfoUnified(
                 **materialization.dict(),
-                **{"engine": materialization.engine.dict()},
                 **info.dict(),
                 backfills=materialization.backfills,
             )

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/metrics.py

@@ -6,7 +6,6 @@ from http import HTTPStatus
 from typing import List, Optional
 
 from fastapi import Depends, HTTPException, Query
-from sqlalchemy.exc import NoResultFound
 from sqlalchemy.sql.operators import is_
 from sqlmodel import Session, select
 
@@ -23,8 +22,8 @@ from datajunction_server.models.node import (
     MetricMetadataOptions,
     MetricUnit,
     Node,
-    NodeType,
 )
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.sql.dag import get_shared_dimensions
 from datajunction_server.utils import get_current_user, get_session, get_settings
 
@@ -103,31 +102,28 @@ async def get_common_dimensions(
     """
     Return common dimensions for a set of metrics.
     """
-    metric_nodes = []
     errors = []
-    for node_name in metric:
-        statement = (
-            select(Node)
-            .where(Node.name == node_name)
-            .where(is_(Node.deactivated_at, None))
-        )
-        try:
-            node = session.exec(statement).one()
-            if node.type != NodeType.METRIC:
-                errors.append(
-                    DJError(
-                        message=f"Not a metric node: {node_name}",
-                        code=ErrorCode.NODE_TYPE_ERROR,
-                    ),
-                )
-            metric_nodes.append(node)
-        except NoResultFound:
+    statement = (
+        select(Node)
+        .where(Node.name.in_(metric))  # type: ignore  # pylint: disable=no-member
+        .where(is_(Node.deactivated_at, None))
+    )
+    metric_nodes = session.exec(statement).all()
+    for node in metric_nodes:
+        if node.type != NodeType.METRIC:
             errors.append(
                 DJError(
-                    message=f"Metric node not found: {node_name}",
-                    code=ErrorCode.UNKNOWN_NODE,
+                    message=f"Not a metric node: {node.name}",
+                    code=ErrorCode.NODE_TYPE_ERROR,
                 ),
             )
+    if not metric_nodes:
+        errors.append(
+            DJError(
+                message=f"Metric nodes not found: {','.join(metric)}",
+                code=ErrorCode.UNKNOWN_NODE,
+            ),
+        )
 
     if errors:
         raise DJException(errors=errors)

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/namespaces.py

@@ -37,8 +37,8 @@ from datajunction_server.models.node import (
     Node,
     NodeMinimumDetail,
     NodeNamespace,
-    NodeType,
 )
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.utils import get_current_user, get_session, get_settings
 
 _logger = logging.getLogger(__name__)

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

@@ -74,10 +74,10 @@ from datajunction_server.models.node import (
     NodeRevisionBase,
     NodeRevisionOutput,
     NodeStatus,
-    NodeType,
     NodeValidation,
     UpdateNode,
 )
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.partition import (
     Granularity,
     Partition,

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/api/tags.py

@@ -12,7 +12,8 @@ from datajunction_server.errors import DJDoesNotExistException, DJException
 from datajunction_server.internal.access.authentication.http import SecureAPIRouter
 from datajunction_server.models import History, User
 from datajunction_server.models.history import ActivityType, EntityType
-from datajunction_server.models.node import NodeMinimumDetail, NodeType
+from datajunction_server.models.node import NodeMinimumDetail
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.tag import CreateTag, Tag, TagOutput, UpdateTag
 from datajunction_server.utils import get_current_user, get_session, get_settings
 

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

@@ -17,7 +17,8 @@ from datajunction_server.models.column import Column, SemanticType
 from datajunction_server.models.engine import Dialect
 from datajunction_server.models.materialization import GenericCubeConfig
 from datajunction_server.models.metric import TranslatedSQL
-from datajunction_server.models.node import BuildCriteria, Node, NodeRevision, NodeType
+from datajunction_server.models.node import BuildCriteria, Node, NodeRevision
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.sql.dag import get_shared_dimensions
 from datajunction_server.sql.parsing.ast import CompileContext
 from datajunction_server.sql.parsing.backends.antlr4 import ast, parse
@@ -583,7 +584,14 @@ def _get_node_table(
             )
         else:
             name = to_namespaced_name(node.name)
-        table = ast.Table(name, _dj_node=node)
+        table = ast.Table(
+            name,
+            _columns=[
+                ast.Column(name=ast.Name(col.name), _type=col.type)
+                for col in node.columns
+            ],
+            _dj_node=node,
+        )
     elif node.availability and node.availability.is_available(
         criteria=build_criteria,
     ):  # pragma: no cover
@@ -596,11 +604,15 @@ def _get_node_table(
                     else None
                 ),
             ),
+            _columns=[
+                ast.Column(name=ast.Name(col.name), _type=col.type)
+                for col in node.columns
+            ],
             _dj_node=node,
         )
     if table and as_select:  # pragma: no cover
         return ast.Select(
-            projection=[ast.Wildcard()],
+            projection=table.columns,  # type: ignore
             from_=ast.From(relations=[ast.Relation(table)]),
         )
     return table
@@ -736,7 +748,10 @@ def rename_columns(built_ast: ast.Query, node: NodeRevision):
             projection.append(expression)
         else:
             expression = expression.copy()
-            if isinstance(expression, ast.Aliasable) and not isinstance(
+            if isinstance(
+                expression,
+                ast.Aliasable,
+            ) and not isinstance(  # pragma: no cover
                 expression,
                 ast.Wildcard,
             ):

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/construction/dj_query.py

@@ -7,7 +7,8 @@ from sqlmodel import Session
 
 from datajunction_server.construction.build import build_metric_nodes, build_node
 from datajunction_server.construction.utils import try_get_dj_node
-from datajunction_server.models.node import Node, NodeType
+from datajunction_server.models.node import Node
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.sql.parsing import ast
 from datajunction_server.sql.parsing.backends.antlr4 import parse
 from datajunction_server.utils import amenable_name

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/construction/utils.py

@@ -8,7 +8,8 @@ from sqlalchemy.orm.exc import NoResultFound
 from sqlmodel import Session, select
 
 from datajunction_server.errors import DJError, DJErrorException, ErrorCode
-from datajunction_server.models.node import Node, NodeRevision, NodeType
+from datajunction_server.models.node import Node, NodeRevision
+from datajunction_server.models.node_type import NodeType
 
 if TYPE_CHECKING:
     from datajunction_server.sql.parsing.ast import Column, Name

datajunction_server-0.0.1a37.dev0/datajunction_server/enum.py

@@ -0,0 +1,21 @@
+"""
+Backwards-compatible StrEnum for both Python >= and < 3.11
+"""
+import enum
+import sys
+
+if sys.version_info >= (3, 11):
+    from enum import (  # noqa  # pylint: disable=unused-import  # pragma: no cover
+        IntEnum,
+        StrEnum,
+    )
+else:
+
+    class StrEnum(str, enum.Enum):  # pragma: no cover
+        """Backwards compatible StrEnum for Python < 3.11"""  # pragma: no cover
+
+        def __str__(self):
+            return str(self.value)
+
+    class IntEnum(int, enum.Enum):  # pragma: no cover
+        """Backwards compatible IntEnum for Python < 3.11"""  # pragma: no cover

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/errors.py

@@ -2,13 +2,14 @@
 Errors and warnings.
 """
 
-from enum import Enum
 from typing import Any, Dict, List, Literal, Optional, TypedDict
 
 from sqlmodel import SQLModel
 
+from datajunction_server.enum import IntEnum
 
-class ErrorCode(int, Enum):
+
+class ErrorCode(IntEnum):
     """
     Error codes.
     """

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/internal/materializations.py

@@ -7,16 +7,9 @@ from sqlmodel import Session
 
 from datajunction_server.construction.build import build_node, get_measures_query
 from datajunction_server.errors import DJException, DJInvalidInputException
-from datajunction_server.internal.engines import get_engine
-from datajunction_server.materialization.jobs import (
-    DruidCubeMaterializationJob,
-    MaterializationJob,
-    SparkSqlMaterializationJob,
-    TrinoMaterializationJob,
-)
-from datajunction_server.models import Engine, NodeRevision, access
+from datajunction_server.materialization.jobs import MaterializationJob
+from datajunction_server.models import NodeRevision, access
 from datajunction_server.models.column import SemanticType
-from datajunction_server.models.engine import Dialect
 from datajunction_server.models.materialization import (
     DruidCubeConfig,
     GenericMaterializationConfig,
@@ -27,7 +20,7 @@ from datajunction_server.models.materialization import (
     UpsertMaterialization,
 )
 from datajunction_server.models.metric import TranslatedSQL
-from datajunction_server.models.node import NodeType
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.models.query import ColumnMetadata
 from datajunction_server.service_clients import QueryServiceClient
 from datajunction_server.sql.parsing import ast
@@ -38,24 +31,6 @@ from datajunction_server.utils import SEPARATOR
 MAX_COLUMN_NAME_LENGTH = 128
 
 
-def materialization_job_from_engine(engine: Engine) -> MaterializationJob:
-    """
-    Finds the appropriate materialization job based on the choice of engine.
-    """
-    engine_to_job_mapping = {
-        Dialect.SPARK: SparkSqlMaterializationJob,
-        Dialect.TRINO: TrinoMaterializationJob,
-        Dialect.DRUID: DruidCubeMaterializationJob,
-        None: SparkSqlMaterializationJob,
-    }
-    if engine.dialect not in engine_to_job_mapping:
-        raise DJInvalidInputException(  # pragma: no cover
-            f"The engine used for materialization ({engine.name}) "
-            "must have a dialect configured.",
-        )
-    return engine_to_job_mapping[engine.dialect]  # type: ignore
-
-
 def rewrite_metrics_expressions(
     session: Session,
     current_revision: NodeRevision,
@@ -111,7 +86,6 @@ def rewrite_metrics_expressions(
 def build_cube_materialization_config(
     session: Session,
     current_revision: NodeRevision,
-    engine: Engine,
     upsert: UpsertMaterialization,
     validate_access: access.ValidateAccessFn,
 ) -> DruidCubeConfig:
@@ -157,9 +131,9 @@ def build_cube_materialization_config(
         raise DJInvalidInputException(  # pragma: no cover
             message=(
                 "No change has been made to the materialization config for "
-                f"node `{current_revision.name}` and engine `{engine.name}` as"
+                f"node `{current_revision.name}` and job `{upsert.job.name}` as"
                 " the config does not have valid configuration for "
-                f"engine `{engine.name}`."
+                f"engine `{upsert.job.name}`."
             ),
         ) from exc
 
@@ -179,6 +153,7 @@ def build_non_cube_materialization_config(
         orderby=[],
     )
     generic_config = GenericMaterializationConfig(
+        lookback_window=upsert.config.lookback_window,
         query=str(materialization_ast),
         spark=upsert.config.spark if upsert.config.spark else {},
         upstream_tables=[
@@ -203,7 +178,6 @@ def create_new_materialization(
     Create a new materialization based on the input values.
     """
     generic_config = None
-    engine = get_engine(session, upsert.engine.name, upsert.engine.version)
     temporal_partition = current_revision.temporal_partition_columns()
     if current_revision.type in (
         NodeType.DIMENSION,
@@ -225,22 +199,20 @@ def create_new_materialization(
         generic_config = build_cube_materialization_config(
             session,
             current_revision,
-            engine,
             upsert,
             validate_access,
         )
     materialization_name = (
-        f"{temporal_partition[0].name}_{engine.name}"
-        if temporal_partition
-        else engine.name
+        f"{upsert.job.name.lower()}__{upsert.strategy.name.lower()}"
+        + (f"__{temporal_partition[0].name}" if temporal_partition else "")
     )
     return Materialization(
         name=materialization_name,
         node_revision=current_revision,
-        engine=engine,
         config=generic_config,
         schedule=upsert.schedule or "@daily",
-        job=materialization_job_from_engine(engine).__name__,  # type: ignore
+        strategy=upsert.strategy,
+        job=upsert.job.value.job_class,  # type: ignore
     )
 
 

{datajunction_server-0.0.1a36 → datajunction_server-0.0.1a37.dev0}/datajunction_server/internal/namespaces.py

@@ -18,7 +18,8 @@ from datajunction_server.errors import (
 from datajunction_server.models import History, User
 from datajunction_server.models.cube import CubeRevisionMetadata
 from datajunction_server.models.history import ActivityType, EntityType
-from datajunction_server.models.node import Node, NodeNamespace, NodeRevision, NodeType
+from datajunction_server.models.node import Node, NodeNamespace, NodeRevision
+from datajunction_server.models.node_type import NodeType
 from datajunction_server.typing import UTCDatetime
 from datajunction_server.utils import SEPARATOR