datajunction-server 0.0.2.dev2__py3-none-any.whl → 0.0.2.dev4__py3-none-any.whl

datajunction_server/__about__.py

@@ -2,4 +2,4 @@
 Version for Hatch
 """
 
-__version__ = "0.0.2.dev2"
+__version__ = "0.0.2.dev4"

datajunction_server/alembic/versions/2025_09_16_1513-b55add7e1ebc_add_cascade_delete_on_tag_node_and_.py

@@ -1,8 +1,7 @@
 """
 Add cascade delete on tag-node and column-attr foreign keys
-
 Revision ID: b55add7e1ebc
-Revises: b6398ba852b3
+Revises: 759c4d50cb8d
 Create Date: 2025-09-16 15:13:39.963297+00:00
 """
 # pylint: disable=no-member, invalid-name, missing-function-docstring, unused-import, no-name-in-module
@@ -11,7 +10,7 @@ from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "b55add7e1ebc"
-down_revision = "b6398ba852b3"
+down_revision = "759c4d50cb8d"
 branch_labels = None
 depends_on = None
 

datajunction_server/alembic/versions/{2025_09_12_2107-b6398ba852b3_deployments.py → 2025_09_17_2107-b6398ba852b3_deployments.py}

@@ -2,7 +2,7 @@
 Deployments
 
 Revision ID: b6398ba852b3
-Revises: 5b00137c69f9
+Revises: b55add7e1ebc
 Create Date: 2025-09-12 00:07:30.531304+00:00
 """
 # pylint: disable=no-member, invalid-name, missing-function-docstring, unused-import, no-name-in-module
@@ -13,7 +13,7 @@ import sqlalchemy_utils
 
 # revision identifiers, used by Alembic.
 revision = "b6398ba852b3"
-down_revision = "759c4d50cb8d"
+down_revision = "b55add7e1ebc"
 branch_labels = None
 depends_on = None
 

datajunction_server/api/namespaces.py

@@ -403,8 +403,7 @@ async def export_namespace_spec(
     session: AsyncSession = Depends(get_session),
 ) -> DeploymentSpec:
     """
-    Generates a zip of YAML files for the contents of the given namespace
-    as well as a project definition file.
+    Generates a deployment spec for a namespace
     """
     nodes = await NodeNamespace.list_all_nodes(
         session,

datajunction_server/database/node.py

@@ -438,6 +438,15 @@ class Node(Base):
         node_spec_cls = node_spec_class_map[self.type]
         return node_spec_cls(**base_kwargs, **extra_kwargs)
 
+    @classmethod
+    def default_load_options(cls) -> List[ExecutableOption]:
+        return [
+            joinedload(Node.current).options(*NodeRevision.default_load_options()),
+            selectinload(Node.tags),
+            selectinload(Node.created_by),
+            selectinload(Node.owners),
+        ]
+
     @classmethod
     def cube_load_options(cls) -> List[ExecutableOption]:
         return [

datajunction_server/internal/deployment.py

@@ -10,7 +10,10 @@ from datajunction_server.database import Node
 from datajunction_server.models import access
 from sqlalchemy.ext.asyncio import AsyncSession
 from datajunction_server.api.tags import get_tags_by_name
+from datajunction_server.models.base import labelize
 
+from datajunction_server.database.partition import Partition
+from datajunction_server.database.namespace import NodeNamespace
 from datajunction_server.models.attribute import AttributeTypeIdentifier
 from datajunction_server.models.deployment import (
     CubeSpec,
@@ -139,9 +142,38 @@ async def deploy(
     deployed_results: list[DeploymentResult] = []
 
     async with session_context(request) as session:
-        existing = await find_existing_nodes(session, deployment.nodes)
-        to_deploy, to_skip = filter_nodes_to_deploy(deployment.nodes, existing)
-    deployed_results.extend(to_skip)
+        current_user = cast(User, await User.get_by_username(session, current_username))
+        await create_deployment_namespaces(
+            deployment,
+            session,
+            current_user,
+            save_history,
+        )
+
+        # async with session_context(request) as session:
+        all_nodes = await NodeNamespace.list_all_nodes(
+            session,
+            deployment.namespace,
+            options=Node.cube_load_options(),
+        )
+        existing = {node.name: await node.to_spec(session) for node in all_nodes}
+        to_deploy, to_skip, to_delete = filter_nodes_to_deploy(
+            deployment.nodes,
+            existing,
+        )
+
+    deployed_results.extend(
+        [
+            DeploymentResult(
+                name=node_spec.rendered_name,
+                deploy_type=DeploymentResult.Type.NODE,
+                status=DeploymentResult.Status.SKIPPED,
+                operation=DeploymentResult.Operation.NOOP,
+                message=f"Node {node_spec.rendered_name} is unchanged.",
+            )
+            for node_spec in to_skip
+        ],
+    )
     if not to_deploy:
         logger.info(
             "No changes detected, skipping deployment. Total elapsed: %.3fs",
@@ -155,15 +187,6 @@ async def deploy(
         len(to_skip),
     )
 
-    async with session_context(request) as session:
-        current_user = cast(User, await User.get_by_username(session, current_username))
-        await create_deployment_namespaces(
-            deployment,
-            session,
-            current_user,
-            save_history,
-        )
-
     node_graph = extract_node_graph(
         [node for node in to_deploy if not isinstance(node, CubeSpec)],
     )
@@ -232,6 +255,9 @@ async def deploy(
         DeploymentStatus.RUNNING,
         deployed_results,
     )
+    logger.info("Starting deletion of %d nodes", len(to_delete))
+    # for node in to_delete:
+    #     await deactivate_node(session, node.name, current_user, save_history)
     logger.info("Finished deploying namespace %s", deployment.namespace)
     return deployed_results
 
@@ -248,7 +274,15 @@ async def create_deployment_namespaces(
         if SEPARATOR in node.rendered_name
     ]
     namespace_set = set(namespaces)
-    for nspace in namespace_set:
+    pruned = {
+        ns
+        for ns in namespace_set
+        if not any(
+            other != ns and other.startswith(f"{ns}{SEPARATOR}")
+            for other in namespace_set
+        )
+    }
+    for nspace in pruned:
         await create_namespace(
             session=session,
             namespace=nspace,
@@ -351,7 +385,7 @@ def filter_nodes_to_deploy(
 ):
     to_create: list[NodeSpec] = []
     to_update: list[NodeSpec] = []
-    to_skip: list[DeploymentResult] = []
+    to_skip: list[NodeSpec] = []
     for node_spec in node_specs:
         existing_spec = existing_nodes_map.get(node_spec.rendered_name)
         if not existing_spec:
@@ -359,15 +393,14 @@ def filter_nodes_to_deploy(
         elif node_spec != existing_spec:
             to_update.append(node_spec)
         else:
-            to_skip.append(
-                DeploymentResult(
-                    name=node_spec.rendered_name,
-                    deploy_type=DeploymentResult.Type.NODE,
-                    status=DeploymentResult.Status.SKIPPED,
-                    operation=DeploymentResult.Operation.NOOP,
-                    message=f"Node {node_spec.rendered_name} is unchanged.",
-                ),
-            )
+            to_skip.append(node_spec)
+
+    desired_node_names = {n.rendered_name for n in node_specs}
+    to_delete = [
+        existing
+        for name, existing in existing_nodes_map.items()
+        if name not in desired_node_names
+    ]
 
     logger.info(
         "Creating %d new nodes: %s",
@@ -382,9 +415,9 @@ def filter_nodes_to_deploy(
     logger.info(
         "Skipping %d nodes as they are unchanged: %s",
         len(to_skip),
-        [result.name for result in to_skip],
+        [result.rendered_name for result in to_skip],
     )
-    return to_create + to_update, to_skip
+    return to_create + to_update, to_skip, to_delete
 
 
 async def check_external_deps(
@@ -475,8 +508,7 @@ async def deploy_nodes_in_levels(
                     background_tasks=background_tasks,
                     save_history=save_history,
                     cache=cache,
-                    existing=existing_nodes_map.get(node_spec.rendered_name)
-                    is not None,
+                    existing=existing_nodes_map.get(node_spec.rendered_name),
                 ),
             )
 
@@ -505,16 +537,17 @@ async def deploy_links_for_node(
         existing_nodes_map.get(node_spec.rendered_name),
     )
     existing_node_links = {
-        link.rendered_dimension_node: link
+        (link.rendered_dimension_node, link.role): link
         for link in (existing_node_spec.dimension_links if existing_node_spec else [])
     }
     desired_node_links = {
-        link.rendered_dimension_node: link for link in node_spec.dimension_links
+        (link.rendered_dimension_node, link.role): link
+        for link in node_spec.dimension_links
     }
     to_delete = {
-        existing_node_links[dim]
-        for dim in existing_node_links
-        if dim not in desired_node_links
+        existing_node_links[(dim, role)]
+        for (dim, role) in existing_node_links
+        if (dim, role) not in desired_node_links
     }
     async with session_context(request) as session:
         for link in to_delete:
@@ -591,7 +624,7 @@ async def deploy_cubes(
                 background_tasks=background_tasks,
                 save_history=save_history,
                 cache=cache,
-                existing=existing_nodes_map.get(cube_spec.rendered_name) is not None,
+                existing=existing_nodes_map.get(cube_spec.rendered_name),
             ),
         )
     return await run_tasks_with_semaphore(
@@ -644,21 +677,61 @@ async def deploy_column_attributes(
     node_spec: NodeSpec,
     current_username: str,
     save_history: Callable,
-):
+) -> set[str]:
+    changed_columns = set()
     async with session_context() as session:
         node = await Node.get_by_name(session=session, name=node_name)
         current_user = cast(User, await User.get_by_username(session, current_username))
-        for col in node_spec.columns or []:
-            await set_node_column_attributes(
-                session=session,
-                node=node,  # type: ignore
-                column_name=col.name,
-                attributes=[
-                    AttributeTypeIdentifier(name=attr) for attr in col.attributes
-                ],
-                current_user=current_user,
-                save_history=save_history,
-            )
+        desired_column_state = {col.name: col for col in node_spec.columns or []}
+        for col in node.current.columns:  # type: ignore
+            if desired_col := desired_column_state.get(col.name):
+                # If the column is explicitly defined, update its properties to match
+                if col.display_name != desired_col.display_name:
+                    col.display_name = desired_col.display_name
+                    changed_columns.add(col.name)
+                if col.description != desired_col.description:
+                    col.description = desired_col.description
+                    changed_columns.add(col.name)
+                if desired_col.partition != (
+                    col.partition.to_spec() if col.partition else None
+                ):
+                    partition = (
+                        Partition(
+                            column_id=col.id,
+                            type_=desired_col.partition.type,
+                            format=desired_col.partition.format,
+                            granularity=desired_col.partition.granularity,
+                        )
+                        if desired_col.partition
+                        else None
+                    )
+                    if partition:
+                        session.add(partition)
+                    col.partition = partition
+                    changed_columns.add(col.name)
+                if set(desired_col.attributes) != set(col.attribute_names()):
+                    await set_node_column_attributes(
+                        session=session,
+                        node=node,  # type: ignore
+                        column_name=col.name,
+                        attributes=[
+                            AttributeTypeIdentifier(name=attr)
+                            for attr in desired_col.attributes
+                        ],
+                        current_user=current_user,
+                        save_history=save_history,
+                    )
+                    changed_columns.add(col.name)
+            else:
+                # If the column is not explicitly defined, reset it to default
+                col.display_name = labelize(col.name)
+                col.description = ""
+                col.partition = None
+                col.attributes = []
+
+            session.add(col)
+        await session.commit()
+    return changed_columns
 
 
 async def deploy_node_from_spec(
@@ -671,7 +744,7 @@ async def deploy_node_from_spec(
     *,
     save_history: Callable,
     cache: Cache,
-    existing: bool = False,
+    existing: NodeSpec | None = None,
 ) -> DeploymentResult:
     """
     Deploy a node from its specification.
@@ -690,6 +763,7 @@ async def deploy_node_from_spec(
         if not existing
         else DeploymentResult.Operation.UPDATE
     )
+    changelog = []
     if not deploy_fn:  # pragma: no cover
         raise DJInvalidDeploymentConfig(f"Unknown node type: {node_spec.node_type}")
     try:
@@ -704,20 +778,40 @@ async def deploy_node_from_spec(
             cache=cache,
             existing=existing,
         )
-        await deploy_node_tags(node_name=node.name, node_spec=node_spec)
-        if node.type in (NodeType.SOURCE, NodeType.TRANSFORM, NodeType.DIMENSION):
-            await deploy_column_attributes(
+        changed_fields = existing.diff(node_spec) if existing else []
+        changelog.append(
+            f"{operation.capitalize()}d {node_spec.node_type} ({node.current_version})",
+        )
+        changelog.append(
+            ("└─ Updated " + ", ".join(changed_fields)),
+        ) if changed_fields else ""
+
+        if set(node_spec.tags) != set([tag.name for tag in node.tags]):
+            await deploy_node_tags(node_name=node.name, node_spec=node_spec)
+            tags_list = ", ".join([f"`{tag}`" for tag in node_spec.tags])
+            changelog.append(f"└─ Set tags to {tags_list}.")
+        if node.type in (
+            NodeType.SOURCE,
+            NodeType.TRANSFORM,
+            NodeType.DIMENSION,
+            NodeType.CUBE,
+        ):
+            changed_columns = await deploy_column_attributes(
                 node_name=node.name,
                 node_spec=node_spec,
                 current_username=current_username,
                 save_history=save_history,
             )
+            if changed_columns and operation == DeploymentResult.Operation.UPDATE:
+                changelog.append(
+                    f"└─ Set properties for {len(changed_columns)} columns",
+                )
     except DJException as exc:
         return DeploymentResult(
             deploy_type=DeploymentResult.Type.NODE,
             name=node_spec.rendered_name,
             status=DeploymentResult.Status.FAILED,
-            message=str(exc),
+            message="\n".join(changelog + [str(exc)]),
             operation=operation,
         )
 
@@ -728,6 +822,7 @@ async def deploy_node_from_spec(
         if isinstance(node, Node)
         else DeploymentResult.Status.FAILED,
         operation=operation,
+        message="\n".join(changelog),
     )
 
 
@@ -810,7 +905,7 @@ async def deploy_transform_dimension_node_from_spec(
     *,
     save_history: Callable,
     cache: Cache,
-    existing: bool = False,
+    existing: NodeSpec | None = None,
 ) -> Node:
     """
     Deploy a transform or dimension node from its spec.
@@ -886,20 +981,12 @@ async def deploy_metric_node_from_spec(
     """
     Deploy a metric node from its spec.
     """
-    metric_metadata_input = (
-        MetricMetadataInput(
-            direction=node_spec.direction,
-            unit=node_spec.unit,
-            significant_digits=node_spec.significant_digits,
-            min_decimal_exponent=node_spec.min_decimal_exponent,
-            max_decimal_exponent=node_spec.max_decimal_exponent,
-        )
-        if node_spec.direction
-        or node_spec.unit
-        or node_spec.significant_digits
-        or node_spec.min_decimal_exponent
-        or node_spec.max_decimal_exponent
-        else None
+    metric_metadata_input = MetricMetadataInput(
+        direction=node_spec.direction,
+        unit=node_spec.unit,
+        significant_digits=node_spec.significant_digits,
+        min_decimal_exponent=node_spec.min_decimal_exponent,
+        max_decimal_exponent=node_spec.max_decimal_exponent,
     )
     async with session_context(request) as session:
         current_user = cast(User, await User.get_by_username(session, current_username))
@@ -911,10 +998,10 @@ async def deploy_metric_node_from_spec(
                     display_name=node_spec.display_name,
                     description=node_spec.description,
                     mode=node_spec.mode,
-                    custom_metadata=node_spec.custom_metadata,
+                    custom_metadata=node_spec.custom_metadata or {},
                     owners=node_spec.owners,
                     query=node_spec.rendered_query,
-                    required_dimensions=node_spec.required_dimensions,
+                    required_dimensions=node_spec.required_dimensions or [],
                     metric_metadata=metric_metadata_input,
                 ),
                 session=session,
@@ -1002,32 +1089,34 @@ async def deploy_cube_node_from_spec(
                 refresh_materialization=True,
                 cache=cache,
             )
-            return await Node.get_by_name(  # type: ignore
-                session,
-                node_spec.rendered_name,
-                options=NodeOutput.load_options(),
-                raise_if_not_exists=True,
+        else:
+            logger.info("Creating cube node %s", node_spec.rendered_name)
+            await create_a_cube(
+                data=CreateCubeNode(
+                    name=node_spec.rendered_name,
+                    display_name=node_spec.display_name,
+                    description=node_spec.description,
+                    mode=node_spec.mode,
+                    custom_metadata=node_spec.custom_metadata,
+                    owners=node_spec.owners,
+                    metrics=node_spec.rendered_metrics,
+                    dimensions=node_spec.rendered_dimensions,
+                    filters=node_spec.rendered_filters,
+                ),
+                request=request,
+                session=session,
+                current_user=current_user,
+                query_service_client=query_service_client,
+                background_tasks=background_tasks,
+                validate_access=validate_access,
+                save_history=save_history,
             )
-        logger.info("Creating cube node %s", node_spec.rendered_name)
-        return await create_a_cube(
-            data=CreateCubeNode(
-                name=node_spec.rendered_name,
-                display_name=node_spec.display_name,
-                description=node_spec.description,
-                mode=node_spec.mode,
-                custom_metadata=node_spec.custom_metadata,
-                owners=node_spec.owners,
-                metrics=node_spec.rendered_metrics,
-                dimensions=node_spec.rendered_dimensions,
-                filters=node_spec.rendered_filters,
-            ),
-            request=request,
-            session=session,
-            current_user=current_user,
-            query_service_client=query_service_client,
-            background_tasks=background_tasks,
-            validate_access=validate_access,
-            save_history=save_history,
+
+        return await Node.get_by_name(  # type: ignore
+            session,
+            node_spec.rendered_name,
+            options=NodeOutput.load_options(),
+            raise_if_not_exists=True,
         )
 
 
@@ -1037,7 +1126,10 @@ async def deploy_dimension_link_from_spec(
     request: Request,
     current_username: str,
     save_history: Callable,
-    existing_node_links: dict[str, DimensionJoinLinkSpec | DimensionReferenceLinkSpec],
+    existing_node_links: dict[
+        tuple[str, str | None],
+        DimensionJoinLinkSpec | DimensionReferenceLinkSpec,
+    ],
 ) -> DeploymentResult:
     try:
         link_name = f"{node_spec.rendered_name} -> {link_spec.rendered_dimension_node}"
@@ -1052,36 +1144,46 @@ async def deploy_dimension_link_from_spec(
                 await User.get_by_username(session, current_username),
             )
             if link_spec.type == LinkType.JOIN:
+                existing = existing_node_links.get(link_spec.rendered_dimension_node)
                 join_link = cast(DimensionJoinLinkSpec, link_spec)
-                if join_link.node_column:
-                    await upsert_simple_dimension_link(  # pragma: no cover
-                        session,
-                        node_spec.rendered_name,
-                        join_link.rendered_dimension_node,
-                        join_link.node_column,
-                        None,
-                        current_user,
-                        save_history,
+                if existing != join_link:
+                    if join_link.node_column:
+                        await upsert_simple_dimension_link(  # pragma: no cover
+                            session,
+                            node_spec.rendered_name,
+                            join_link.rendered_dimension_node,
+                            join_link.node_column,
+                            None,
+                            current_user,
+                            save_history,
+                        )
+                    else:
+                        link_input = JoinLinkInput(
+                            dimension_node=join_link.rendered_dimension_node,
+                            join_type=join_link.join_type,
+                            join_on=join_link.rendered_join_on,
+                            role=join_link.role,
+                        )
+                        await upsert_complex_dimension_link(
+                            session,
+                            node_spec.rendered_name,
+                            link_input,
+                            current_user,
+                            save_history,
+                        )
+                    return DeploymentResult(
+                        deploy_type=DeploymentResult.Type.LINK,
+                        operation=operation,
+                        name=link_name,
+                        status=DeploymentResult.Status.SUCCESS,
+                        message="Join link successfully deployed",
                     )
-                link_input = JoinLinkInput(
-                    dimension_node=join_link.rendered_dimension_node,
-                    join_type=join_link.join_type,
-                    join_on=join_link.rendered_join_on,
-                    role=join_link.role,
-                )
-                await upsert_complex_dimension_link(
-                    session,
-                    node_spec.rendered_name,
-                    link_input,
-                    current_user,
-                    save_history,
-                )
                 return DeploymentResult(
                     deploy_type=DeploymentResult.Type.LINK,
                     operation=operation,
                     name=link_name,
-                    status=DeploymentResult.Status.SUCCESS,
-                    message="Join link successfully deployed",
+                    status=DeploymentResult.Status.SKIPPED,
+                    message="No change to dimension link",
                 )
             else:
                 reference_link = cast(DimensionReferenceLinkSpec, link_spec)

datajunction_server/internal/nodes.py

@@ -1137,7 +1137,12 @@ def has_minor_changes(
     Whether the node has minor changes
     """
     return (
-        (data and data.description and old_revision.description != data.description)
+        (
+            data
+            and data.description
+            and old_revision.description
+            and (old_revision.description != data.description)
+        )
         or (data and data.mode and old_revision.mode != data.mode)
         or (
             data
@@ -1595,7 +1600,7 @@ async def create_new_revision_from_existing(
         )
         or (
             data
-            and data.custom_metadata
+            and data.custom_metadata is not None
             and old_revision.custom_metadata != data.custom_metadata
         )
     )
@@ -1621,7 +1626,7 @@ async def create_new_revision_from_existing(
     )
     required_dim_changes = (
         data
-        and data.required_dimensions
+        and isinstance(data.required_dimensions, list)
         and {col.name for col in old_revision.required_dimensions}
         != set(data.required_dimensions)
     )
@@ -1692,10 +1697,10 @@ async def create_new_revision_from_existing(
         created_by_id=current_user.id,
         custom_metadata=old_revision.custom_metadata,
     )
-    if data and data.required_dimensions:  # type: ignore
+    if data and data.required_dimensions is not None:  # type: ignore
         new_revision.required_dimensions = data.required_dimensions  # type: ignore
 
-    if data and data.custom_metadata:  # type: ignore
+    if data and data.custom_metadata is not None:  # type: ignore
         new_revision.custom_metadata = data.custom_metadata  # type: ignore
 
     # Link the new revision to its parents if a new revision was created and update its status

datajunction_server/models/deployment.py

@@ -58,14 +58,13 @@ class ColumnSpec(BaseModel):
     def __eq__(self, other: Any) -> bool:
         if not isinstance(other, ColumnSpec):
             return False
-
         return (
             self.name == other.name
             and self.type == other.type
             and (self.display_name == other.display_name or self.display_name is None)
-            and (self.description == other.description or self.description is None)
+            and self.description == other.description
             and set(self.attributes) == set(other.attributes)
-            and (self.partition == other.partition) or (self.partition is None and other.partition is None)
+            and self.partition == other.partition
         )
 
 
@@ -126,15 +125,14 @@ class DimensionJoinLinkSpec(DimensionLinkSpec):
         )
 
     def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, DimensionJoinLinkSpec):
+            return False
         return (
             super().__eq__(other)
             and self.rendered_dimension_node == other.rendered_dimension_node
             and self.join_type == other.join_type
             and self.rendered_join_on == other.rendered_join_on
-            and (
-                self.node_column == other.node_column
-                or (self.node_column is None and other.node_column is None)
-            )
+            and self.node_column == other.node_column
         )
 
 
@@ -233,7 +231,7 @@ class NodeSpec(BaseModel):
 
     def __eq__(self, other: Any) -> bool:
         if not isinstance(other, NodeSpec):
-            return False
+            return False  # pragma: no cover
         return (
             self.rendered_name == other.rendered_name
             and self.node_type == other.node_type
@@ -242,11 +240,17 @@ class NodeSpec(BaseModel):
             and set(self.owners) == set(other.owners)
             and set(self.tags) == set(other.tags)
             and self.mode == other.mode
-            and (
-                self.custom_metadata == other.custom_metadata
-                or self.custom_metadata is None
-                and other.custom_metadata == {}
-            )
+            and eq_or_fallback(self.custom_metadata, other.custom_metadata, {})
+        )
+
+    def diff(self, other: "NodeSpec") -> list[str]:
+        """
+        Return a list of fields that differ between this and another NodeSpec.
+        """
+        return diff(
+            self,
+            other,
+            ignore_fields=["name", "namespace", "query", "columns"],
         )
 
 
@@ -278,27 +282,24 @@ class LinkableNodeSpec(NodeSpec):
         return value
 
     def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, LinkableNodeSpec):
+            return False
+        dimension_links_equal = sorted(
+            self.dimension_links or [],
+            key=lambda link: link.rendered_dimension_node,
+        ) == sorted(
+            other.dimension_links or [],
+            key=lambda link: link.rendered_dimension_node,
+        )
+        print(
+            "Comparing LinkableNodeSpec",
+            self.rendered_name,
+            eq_columns(self.columns, other.columns),
+        )
         return (
             super().__eq__(other)
-            and (
-                (self.columns or []) == (other.columns or [])
-                or (
-                    self.columns is None
-                    and not any(
-                        [attr for attr in col.attributes if attr != "primary_key"]
-                        for col in other.columns
-                    )
-                    and not any(col.partition for col in other.columns)
-                )
-            )
-            and sorted(
-                self.dimension_links or [],
-                key=lambda link: link.rendered_dimension_node,
-            )
-            == sorted(
-                other.dimension_links or [],
-                key=lambda link: link.rendered_dimension_node,
-            )
+            and eq_columns(self.columns, other.columns)
+            and dimension_links_equal
         )
 
 
@@ -368,6 +369,18 @@ class MetricSpec(NodeSpec):
     min_decimal_exponent: int | None
     max_decimal_exponent: int | None
 
+    def __init__(self, **data: Any):
+        unit = data.pop("unit", None)
+        if unit:
+            try:
+                if isinstance(unit, MetricUnit):
+                    data["unit_enum"] = unit
+                else:
+                    data["unit_enum"] = MetricUnit[unit.strip().upper()]
+            except KeyError:  # pragma: no cover
+                raise DJInvalidInputException(f"Invalid metric unit: {unit}")
+        super().__init__(**data)
+
     @property
     def unit(self) -> str | None:
         """Return lowercased unit name for JSON serialization."""
@@ -387,11 +400,11 @@ class MetricSpec(NodeSpec):
             super().__eq__(other)
             and self.query_ast.compare(other.query_ast)
             and (self.required_dimensions or []) == (other.required_dimensions or [])
-            and (self.direction == other.direction) or (self.direction is None and other.direction is None)
-            and (self.unit == other.unit) or (self.unit is None and other.unit is None)
-            and (self.significant_digits == other.significant_digits) or (self.significant_digits is None and other.significant_digits is None)
-            and (self.min_decimal_exponent == other.min_decimal_exponent) or (self.min_decimal_exponent is None and other.min_decimal_exponent is None)
-            and (self.max_decimal_exponent == other.max_decimal_exponent) or (self.max_decimal_exponent is None and other.max_decimal_exponent is None)
+            and eq_or_fallback(self.direction, other.direction, MetricDirection.NEUTRAL)
+            and eq_or_fallback(self.unit, other.unit, MetricUnit.UNKNOWN.value.name)
+            and self.significant_digits == other.significant_digits
+            and self.min_decimal_exponent == other.min_decimal_exponent
+            and self.max_decimal_exponent == other.max_decimal_exponent
         )
 
 
@@ -421,32 +434,14 @@ class CubeSpec(NodeSpec):
         ]
 
     def __eq__(self, other: Any) -> bool:
-        print("!!!Comparing cubes", self.rendered_name, other.rendered_name,
-              "super:", super().__eq__(other),
-                "columns:", (self.columns or []) == (other.columns or []),
-                "othercol", ([
-                        [attr for attr in col.attributes if attr != "primary_key"]
-                        for col in other.columns
-                ],
-                 not any(col.partition for col in other.columns)
-                ),
-                "metrics:", set(self.rendered_metrics) == set(other.rendered_metrics),
-                "dimensions:", set(self.rendered_dimensions) == set(other.rendered_dimensions),
-                "filters:", (self.rendered_filters or []) == (other.rendered_filters or [])
+        print(
+            "Comparing CubeSpec",
+            self.rendered_name,
+            eq_columns(self.columns, other.columns),
         )
         return (
             super().__eq__(other)
-            and (
-                (self.columns or []) == (other.columns or [])
-                or (
-                    not self.columns
-                    and not any(
-                        [attr for attr in col.attributes if attr != "primary_key"]
-                        for col in other.columns
-                    )
-                    and not any(col.partition for col in other.columns)
-                )
-            )
+            and eq_columns(self.columns, other.columns)
             and set(self.rendered_metrics) == set(other.rendered_metrics)
             and set(self.rendered_dimensions) == set(other.rendered_dimensions)
             and (self.rendered_filters or []) == (other.rendered_filters or [])
@@ -462,6 +457,30 @@ NodeUnion = Union[
 ]
 
 
+def diff(one: BaseModel, two: BaseModel, ignore_fields: list[str] = None) -> list[str]:
+    """
+    Compare two Pydantic models and return a list of fields that have changed.
+    """
+    changed_fields = [
+        field
+        for field in one.__fields__.keys()
+        if field not in (ignore_fields or [])
+        and hasattr(one, field)
+        and hasattr(two, field)
+        and (
+            (
+                isinstance(getattr(one, field), (list, dict))
+                and set(getattr(one, field) or []) != set(getattr(two, field) or [])
+            )
+            or (
+                not isinstance(getattr(one, field), (list, dict))
+                and getattr(one, field) != getattr(two, field)
+            )
+        )
+    ]
+    return changed_fields
+
+
 class DeploymentSpec(BaseModel):
     """
     Specification of a full deployment (namespace, nodes, tags, and add'l metadata).
@@ -541,3 +560,40 @@ class DeploymentInfo(BaseModel):
     namespace: str
     status: DeploymentStatus
     results: list[DeploymentResult] = Field(default_factory=list)
+
+
+def eq_or_fallback(a, b, fallback):
+    """
+    Helper to compare two values that may be None, with a fallback value
+    """
+    return a == b or (a is None and b == fallback)
+
+
+def eq_columns(a: list[ColumnSpec] | None, b: list[ColumnSpec] | None) -> bool:
+    """
+    Compare two lists of ColumnSpec objects (or None) with special rules:
+      - None or [] is considered equivalent to a list where every column only has 'primary_key'
+        in attributes and partition is None.
+    """
+    a_list = a or []
+    b_list = b or []
+
+    a_map = {col.name: col for col in a_list}
+    b_map = {col.name: col for col in b_list}
+    for col_name, col_a in a_map.items():
+        col_b = b_map.get(col_name)
+        if (set(col_a.attributes if col_a else []) - {"primary_key"}) != (  # type: ignore
+            set(col_b.attributes if col_b else []) - {"primary_key"}  # type: ignore
+        ) or (col_a.partition if col_a else None) != (
+            col_b.partition if col_b else None
+        ):  # type: ignore
+            return False
+    for col_name, col_b in b_map.items():
+        col_a = a_map.get(col_name)  # type: ignore
+        if (set(col_b.attributes if col_b else []) - {"primary_key"}) != (  # type: ignore
+            set(col_a.attributes if col_a else []) - {"primary_key"}  # type: ignore
+        ) or (col_b.partition if col_b else None) != (
+            col_a.partition if col_a else None
+        ):  # type: ignore
+            return False
+    return True

{datajunction_server-0.0.2.dev2.dist-info → datajunction_server-0.0.2.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.2.dev2
+Version: 0.0.2.dev4
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: Homepage, https://datajunction.io
 Project-URL: Repository, https://github.com/DataJunction/dj

{datajunction_server-0.0.2.dev2.dist-info → datajunction_server-0.0.2.dev4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-datajunction_server/__about__.py,sha256=kVl_34fkA7KY3Y1J_D8v00tuvI2dTjfSCc1549SHP7g,54
+datajunction_server/__about__.py,sha256=7_8nP1iwEx_vfBpO-HcgSpLMpKEmeBk1LgGxMXjgACM,54
 datajunction_server/__init__.py,sha256=nN5-uJoSVEwuc8n-wMygqeF0Xhxi_zqqbCgutZvAt3E,384
 datajunction_server/alembic.ini,sha256=mclJ_xx8pHfRyZ69SA9ZPqUwZaaQCTyxZ6wBmbrf1bo,3024
 datajunction_server/config.py,sha256=L1zkaiF82S-ciR-wVeILx7CWKSOPPJ90a9zooXVNHEc,5641
@@ -44,8 +44,8 @@ datajunction_server/alembic/versions/2025_07_06_0746-634fdac051c3_unique_contrai
 datajunction_server/alembic/versions/2025_08_02_1543-8eab64955a49_add_concrete_measures_for_node_revisions.py,sha256=wN7UtCLjrXsMyDIb1DKJv7p0QULBSQGA0gILgSn-CXw,2394
 datajunction_server/alembic/versions/2025_09_02_0102-5b00137c69f9_add_service_accounts.py,sha256=rv9j0VDoi3bQNTjcPFphwAsvQMOmL2j35PlcYiGKYJM,2055
 datajunction_server/alembic/versions/2025_09_12_0555-759c4d50cb8d_add_cascade_delete.py,sha256=hULra07uoqeUVLKmeOXiznx7FKPBowvOn8e3EWMb8Xo,7236
-datajunction_server/alembic/versions/2025_09_12_2107-b6398ba852b3_deployments.py,sha256=KEH9L0VPs-x4E579MF4CDhBoyB7FKYrFvr_W_7oVE84,1421
-datajunction_server/alembic/versions/2025_09_16_1513-b55add7e1ebc_add_cascade_delete_on_tag_node_and_.py,sha256=nRFhu3VMptDjdPqMei5RzfncNeu9foFPyb7hVZxo6Hc,3317
+datajunction_server/alembic/versions/2025_09_16_1513-b55add7e1ebc_add_cascade_delete_on_tag_node_and_.py,sha256=06vQjjaskVQI1EaztJ_jNUObseRWWuLzWqQymZiEKRA,3316
+datajunction_server/alembic/versions/2025_09_17_2107-b6398ba852b3_deployments.py,sha256=NfPEHgvrSsxfCotC_fVKv-A-g5PH5QaLtAEhszqvFVk,1421
 datajunction_server/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datajunction_server/api/attributes.py,sha256=zSTHqdf1el7pWX76Eu-sPrt6uzWFwGN0mXiNJFz9vBE,4553
 datajunction_server/api/catalogs.py,sha256=D-avfvhUdgTAnOvMSxMN2I8dXebDuovEZr-dQSB-nk8,4454
@@ -65,7 +65,7 @@ datajunction_server/api/main.py,sha256=s1gWNs5wGXzCtlqf4faeq-rE6uf_RLn4O7WJnauWr
 datajunction_server/api/materializations.py,sha256=buhYWTUGBbRI0fWvREaK1D1F809y5eSxHDWqTQtBewc,21796
 datajunction_server/api/measures.py,sha256=MdNpB4iNqEcU5-hWno5X4QnMTbijc2ISrprS8nyY2WQ,5729
 datajunction_server/api/metrics.py,sha256=X5By7oNWa9b0l65Qf8Bcz--aClngc30y4G3PMdJhTCs,4917
-datajunction_server/api/namespaces.py,sha256=S-j5JNWzwKh52SgML6pTbgF-dbFzPUvn1r9x3oPWIhw,14849
+datajunction_server/api/namespaces.py,sha256=220PNifdq_DShw9I3OH-VNDd4zJtP54OYRXUTdzSUfA,14781
 datajunction_server/api/nodes.py,sha256=0nOPEKD0OQ8Tq5FLElKI2ODnXRZS25jM9yUywURKfsc,43728
 datajunction_server/api/notifications.py,sha256=0jHnWD6leBxazVgZtfTlL1e8-sZ3Y2PmU8FI-TWepkU,5403
 datajunction_server/api/setup_logging.py,sha256=_1LlR2KMqjjBff1gqJ8Kmyvza1dAYjzGGK6kak1GdcU,174
@@ -128,7 +128,7 @@ datajunction_server/database/materialization.py,sha256=7_w5ay2RXukTaRS03UILsMFrN
 datajunction_server/database/measure.py,sha256=iwZQIhM-_OlZ4v2a3BmZrhpC4ej-MGh6rLqGB70XGYo,6387
 datajunction_server/database/metricmetadata.py,sha256=jKh58lOf5_MoFyDTVtpWhK9-Ox22ryWK2XtBKjPApc4,2084
 datajunction_server/database/namespace.py,sha256=T5GF4eDLgw51xdjWC0T5G_mcAgL4E7OrYuk6x552dhM,5685
-datajunction_server/database/node.py,sha256=QkGn5_HMMnotgKETLMZlCqyyHn6TXc_67jXgQb8pq_w,44642
+datajunction_server/database/node.py,sha256=4BJPUaoYQGz-CtBHPcSB8-I1S4yzkd8-Q2NOvRAtYpk,44951
 datajunction_server/database/nodeowner.py,sha256=YydIO1F-S-J6qyNW8ui71H-l6aENbW7RhdX5koIBq8E,1196
 datajunction_server/database/notification_preference.py,sha256=uLy60fWLWLJE940Qj7bY0Rq5b5flEkgcq2uxx4pRvPE,1892
 datajunction_server/database/partition.py,sha256=312KyT0IbaKk-lXxMRvAphJDfA83Wm1RsGp7-dT-U0g,5242
@@ -138,12 +138,12 @@ datajunction_server/database/user.py,sha256=-zW5ssf2IWgSjvZbOljOzVoqynBtNp3gQxHm
 datajunction_server/internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datajunction_server/internal/client.py,sha256=hpManY1PTGQxAzx4S-1aUAoMvlWfPPU1wgL9iLlAg7o,11442
 datajunction_server/internal/cube_materializations.py,sha256=SJYIZfjAQr8n-pgECKoroGfOhoR_J0vnMmpCQ0mbLlY,10695
-datajunction_server/internal/deployment.py,sha256=rjGFpGJeNHQYSGt97BVUYWU9B9ucOU7ecOfltXDYLgU,40664
+datajunction_server/internal/deployment.py,sha256=N9p5kVllXC61yLX6JXiXRV2P_mjeIt-4gO8fWXm_cVE,45154
 datajunction_server/internal/engines.py,sha256=RKIYIYJQMjRIFS7YXIW-q6vLUxilc3sd3eWHwTmDDu0,858
 datajunction_server/internal/history.py,sha256=MAj2ZTUCGgSLCaS1uB5dWtTqvb2SE_5HHLo0RReCRAc,816
 datajunction_server/internal/materializations.py,sha256=HVc1RPiarOBksvzyLP8Mt5GFvyEPlOqgIe151I_ZZMY,18184
 datajunction_server/internal/namespaces.py,sha256=Ff020CvpzWeypqReU5sPl3kNbHj1aQpw_6MI2DJhFSw,20713
-datajunction_server/internal/nodes.py,sha256=dgK54ybgLkr5ZBNLi_jztrdOSYAhUvsj-SNi-lYVU_w,103572
+datajunction_server/internal/nodes.py,sha256=BbXzMg5G2Tk-xXcBD73UhWR7MQh3B_UeZ9r83LkK8tg,103715
 datajunction_server/internal/notifications.py,sha256=8aP8KBs8k4kKXnQXIUPWyHa4uKsyV0oERipyP0LR0bs,1724
 datajunction_server/internal/seed.py,sha256=mc2TQP4dMwAyWTfGKj5b6wK6pvVyU6azHfxSozPElY0,2363
 datajunction_server/internal/sql.py,sha256=bboANhvtKufVYOOI6RF719GXQFWv-toVXIQQtKIFCtA,18475
@@ -185,7 +185,7 @@ datajunction_server/models/column.py,sha256=3TCa9dDAb9Q2WEAzpcdqAjKSX3PutbwlS8qG
 datajunction_server/models/cube.py,sha256=p6KmqoOVGlziH5k0wXs6qBvgWWQs984Ho6SGplDbtAQ,4459
 datajunction_server/models/cube_materialization.py,sha256=ydMRepDM95b4BBVay_nOYlRtK7OFG3pCDDTRdHe2awU,15787
 datajunction_server/models/database.py,sha256=xhCllbq5ikFNnrPvzuchxQUC9RWogzh73Eqz7Jj0i38,499
-datajunction_server/models/deployment.py,sha256=AgVd2o1dSYtWzpqR3R61-Hja0OVWk_sExh408Gx4iOo,16631
+datajunction_server/models/deployment.py,sha256=ZCRgGVy_FLHeoLc98-zRz_n79IZAPsr073Y8k4SOhqA,18051
 datajunction_server/models/dialect.py,sha256=uifriawtKR4vi-GG2rdp4eeQkAkD6iLNuarCLQanTxY,3825
 datajunction_server/models/dimensionlink.py,sha256=WaCarxhawOiQqtH1EVS0RQRu9D8Bx6GFonLsdSVgXSs,1551
 datajunction_server/models/engine.py,sha256=Ebuy4HLkURr7mj0pxTj_Y4fEmF0oDen393rnj9fBnR0,466
@@ -226,7 +226,7 @@ datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParser.py,sha2
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParser.tokens,sha256=JDrzbaKDwIaimAZPYIUzCgzkOEgq0X5-a6_lz78lqgs,8131
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParserListener.py,sha256=vp8wduYkB-T5Xr6HZCSdzAxTHHPrDI5UJZXRJSVhAGA,102464
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParserVisitor.py,sha256=w3V03LgPIHCiqojNyuekBDYqskjOKlKrd0sczQAB_WQ,60290
-datajunction_server-0.0.2.dev2.dist-info/METADATA,sha256=1nsSX_VKvu5SkHpIuXNFyBudwMZRwU_1mF6AuDaTFhc,3769
-datajunction_server-0.0.2.dev2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-datajunction_server-0.0.2.dev2.dist-info/entry_points.txt,sha256=MOInJGdcQ10bDEl-XW4UMokEgx-ypINqBhObeDI8KiQ,74
-datajunction_server-0.0.2.dev2.dist-info/RECORD,,
+datajunction_server-0.0.2.dev4.dist-info/METADATA,sha256=h0bsPkDT6voeOPRcczUx6yrmvivISRd09p51Kq40Qq4,3769
+datajunction_server-0.0.2.dev4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+datajunction_server-0.0.2.dev4.dist-info/entry_points.txt,sha256=MOInJGdcQ10bDEl-XW4UMokEgx-ypINqBhObeDI8KiQ,74
+datajunction_server-0.0.2.dev4.dist-info/RECORD,,