dataflow-core 2.1.5__py3-none-any.whl → 2.1.6__py3-none-any.whl

dataflow/db.py

@@ -1,14 +1,20 @@
+import dataflow
 from .database_manager import DatabaseManager
 from .configuration import ConfigurationManager
 from sqlalchemy.orm import declarative_base
 from sqlalchemy.exc import SQLAlchemyError
 from .utils.logger import CustomLogger
+import os
+import pwd
+import grp
+from urllib.parse import urlparse
 
 logger = CustomLogger().get_logger(__name__)
 
 dataflow_config = ConfigurationManager('/dataflow/app/config/dataflow.cfg')
+dataflow_local_config = ConfigurationManager('/dataflow/app/auth_config/dataflow_auth.cfg')
 db_url = dataflow_config.get_config_value('database', 'database_url')
-local_db_url = dataflow_config.get_config_value('database', 'single_user_db_url')
+local_db_url = dataflow_local_config.get_config_value('database', 'single_user_db_url')
 
 db_manager = DatabaseManager(db_url)
 local_db_manager = None
@@ -23,10 +29,44 @@ def create_tables(local_db=False):
     """
     try:
         if local_db:
-            global local_db_manager
-            if local_db_manager is None:
-                local_db_manager = DatabaseManager(local_db_url) 
-            Local_Base.metadata.create_all(bind=local_db_manager.get_engine())
+            if local_db_url and local_db_url.startswith('sqlite:///'):
+                parsed_url = urlparse(local_db_url)
+                db_file_path = parsed_url.path
+                db_dir = os.path.dirname(db_file_path)
+                logger.info(f"Creating local database at: {db_file_path}")
+                
+                if db_dir and not os.path.exists(db_dir):
+                    os.makedirs(db_dir, exist_ok=True)
+                    logger.info(f"Created directory for local database: {db_dir}")
+                
+                # Set ownership for database directory and file
+                nb_user = os.environ.get("NB_USER")
+                if nb_user:
+                    try:
+                        uid = pwd.getpwnam(nb_user).pw_uid
+                        gid = grp.getgrnam(nb_user).gr_gid
+                        
+                        # Set ownership for database directory
+                        if os.path.exists(db_dir):
+                            os.chown(db_dir, uid, gid)
+                        
+                        global local_db_manager
+                        if local_db_manager is None:
+                            local_db_manager = DatabaseManager(local_db_url) 
+                        Local_Base.metadata.create_all(bind=local_db_manager.get_engine())
+                        
+                        if os.path.exists(db_file_path):
+                            os.chown(db_file_path, uid, gid)
+                        logger.info(f"Ownership set for local database files")
+                    except (KeyError, OSError) as e:
+                        logger.warning(f"Could not set ownership for database files: {e}")
+                else:
+                    logger.error("NB_USER environment variable is not set. Cannot set ownership for local database files.")
+                    raise ValueError("Can only use local database with a valid NB_USER environment variable")
+            else:
+                logger.error("Local database URL must be a valid SQLite URL starting with 'sqlite:///'")
+                raise ValueError("Local database URL must be a valid SQLite URL starting with 'sqlite:///'")
+            
         else:
             Base.metadata.create_all(bind=db_manager.get_engine())
         logger.info("Database tables created successfully")

dataflow/models/__init__.py

@@ -3,7 +3,7 @@
 from .role import Role
 from .user import User
 from .team import Team
-from .environment import Environment
+from .environment import (Environment, LocalEnvironment, ArchivedEnvironment, JobLogs)
 from .project_details import ProjectDetails
 from .recent_projects import RecentProjects
 from .pinned_projects import PinnedProject
@@ -11,7 +11,7 @@ from .app_types import AppType
 from .blacklist_library import BlacklistedLibrary
 from .environment_status import EnvironmentStatus
 from .session import Session
-from .server_config import ServerConfig
+from .server_config import ServerConfig, CustomServerConfig
 from .runtime import RuntimeZone
 from .environment_status import EnvironmentStatus
 from .user_team import UserTeam

dataflow/models/environment.py

@@ -1,8 +1,8 @@
 from sqlalchemy import Column, Integer, String, Boolean, Text, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
-from datetime import datetime
-from dataflow.db import Base
+from datetime import datetime, timezone
+from dataflow.db import Base, Local_Base
 
 class EnvironmentAttributes(Base):
     """
@@ -61,3 +61,15 @@ class JobLogs(Base):
     status = Column(String)
     created_by = Column(String)
 
+
+class LocalEnvironment(Local_Base):
+    __tablename__ = "LOCAL_ENVIRONMENT"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    name = Column(String, nullable=False)
+    py_version = Column(String)
+    pip_libraries = Column(Text)
+    conda_libraries = Column(Text)
+    status = Column(String, default="Created")
+    updated_at = Column(DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
+    need_refresh = Column(Boolean, default=False)

dataflow/models/pinned_projects.py

@@ -6,8 +6,8 @@ class PinnedProject(Base):
     __tablename__ = "PINNED_PROJECT"
 
     id = Column(Integer, primary_key=True)
-    user_id = Column(Integer, ForeignKey('USER.user_id'), index=True)
-    project_id = Column(Integer, ForeignKey('PROJECT_DETAIL.project_id'), index=True)
+    user_id = Column(Integer, ForeignKey('USER.user_id', ondelete="CASCADE"), index=True)
+    project_id = Column(Integer, ForeignKey('PROJECT_DETAIL.project_id', ondelete="CASCADE"), index=True)
     pinned_at = Column(DateTime, default=datetime.utcnow)
 
     __table_args__ = (

dataflow/models/project_details.py

@@ -10,7 +10,7 @@ class ProjectDetails(Base):
     git_url = Column(String)
     git_branch = Column(String, nullable=True)
     git_folder = Column(String, nullable=True)
-    type = Column(String, ForeignKey('RUNTIME_APP_TYPE.name'), nullable=False)
+    type = Column(String, ForeignKey('RUNTIME_APP_TYPE.name', ondelete="CASCADE"), nullable=False)
     slug = Column(String, nullable=False, unique=True)
     runtime = Column(String, nullable=False)
     py_env = Column(String, nullable=True)

dataflow/models/recent_projects.py

@@ -5,5 +5,5 @@ class RecentProjects(Base):
     __tablename__ = "RECENT_PROJECT"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    project_id = Column(Integer, ForeignKey('PROJECT_DETAIL.project_id'), nullable=False)
+    project_id = Column(Integer, ForeignKey('PROJECT_DETAIL.project_id', ondelete="CASCADE"), nullable=False)
 

dataflow/models/server_config.py

@@ -24,7 +24,7 @@ class CustomServerConfig(Base):
     __tablename__ = "CUSTOM_SERVER"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    base_server_id = Column(Integer, ForeignKey(ServerConfig.id), nullable=False)
+    base_server_id = Column(Integer, ForeignKey(ServerConfig.id, ondelete="CASCADE"), nullable=False)
     display_name = Column(String, nullable=False, unique=True, index=True)
     description = Column(Text, nullable=True)
     

dataflow/models/user.py

@@ -20,7 +20,8 @@ class User(Base):
     image_url = Column(String, nullable=True)
     active = Column(Enum('N', 'Y', name='active_field'), nullable=False, server_default=str("N"))
     password = Column(String, nullable=False)
-    active_env = Column(String, ForeignKey('ENVIRONMENT.short_name')) 
+    active_env = Column(String)
+    active_env_type = Column(String, nullable=True)
     current_server = Column(String)
     show_server_page = Column(Boolean, default = True)
 

{dataflow_core-2.1.5.dist-info → dataflow_core-2.1.6.dist-info}/METADATA

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

{dataflow_core-2.1.5.dist-info → dataflow_core-2.1.6.dist-info}/RECORD

@@ -6,26 +6,26 @@ dataflow/__init__.py,sha256=WTRg8HMpMWSgxYJ9ZGVldx4k07fAbta3mBmZ1hG9mWE,30
 dataflow/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
 dataflow/database_manager.py,sha256=tJHMuOZ9Muskrh9t4uLRlTuFU0VkHAzoHlGP5DORIC4,899
 dataflow/dataflow.py,sha256=-UYZst7EO1GgaOjlAkKu-tu7RC6XsgadGeDp1MOvZiA,7439
-dataflow/db.py,sha256=5UwE4w5Vn9RqFIhr8ARlu2haZX-PtHDLRPjmn5BG2m8,1649
+dataflow/db.py,sha256=73ojGqpCTRVTlPszD73Ozhjih_BI2KTHmazqxxL6iWk,3780
 dataflow/environment.py,sha256=05F-dBRyZu2mr26vuiuJU13pfgtRpA9yW69bk83HGUw,27239
-dataflow/models/__init__.py,sha256=QMLiKj8BMhfScWMm8kgHkMjwAlFeg5Cym3_AI1NvBUA,783
+dataflow/models/__init__.py,sha256=7Wnx1_8eRd5QW07QlcY4-Pdt_3OD7dXm2-CcV0S6uy4,853
 dataflow/models/app_types.py,sha256=yE_ZB13lhpK7AZ7PyBwnQlf0RlIHYs_-vdMKx7_RMlY,379
 dataflow/models/blacklist_library.py,sha256=B2oi3Z8GcR_glhLAyinFk0W8c9txXvm3uOER6dY-q7I,991
 dataflow/models/connection.py,sha256=_VJL3KuIrm8t4lJmtunIL3-AXF9Yvi5wUolzdR3tE0E,1017
-dataflow/models/environment.py,sha256=Vg-4vQe_cHIfOX-kPJWd6SIEapPJcgxoCITgdRrqT_o,2107
+dataflow/models/environment.py,sha256=300CUwx7d7bjadrMsTch7NSRYLCuf9AK9WVzlT26CAc,2616
 dataflow/models/environment_status.py,sha256=lvPDNUsUoTW9D97B07aKqJQHRKp4LvPM28pQDMPH1ac,536
 dataflow/models/git_ssh.py,sha256=W15SDypxzGOz_aZkHEnVZ6DIMVsjAsbSIXVIEt2mPYU,694
-dataflow/models/pinned_projects.py,sha256=rkpPX_f2U9HjmrRo7_K8rnZIeXuQKGq6hYTrtLmu21c,566
-dataflow/models/project_details.py,sha256=94wTygXv9iGB0w8g_6vtkB5ZqIzpEv1W9uWwCA4hM0Y,1078
+dataflow/models/pinned_projects.py,sha256=I-XMQq7__XJJi2lyOdEvQEfhPRz8D6KHA6Cbavbf05o,606
+dataflow/models/project_details.py,sha256=iNb95L3UGjcC_Ws6FiUTDANCUFhYWpnsKraS6rmCyRU,1098
 dataflow/models/recent_project_studio.py,sha256=m12KGCsv453C1ijHjfVD8E7cJ7Og_0N8uc7_9VlfkYw,812
-dataflow/models/recent_projects.py,sha256=QqDlk3ll7tBaQl5hqvRarlB9_SUBuN44muLIuTVbPe0,301
+dataflow/models/recent_projects.py,sha256=OFd5MSRXVRHs9UbvUNoJBBnh9rgsJ0lwE23wm5_Hc5w,321
 dataflow/models/role.py,sha256=_I5F2TFox_k2-LGgjVuO2PIW9-gpwpoX8Te7m024A8k,693
 dataflow/models/role_server.py,sha256=mMcfjsGX1cY8hOAOBBmrZgw8ozdfuvjKJoBlR6F0Kdc,689
 dataflow/models/runtime.py,sha256=OiuBfZTMg81U10GS00DxfhiAmHlcyQUw5LBR8RaPl7s,415
-dataflow/models/server_config.py,sha256=GTMtQfgtuvKUbxV16VhEpKGhYoNISFLRWdUPqBJmYbM,1365
+dataflow/models/server_config.py,sha256=8ocKT8tPen9tedO8BLPEfkWxUEIHaqvA2L-qEhrFND0,1385
 dataflow/models/session.py,sha256=c8TI6qXsM8utzp5vSQtAOXJSbgasnyu-a0qSAvA-rWs,459
 dataflow/models/team.py,sha256=fjkqF0N4PSwSYTgHjEQl9wuC7yumd0iOb5nNFePI6q4,488
-dataflow/models/user.py,sha256=PT-zwZj7NWUubIj_7EY2EsjduMbI_42EyMclWMLESGk,1073
+dataflow/models/user.py,sha256=agxhZkkJ6C6_ZqNX-ISTBySeBz5kPw-OM_POMn_MESU,1086
 dataflow/models/user_environment.py,sha256=yI9NutULcLiwlycuEin6ROe6o1Sjdv_sgw2MEkJFeYg,568
 dataflow/models/user_team.py,sha256=r_fmKvf6JuGgiiI9TXWjVG2QZ3WOvDrOwYWVQ3r8oWo,659
 dataflow/models/variables.py,sha256=Sinvv3zFYni5i_GrL69cVfhCh4tOOaIHiEzWYRJ-i10,1132
@@ -37,8 +37,8 @@ dataflow/utils/aws_secrets_manager.py,sha256=A_fNs9VNah9dDdl9NhqizJamYU7xr2v_GXl
 dataflow/utils/get_current_user.py,sha256=akjcUyTpmMdAZj9LFGSTs76hjBRjltNk9hLUqC_BdkA,1140
 dataflow/utils/json_handler.py,sha256=5_7WdypegRBDe2HSqBXyrJAdd92wsha8qRcmQvCj1TA,782
 dataflow/utils/logger.py,sha256=7BFrOq5Oiqn8P4XZbgJzMP5O07d2fpdECbbfsjrUuHw,1213
-dataflow_core-2.1.5.dist-info/METADATA,sha256=8UhovnGu3NJ6b4wK-xBK7QBkr17y3O96P_RGTJHf8XY,301
-dataflow_core-2.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dataflow_core-2.1.5.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.1.5.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-2.1.5.dist-info/RECORD,,
+dataflow_core-2.1.6.dist-info/METADATA,sha256=riTs6HqJEWRlVFoaXya_aF98d_tJgB6TbuBBpIaTABo,301
+dataflow_core-2.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dataflow_core-2.1.6.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.1.6.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.1.6.dist-info/RECORD,,