make NotificationsConfig a separate table

Author: andrii-i

jupyter_scheduler/models.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from typing import Dict, List, Optional, Type, Union
 
-from pydantic import BaseModel, root_validator
+from pydantic import BaseModel, root_validator, validator
 
 Tags = List[str]
 EnvironmentParameterValues = Union[int, float, bool, str]
@@ -38,7 +38,19 @@ class NotificationsConfig(BaseModel):
 
     send_to: List[str]
     events: List[NotificationEvent]
-    include_output: bool
+    include_output: bool = False
+
+    @validator("send_to")
+    def validate_send_to(self, send_to):
+        if len(send_to) > 1000:
+            raise ValueError("Too many email addresses. Maximum allowed is 1000.")
+        return send_to
+
+    @validator("events")
+    def validate_events(self, events):
+        if len(events) > 1000:
+            raise ValueError("Too many events. Maximum allowed is 1000.")
+        return events
 
 
 class RuntimeEnvironment(BaseModel):

jupyter_scheduler/orm.py

@@ -4,8 +4,8 @@
 from uuid import uuid4
 
 import sqlalchemy.types as types
-from sqlalchemy import Boolean, Column, Integer, String, create_engine
-from sqlalchemy.orm import declarative_base, declarative_mixin, registry, sessionmaker
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, create_engine
+from sqlalchemy.orm import declarative_base, declarative_mixin, registry, relationship, sessionmaker
 
 from jupyter_scheduler.models import EmailNotifications, Status
 from jupyter_scheduler.utils import get_utc_timestamp
@@ -67,6 +67,14 @@ def process_result_value(self, value, dialect):
 mapper_registry = registry()
 
 
+class NotificationsConfig(Base):
+    __tablename__ = "notifications_config"
+    id = Column(String(36), primary_key=True, default=generate_uuid)
+    include_output = Column(Boolean, default=False)
+    send_to = Column(JsonType, nullable=False)
+    events = Column(JsonType, nullable=False)
+
+
 @declarative_mixin
 class CommonColumns:
     runtime_environment_name = Column(String(256), nullable=False)
@@ -98,7 +106,8 @@ class Job(CommonColumns, Base):
     url = Column(String(256), default=generate_jobs_url)
     pid = Column(Integer)
     idempotency_token = Column(String(256))
-    notifications_config = Column(JsonType(1024), nullable=True)
+    notifications_config_id = Column(String(36), ForeignKey("notifications_config.id"))
+    notifications_config = relationship("NotificationsConfig")
 
 
 class JobDefinition(CommonColumns, Base):
@@ -109,7 +118,8 @@ class JobDefinition(CommonColumns, Base):
     url = Column(String(256), default=generate_job_definitions_url)
     create_time = Column(Integer, default=get_utc_timestamp)
     active = Column(Boolean, default=True)
-    notifications_config = Column(JsonType(1024), nullable=True)
+    notifications_config_id = Column(String(36), ForeignKey("notifications_config.id"))
+    notifications_config = relationship("NotificationsConfig")
 
 
 def create_tables(db_url, drop_tables=False):