dataflow-core 2.1.11__tar.gz → 2.1.13__tar.gz

{dataflow_core-2.1.11 → dataflow_core-2.1.13}/PKG-INFO

@@ -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 → dataflow_core-2.1.13}/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_core-2.1.13/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_core-2.1.13/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_core-2.1.11 → dataflow_core-2.1.13}/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_core-2.1.11 → dataflow_core-2.1.13}/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_core-2.1.11 → dataflow_core-2.1.13}/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 → dataflow_core-2.1.13}/dataflow_core.egg-info/PKG-INFO

@@ -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 → dataflow_core-2.1.13}/dataflow_core.egg-info/SOURCES.txt

@@ -19,6 +19,8 @@ dataflow/models/environment.py
 dataflow/models/environment_status.py
 dataflow/models/git_ssh.py
 dataflow/models/pinned_projects.py
+dataflow/models/pod_activity.py
+dataflow/models/pod_session_history.py
 dataflow/models/project_details.py
 dataflow/models/recent_project_studio.py
 dataflow/models/recent_projects.py

{dataflow_core-2.1.11 → dataflow_core-2.1.13}/setup.py

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