dataflow-core 2.1.31__tar.gz → 2.1.32__tar.gz

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/PKG-INFO

@@ -1,14 +1,16 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.31
+Version: 2.1.32
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 
-Requires-Dist: sqlalchemy
+Requires-Dist: sqlalchemy<2.1
 Requires-Dist: alembic
 Requires-Dist: boto3
 Requires-Dist: psycopg2-binary
 Requires-Dist: pymysql
+Requires-Dist: pymssql<3,>=2.2.8
+Requires-Dist: sqlalchemy-bigquery<2,>=1.12.1
 Requires-Dist: requests
 Requires-Dist: azure-identity
 Requires-Dist: azure-keyvault-secrets

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/dataflow/models/__init__.py

@@ -36,3 +36,4 @@ from .active_server_view import ActiveServerView
 from .inference_service import InferenceService, InferenceStatus
 from .onboarding_project import OnboardingProject
 from .ai_provider import AIProvider, AIModel, AIUserProviderKey
+from .dbml_diagram import Diagram

dataflow_core-2.1.32/dataflow/models/dbml_diagram.py

@@ -0,0 +1,58 @@
+from sqlalchemy import Column, Integer, String, ForeignKey, Text, DateTime, func, Enum, Index, text
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+from dataflow.db import Base
+import uuid
+
+
+class Diagram(Base):
+
+    """TABLE 'DBML_DIAGRAM'
+
+    Stores a user-authored database ER diagram. The DBML source is the single source of
+    truth for the schema itself (tables, columns, relationships, header colours); the
+    layout column only holds presentation state that DBML has no syntax for, i.e. where
+    each table sits on the canvas and the last viewport.
+
+    Attributes:
+        id (int): Primary key for the diagram entry.
+        uid (UUID): Public identifier used in URLs, so the internal id is never exposed.
+        name (str): Display name of the diagram, unique per user within an organization.
+        description (str): Optional description of the diagram.
+        org_id (int): Foreign key referencing the ORGANIZATION table.
+        user_id (int): Foreign key referencing the USER table (the owner).
+        dbml_source (str): The DBML document defining the schema.
+        layout (dict): Canvas presentation state. Shape:
+            {"tables": {"public.users": {"x": 40, "y": 120}}, "viewport": {"x": 0, "y": 0, "zoom": 1}}
+        visibility (str): 'PRIVATE' or 'ORG'. Reserved for org sharing; currently always PRIVATE.
+        created_at (datetime): Timestamp of when the diagram was created.
+        updated_at (datetime): Timestamp of the last update to the diagram.
+        deleted_at (datetime): Soft delete timestamp; NULL while the diagram is active.
+
+    Constraints:
+        Index: Partial unique index ensuring a user cannot have two active diagrams
+            with the same name in the same organization.
+    """
+
+    __tablename__ = 'DBML_DIAGRAM'
+
+    id = Column(Integer, primary_key=True, autoincrement=True, nullable=False)
+    uid = Column(UUID(as_uuid=True), default=uuid.uuid4, nullable=False, unique=True, server_default=text("gen_random_uuid()"))
+    name = Column(String, nullable=False)
+    description = Column(Text, nullable=True)
+    org_id = Column(Integer, ForeignKey("ORGANIZATION.id", ondelete="CASCADE"), index=True, nullable=False)
+    user_id = Column(Integer, ForeignKey("USER.user_id", ondelete="CASCADE"), index=True, nullable=False)
+    dbml_source = Column(Text, nullable=False, server_default='')
+    layout = Column(JSONB, nullable=True)
+    visibility = Column(Enum("PRIVATE", "ORG", name="diagram_visibility"), default="PRIVATE", server_default="PRIVATE", nullable=False)
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
+    updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
+    deleted_at = Column(DateTime(timezone=True), nullable=True)
+
+    __table_args__ = (
+        Index(
+            'uq_active_diagram_name',
+            'name', 'user_id', 'org_id',
+            unique=True,
+            postgresql_where=deleted_at.is_(None)
+        ),
+    )

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/dataflow/models/project_details.py

@@ -36,7 +36,13 @@ class ProjectDetails(Base):
         exposed_port (int): Port exposed by the custom image.
         private_repo (bool): Whether the image repository is private.
         registry_secret_id (int): Foreign key referencing the VARIABLE table for registry credentials.
-    
+        source_type (str): Where the project's code comes from: GIT (cloned from git_url) or STUDIO
+            (synced from the creator's Studio folder into the runtime's projects volume).
+        studio_source_path (str): For STUDIO projects, the source folder relative to the creator's
+            /home/jovyan.
+        last_synced_at (datetime): For STUDIO projects, when files were last synced from Studio.
+        synced_by (str): For STUDIO projects, the user who ran the last sync.
+
     Relationships:
         app_type: Relationship to the AppType model.
     """
@@ -87,6 +93,15 @@ class ProjectDetails(Base):
     resource_config = Column(JSONB, nullable=True)
     cost_incurred = Column(JSONB, nullable=True)
     runtime_cost_state = Column(JSONB, nullable=True)
+    source_type = Column(
+        Enum("GIT", "STUDIO", name="project_source_type"),
+        nullable=False,
+        default="GIT",
+        server_default="GIT",
+    )
+    studio_source_path = Column(String, nullable=True)
+    last_synced_at = Column(DateTime(timezone=True), nullable=True)
+    synced_by = Column(String, nullable=True)
 
     __table_args__ = (
         Index(

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/dataflow/scripts/build_from_upper.sh

@@ -81,7 +81,7 @@ if [ "$base_prefix" = "$target_prefix" ]; then
     # mounted. Squash it as-is.
     squashfs_source="$merged_dir"
 else
-    echo "base_prefix} to ${target_prefix}; cloning environment"
+    echo "${base_prefix} to ${target_prefix}; cloning environment"
 
     export PIP_NO_CACHE_DIR=1
     export CONDA_PKGS_DIRS="${scratch_dir}/pkgs/${env_name_with_version}/"

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/dataflow_core.egg-info/PKG-INFO

@@ -1,14 +1,16 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.31
+Version: 2.1.32
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 
-Requires-Dist: sqlalchemy
+Requires-Dist: sqlalchemy<2.1
 Requires-Dist: alembic
 Requires-Dist: boto3
 Requires-Dist: psycopg2-binary
 Requires-Dist: pymysql
+Requires-Dist: pymssql<3,>=2.2.8
+Requires-Dist: sqlalchemy-bigquery<2,>=1.12.1
 Requires-Dist: requests
 Requires-Dist: azure-identity
 Requires-Dist: azure-keyvault-secrets

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/dataflow_core.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ dataflow/models/container.py
 dataflow/models/container_session_history.py
 dataflow/models/dataflow_setting.py
 dataflow/models/dataflow_zone.py
+dataflow/models/dbml_diagram.py
 dataflow/models/environment.py
 dataflow/models/environment_status.py
 dataflow/models/git_ssh.py
@@ -107,4 +108,6 @@ dfmigration/versions/024_add_status_reason_to_local_environment.py
 dfmigration/versions/025_add_project_preview_image.py
 dfmigration/versions/026_runtime_costing.py
 dfmigration/versions/027_local_environment_workset_columns.py
+dfmigration/versions/028_create_diagram_table.py
+dfmigration/versions/029_project_studio_source.py
 dfmigration/versions/__init__.py

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/dataflow_core.egg-info/requires.txt

@@ -1,8 +1,10 @@
-sqlalchemy
+sqlalchemy<2.1
 alembic
 boto3
 psycopg2-binary
 pymysql
+pymssql<3,>=2.2.8
+sqlalchemy-bigquery<2,>=1.12.1
 requests
 azure-identity
 azure-keyvault-secrets

dataflow_core-2.1.32/dfmigration/versions/028_create_diagram_table.py

@@ -0,0 +1,60 @@
+"""Create DBML_DIAGRAM table for DBML ER diagrams
+
+Revision ID: 028
+Revises: 027
+Create Date: 2026-08-17
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+revision = "028"
+down_revision = "027"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+	op.create_table(
+		"DBML_DIAGRAM",
+		sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+		sa.Column("uid", postgresql.UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), nullable=False),
+		sa.Column("name", sa.String(), nullable=False),
+		sa.Column("description", sa.Text(), nullable=True),
+		sa.Column("org_id", sa.Integer(), sa.ForeignKey("ORGANIZATION.id", ondelete="CASCADE"), nullable=False),
+		sa.Column("user_id", sa.Integer(), sa.ForeignKey("USER.user_id", ondelete="CASCADE"), nullable=False),
+		sa.Column("dbml_source", sa.Text(), server_default=sa.text("''"), nullable=False),
+		sa.Column("layout", postgresql.JSONB(), nullable=True),
+		sa.Column(
+			"visibility",
+			sa.Enum("PRIVATE", "ORG", name="diagram_visibility"),
+			server_default=sa.text("'PRIVATE'"),
+			nullable=False,
+		),
+		sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+		sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+		sa.Column("deleted_at", sa.DateTime(timezone=True), nullable=True),
+		sa.PrimaryKeyConstraint("id"),
+		sa.UniqueConstraint("uid", name="uq_diagram_uid"),
+	)
+
+	op.create_index("ix_DBML_DIAGRAM_org_id", "DBML_DIAGRAM", ["org_id"], unique=False)
+	op.create_index("ix_DBML_DIAGRAM_user_id", "DBML_DIAGRAM", ["user_id"], unique=False)
+
+	# A user cannot have two ACTIVE diagrams with the same name in the same org.
+	# Soft-deleted rows are excluded so a name can be reused after deletion.
+	op.create_index(
+		"uq_active_diagram_name",
+		"DBML_DIAGRAM",
+		["name", "user_id", "org_id"],
+		unique=True,
+		postgresql_where=sa.text("deleted_at IS NULL"),
+	)
+
+
+def downgrade():
+	op.drop_index("uq_active_diagram_name", table_name="DBML_DIAGRAM")
+	op.drop_index("ix_DBML_DIAGRAM_user_id", table_name="DBML_DIAGRAM")
+	op.drop_index("ix_DBML_DIAGRAM_org_id", table_name="DBML_DIAGRAM")
+	op.drop_table("DBML_DIAGRAM")
+	op.execute("DROP TYPE IF EXISTS diagram_visibility")

dataflow_core-2.1.32/dfmigration/versions/029_project_studio_source.py

@@ -0,0 +1,40 @@
+"""add studio source columns to project details
+
+Revision ID: 029
+Revises: 028
+Create Date: 2026-10-13
+
+Lets a project deployed to a runtime take its code from the creator's Studio folder
+(synced into the runtime's projects volume) instead of a Git repository.
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = "029"
+down_revision = "028"
+branch_labels = None
+depends_on = None
+
+
+project_source_type = sa.Enum("GIT", "STUDIO", name="project_source_type")
+
+
+def upgrade() -> None:
+    project_source_type.create(op.get_bind(), checkfirst=True)
+    op.add_column(
+        'PROJECT_DETAIL',
+        sa.Column('source_type', project_source_type, nullable=False, server_default='GIT'),
+    )
+    op.add_column('PROJECT_DETAIL', sa.Column('studio_source_path', sa.String(), nullable=True))
+    op.add_column('PROJECT_DETAIL', sa.Column('last_synced_at', sa.DateTime(timezone=True), nullable=True))
+    op.add_column('PROJECT_DETAIL', sa.Column('synced_by', sa.String(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column('PROJECT_DETAIL', 'synced_by')
+    op.drop_column('PROJECT_DETAIL', 'last_synced_at')
+    op.drop_column('PROJECT_DETAIL', 'studio_source_path')
+    op.drop_column('PROJECT_DETAIL', 'source_type')
+    project_source_type.drop(op.get_bind(), checkfirst=True)

{dataflow_core-2.1.31 → dataflow_core-2.1.32}/setup.py

@@ -14,18 +14,20 @@ class PostInstall(install):
 
 setup(
     name="dataflow-core",
-    version="2.1.31",
+    version="2.1.32",
     packages=find_packages(include=["dataflow", "dataflow.*", "authenticator", "authenticator.*", "dfmigration", "dfmigration.*"]),
     include_package_data=True,
     package_data={
         "dataflow": ["scripts/*.sh"],
     },
     install_requires=[
-        'sqlalchemy',
+        'sqlalchemy<2.1',
         'alembic',
         'boto3',
         'psycopg2-binary',
         'pymysql',
+        'pymssql>=2.2.8,<3',
+        'sqlalchemy-bigquery>=1.12.1,<2',
         'requests',
         'azure-identity',
         'azure-keyvault-secrets',