Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion src/ispyb/sqlalchemy/_auto_db_schema.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__schema_version__ = "4.11.0"
__schema_version__ = "4.12.0"
import datetime
import decimal
from typing import List, Optional
Expand Down Expand Up @@ -7102,12 +7102,18 @@ class SSXDataCollection(Base):
class AutoProcProgram(Base):
__tablename__ = "AutoProcProgram"
__table_args__ = (
ForeignKeyConstraint(
["parentAutoProcProgramId"],
["AutoProcProgram.autoProcProgramId"],
name="AutoProcProgram_fk_parentAutoProcProgramId",
),
ForeignKeyConstraint(
["processingJobId"],
["ProcessingJob.processingJobId"],
name="AutoProcProgram_FK2",
),
Index("AutoProcProgram_FK2", "processingJobId"),
Index("AutoProcProgram_fk_parentAutoProcProgramId", "parentAutoProcProgramId"),
)

autoProcProgramId: Mapped[int] = mapped_column(
Expand Down Expand Up @@ -7139,7 +7145,18 @@ class AutoProcProgram(Base):
)
processingJobId: Mapped[Optional[int]] = mapped_column(INTEGER(11))
processingPipelineId: Mapped[Optional[int]] = mapped_column(INTEGER(11))
parentAutoProcProgramId: Mapped[Optional[int]] = mapped_column(INTEGER(10))

AutoProcProgram: Mapped["AutoProcProgram"] = relationship(
"AutoProcProgram",
remote_side=[autoProcProgramId],
back_populates="AutoProcProgram_reverse",
)
AutoProcProgram_reverse: Mapped[List["AutoProcProgram"]] = relationship(
"AutoProcProgram",
remote_side=[parentAutoProcProgramId],
back_populates="AutoProcProgram",
)
ProcessingJob: Mapped["ProcessingJob"] = relationship(
"ProcessingJob", back_populates="AutoProcProgram"
)
Expand Down Expand Up @@ -8286,6 +8303,29 @@ class ProcessedTomogram(Base):
processingType: Mapped[Optional[str]] = mapped_column(
String(255), comment="nature of the processed tomogram"
)
feature: Mapped[Optional[str]] = mapped_column(
Enum(
"Membrane",
"Microtubule",
"Ribosome",
"Tric",
"Actin",
"Cytoplasm",
"Cytoplasmic granule",
"Lipid droplet",
"Mitochondrial granule",
"Mitochondrion",
"Npc",
"Nuclear envelope",
"Nucleus",
"Prohibitin",
"Proteasome",
"Vault",
"Vimentin",
"Void",
),
comment="Tomogram feature",
)

Tomogram: Mapped["Tomogram"] = relationship(
"Tomogram", back_populates="ProcessedTomogram"
Expand Down