dataflow-core 2.1.14rc1__py3-none-any.whl → 2.1.14rc3__py3-none-any.whl

dataflow/environment.py

@@ -53,7 +53,8 @@ class EnvironmentManager:
                 status="published",
                 mode="create",
                 yaml_file_path=yaml_path,
-                version=int(env_version)
+                version=int(env_version),
+                py_version=py_version
             )
         elif status == "draft":
             mode = "create" if env_version == '1' else "update"
@@ -63,7 +64,8 @@ class EnvironmentManager:
                 mode=mode,
                 yaml_file_path=yaml_path,
                 log_file_location=log_file_location,
-                version=int(env_version)
+                version=int(env_version),
+                py_version=py_version
             )
             
             # Update job log status if db was provided
@@ -189,6 +191,7 @@ class EnvironmentManager:
         version: int,
         source_path=None, 
         log_file_location=None,
+        py_version=None
     ):
         """
         Executes environment operations (create or clone).
@@ -220,7 +223,7 @@ class EnvironmentManager:
 
             if mode == "create":                
                 create_env_script_path = pkg_resources.resource_filename('dataflow', 'scripts/create_environment.sh')
-                command = ["bash", create_env_script_path, yaml_file_path, conda_env_path]
+                command = ["bash", create_env_script_path, yaml_file_path, conda_env_path, py_version]
 
             elif mode == "update":
                 update_env_script_path = pkg_resources.resource_filename('dataflow', 'scripts/update_environment.sh')

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/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/scripts/create_environment.sh

@@ -5,6 +5,7 @@ set -e
 # Accept new parameters
 yaml_file_path=$1
 conda_env_path=$2
+py_version=$3
 
 # Validate inputs
 if [ -z "$yaml_file_path" ] || [ -z "$conda_env_path" ]; then
@@ -23,6 +24,8 @@ env_name=$(basename "$conda_env_path")
 # Set unique cache dir per environment
 export CONDA_PKGS_DIRS="/dataflow/envs/cache/${env_name}"
 mkdir -p "$CONDA_PKGS_DIRS"
+export PIP_CONSTRAINT="/dataflow/setup/pip_constraints/py${py_version}-constraints.txt"
+export NO_CONDA_PLUGIN_PIP_CONSTRAINT="true"
 
 # Create the conda environment from the YAML file
 conda env create --file "$yaml_file_path" --prefix "$conda_env_path" --yes

{dataflow_core-2.1.14rc1.dist-info → dataflow_core-2.1.14rc3.dist-info}/METADATA

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

{dataflow_core-2.1.14rc1.dist-info → dataflow_core-2.1.14rc3.dist-info}/RECORD

@@ -7,13 +7,13 @@ dataflow/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
 dataflow/database_manager.py,sha256=tJHMuOZ9Muskrh9t4uLRlTuFU0VkHAzoHlGP5DORIC4,899
 dataflow/dataflow.py,sha256=0kPDIpFgrEcK81QYeLQGb-rQTrAH-83gLpn566yvBGA,14004
 dataflow/db.py,sha256=73ojGqpCTRVTlPszD73Ozhjih_BI2KTHmazqxxL6iWk,3780
-dataflow/environment.py,sha256=qiyuRRPpVLVWiYccRHXnGyWMr_ZBPWzixAyDtAzxQYE,28277
-dataflow/models/__init__.py,sha256=5Ai-sUHtT1dtc0l4nL1fuwVbx0GcwaGQg_LXqOzWb4c,981
+dataflow/environment.py,sha256=IuhhYtKR7h3KuqRBKpaa_b-NW4M3b64tmCTGFKT3sF8,28391
+dataflow/models/__init__.py,sha256=Z3pf61pq9Gw0c4csDvAYZ-XmQfLpHHDIBezCsCIs8gs,992
 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/dataflow_zone.py,sha256=yFCvQXos5M1cU7ksbVSO338_RkT3hkdw2wr3kCJ_rec,769
-dataflow/models/environment.py,sha256=3W-Pvkuiufjw0MWy9F6uWSd0HDPjRNNJe3TnhpHxcGg,2920
+dataflow/models/environment.py,sha256=IpM3aJ4ViS351fmWrj5zKIlg7HM_Jn2hV4EqnEjhhVU,4413
 dataflow/models/environment_status.py,sha256=lvPDNUsUoTW9D97B07aKqJQHRKp4LvPM28pQDMPH1ac,536
 dataflow/models/git_ssh.py,sha256=W15SDypxzGOz_aZkHEnVZ6DIMVsjAsbSIXVIEt2mPYU,694
 dataflow/models/pinned_projects.py,sha256=I-XMQq7__XJJi2lyOdEvQEfhPRz8D6KHA6Cbavbf05o,606
@@ -37,7 +37,7 @@ dataflow/schemas/connection.py,sha256=ut2sqz06yOjmFKzHry92FEt7DN09Bj30GYse35__Cu
 dataflow/schemas/git_ssh.py,sha256=N1O7HM6ZbygIBZn2rKvNR0e7IM3ZJMAH6aJtjaghDr0,1283
 dataflow/schemas/secret.py,sha256=wMSCn6zoBHS-R4NoKwljq2JUad8p9JY542UNJFa86X8,1183
 dataflow/scripts/clone_environment.sh,sha256=Qy0GylsA3kUVUL_L1MirxIWujOFhT1tikKqXNtCTWd4,506
-dataflow/scripts/create_environment.sh,sha256=3FHgNplJuEZvyTsLqlCJNX9oyfXgsfqn80VZk2xtvso,828
+dataflow/scripts/create_environment.sh,sha256=Ny6iXYK4K5o5h_BLcRPjl0hMU-WQZWXhxiL2uKj166w,975
 dataflow/scripts/update_environment.sh,sha256=2dtn2xlNi6frpig-sqlGE1_IKRbbkqYOCpf_qyMKKII,992
 dataflow/secrets_manager/__init__.py,sha256=idGqIDtYl0De2WIK9Obl-N7SDPSYtVM0D-wXfZjCiy4,559
 dataflow/secrets_manager/factory.py,sha256=k1sIyXBKtas1upWJpq8Mks2d8kjLAHU7CFvjeuMXXxs,2160
@@ -50,8 +50,8 @@ dataflow/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataflow/utils/exceptions.py,sha256=8GRFoYZ5dPGQckVm2znaHpPi0ZAs69fK-RGKukEsapk,4432
 dataflow/utils/get_current_user.py,sha256=4nSO3SPVMZhW-MsIgxR3f9ZzrFaIZIuyrM6hvfyE7PQ,1202
 dataflow/utils/logger.py,sha256=7BFrOq5Oiqn8P4XZbgJzMP5O07d2fpdECbbfsjrUuHw,1213
-dataflow_core-2.1.14rc1.dist-info/METADATA,sha256=akGTrwmInmlMGEyHbPlFx7lpwLE8l03du5zHb9UxEOc,373
-dataflow_core-2.1.14rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dataflow_core-2.1.14rc1.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.1.14rc1.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-2.1.14rc1.dist-info/RECORD,,
+dataflow_core-2.1.14rc3.dist-info/METADATA,sha256=Fb6jxrYq_5C2scDOAPFyoJteluYEvu3904HhS74ZtV8,373
+dataflow_core-2.1.14rc3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dataflow_core-2.1.14rc3.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.1.14rc3.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.1.14rc3.dist-info/RECORD,,