Register movies on the murfey side

Author: stephen-riggs

src/murfey/server/api/workflow.py

@@ -443,6 +443,7 @@ async def request_spa_preprocessing(
             db.add(feedback_params)
         movie = Movie(
             murfey_id=murfey_ids[0],
+            data_collection_id=detached_ids[1],
             path=proc_file.path,
             image_number=proc_file.image_number,
             tag=proc_file.tag,
@@ -695,6 +696,17 @@ async def request_tomography_preprocessing(
                 0
             ].eer_fractionation_file
 
+        movie = Movie(
+            murfey_id=murfey_ids[0],
+            data_collection_id=dcid,
+            path=proc_file.path,
+            image_number=proc_file.image_number,
+            tag=proc_file.tag,
+        )
+        db.add(movie)
+        db.commit()
+        db.close()
+
         zocalo_message: dict = {
             "recipes": [recipe_name],
             "parameters": {

src/murfey/server/feedback.py

@@ -1488,6 +1488,7 @@ def _flush_tomography_preprocessing(message: dict, _db):
             p.parent.mkdir(parents=True)
         movie = db.Movie(
             murfey_id=murfey_ids[0],
+            data_collection_id=detached_ids[1],
             path=f.file_path,
             image_number=f.image_number,
             tag=f.tag,

src/murfey/util/db.py

@@ -4,20 +4,21 @@
 """
 
 from datetime import datetime
-from typing import List, Optional
+from typing import TYPE_CHECKING, List, Optional
 
 import sqlalchemy
 from sqlmodel import Field, Relationship, SQLModel, create_engine
 
-from murfey.util.processing_db import (
-    CTF,
-    MotionCorrection,
-    ParticleClassificationGroup,
-    ParticlePicker,
-    RelativeIceThickness,
-    TiltImageAlignment,
-    Tomogram,
-)
+if TYPE_CHECKING:
+    from murfey.util.processing_db import (
+        CTF,
+        MotionCorrection,
+        ParticleClassificationGroup,
+        ParticlePicker,
+        RelativeIceThickness,
+        TiltImageAlignment,
+        Tomogram,
+    )
 
 """
 GENERAL
@@ -712,7 +713,7 @@ class FoilHole(SQLModel, table=True):  # type: ignore
 class SearchMap(SQLModel, table=True):  # type: ignore
     id: Optional[int] = Field(primary_key=True, default=None)
     session_id: int = Field(foreign_key="session.id")
-    atlasId: Optional[int] = Field(foreign_key="data_collection_group.id")
+    atlas_id: Optional[int] = Field(foreign_key="data_collection_group.id")
     name: str
     tag: str
     x_location: Optional[float] = None
@@ -761,8 +762,6 @@ class Movie(SQLModel, table=True):  # type: ignore
     image_number: int
     tag: str
     preprocessed: bool = False
-    createdTimeStamp: Optional[datetime] = None
-    movie_full_path: Optional[str] = None
     murfey_ledger: Optional[MurfeyLedger] = Relationship(back_populates="movies")
     foil_hole: Optional[FoilHole] = Relationship(back_populates="movies")
     data_collection: Optional["DataCollection"] = Relationship(back_populates="movies")

src/murfey/util/processing_db.py

@@ -1,9 +1,10 @@
 import datetime
-from typing import List, Optional
+from typing import TYPE_CHECKING, List, Optional
 
 from sqlmodel import Enum, Field, Relationship, SQLModel
 
-from murfey.util.db import AutoProcProgram, DataCollection, Movie, SearchMap
+if TYPE_CHECKING:
+    from murfey.util.db import AutoProcProgram, DataCollection, Movie, SearchMap
 
 
 class MotionCorrection(SQLModel, table=True):  # type: ignore
@@ -25,7 +26,7 @@ class MotionCorrection(SQLModel, table=True):  # type: ignore
     fftFullPath: Optional[str] = None
     fftCorrectedFullPath: Optional[str] = None
     comments: Optional[str] = None
-    movieId: Optional[int] = Field(foreign_key="Movie.movieId")
+    movieId: Optional[int] = Field(foreign_key="Movie.murfey_id")
     AutoProcProgram: Optional["AutoProcProgram"] = Relationship(
         back_populates="MotionCorrection"
     )

src/murfey/workflows/spa/flush_spa_preprocess.py

@@ -402,6 +402,7 @@ def flush_spa_preprocess(
             mrcp.parent.mkdir(parents=True)
         movie = Movie(
             murfey_id=murfey_ids[2 * i],
+            data_collection_id=collected_ids[1].id,
             path=f.file_path,
             image_number=f.image_number,
             tag=f.tag,