dataflow-core 2.1.11__py3-none-any.whl → 2.1.13__py3-none-any.whl

dataflow/models/__init__.py

@@ -20,4 +20,6 @@ from .role_server import RoleServer
 from .variables import Variable
 from .recent_project_studio import RecentProjectStudio
 from .connection import Connection
-from .git_ssh import GitSSH
+from .git_ssh import GitSSH
+from .pod_activity import PodActivity
+from .pod_session_history import PodSessionHistory

dataflow/models/pod_activity.py

@@ -0,0 +1,16 @@
+from sqlalchemy import Column, Integer, String, DateTime, ForeignKey
+from dataflow.db import Base
+
+class PodActivity(Base):
+    """Model for tracking active JupyterHub pod sessions"""
+    __tablename__ = 'POD_ACTIVITY'
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    username = Column(String, ForeignKey('USER.user_name', ondelete="SET NULL"), nullable=True, index=True)
+    pod_name = Column(String, nullable=False, unique=True, index=True)
+    namespace = Column(String, nullable=False, index=True)
+    start_time = Column(DateTime(timezone=True))
+    stop_time = Column(DateTime(timezone=True))
+    status = Column(String, nullable=False, index=True)
+    instance_type = Column(String, index=True)
+    node_name = Column(String)

dataflow/models/pod_session_history.py

@@ -0,0 +1,16 @@
+from sqlalchemy import Column, Integer, String, DateTime, Numeric, ForeignKey
+from dataflow.db import Base
+
+class PodSessionHistory(Base):
+    """Model for tracking completed JupyterHub user sessions"""
+    __tablename__ = 'POD_SESSION_HISTORY'
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    username = Column(String, ForeignKey('USER.user_name', ondelete="SET NULL"), nullable=True, index=True)
+    pod_name = Column(String, nullable=False, index=True)
+    namespace = Column(String, nullable=False, index=True)
+    start_time = Column(DateTime(timezone=True))
+    stop_time = Column(DateTime(timezone=True), nullable=False)
+    session_duration_minutes = Column(Numeric(10, 2))
+    instance_type = Column(String, index=True)
+    node_name = Column(String)

dataflow/models/user.py

@@ -24,6 +24,7 @@ class User(Base):
     active_env_type = Column(String, nullable=True)
     current_server = Column(String)
     show_server_page = Column(Boolean, default = True)
+    monthly_allocation = Column(Integer, nullable=True, default=0)
 
     role_details = relationship("Role")
 

dataflow/schemas/connection.py

@@ -29,11 +29,11 @@ class ConnectionBase(BaseModel):
         import re
         if not isinstance(v, str):
             raise ValueError("Connection ID must be a string.")
-        if len(v) > 20:
-            raise ValueError("Connection ID must be at most 20 characters long.")
-        if not re.fullmatch(r"[A-Za-z0-9-]+", v):
+        if len(v) > 30:
+            raise ValueError("Connection ID must be at most 30 characters long.")
+        if not re.fullmatch(r"[A-Za-z0-9_-]+", v):
             raise ValueError(
-                "Connection ID can only contain letters, numbers, and hyphens (-)!"
+                "Connection ID can only contain letters, numbers, underscores (_), and hyphens (-)!"
             )
         return v
 

dataflow/schemas/secret.py

@@ -16,11 +16,11 @@ class SecretBase(BaseModel):
         import re
         if not isinstance(v, str):
             raise ValueError("Secret key must be a string.")
-        if len(v) > 20:
-            raise ValueError("Secret key must be at most 20 characters long.")
-        if not re.fullmatch(r"[A-Za-z0-9-]+", v):
+        if len(v) > 30:
+            raise ValueError("Secret key must be at most 30 characters long.")
+        if not re.fullmatch(r"[A-Za-z0-9_-]+", v):
             raise ValueError(
-                "Secret key can only contain letters, numbers, and hyphens (-)!"
+                "Secret key can only contain letters, numbers, underscores (_), and hyphens (-)!"
             )
         return v
 

{dataflow_core-2.1.11.dist-info → dataflow_core-2.1.13.dist-info}/METADATA

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

{dataflow_core-2.1.11.dist-info → dataflow_core-2.1.13.dist-info}/RECORD

@@ -8,7 +8,7 @@ dataflow/database_manager.py,sha256=tJHMuOZ9Muskrh9t4uLRlTuFU0VkHAzoHlGP5DORIC4,
 dataflow/dataflow.py,sha256=A66OFXgJCxW18Dk_BnasvR82LrPXQ2iB-QMTyYJJ1cc,13100
 dataflow/db.py,sha256=73ojGqpCTRVTlPszD73Ozhjih_BI2KTHmazqxxL6iWk,3780
 dataflow/environment.py,sha256=qiyuRRPpVLVWiYccRHXnGyWMr_ZBPWzixAyDtAzxQYE,28277
-dataflow/models/__init__.py,sha256=WnlLd-0T3HYtJloDms1a58lN66WzBIbBSTReDXD6HaQ,892
+dataflow/models/__init__.py,sha256=5Ai-sUHtT1dtc0l4nL1fuwVbx0GcwaGQg_LXqOzWb4c,981
 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
@@ -17,6 +17,8 @@ dataflow/models/environment.py,sha256=3W-Pvkuiufjw0MWy9F6uWSd0HDPjRNNJe3TnhpHxcG
 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
+dataflow/models/pod_activity.py,sha256=4NQplUtckS4d2Uc-Iyi8PfgciblHiExbXo_VTMaukB8,751
+dataflow/models/pod_session_history.py,sha256=-O8DHtH1AtGLntJ1shI6eiciTJGL_vYvG3gfupvr0zY,778
 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=OFd5MSRXVRHs9UbvUNoJBBnh9rgsJ0lwE23wm5_Hc5w,321
@@ -26,14 +28,14 @@ dataflow/models/role_zone.py,sha256=uH8JheWyzUWcRECRzYuzdphUAUXeU5zRVA1Bhuz3h9w,
 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=qFvkU6hZQzv-QWCC8nDKonnpl2Z2YEqMni5iUVQpMB0,1041
+dataflow/models/user.py,sha256=-XEpulg7UAL-WDMyigPasDS61btna2mKtJPsanWA4lw,1108
 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
 dataflow/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dataflow/schemas/connection.py,sha256=1bKTSEPW1QwcFQe35QCIr-S5DTMr34WJCjSKhxMpPek,2449
+dataflow/schemas/connection.py,sha256=ut2sqz06yOjmFKzHry92FEt7DN09Bj30GYse35__Cuw,2467
 dataflow/schemas/git_ssh.py,sha256=N1O7HM6ZbygIBZn2rKvNR0e7IM3ZJMAH6aJtjaghDr0,1283
-dataflow/schemas/secret.py,sha256=dAN_2IBTjnjf4sT6cyPVd_Zcdaw8s_EMG4aodMoCwXU,1165
+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/update_environment.sh,sha256=2dtn2xlNi6frpig-sqlGE1_IKRbbkqYOCpf_qyMKKII,992
@@ -48,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.11.dist-info/METADATA,sha256=5ascZ5HFZFObYNT9mPFD1jrOrxoeFhUbyZX3kkjydzI,370
-dataflow_core-2.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dataflow_core-2.1.11.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.1.11.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-2.1.11.dist-info/RECORD,,
+dataflow_core-2.1.13.dist-info/METADATA,sha256=Eyk1E5u6AlVNLcLV7ZUYOyZvknXtui-RY9KB1HaIIOo,370
+dataflow_core-2.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dataflow_core-2.1.13.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.1.13.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.1.13.dist-info/RECORD,,