dataflow-core 2.1.14__tar.gz → 2.1.14rc2__tar.gz

{dataflow_core-2.1.14 → dataflow_core-2.1.14rc2}/PKG-INFO

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

{dataflow_core-2.1.14 → dataflow_core-2.1.14rc2}/authenticator/dataflowairflowauthenticator.py

@@ -4,7 +4,7 @@ from flask_appbuilder.security.views import expose
 from flask_login import login_user
 from airflow.www.security import FabAirflowSecurityManagerOverride
 from dataflow.dataflow import Dataflow
-import logging
+import logging, os
 
 logging.basicConfig(
     level=logging.INFO,
@@ -29,9 +29,15 @@ class DataflowAuthDBView(AuthDBView):
             
             user_details = dataflow.auth(session_id)
             logger.info(f"User details retrieved for: {user_details['user_name']}")
+            if os.getenv("RUNTIME"):
+                role = self.appbuilder.sm.find_role(user_details.get("base_role", "user").title())
+            else:
+                role = self.appbuilder.sm.find_role("Admin")
             user = self.appbuilder.sm.find_user(username=user_details['user_name'])
             if user:
-                logger.info(f"User found: {user}")
+                # Update user role
+                user.role = role
+                self.appbuilder.sm.update_user(user=user)
                 login_user(user, remember=False)
             else:
                 user = self.appbuilder.sm.add_user(
@@ -39,7 +45,7 @@ class DataflowAuthDBView(AuthDBView):
                     first_name=user_details.get("first_name", ""),
                     last_name=user_details.get("last_name", ""), 
                     email=user_details.get("email", ""), 
-                    role=self.appbuilder.sm.find_role(user_details.get("base_role", "user").title())
+                    role=role,
                 )
                 logger.info(f"New user created: {user}")
                 if user:

{dataflow_core-2.1.14 → dataflow_core-2.1.14rc2}/dataflow/models/__init__.py

@@ -3,7 +3,7 @@
 from .role import Role
 from .user import User
 from .team import Team
-from .environment import (Environment, LocalEnvironment, ArchivedEnvironment, JobLogs)
+from .environment import (Environment, LocalEnvironment, ArchivedEnvironment, JobLogs, PipSource)
 from .project_details import ProjectDetails
 from .recent_projects import RecentProjects
 from .pinned_projects import PinnedProject

{dataflow_core-2.1.14 → dataflow_core-2.1.14rc2}/dataflow/models/environment.py

@@ -1,4 +1,8 @@
-from sqlalchemy import Column, Integer, String, Boolean, Text, ForeignKey, DateTime
+from sqlalchemy import (
+    Column, Integer, String, Boolean, Text, 
+    ForeignKey, DateTime, UniqueConstraint, CheckConstraint
+)
+from sqlalchemy.orm import relationship, Session
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
 from datetime import datetime, timezone
@@ -79,4 +83,41 @@ class LocalEnvironment(Base):
 
 class EnvType(str, Enum):
     dataflow = "dataflow"
-    local = "local"
+    local = "local"
+
+class PipSource(Base):
+    __tablename__ = "PIP_SOURCE"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+
+    user_name = Column(String, ForeignKey("USER.user_name", ondelete="CASCADE"), nullable=True, index=True)
+
+    name = Column(String, nullable=False)
+    url = Column(String, nullable=False)
+    is_index = Column(Boolean, default=False, nullable=False, server_default='false')
+
+    created_at = Column(DateTime, default=datetime.now(timezone.utc), nullable=False)
+    updated_at = Column(DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc), nullable=False)
+
+    __table_args__ = (
+        UniqueConstraint("name", "user_name", name="uq_pip_source_per_user"),
+        CheckConstraint("NOT (is_index = TRUE AND user_name IS NOT NULL)", name="check_no_user_index_url"),
+    )
+
+    @classmethod
+    def get_admin_sources(cls, session: Session):
+        """
+        Returns all admin/system-wide sources (user_name is NULL).
+        """
+        return session.query(cls).filter(
+            cls.user_name == None
+        ).all()
+
+    @classmethod
+    def get_user_sources(cls, session: Session, user_name: str):
+        """
+        Returns merged sources for a user (admin-level + user-level personal sources).
+        """
+        return session.query(cls).filter(
+            (cls.user_name == None) | (cls.user_name == user_name)
+        ).all()

{dataflow_core-2.1.14 → dataflow_core-2.1.14rc2}/dataflow_core.egg-info/PKG-INFO

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

{dataflow_core-2.1.14 → dataflow_core-2.1.14rc2}/setup.py

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