Skip to content

ISPyB ORM schema update v4.9.0 #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ISPyB ORM schema update v4.9.0 #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5bf3f6
Bump schema version from v4.11.0 to v4.12.0
gfrn Feb 13, 2026
8261b49
Update ISPyB ORM schema to database schema v4.12.0
DiamondLightSource-build-server Feb 13, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/test-and-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:

env:
DATABASE_SCHEMA: 4.11.0
DATABASE_SCHEMA: 4.12.0

permissions:
contents: read
Expand Down
5 changes: 5 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ History
Unreleased / main
-------------------

11.1.2 (2026-02-13)
-------------------

* Update database schema to v4.12.0

11.1.1 (2026-01-13)
-------------------

Expand Down
42 changes: 41 additions & 1 deletion src/ispyb/sqlalchemy/_auto_db_schema.py
View file
Open in desktop
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