Skip to content

Commit 3c36286

Browse files
committed
try and align with ISPyB schema through aliases
1 parent 5f3244a commit 3c36286

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

src/murfey/util/db.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ class Tilt(SQLModel, table=True): # type: ignore
415415

416416

417417
class DataCollectionGroup(SQLModel, table=True): # type: ignore
418-
id: int = Field(primary_key=True, unique=True)
418+
id: int = Field(primary_key=True, unique=True, alias="dataCollectionGroupId")
419419
session_id: int = Field(foreign_key="session.id", primary_key=True)
420420
tag: str = Field(primary_key=True)
421421
atlas_id: Optional[int] = None
@@ -479,9 +479,11 @@ class NotificationValue(SQLModel, table=True): # type: ignore
479479

480480

481481
class DataCollection(SQLModel, table=True): # type: ignore
482-
id: int = Field(primary_key=True, unique=True)
482+
id: int = Field(primary_key=True, unique=True, alias="dataCollectionId")
483483
tag: str = Field(primary_key=True)
484-
dcg_id: int = Field(foreign_key="datacollectiongroup.id")
484+
dcg_id: int = Field(
485+
foreign_key="datacollectiongroup.id", alias="dataCollectionGroupId"
486+
)
485487
data_collection_group: Optional[DataCollectionGroup] = Relationship(
486488
back_populates="data_collections"
487489
)
@@ -500,9 +502,9 @@ class DataCollection(SQLModel, table=True): # type: ignore
500502

501503

502504
class ProcessingJob(SQLModel, table=True): # type: ignore
503-
id: int = Field(primary_key=True, unique=True)
505+
id: int = Field(primary_key=True, unique=True, alias="processingJobId")
504506
recipe: str = Field(primary_key=True)
505-
dc_id: int = Field(foreign_key="datacollection.id")
507+
dc_id: int = Field(foreign_key="datacollection.id", alias="dataCollectionId")
506508
data_collection: Optional[DataCollection] = Relationship(
507509
back_populates="processing_jobs"
508510
)
@@ -590,8 +592,8 @@ class TomographyProcessingParameters(SQLModel, table=True): # type: ignore
590592

591593

592594
class AutoProcProgram(SQLModel, table=True): # type: ignore
593-
id: int = Field(primary_key=True, unique=True)
594-
pj_id: int = Field(foreign_key="processingjob.id")
595+
id: int = Field(primary_key=True, unique=True, alias="autoProcProgramId")
596+
pj_id: int = Field(foreign_key="processingjob.id", alias="processingJobId")
595597
processing_job: Optional[ProcessingJob] = Relationship(
596598
back_populates="auto_proc_programs"
597599
)
@@ -760,8 +762,12 @@ class SearchMap(SQLModel, table=True): # type: ignore
760762

761763

762764
class Movie(SQLModel, table=True): # type: ignore
763-
murfey_id: int = Field(primary_key=True, foreign_key="murfeyledger.id")
764-
data_collection_id: Optional[int] = Field(foreign_key="datacollection.id")
765+
murfey_id: int = Field(
766+
primary_key=True, foreign_key="murfeyledger.id", alias="movieId"
767+
)
768+
data_collection_id: Optional[int] = Field(
769+
foreign_key="datacollection.id", alias="dataCollectionId"
770+
)
765771
foil_hole_id: int = Field(foreign_key="foilhole.id", nullable=True, default=None)
766772
path: str
767773
image_number: int

0 commit comments

Comments
 (0)