Tomo params depend on dcg_id

Author: stephen-riggs

src/murfey/workflows/tomo/picking.py

@@ -1,4 +1,5 @@
 from logging import getLogger
+from typing import Tuple
 
 import numpy as np
 from sqlalchemy import func
@@ -21,7 +22,7 @@
 logger = getLogger("murfey.workflows.tomo.feedback")
 
 
-def _pj_id_tomo_classification(app_id: int, recipe: str, _db) -> int:
+def _ids_tomo_classification(app_id: int, recipe: str, _db) -> Tuple[int, int]:
     dcg_id = (
         _db.exec(
             select(AutoProcProgram, ProcessingJob, DataCollection)
@@ -42,13 +43,15 @@ def _pj_id_tomo_classification(app_id: int, recipe: str, _db) -> int:
         .one()[0]
         .id
     )
-    return pj_id
+    return dcg_id, pj_id
 
 
 def _register_picked_tomogram_use_diameter(message: dict, _db: Session):
     """Received picked particles from the tomogram autopick service"""
     # Add this message to the table of seen messages
-    pj_id = _pj_id_tomo_classification(message["program_id"], "em-tomo-class2d", _db)
+    dcg_id, pj_id = _ids_tomo_classification(
+        message["program_id"], "em-tomo-class2d", _db
+    )
 
     pick_params = TomogramPicks(
         pj_id=pj_id,
@@ -78,7 +81,7 @@ def _register_picked_tomogram_use_diameter(message: dict, _db: Session):
         ]
         tomo_params = _db.exec(
             select(TomographyProcessingParameters).where(
-                TomographyProcessingParameters.pj_id == pj_id
+                TomographyProcessingParameters.dcg_id == dcg_id
             )
         ).one()
 

tests/workflows/tomo/test_tomo_picking.py

@@ -20,7 +20,7 @@ def test_picked_tomogram_not_run_class2d(
     mock_pjid, mock_transport, murfey_db_session: Session, tmp_path
 ):
     """Run the picker feedback with less particles than needed for classification"""
-    mock_pjid.return_value = 1
+    mock_pjid.return_value = [2, 1]
 
     # Insert table dependencies
     dcg_entry: DataCollectionGroup = get_or_create_db_entry(
@@ -89,7 +89,7 @@ def test_picked_tomogram_run_class2d(
     mock_pjid, mock_transport, murfey_db_session: Session, tmp_path
 ):
     """Run the picker feedback with less particles than needed for classification"""
-    mock_pjid.return_value = 1
+    mock_pjid.return_value = [2, 1]
 
     # Insert table dependencies
     dcg_entry: DataCollectionGroup = get_or_create_db_entry(