Correct types in JobToInputDatasetAssociation (optional/nullable)

jdavcs · Apr 11, 2024 · 2901b7c · 2901b7c
1 parent e26c9f5
commit 2901b7c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -2310,14 +2310,12 @@ class JobToInputDatasetAssociation(Base, RepresentById):
     __tablename__ = "job_to_input_dataset"
 
     id: Mapped[int] = mapped_column(primary_key=True)
-    job_id: Mapped[Optional[int]] = mapped_column(ForeignKey("job.id"), index=True)
-    dataset_id: Mapped[Optional[int]] = mapped_column(ForeignKey("history_dataset_association.id"), index=True)
+    job_id: Mapped[int] = mapped_column(ForeignKey("job.id"), index=True, nullable=True)
+    dataset_id: Mapped[int] = mapped_column(ForeignKey("history_dataset_association.id"), index=True, nullable=True)
     dataset_version: Mapped[Optional[int]]
     name: Mapped[Optional[str]] = mapped_column(String(255))
-    dataset: Mapped[Optional["HistoryDatasetAssociation"]] = relationship(
-        lazy="joined", back_populates="dependent_jobs"
-    )
-    job: Mapped[Optional["Job"]] = relationship(back_populates="input_datasets")
+    dataset: Mapped["HistoryDatasetAssociation"] = relationship(lazy="joined", back_populates="dependent_jobs")
+    job: Mapped["Job"] = relationship(back_populates="input_datasets")
 
     def __init__(self, name, dataset):
         self.name = name