datajunction-server 0.0.1a39.dev0__tar.gz → 0.0.1a39.dev2__tar.gz

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datajunction-server
-Version: 0.0.1a39.dev0
+Version: 0.0.1a39.dev2
 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.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/alembic/env.py

@@ -14,6 +14,7 @@ from datajunction_server.database import (
     Column,
     ColumnAttribute,
     Database,
+    DimensionLink,
     Engine,
     History,
     Measure,

datajunction_server-0.0.1a39.dev2/alembic/versions/2024_01_18_2011-20f060b02772_switch_enum_values.py

@@ -0,0 +1,207 @@
+"""Switch enum values
+
+Revision ID: 20f060b02772
+Revises: c74b11566d82
+Create Date: 2024-01-18 20:11:08.521879+00:00
+
+"""
+# pylint: disable=no-member, invalid-name, missing-function-docstring, unused-import, no-name-in-module
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "20f060b02772"
+down_revision = "c74b11566d82"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table("nodenamespace", schema=None) as batch_op:
+        batch_op.create_unique_constraint("uq_nodenamespace_namespace", ["namespace"])
+
+    op.execute("ALTER TYPE oauthprovider RENAME VALUE 'basic' TO 'BASIC'")
+    op.execute("ALTER TYPE oauthprovider RENAME VALUE 'github' TO 'GITHUB'")
+    op.execute("ALTER TYPE oauthprovider RENAME VALUE 'google' TO 'GOOGLE'")
+    op.execute(
+        "UPDATE users set oauth_provider = upper(oauth_provider::text)::oauthprovider",
+    )
+
+    op.execute("ALTER TYPE materializationstrategy RENAME VALUE 'full' TO 'FULL'")
+    op.execute(
+        "ALTER TYPE materializationstrategy RENAME VALUE 'snapshot' TO 'SNAPSHOT'",
+    )
+    op.execute(
+        "ALTER TYPE materializationstrategy "
+        "RENAME VALUE 'snapshot_partition' TO 'SNAPSHOT_PARTITION'",
+    )
+    op.execute(
+        "ALTER TYPE materializationstrategy RENAME VALUE 'incremental_time' TO 'INCREMENTAL_TIME'",
+    )
+    op.execute("ALTER TYPE materializationstrategy RENAME VALUE 'view' TO 'VIEW'")
+    op.execute(
+        "UPDATE materialization set strategy = upper(strategy::text)::materializationstrategy",
+    )
+
+    op.execute("ALTER TYPE aggregationrule RENAME VALUE 'additive' TO 'ADDITIVE'")
+    op.execute(
+        "ALTER TYPE aggregationrule RENAME VALUE 'non_additive' TO 'NON_ADDITIVE'",
+    )
+    op.execute(
+        "ALTER TYPE aggregationrule RENAME VALUE 'semi_additive' TO 'SEMI_ADDITIVE'",
+    )
+    op.execute("UPDATE measures set additive = upper(additive::text)::aggregationrule")
+
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'attribute' TO 'ATTRIBUTE'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'availability' TO 'AVAILABILITY'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'backfill' TO 'BACKFILL'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'catalog' TO 'CATALOG'")
+    op.execute(
+        "ALTER TYPE entitytype RENAME VALUE 'column_attribute' TO 'COLUMN_ATTRIBUTE'",
+    )
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'dependency' TO 'DEPENDENCY'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'engine' TO 'ENGINE'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'link' TO 'LINK'")
+    op.execute(
+        "ALTER TYPE entitytype RENAME VALUE 'materialization' TO 'MATERIALIZATION'",
+    )
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'namespace' TO 'NAMESPACE'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'node' TO 'NODE'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'partition' TO 'PARTITION'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'query' TO 'QUERY'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'tag' TO 'TAG'")
+    op.execute("UPDATE history set entity_type = upper(entity_type::text)::entitytype")
+
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'create' TO 'CREATE'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'delete' TO 'DELETE'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'restore' TO 'RESTORE'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'update' TO 'UPDATE'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'refresh' TO 'REFRESH'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'tag' TO 'TAG'")
+    op.execute(
+        "ALTER TYPE activitytype RENAME VALUE 'set_attribute' TO 'SET_ATTRIBUTE'",
+    )
+    op.execute(
+        "ALTER TYPE activitytype RENAME VALUE 'status_change' TO 'STATUS_CHANGE'",
+    )
+    op.execute(
+        "UPDATE history set activity_type = upper(activity_type::text)::activitytype",
+    )
+
+    op.execute("CREATE TYPE nodestatus AS ENUM ('VALID', 'INVALID')")
+    op.execute("CREATE TYPE nodemode AS ENUM ('DRAFT', 'PUBLISHED')")
+    op.execute(
+        "ALTER TABLE noderevision ALTER COLUMN status "
+        "TYPE nodestatus USING upper(status)::nodestatus",
+    )
+    op.execute(
+        "ALTER TABLE noderevision ALTER COLUMN mode TYPE nodemode USING upper(mode)::nodemode",
+    )
+
+    op.execute("CREATE TYPE partitiontype AS ENUM ('TEMPORAL', 'CATEGORICAL')")
+    op.execute(
+        "CREATE TYPE granularity AS ENUM "
+        "('SECOND', 'MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'QUARTER', 'YEAR')",
+    )
+    op.execute(
+        "ALTER TABLE partition ALTER COLUMN type_ "
+        "TYPE partitiontype USING upper(type_)::partitiontype",
+    )
+    op.execute(
+        "ALTER TABLE partition ALTER COLUMN granularity "
+        "TYPE granularity USING upper(granularity)::granularity",
+    )
+
+
+def downgrade():
+    op.execute("DROP TYPE partitiontype")
+    op.execute("DROP TYPE granularity")
+    op.execute(
+        "ALTER TABLE partition ALTER COLUMN type_ TYPE text USING lower(type_::text)",
+    )
+    op.execute(
+        "ALTER TABLE partition ALTER COLUMN granularity TYPE text USING lower(granularity::text)",
+    )
+
+    op.execute("DROP TYPE nodestatus")
+    op.execute("DROP TYPE nodemode")
+    op.execute(
+        "ALTER TABLE noderevision ALTER COLUMN status TYPE text USING lower(status::text)",
+    )
+    op.execute(
+        "ALTER TABLE noderevision ALTER COLUMN mode TYPE text USING lower(mode::text)",
+    )
+
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'CREATE' TO 'create'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'DELETE' TO 'delete'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'RESTORE' TO 'restore'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'UPDATE' TO 'update'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'REFRESH' TO 'refresh'")
+    op.execute("ALTER TYPE activitytype RENAME VALUE 'TAG' TO 'tag'")
+    op.execute(
+        "ALTER TYPE activitytype RENAME VALUE 'SET_ATTRIBUTE' TO 'set_attribute'",
+    )
+    op.execute(
+        "ALTER TYPE activitytype RENAME VALUE 'STATUS_CHANGE' TO 'status_change'",
+    )
+    op.execute(
+        "UPDATE history set activity_type = lower(activity_type::text)::activitytype",
+    )
+
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'ATTRIBUTE' TO 'attribute'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'AVAILABILITY' TO 'availability'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'BACKFILL' TO 'backfill'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'CATALOG' TO 'catalog'")
+    op.execute(
+        "ALTER TYPE entitytype RENAME VALUE 'COLUMN_ATTRIBUTE' TO 'column_attribute'",
+    )
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'DEPENDENCY' TO 'dependency'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'ENGINE' TO 'engine'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'LINK' TO 'link'")
+    op.execute(
+        "ALTER TYPE entitytype RENAME VALUE 'MATERIALIZATION' TO 'materialization'",
+    )
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'NAMESPACE' TO 'namespace'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'NODE' TO 'node'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'PARTITION' TO 'partition'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'QUERY' TO 'query'")
+    op.execute("ALTER TYPE entitytype RENAME VALUE 'TAG' TO 'tag'")
+    op.execute("UPDATE history set entity_type = lower(entity_type::text)::entitytype")
+
+    op.execute("ALTER TYPE aggregationrule RENAME VALUE 'ADDITIVE' TO 'additive'")
+    op.execute(
+        "ALTER TYPE aggregationrule RENAME VALUE 'NON_ADDITIVE' TO 'non_additive'",
+    )
+    op.execute(
+        "ALTER TYPE aggregationrule RENAME VALUE 'SEMI_ADDITIVE' TO 'semi_additive'",
+    )
+    op.execute("UPDATE measures set additive = lower(additive::text)::aggregationrule")
+
+    op.execute("ALTER TYPE materializationstrategy RENAME VALUE 'VIEW' TO 'view'")
+    op.execute(
+        "ALTER TYPE materializationstrategy RENAME VALUE 'INCREMENTAL_TIME' TO 'incremental_time'",
+    )
+    op.execute(
+        "ALTER TYPE materializationstrategy "
+        "RENAME VALUE 'SNAPSHOT_PARTITION' TO 'snapshot_partition'",
+    )
+    op.execute(
+        "ALTER TYPE materializationstrategy RENAME VALUE 'SNAPSHOT' TO 'snapshot'",
+    )
+    op.execute("ALTER TYPE materializationstrategy RENAME VALUE 'FULL' TO 'full'")
+    op.execute(
+        "UPDATE materialization set strategy = lower(strategy::text)::materializationstrategy",
+    )
+
+    op.execute("ALTER TYPE oauthprovider RENAME VALUE 'GOOGLE' TO 'google'")
+    op.execute("ALTER TYPE oauthprovider RENAME VALUE 'GITHUB' TO 'github'")
+    op.execute("ALTER TYPE oauthprovider RENAME VALUE 'BASIC' TO 'basic'")
+    op.execute(
+        "UPDATE users set oauth_provider = lower(oauth_provider::text)::oauthprovider",
+    )
+
+    with op.batch_alter_table("nodenamespace", schema=None) as batch_op:
+        batch_op.drop_constraint("uq_nodenamespace_namespace", type_="unique")

datajunction_server-0.0.1a39.dev2/datajunction_server/__about__.py

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a39.dev2"

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

@@ -1135,7 +1135,7 @@ def hard_delete_node(
     Hard delete a node, destroying all links and invalidating all downstream nodes.
     This should be used with caution, deactivating a node is preferred.
     """
-    node = get_node_by_name(session, name, with_current=True)
+    node = get_node_by_name(session, name, with_current=True, include_inactive=True)
     downstream_nodes = get_downstream_nodes(session=session, node_name=name)
 
     linked_nodes = []

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

@@ -1306,3 +1306,95 @@ def set_column_partition(  # pylint: disable=too-many-locals
     session.commit()
     session.refresh(column)
     return column
+
+
+@router.post("/nodes/{name}/savecolumnorder")
+def save_column_order(
+    name: str,
+    session: Session = Depends(get_session),
+    query_service_client: QueryServiceClient = Depends(get_query_service_client),
+):
+    node = get_node_by_name(session, name, with_current=True)
+    current_node_revision = node.current
+    _logger.info("Processing %s node `%s`", node.type, node.name)
+
+    # Only assign column orders if one or more columns lack an order value
+    columns_without_order = [
+        col.order for col in current_node_revision.columns if not col.order
+    ]
+    if columns_without_order:
+        _logger.info(
+            "Found columns without order for %s node `%s`",
+            node.type,
+            node.name,
+        )
+        if node.type == NodeType.SOURCE:
+            column_mapping = {
+                col.name: col
+                for col in query_service_client.get_columns_for_table(
+                    current_node_revision.catalog.name,
+                    current_node_revision.schema_,
+                    current_node_revision.table,
+                )
+            }
+            for col in current_node_revision.columns:
+                col.order = column_mapping[col.name].order
+                session.add(col)
+            _logger.info(
+                "Assigning new column order to %s node `%s`",
+                node.type,
+                node.name,
+            )
+            session.commit()
+            return JSONResponse(
+                status_code=200,
+                content={
+                    "message": f"Assigned new column order to node `{node.name}`",
+                    "columns": [
+                        ColumnOutput.from_orm(col)
+                        for col in current_node_revision.columns
+                    ],
+                },
+            )
+        if node.type in (NodeType.TRANSFORM, NodeType.DIMENSION, NodeType.METRIC):
+            query_ast = parse(current_node_revision.query)
+            column_mapping = {
+                col.alias_or_name.name: idx
+                for idx, col in enumerate(query_ast.select.projection)
+            }
+            for col in current_node_revision.columns:
+                col.order = column_mapping[col.name]
+                session.add(col)
+            _logger.info(
+                "Assigning new column order to %s node `%s`",
+                node.type,
+                node.name,
+            )
+            session.commit()
+
+            return JSONResponse(
+                status_code=200,
+                content={
+                    "message": f"Assigned new column order to node `{node.name}`",
+                    "columns": [
+                        ColumnOutput.from_orm(col).dict()
+                        for col in current_node_revision.columns
+                    ],
+                },
+            )
+
+        return JSONResponse(
+            status_code=500,
+            content={
+                "message": f"Manual update needed for `{node.name}`.",
+                "columns": [
+                    ColumnOutput.from_orm(col) for col in current_node_revision.columns
+                ],
+            },
+        )
+    return JSONResponse(
+        status_code=200,
+        content={
+            "message": f"All columns for `{node.name}` have an order. Skipping update.",
+        },
+    )

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/database/__init__.py

@@ -5,6 +5,7 @@ __all__ = [
     "Catalog",
     "Column",
     "Database",
+    "DimensionLink",
     "Engine",
     "History",
     "Node",
@@ -21,6 +22,7 @@ from datajunction_server.database.attributetype import AttributeType, ColumnAttr
 from datajunction_server.database.catalog import Catalog
 from datajunction_server.database.column import Column
 from datajunction_server.database.database import Database, Table
+from datajunction_server.database.dimensionlink import DimensionLink
 from datajunction_server.database.engine import Engine
 from datajunction_server.database.measure import Measure
 from datajunction_server.database.namespace import NodeNamespace

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/database/dimensionlink.py

@@ -1,12 +1,11 @@
 """Dimension links table."""
 from typing import Dict, Optional
 
-from sqlalchemy import JSON, BigInteger, ForeignKey, Integer
+from sqlalchemy import JSON, BigInteger, Enum, ForeignKey, Integer
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from datajunction_server.database.base import Base
 from datajunction_server.database.node import Node, NodeRevision
-from datajunction_server.models.base import sqlalchemy_enum_with_name
 from datajunction_server.models.dimensionlink import JoinCardinality, JoinType
 
 
@@ -55,7 +54,7 @@ class DimensionLink(Base):  # pylint: disable=too-few-public-methods
     # Metadata about the join
     join_type: Mapped[Optional[JoinType]]
     join_cardinality: Mapped[JoinCardinality] = mapped_column(
-        sqlalchemy_enum_with_name(JoinCardinality),
+        Enum(JoinCardinality),
         default=JoinCardinality.MANY_TO_ONE,
     )
 

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/database/engine.py

@@ -2,10 +2,10 @@
 from typing import Optional
 
 import sqlalchemy as sa
+from sqlalchemy import Enum
 from sqlalchemy.orm import Mapped, mapped_column
 
 from datajunction_server.database.base import Base
-from datajunction_server.models.base import sqlalchemy_enum_with_name
 from datajunction_server.models.engine import Dialect
 
 
@@ -17,12 +17,12 @@ class Engine(Base):  # pylint: disable=too-few-public-methods
     __tablename__ = "engine"
 
     id: Mapped[int] = mapped_column(
-        sa.BigInteger(),
+        sa.BigInteger().with_variant(sa.Integer, "sqlite"),
         primary_key=True,
     )
     name: Mapped[str]
     version: Mapped[str]
     uri: Mapped[Optional[str]]
     dialect: Mapped[Optional[Dialect]] = mapped_column(
-        sqlalchemy_enum_with_name(Dialect),
+        Enum(Dialect),
     )

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/database/history.py

@@ -3,12 +3,11 @@ from datetime import datetime, timezone
 from functools import partial
 from typing import Any, Dict, Optional
 
-from sqlalchemy import JSON, BigInteger, DateTime, Integer, String
+from sqlalchemy import JSON, BigInteger, DateTime, Enum, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from datajunction_server.database.base import Base
 from datajunction_server.enum import StrEnum
-from datajunction_server.models.base import sqlalchemy_enum_with_name
 from datajunction_server.typing import UTCDatetime
 
 
@@ -60,13 +59,13 @@ class History(Base):  # pylint: disable=too-few-public-methods
         primary_key=True,
     )
     entity_type: Mapped[Optional[EntityType]] = mapped_column(
-        sqlalchemy_enum_with_name(EntityType),
+        Enum(EntityType),
         default=None,
     )
     entity_name: Mapped[Optional[str]] = mapped_column(String, default=None)
     node: Mapped[Optional[str]] = mapped_column(String, default=None)
     activity_type: Mapped[Optional[ActivityType]] = mapped_column(
-        sqlalchemy_enum_with_name(ActivityType),
+        Enum(ActivityType),
         default=None,
     )
     user: Mapped[Optional[str]] = mapped_column(String, default=None)

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/database/node.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
 import sqlalchemy as sa
 from pydantic import Extra
-from sqlalchemy import JSON, DateTime, ForeignKey, String, UniqueConstraint
+from sqlalchemy import JSON, DateTime, Enum, ForeignKey, String, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from datajunction_server.database.availabilitystate import AvailabilityState
@@ -17,11 +17,7 @@ from datajunction_server.database.materialization import Materialization
 from datajunction_server.database.metricmetadata import MetricMetadata
 from datajunction_server.database.tag import Tag
 from datajunction_server.errors import DJInvalidInputException
-from datajunction_server.models.base import (
-    labelize,
-    sqlalchemy_enum_with_name,
-    sqlalchemy_enum_with_value,
-)
+from datajunction_server.models.base import labelize
 from datajunction_server.models.node import (
     DEFAULT_DRAFT_VERSION,
     BuildCriteria,
@@ -159,7 +155,7 @@ class Node(Base):  # pylint: disable=too-few-public-methods
         primary_key=True,
     )
     name: Mapped[str] = mapped_column(String, unique=True)
-    type: Mapped[NodeType] = mapped_column(sqlalchemy_enum_with_name(NodeType))
+    type: Mapped[NodeType] = mapped_column(Enum(NodeType))
     display_name: Mapped[Optional[str]]
     namespace: Mapped[str] = mapped_column(String, default="default")
     current_version: Mapped[str] = mapped_column(
@@ -232,12 +228,12 @@ class NodeRevision(
         String,
         insert_default=lambda context: labelize(context.current_parameters.get("name")),
     )
-    type: Mapped[NodeType] = mapped_column(sqlalchemy_enum_with_name(NodeType))
+    type: Mapped[NodeType] = mapped_column(Enum(NodeType))
     description: Mapped[str] = mapped_column(String, default="")
     query: Mapped[Optional[str]] = mapped_column(String)
     mode: Mapped[NodeMode] = mapped_column(
-        sqlalchemy_enum_with_value(NodeMode),
-        default=NodeMode.PUBLISHED.value,  # pylint: disable=no-member
+        Enum(NodeMode),
+        default=NodeMode.PUBLISHED,  # pylint: disable=no-member
     )
 
     version: Mapped[Optional[str]] = mapped_column(
@@ -293,7 +289,7 @@ class NodeRevision(
     )
 
     status: Mapped[NodeStatus] = mapped_column(
-        sqlalchemy_enum_with_value(NodeStatus),
+        Enum(NodeStatus),
         default=NodeStatus.INVALID,
     )
     updated_at: Mapped[UTCDatetime] = mapped_column(
@@ -559,11 +555,11 @@ class NodeColumns(Base):  # pylint: disable=too-few-public-methods
 
     __tablename__ = "nodecolumns"
 
-    node_id: Mapped[int] = mapped_column(
+    node_id: Mapped[int] = mapped_column(  # pylint: disable=unsubscriptable-object
         ForeignKey("noderevision.id", name="fk_nodecolumns_node_id_noderevision"),
         primary_key=True,
     )
-    column_id: Mapped[int] = mapped_column(
+    column_id: Mapped[int] = mapped_column(  # pylint: disable=unsubscriptable-object
         ForeignKey("column.id", name="fk_nodecolumns_column_id_column"),
         primary_key=True,
     )

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/database/user.py

@@ -1,12 +1,11 @@
 """User database schema."""
 from typing import Optional
 
-from sqlalchemy import BigInteger, Integer
+from sqlalchemy import BigInteger, Enum, Integer
 from sqlalchemy.orm import Mapped, mapped_column
 
 from datajunction_server.database.base import Base
 from datajunction_server.enum import StrEnum
-from datajunction_server.models.base import sqlalchemy_enum_with_name
 
 
 class OAuthProvider(StrEnum):
@@ -33,6 +32,6 @@ class User(Base):  # pylint: disable=too-few-public-methods
     email: Mapped[Optional[str]]
     name: Mapped[Optional[str]]
     oauth_provider: Mapped[OAuthProvider] = mapped_column(
-        sqlalchemy_enum_with_name(OAuthProvider),
+        Enum(OAuthProvider),
     )
     is_admin: Mapped[bool] = mapped_column(default=False)

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/internal/namespaces.py

@@ -25,6 +25,12 @@ from datajunction_server.models.node_type import NodeType
 from datajunction_server.typing import UTCDatetime
 from datajunction_server.utils import SEPARATOR
 
+# A list of namespace names that cannot be used because they are
+# part of a list of reserved SQL keywords
+RESERVED_NAMESPACE_NAMES = [
+    "user",
+]
+
 
 def get_nodes_in_namespace(
     session: Session,
@@ -182,10 +188,10 @@ def validate_namespace(namespace: str):
     """
     parts = namespace.split(SEPARATOR)
     for part in parts:
-        if not part or (part and part[0].isdigit()):
+        if not part or (part and part[0].isdigit()) or part in RESERVED_NAMESPACE_NAMES:
             raise DJInvalidInputException(
-                f"{namespace} is not a valid namespace. Namespace parts cannot start with "
-                "numbers or be empty.",
+                f"{namespace} is not a valid namespace. Namespace parts cannot start with numbers"
+                f", be empty, or use the reserved keyword [{', '.join(RESERVED_NAMESPACE_NAMES)}]",
             )
 
 
@@ -281,6 +287,7 @@ def hard_delete_namespace(
             "status": "deleted",
         }
         session.delete(_namespace)
+    session.commit()
     return impacts
 
 

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/models/base.py

@@ -1,8 +1,6 @@
 """
 A base SQLModel class with a default naming convention.
 """
-import sqlalchemy as sa
-
 NAMING_CONVENTION = {
     "ix": "ix_%(column_0_label)s",
     "uq": "uq_%(table_name)s_%(column_0_name)s",
@@ -12,23 +10,6 @@ NAMING_CONVENTION = {
 }
 
 
-def sqlalchemy_enum_with_name(enum_type):
-    """
-    SQLAlchemy-compatible enum type using the enum's names as values
-    """
-    return sa.Enum(enum_type, values_callable=lambda obj: [e.name for e in obj])
-
-
-def sqlalchemy_enum_with_value(enum_type):
-    """
-    SQLAlchemy-compatible enum type using the enum's values as values
-    """
-    return sa.Enum(
-        enum_type,
-        values_callable=lambda obj: [e.value for e in obj],
-    )
-
-
 def labelize(value: str) -> str:
     """
     Turn a system name into a human-readable name.

{datajunction_server-0.0.1a39.dev0 → datajunction_server-0.0.1a39.dev2}/datajunction_server/models/tag.py

@@ -15,7 +15,7 @@ class MutableTagFields(BaseModel):
     Tag fields that can be changed.
     """
 
-    description: str
+    description: Optional[str]
     display_name: Optional[str]
     tag_metadata: Optional[Dict[str, Any]] = {}