fix orm to pydantic model conversion

Author: andrii-i

jupyter_scheduler/models.py

@@ -40,8 +40,8 @@ class NotificationsConfig(BaseModel):
     events: List[NotificationEvent] = []
     include_output: bool = False
 
-    def to_dict(self):
-        return self.dict(exclude_none=True)
+    class Config:
+        orm_mode = True
 
     @validator("send_to")
     def validate_send_to(cls, v):
@@ -155,12 +155,6 @@ def compute_input_filename(cls, values) -> Dict:
 
         return values
 
-    @validator("notifications_config", pre=True, always=True)
-    def convert_notifications_config(cls, v):
-        if isinstance(v, NotificationsConfig):
-            return v.to_dict()
-        return v
-
 
 class JobFile(BaseModel):
     """This model is used to describe the display value,

jupyter_scheduler/orm.py

@@ -73,7 +73,7 @@ def process_result_value(self, value, dialect):
 mapper_registry = registry()
 
 
-class NotificationsConfig(Base):
+class NotificationsConfigTable(Base):
     __tablename__ = "notifications_config"
     id = Column(String(36), primary_key=True, default=generate_uuid)
     include_output = Column(Boolean, default=False)
@@ -113,7 +113,7 @@ class Job(CommonColumns, Base):
     pid = Column(Integer)
     idempotency_token = Column(String(256))
     notifications_config_id = Column(String(36), ForeignKey("notifications_config.id"))
-    notifications_config = relationship("NotificationsConfig", lazy="joined")
+    notifications_config = relationship("NotificationsConfigTable", lazy="joined")
 
 
 class JobDefinition(CommonColumns, Base):
@@ -125,7 +125,7 @@ class JobDefinition(CommonColumns, Base):
     create_time = Column(Integer, default=get_utc_timestamp)
     active = Column(Boolean, default=True)
     notifications_config_id = Column(String(36), ForeignKey("notifications_config.id"))
-    notifications_config = relationship("NotificationsConfig", lazy="joined")
+    notifications_config = relationship("NotificationsConfigTable", lazy="joined")
 
 
 def create_tables(db_url, drop_tables=False):

jupyter_scheduler/scheduler.py

@@ -38,7 +38,7 @@
     UpdateJob,
     UpdateJobDefinition,
 )
-from jupyter_scheduler.orm import Job, JobDefinition, create_session
+from jupyter_scheduler.orm import Job, JobDefinition, NotificationsConfigTable, create_session
 from jupyter_scheduler.utils import create_output_directory, create_output_filename
 
 
@@ -396,7 +396,17 @@ def create_job(self, model: CreateJob) -> str:
             if not model.output_formats:
                 model.output_formats = []
 
-            job = Job(**model.dict(exclude_none=True, exclude={"input_uri"}))
+            orm_notifications_config = None
+            if model.notifications_config:
+                orm_notifications_config = NotificationsConfigTable(
+                    **model.notifications_config.dict()
+                )
+                session.add(orm_notifications_config)
+
+            job_data = model.dict(exclude={"input_uri", "notifications_config"})
+            job_data["notifications_config"] = orm_notifications_config
+
+            job = Job(**job_data)
             session.add(job)
             session.commit()