dataflow-core 2.1.6__tar.gz → 2.1.7__tar.gz

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/PKG-INFO

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

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/authenticator/dataflowhubauthenticator.py

@@ -136,7 +136,6 @@ class DataflowBaseAuthenticator(Authenticator):
                 last_name=last_name or "",
                 email=email,
                 role_id=role_id,
-                active='Y',
                 password='user@123',
             )
             

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/dataflow/models/__init__.py

@@ -12,7 +12,8 @@ from .blacklist_library import BlacklistedLibrary
 from .environment_status import EnvironmentStatus
 from .session import Session
 from .server_config import ServerConfig, CustomServerConfig
-from .runtime import RuntimeZone
+from .dataflow_zone import DataflowZone
+from .role_zone import RoleZone
 from .environment_status import EnvironmentStatus
 from .user_team import UserTeam
 from .role_server import RoleServer

dataflow_core-2.1.7/dataflow/models/dataflow_zone.py

@@ -0,0 +1,19 @@
+from sqlalchemy import Column, Integer, String, Boolean
+from sqlalchemy.orm import relationship
+from dataflow.db import Base
+
+class DataflowZone(Base):
+    __tablename__ = "DATAFLOW_ZONE"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    slug = Column(String, unique=True, nullable=False)
+    display_name = Column(String, nullable=False)
+    is_runtime = Column(Boolean, default=False)
+    subdomain = Column(String)
+    spark_enabled = Column(Boolean, default=False)
+    display_order = Column(Integer, default=0)
+
+    role_zone_assocs = relationship("RoleZone", back_populates="zone")
+
+    def __repr__(self):
+        return f"<DataflowZone(id={self.id}, slug='{self.slug}', display_name='{self.display_name}', display_order={self.display_order})>"

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/dataflow/models/role.py

@@ -2,6 +2,12 @@
 from sqlalchemy import Column, Integer, String, Enum
 from sqlalchemy.orm import relationship
 from dataflow.db import Base
+import enum
+
+class BaseRoleField(enum.Enum):
+    admin = "admin"
+    user = "user"
+    applicant = "applicant"
 
 class Role(Base):
     """
@@ -13,7 +19,11 @@ class Role(Base):
     id = Column(Integer, primary_key=True, index=True, autoincrement=True, nullable=False)
     name = Column(String, unique=True, nullable=False)
     description = Column(String, nullable=True)
-    base_role = Column(Enum('admin', 'user', 'applicant', name='base_role_field'), default='user', nullable=False)
+    base_role = Column(Enum(BaseRoleField), nullable=False, default=BaseRoleField.user)
 
     users = relationship("User", back_populates="role_details", cascade="all, delete-orphan")
-    role_server_assocs = relationship("RoleServer", back_populates="role")
+    role_server_assocs = relationship("RoleServer", back_populates="role")
+    role_zone_assocs = relationship("RoleZone", back_populates="role")
+
+    def __repr__(self):
+        return f"<Role(id={self.id}, name='{self.name}', base_role='{self.base_role}')>"

dataflow_core-2.1.7/dataflow/models/role_zone.py

@@ -0,0 +1,17 @@
+from typing import Dict, List, Optional
+from sqlalchemy import Column, Integer, ForeignKey, UniqueConstraint, Boolean
+from sqlalchemy.orm import relationship
+from dataflow.db import Base
+
+class RoleZone(Base):
+    __tablename__ = 'ROLE_ZONE'
+
+    role_id = Column(Integer, ForeignKey('ROLE.id', ondelete="CASCADE"), primary_key=True)
+    zone_id = Column(Integer, ForeignKey('DATAFLOW_ZONE.id', ondelete="CASCADE"), primary_key=True)
+    is_default = Column(Boolean, default=False, nullable=False)
+
+    role = relationship("Role", back_populates="role_zone_assocs")
+    zone = relationship("DataflowZone", back_populates="role_zone_assocs")
+
+    def __repr__(self):
+        return f"<RoleZone(role_id={self.role_id}, zone_id={self.zone_id}, is_default={self.is_default})>"

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/dataflow/models/user.py

@@ -1,5 +1,5 @@
 """models.py"""
-from sqlalchemy import Column, Integer, String, Boolean, LargeBinary, Enum, ForeignKey
+from sqlalchemy import Column, Integer, String, Boolean, LargeBinary, ForeignKey
 from sqlalchemy.orm import relationship
 from dataflow.db import Base
 
@@ -18,7 +18,7 @@ class User(Base):
     role_id = Column(Integer, ForeignKey('ROLE.id'), nullable=False)
     image = Column(LargeBinary)
     image_url = Column(String, nullable=True)
-    active = Column(Enum('N', 'Y', name='active_field'), nullable=False, server_default=str("N"))
+    active = Column(Boolean, nullable=False, default=True)
     password = Column(String, nullable=False)
     active_env = Column(String)
     active_env_type = Column(String, nullable=True)

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/dataflow/utils/get_current_user.py

@@ -26,9 +26,11 @@ def get_user_from_session(session_id: str, db: Session):
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found")
 
     base_role = user.role_details.base_role
+    role_id = user.role_details.id
     role_name = user.role_details.name
     user.base_role = base_role
     user.role = role_name
+    user.role_id = role_id
     
     return user
 

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/dataflow_core.egg-info/PKG-INFO

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

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/dataflow_core.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ dataflow/models/__init__.py
 dataflow/models/app_types.py
 dataflow/models/blacklist_library.py
 dataflow/models/connection.py
+dataflow/models/dataflow_zone.py
 dataflow/models/environment.py
 dataflow/models/environment_status.py
 dataflow/models/git_ssh.py
@@ -23,7 +24,7 @@ dataflow/models/recent_project_studio.py
 dataflow/models/recent_projects.py
 dataflow/models/role.py
 dataflow/models/role_server.py
-dataflow/models/runtime.py
+dataflow/models/role_zone.py
 dataflow/models/server_config.py
 dataflow/models/session.py
 dataflow/models/team.py

{dataflow_core-2.1.6 → dataflow_core-2.1.7}/setup.py

@@ -14,7 +14,7 @@ class PostInstall(install):
 
 setup(
     name="dataflow-core",
-    version="2.1.6",
+    version="2.1.7",
     packages=find_packages(include=["dataflow", "dataflow.*", "authenticator", "authenticator.*"]),
     include_package_data=True,
     package_data={

dataflow_core-2.1.6/dataflow/models/runtime.py

@@ -1,11 +0,0 @@
-from sqlalchemy import Column, Integer, String, Boolean
-from dataflow.db import Base
-
-class RuntimeZone(Base):
-    __tablename__ = "RUNTIME_ZONE"
-
-    id = Column(Integer, primary_key=True, autoincrement=True, unique=True)
-    name = Column(String, unique=True, nullable=False)
-    display_name = Column(String, nullable=False)
-    display_order = Column(Integer)
-    spark_enabled = Column(Boolean, default=False)