dataflow-core 2.1.28__tar.gz → 2.1.29__tar.gz

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.28
+Version: 2.1.29
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/authenticator/dataflowhubauthenticator.py

@@ -12,6 +12,8 @@ from dataflow.configuration import ConfigurationManager
 import asyncio
 import httpx
 
+from .utils.verify_email_domain import is_disposable_email
+
 class DataflowBaseAuthenticator(Authenticator):
     """Base Authenticator to handle Dataflow authentication and session management.
     Provides methods to authenticate users via Dataflow credentials, manage sessions.
@@ -177,7 +179,7 @@ class DataflowBaseAuthenticator(Authenticator):
         except Exception as e:
             self.log.warning(f"Error sending user creation email for {email}: {str(e)}")
 
-    def create_new_user(self, email, first_name=None, last_name=None):
+    def create_new_user(self, email, first_name=None, last_name=None, handler=None):
 
         """Create a new user with Applicant role
         
@@ -185,6 +187,7 @@ class DataflowBaseAuthenticator(Authenticator):
             email (str): User's email address
             first_name (str): User's first name
             last_name (str): User's last name
+            handler: optional request handler to show a login_error page when signup is refused
         
         Returns:
             new_user (m_user.User|None): Created user object or None if creation failed
@@ -193,6 +196,16 @@ class DataflowBaseAuthenticator(Authenticator):
         try:
             # Normalize email to lowercase for consistency
             email = email.lower()
+
+            # Disallow disposable / temporary email addresses at signup
+            if is_disposable_email(email):
+                self.log.warning(f"Rejected signup for disposable email: {email}")
+                if handler is not None:
+                    try:
+                        self.login_error(handler, "Disposable or temporary email addresses cannot be used. Please use a personal or work email.", "Invalid Email")
+                    except Exception as e:
+                        self.log.warning(f"Failed to render disposable email error page: {e}")
+                return None
             
             username = self.extract_username_from_email(email)
             username = re.sub(r'[^a-z0-9]', '', username.lower())
@@ -229,6 +242,22 @@ class DataflowBaseAuthenticator(Authenticator):
             self.db.add(new_user)
             self.db.commit()
             self.db.refresh(new_user)
+
+            # Create initial USER_ONBOARDING entry with demo_launch_initialized = False
+            try:
+                if hasattr(m_user, "UserOnboarding"):
+                    onboarding = m_user.UserOnboarding(
+                        user_id=new_user.user_id,
+                        demo_launch_initialized=False
+                    )
+                    self.db.add(onboarding)
+                    self.db.commit()
+                else:
+                    self.log.warning("UserOnboarding model not found in m_user; skipping onboarding entry creation")
+                    
+            except Exception as e:
+                self.log.warning(f"Failed to create USER_ONBOARDING entry for user {username}: {e}")
+                self.db.rollback()
             
             self.log.info(f"Created new user: {username} with email: {email}")
             
@@ -276,6 +305,33 @@ class DataflowBaseAuthenticator(Authenticator):
         #     return False
         
         return True
+    
+    def login_error(self, handler, message, title="Authentication Failed"):
+        """Custom error handler with simple centered design"""
+        html = f"""
+        <!DOCTYPE html>
+        <html>
+        <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>{title}</title>
+            <link href='https://fonts.googleapis.com/css?family=Lato:400,600' rel='stylesheet'>
+        </head>
+        <body style="margin: 0; padding: 20px; font-family: 'Lato', Arial, sans-serif; background-color: #f8fafc; min-height: 100vh; display: flex; align-items: center; justify-content: center;">
+            <div style="background: white; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); max-width: 450px; width: 100%; padding: 40px; text-align: center;">
+                <div style="width: 60px; height: 60px; background-color: #ffebee; border-radius: 50%; display: flex; align-items: center; justify-content: center; margin: 0 auto 20px; font-size: 30px; color: #d32f2f;">!</div>
+                
+                <h1 style="font-size: 24px; font-weight: 600; color: #121926; margin: 0 0 12px 0;">{title}</h1>
+                
+                <p style="font-size: 15px; color: #697586; line-height: 1.5; margin: 0 0 24px 0;">{message}</p>
+                
+                <a href="/hub/login" style="display: inline-block; padding: 12px 32px; background-color: #30baba; color: white; text-decoration: none; border-radius: 6px; font-size: 14px; font-weight: 600; transition: background-color 0.3s;">Try Again</a>
+            </div>
+        </body>
+        </html>
+        """
+        handler.set_status(403)
+        handler.finish(html)
 
     async def authenticate_dataflow(self, handler, data):
 
@@ -328,7 +384,7 @@ class DataflowBaseAuthenticator(Authenticator):
             self.log.info(f"OTP validated and deleted for user: {user_email}")
             if not user:
                 try:
-                    db_user = self.create_new_user(user_email)
+                    db_user = self.create_new_user(user_email, handler=handler)
                     if not db_user:
                         self.log.error(f"Failed to create new user for email: {user_email}")
                         self.login_error(handler, "Authentication error occurred. Please try again.")
@@ -389,35 +445,6 @@ class DataflowGoogleAuthenticator(DataflowBaseAuthenticator, GoogleOAuthenticato
                       f"oauth_callback_url={self.oauth_callback_url}, "
                       f"enable_dataflow_auth={self.enable_dataflow_auth}")
 
-    def login_error(self, handler, message, title="Authentication Failed"):
-        """Custom error handler with simple centered design"""
-        html = f"""
-        <!DOCTYPE html>
-        <html>
-        <head>
-            <meta charset="UTF-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <title>{title}</title>
-            <link href='https://fonts.googleapis.com/css?family=Lato:400,600' rel='stylesheet'>
-        </head>
-        <body style="margin: 0; padding: 20px; font-family: 'Lato', Arial, sans-serif; background-color: #f8fafc; min-height: 100vh; display: flex; align-items: center; justify-content: center;">
-            <div style="background: white; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); max-width: 450px; width: 100%; padding: 40px; text-align: center;">
-                <div style="width: 60px; height: 60px; background-color: #ffebee; border-radius: 50%; display: flex; align-items: center; justify-content: center; margin: 0 auto 20px; font-size: 30px; color: #d32f2f;">!</div>
-                
-                <h1 style="font-size: 24px; font-weight: 600; color: #121926; margin: 0 0 12px 0;">{title}</h1>
-                
-                <p style="font-size: 15px; color: #697586; line-height: 1.5; margin: 0 0 24px 0;">{message}</p>
-                
-                <a href="/hub/login" style="display: inline-block; padding: 12px 32px; background-color: #30baba; color: white; text-decoration: none; border-radius: 6px; font-size: 14px; font-weight: 600; transition: background-color 0.3s;">Try Again</a>
-            </div>
-        </body>
-        </html>
-        """
-        handler.set_status(403)
-        handler.finish(html)
-
-
-
     async def authenticate(self, handler, data):
 
         """Authenticate user using Google OAuth with Dataflow integration.
@@ -474,7 +501,7 @@ class DataflowGoogleAuthenticator(DataflowBaseAuthenticator, GoogleOAuthenticato
                 self.log.info(f"Creating user with first_name='{first_name}', last_name='{last_name}' from Google data: {user_info}")
                 
                 try:
-                    db_user = self.create_new_user(email, first_name, last_name)
+                    db_user = self.create_new_user(email, first_name, last_name, handler)
                     if not db_user:
                         self.log.error(f"Failed to create new user for email: {email}")
                         self.login_error(handler, "Authentication error occurred. Please try again.")
@@ -543,32 +570,6 @@ class DataflowAzureAuthenticator(DataflowBaseAuthenticator, AzureAdOAuthenticato
                       f"oauth_callback_url={self.oauth_callback_url}, "
                       f"enable_dataflow_auth={self.enable_dataflow_auth}")
 
-    def login_error(self, handler, message, title="Authentication Failed"):
-        """Custom error handler with simple centered design"""
-        html = f"""
-        <!DOCTYPE html>
-        <html>
-        <head>
-            <meta charset="UTF-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <title>{title}</title>
-            <link href='https://fonts.googleapis.com/css?family=Lato:400,600' rel='stylesheet'>
-        </head>
-        <body style="margin: 0; padding: 20px; font-family: 'Lato', Arial, sans-serif; background-color: #f8fafc; min-height: 100vh; display: flex; align-items: center; justify-content: center;">
-            <div style="background: white; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); max-width: 450px; width: 100%; padding: 40px; text-align: center;">
-                <div style="width: 60px; height: 60px; background-color: #ffebee; border-radius: 50%; display: flex; align-items: center; justify-content: center; margin: 0 auto 20px; font-size: 30px; color: #d32f2f;">!</div>
-                
-                <h1 style="font-size: 24px; font-weight: 600; color: #121926; margin: 0 0 12px 0;">{title}</h1>
-                
-                <p style="font-size: 15px; color: #697586; line-height: 1.5; margin: 0 0 24px 0;">{message}</p>
-                
-                <a href="/hub/login" style="display: inline-block; padding: 12px 32px; background-color: #30baba; color: white; text-decoration: none; border-radius: 6px; font-size: 14px; font-weight: 600; transition: background-color 0.3s;">Try Again</a>
-            </div>
-        </body>
-        </html>
-        """
-        handler.set_status(403)
-        handler.finish(html)
 
     async def authenticate(self, handler, data):
         """Authenticate user using Azure AD OAuth with Dataflow integration.
@@ -626,7 +627,7 @@ class DataflowAzureAuthenticator(DataflowBaseAuthenticator, AzureAdOAuthenticato
                 self.log.info(f"Creating user with first_name='{first_name}', last_name='{last_name}' from Azure data: {user_info}")
                 
                 try:
-                    db_user = self.create_new_user(email, first_name, last_name)
+                    db_user = self.create_new_user(email, first_name, last_name, handler)
                     if not db_user:
                         self.log.error(f"Failed to create new user for email: {email}")
                         self.login_error(handler, "Authentication error occurred. Please try again.")

dataflow_core-2.1.29/authenticator/utils/verify_email_domain.py

@@ -0,0 +1,67 @@
+"""Simple cached-file disposable email checker.
+
+Behavior:
+- Read domains from a local cache file (`CACHE`).
+- Cache contents in memory and reload only when the file modification time changes.
+- If the cache file is missing or unreadable, treat all emails as valid (returns False).
+"""
+from __future__ import annotations
+
+import os
+from typing import Set, Optional
+
+CACHE = '/dataflow/app/constants/domains.txt'
+
+_domains: Set[str] = set()
+_last_mtime: Optional[float] = None
+
+
+def _load_cache(path: str) -> bool:
+    """Load domains from `path` into the in-memory set.
+
+    Returns True if the cache file existed and was loaded (or already up-to-date),
+    False if the file did not exist or could not be read.
+    """
+    global _domains, _last_mtime
+    try:
+        if not os.path.exists(path):
+            _domains = set()
+            _last_mtime = None
+            return False
+
+        mtime = os.path.getmtime(path)
+        if _last_mtime is None or mtime != _last_mtime:
+            # (re)load file
+            domains: Set[str] = set()
+            with open(path, 'r') as fh:
+                for ln in fh:
+                    ln = ln.strip()
+                    if not ln or ln.startswith('#'):
+                        continue
+                    domains.add(ln.lower())
+            _domains = domains
+            _last_mtime = mtime
+        return True
+    except Exception:
+        # On any error treat as missing so callers can decide (we return False)
+        _domains = set()
+        _last_mtime = None
+        return False
+
+
+def is_disposable_email(email: str) -> bool:
+    """Check whether `email` belongs to a disposable domain.
+
+    - If the cache file is missing/unreadable: return True (treat as disposable).
+    - If email is invalid (no '@'): return False.
+    """
+    if not email or '@' not in email:
+        return False
+
+    cache_ok = _load_cache(CACHE)
+    if not cache_ok:
+        # No reliable domain list available allow all
+        return False
+
+    domain = email.split('@', 1)[1].lower()
+    return domain in _domains

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/__init__.py

@@ -18,7 +18,7 @@ from .environment_status import EnvironmentStatus
 from .user_team import UserTeam
 from .role_server import RoleServer
 from .variables import Variable
-from .recent_project_studio import RecentProjectStudio
+from .recent_project_studio import RecentProjectStudio, AppLaunchStatus
 from .connection import Connection
 from .git_ssh import GitSSH
 from .pod_activity import PodActivity
@@ -29,3 +29,7 @@ from .dataflow_setting import DataflowSetting
 from .subscription import Subscription, SubscriptionServer, Price, OrganizationCreditTransaction, OrganizationSubscription
 from .otp import UserOtp
 from .connection_type import ConnectionType
+from .container import Container, ContainerStatus
+from .active_server_view import ActiveServerView
+from .inference_service import InferenceService, InferenceStatus
+from .onboarding_project import OnboardingProject

dataflow_core-2.1.29/dataflow/models/active_server_view.py

@@ -0,0 +1,27 @@
+"""active_server_view.py"""
+from sqlalchemy import Column, Integer, String, Boolean, ForeignKey, DateTime, func
+from dataflow.db import Base
+
+
+class ActiveServerView(Base):
+    """Table ACTIVE_SERVER_VIEW
+
+    Tracks which user's server the current user is viewing/accessing.
+    When a user switches to viewing a shared server, this record is upserted.
+    When viewing their own server, the record is deleted.
+
+    Attributes:
+        id (int): Primary key.
+        user_name (str): The logged-in user (the viewer). Unique — one active view per user.
+        viewing_user_name (str): The server owner whose server is being viewed.
+        can_spawn (bool): Whether the viewer has start/stop (spawn) permission on the viewed server.
+        updated_at (datetime): When this was last changed.
+    """
+
+    __tablename__ = 'ACTIVE_SERVER_VIEW'
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    user_name = Column(String, ForeignKey('USER.user_name', ondelete='CASCADE'), unique=True, nullable=False, index=True)
+    viewing_user_name = Column(String, ForeignKey('USER.user_name', ondelete='CASCADE'), nullable=False)
+    can_spawn = Column(Boolean, nullable=False, default=True, server_default='true')
+    updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/app_types.py

@@ -11,6 +11,7 @@ class AppType(Base):
         name (str): Unique name identifier for the app type.
         display_name (str): Human-readable name for the app type.
         code_based (bool): Indicates if the app type is code-based.
+        is_public_allowed (bool): Indicates if the app type is allowed for public use.
         studio (bool): Indicates if the app type is associated with Dataflow Studio.
         runtime (bool): Indicates if the app type is a runtime application.
         organizations (list): Relationship to organizations using this app type.
@@ -25,6 +26,7 @@ class AppType(Base):
     name = Column(String, unique=True, nullable=False)
     display_name = Column(String, nullable=False)
     code_based = Column(Boolean, nullable=False)
+    is_public_allowed = Column(Boolean, nullable=False, default=True, server_default='true')
     studio = Column(Boolean, nullable=False, default=False, server_default='false')
     runtime = Column(Boolean, nullable=False, default=False, server_default='false')
 

dataflow_core-2.1.29/dataflow/models/container.py

@@ -0,0 +1,54 @@
+from sqlalchemy import Column, Enum, Integer, String, ForeignKey, UniqueConstraint, Text
+from dataflow.db import Base
+import enum
+
+class ContainerStatus(enum.Enum):
+    """Enum-like class for container deployment status."""
+    PENDING  = "PENDING"
+    DEPLOYED = "DEPLOYED"
+    FAILED   = "FAILED"
+    DELETING = "DELETING"
+    STOPPED  = "STOPPED"
+
+class Container(Base):
+    """TABLE 'CONTAINER'.
+    
+    Attributes:
+        id (int): Primary key for the container.
+        name (str): Unique name identifier for the container.
+        image (str): The container image to deploy.
+        port (int): The port to expose.
+        env_vars (str): JSON string of environment variables.
+        command (str): JSON string of container command override.
+        cpu_limit (str): CPU resource limit (e.g., '1', '500m').
+        memory_limit (str): Memory resource limit (e.g., '2Gi', '512Mi').
+        status (ContainerStatus): Deployment status of the container.
+        url (str): URL where the container is accessible after deployment.
+    
+    Relationships:
+        created_by (str): Foreign key referencing the USER table.
+        org_id (int): Foreign key referencing the ORGANIZATION table.
+
+    Constraints:
+        UniqueConstraint: Ensures unique combination of name and org_id.
+    """
+    
+    __tablename__ = "CONTAINER"
+    
+    id           = Column(Integer, primary_key=True, autoincrement=True, unique=True)
+    name         = Column(String, nullable=False)
+    slug         = Column(String, nullable=False)
+    image        = Column(String, nullable=False)
+    port         = Column(Integer, nullable=True)
+    env_vars     = Column(Text, nullable=True)  
+    command      = Column(Text, nullable=True)  
+    cpu_limit    = Column(String, nullable=True, default="1", server_default="1")
+    memory_limit = Column(String, nullable=True, default="2Gi", server_default="2Gi")
+    created_by   = Column(String, ForeignKey('USER.user_name', ondelete="CASCADE"), nullable=False)
+    org_id       = Column(Integer, ForeignKey("ORGANIZATION.id"), index=True, nullable=False)
+    status       = Column(Enum(ContainerStatus), default=ContainerStatus.PENDING, server_default="PENDING", nullable=False)
+    url          = Column(String, nullable=True)
+    
+    __table_args__ = (
+        UniqueConstraint(slug, org_id, name='name_org_id_unique'),
+    )

dataflow_core-2.1.29/dataflow/models/inference_service.py

@@ -0,0 +1,59 @@
+from sqlalchemy import Column, Integer, String, ForeignKey, UniqueConstraint, Enum
+from dataflow.db import Base
+import enum
+
+class InferenceStatus(enum.Enum):
+    """Enum-like class for inference service status."""
+    PENDING  = "PENDING"
+    RUNNING  = "RUNNING"
+    SUCCEEDED = "SUCCEEDED"
+    FAILED   = "FAILED"
+
+class InferenceService(Base):
+    """TABLE 'INFERENCE_SERVICE'
+
+    Attributes:
+        id (int): Primary key for the model.
+        slug (str): Unique identifier for the model.
+        model_name (str): Name of the model.
+        model_version (str): Version of the model.
+        description (str): Description of the model.
+        runtime (str): Runtime in which the model is deployed.
+        org_id (int): Foreign key referencing the ORGANIZATION table.
+        storage_uri (str): URI where the model artifacts are stored.
+        service_url (str): User-facing URL to access the inference service.
+        concurrency (int): Number of concurrent requests the model can handle.
+        min_replicas (int): Minimum number of replicas for the model deployment.
+        max_replicas (int): Maximum number of replicas for the model deployment.
+        cpu_limit (str): CPU resource limit for the model deployment
+        memory_limit (str): Memory resource limit for the model deployment
+        gpu_type (str): Type of GPU to use for the model deployment (if any)
+        gpu_count (str): Number of GPUs to use for the model deployment (if any)
+        status (InferenceStatus): Deployment status of the model inference service.
+
+    Constraints:
+        UniqueConstraint: Ensures unique combination of slug and runtime.
+    """
+    __tablename__ = "INFERENCE_SERVICE"
+    
+    id            = Column(Integer, primary_key=True, autoincrement=True, unique=True)
+    slug          = Column(String, nullable=False)
+    model_name    = Column(String, nullable=False)
+    model_version = Column(String, nullable=False)
+    description   = Column(String, nullable=True)
+    runtime       = Column(String, nullable=False)
+    org_id        = Column(Integer, ForeignKey("ORGANIZATION.id"), index=True, nullable=False)
+    storage_uri   = Column(String, nullable=False)
+    service_url   = Column(String, nullable=True)
+    concurrency   = Column(Integer, nullable=True, default=80)
+    min_replicas  = Column(Integer, nullable=True, default=1)
+    max_replicas  = Column(Integer, nullable=True, default=1)
+    cpu_limit     = Column(String, nullable=True, default="500m", server_default="500m")
+    memory_limit  = Column(String, nullable=True, default="2Gi", server_default="2Gi")
+    gpu_type      = Column(String, nullable=True)
+    gpu_count     = Column(String, nullable=True, default="0", server_default="0")
+    status        = Column(Enum(InferenceStatus, name="inference_status"), default=InferenceStatus.PENDING, server_default="PENDING", nullable=False)
+
+    __table_args__ = (
+        UniqueConstraint('slug', 'runtime', name='slug_runtime_unique'),
+    )

dataflow_core-2.1.29/dataflow/models/onboarding_project.py

@@ -0,0 +1,54 @@
+from sqlalchemy import Column, String, Integer, DateTime, func
+from sqlalchemy.dialects.postgresql import JSONB, ARRAY
+from dataflow.db import Base
+
+
+class OnboardingProject(Base):
+
+    """Represents an onboarding project template.
+
+    Attributes:
+        project_id (int): Primary key.
+        name (str): Human-friendly name for the onboarding project.
+        description (str): Optional description.
+        apps (dict): JSON map of app name -> relative path in project.
+        path_to_clone (str): Base path where the project is cloned inside Dataflow.
+        git_url (str): Repository URL used to clone onboarding project content.
+        git_branch (str): Branch to checkout for onboarding project content.
+        display_order (int): Card ordering priority in onboarding selection UI.
+        connections (dict): JSON map of connection id -> relative path in project.
+        variables (dict): JSON map of variable key -> value.
+        secrets (dict): JSON map of secret key -> value.
+        guide_steps (list[dict]): Ordered guide metadata with route, label and hint per step.
+        steps (list[str]): Ordered short onboarding journey steps.
+        created_at (datetime): Creation timestamp.
+        created_by (str): User who created the template.
+    """
+
+    __tablename__ = "ONBOARDING_PROJECT"
+
+    project_id = Column(Integer, primary_key=True, autoincrement=True)
+    name = Column(String, nullable=False, unique=True)
+    description = Column(String, nullable=True)
+    path_to_clone = Column(String, nullable=False)
+    git_url = Column(String, nullable=True)
+    git_branch = Column(String, nullable=True)
+    display_order = Column(Integer, nullable=False, server_default='100')
+
+    # Key-value configuration for onboarding resources
+    # apps example: {"streamlit": "Demo 1 - Flight Delay Analysis/streamlit"}
+    apps = Column(JSONB, nullable=True, server_default='{}')
+    # connections example: {"conn_id": "relative/path/to/db.sqlite"}
+    connections = Column(JSONB, nullable=True, server_default='{}')
+    variables = Column(JSONB, nullable=True, server_default='{}')
+    secrets = Column(JSONB, nullable=True, server_default='{}')
+    config_step = Column(ARRAY(String), nullable=True, server_default='{}')
+    environment = Column(String, nullable=True)
+    guide_steps = Column(JSONB, nullable=True, server_default='[]')
+    steps = Column(ARRAY(String), nullable=True, server_default='{}')
+
+    created_at = Column(DateTime, nullable=False, server_default=func.now())
+    created_by = Column(String, nullable=False)
+
+    def __repr__(self):
+        return f"<OnboardingProject(id={self.project_id}, name={self.name})>"

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/org_associations.py

@@ -57,6 +57,21 @@ class OrganizationAppType(Base):
     org_id = Column(Integer, ForeignKey('ORGANIZATION.id', ondelete="CASCADE"), primary_key=True, nullable=False)
     app_type_id = Column(Integer, ForeignKey('APP_TYPE.id', ondelete="CASCADE"), primary_key=True, nullable=False)
 
+
+class OrganizationServer(Base):
+
+    """TABLE 'ORGANIZATION_SERVER'
+
+    Attributes:
+        org_id (int): Foreign key referencing the ORGANIZATION table, also part of the primary key.
+        server_id (int): Foreign key referencing the SERVER_CONFIG table, also part of the primary key.
+    """
+
+    __tablename__ = "ORGANIZATION_SERVER"
+
+    org_id = Column(Integer, ForeignKey('ORGANIZATION.id', ondelete="CASCADE"), primary_key=True, nullable=False)
+    server_id = Column(Integer, ForeignKey('SERVER_CONFIG.id', ondelete="CASCADE"), primary_key=True, nullable=False)
+
 # class OrganizationSubscription(Base):
     
 #     """TABLE 'ORGANIZATION_SUBSCRIPTION'

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/organization.py

@@ -42,6 +42,7 @@ class Organization(Base):
     email_domain = Column(String(255), nullable=False)
     spark_enabled_zones = Column(JSONB, default=func.json([]), server_default=text("'[]'::jsonb"))  # List of zone IDs where Spark is enabled
     agent_enabled = Column(Boolean, default=False, server_default='false')
+    agent_enabled_org = Column(Boolean, default=False, server_default='false')
     created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), server_default=func.now())
     allow_auto_user_onboarding = Column(Boolean, nullable=False, default=True, server_default="true")
     active = Column(Boolean, nullable=False, default=True, server_default="true")
@@ -54,7 +55,7 @@ class Organization(Base):
     # subscriptions = relationship("Subscription", secondary="ORGANIZATION_SUBSCRIPTION", back_populates="organizations")
     onboarding_requests = relationship("UserOnboarding", back_populates="organization", cascade="all, delete-orphan")
     invited_users = relationship("InvitedUser", back_populates="organization", cascade="all, delete-orphan")
-    # servers = relationship("ServerConfig", secondary="ORGANIZATION_SERVER", back_populates="organizations")
+    servers = relationship("ServerConfig", secondary="ORGANIZATION_SERVER", back_populates="organizations")
     apps = relationship("AppType", secondary="ORGANIZATION_APP_TYPE", back_populates="organizations")
     roles = relationship("Role", cascade="all, delete-orphan")
     environments = relationship("Environment", back_populates="organization")

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/project_details.py

@@ -50,6 +50,7 @@ class ProjectDetails(Base):
     git_folder = Column(String, nullable=True)
     type = Column(String, ForeignKey('APP_TYPE.name'), nullable=False)
     slug = Column(String, nullable=False)
+    description = Column(String, nullable=True)
     runtime = Column(String, nullable=False)
     py_env = Column(Integer, nullable=True)
     launch_url = Column(String, nullable=True)  

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/recent_project_studio.py

@@ -32,4 +32,18 @@ class RecentProjectStudio(Base):
 
     __table_args__ = (
         UniqueConstraint(user_name, project_path, app_name, name='user_name_project_path_app_name_unique'),
-    )
+    )
+
+
+class AppLaunchStatus(Base):
+    """TABLE 'APP_LAUNCH_STATUS'
+
+    Tracks the last launch attempt for each application.
+    """
+
+    __tablename__ = 'APP_LAUNCH_STATUS'
+
+    id = Column(Integer, primary_key=True, index=True, autoincrement=True)
+    app_name = Column(String, nullable=False, unique=True, index=True)
+    launch_status = Column(Boolean, nullable=False, default=False, server_default='false')
+    last_launch_time = Column(DateTime, server_default=func.now(), nullable=False)

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/role.py

@@ -12,6 +12,7 @@ class BaseRoleField(enum.Enum):
     user = "user"
     applicant = "applicant"
     ops = "ops"
+    viewer = "viewer"
 
 class Role(Base):
     """

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/server_config.py

@@ -35,10 +35,12 @@ class ServerConfig(Base):
     cpu                  = Column(String, nullable=False)
     gpu                  = Column(String)
     default              = Column(Boolean, default=False, server_default='false')
+    available_to_all_orgs = Column(Boolean, default=True, server_default='true', nullable=False)
     tags                 = Column(JSONB, default=func.json([]), server_default=text("'[]'::jsonb"))
     description          = Column(Text, nullable=True)
     kubespawner_override = Column(JSONB, default=func.json({}), server_default=text("'{}'::jsonb"))
 
     # Relationships
     subscriptions = relationship("Subscription", secondary="SUBSCRIPTION_SERVER", back_populates="servers")
-    roles         = relationship("Role", secondary="ROLE_SERVER", back_populates="servers")
+    roles         = relationship("Role", secondary="ROLE_SERVER", back_populates="servers")
+    organizations = relationship("Organization", secondary="ORGANIZATION_SERVER", back_populates="servers")

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/models/user.py

@@ -21,6 +21,7 @@ class User(Base):
         active (bool): Flag indicating whether the user is active.
         password (str): Hashed password for the user.
         active_org_id (int): Foreign key referencing the active organization of the user.
+        created_at (datetime): Timestamp of when the user record was created.
     
     Relationships:
         org_user_assocs: Relationship to OrganizationUser model.
@@ -43,6 +44,7 @@ class User(Base):
     password = Column(String, nullable=True)
     active_org_id = Column(Integer, ForeignKey('ORGANIZATION.id'))
     is_super_admin = Column(Boolean, nullable=False, default=False, server_default='false')
+    created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False, server_default=func.now())
 
     # Relationships
     org_user_assocs = relationship("OrganizationUser", back_populates="user", cascade="all, delete-orphan")
@@ -97,6 +99,12 @@ class UserOnboarding(Base):
     user_id = Column(Integer, ForeignKey("USER.user_id", ondelete="CASCADE"), nullable=False)
     org_id = Column(Integer, ForeignKey("ORGANIZATION.id", ondelete="CASCADE"), nullable=False)
     status = Column(Enum(OnboardingStatus, name='onboarding_status'), nullable=False, default=OnboardingStatus.pending.value, server_default='pending')
+    selected_role = Column(String, nullable=True)
+    selected_demo_project = Column(String, nullable=True)
+    skipped = Column(Boolean, nullable=False, default=False, server_default='false')
+    demo_launch_initialized = Column(Boolean, nullable=False, default=False, server_default='false')
+    demo_current_step_id = Column(String, nullable=True)
+    demo_current_step_index = Column(Integer, nullable=True)
     created_at = Column(DateTime, default=func.now(), nullable=False, server_default=func.now())
     updated_at = Column(DateTime, default=func.now(), onupdate=func.now(), nullable=False, server_default=func.now())
     # Relationships

{dataflow_core-2.1.28 → dataflow_core-2.1.29}/dataflow/secrets_manager/providers/gcp_manager.py

@@ -233,6 +233,9 @@ class GCPSecretsManager(SecretManager):
                 if version.name == new_version_name:
                     continue
 
+                if version.state.name == "DESTROYED":
+                    continue
+
                 # Disable the version before destroying
                 if version.state.name != "DISABLED":
                     self.client.disable_secret_version(