|
8 | 8 |
|
9 | 9 | from murfey.server import _transport_object |
10 | 10 | from murfey.server.api.auth import MurfeySessionID |
| 11 | +from murfey.server.api.spa import _cryolo_model_path |
11 | 12 | from murfey.server.feedback import _murfey_id |
12 | 13 | from murfey.util import sanitise, secure_path |
13 | 14 | from murfey.util.config import get_machine_config, get_microscope |
@@ -314,15 +315,12 @@ def flush_spa_preprocess(message: dict, murfey_db: Session, demo: bool = False) |
314 | 315 | ).all() |
315 | 316 | if not stashed_files: |
316 | 317 | return True |
317 | | - instrument_name = ( |
318 | | - murfey_db.exec( |
319 | | - select(MurfeySession).where(MurfeySession.id == message["session_id"]) |
320 | | - ) |
321 | | - .one() |
322 | | - .instrument_name |
323 | | - ) |
324 | | - machine_config = get_machine_config(instrument_name=instrument_name)[ |
325 | | - instrument_name |
| 318 | + |
| 319 | + murfey_session = murfey_db.exec( |
| 320 | + select(MurfeySession).where(MurfeySession.id == message["session_id"]) |
| 321 | + ).one() |
| 322 | + machine_config = get_machine_config(instrument_name=murfey_session.instrument_name)[ |
| 323 | + murfey_session.instrument_name |
326 | 324 | ] |
327 | 325 | recipe_name = machine_config.recipes.get("em-spa-preprocess", "em-spa-preprocess") |
328 | 326 | collected_ids = murfey_db.exec( |
@@ -424,6 +422,11 @@ def flush_spa_preprocess(message: dict, murfey_db: Session, demo: bool = False) |
424 | 422 | else f.eer_fractionation_file |
425 | 423 | ), |
426 | 424 | "do_icebreaker_jobs": default_spa_parameters.do_icebreaker_jobs, |
| 425 | + "cryolo_model_weights": str( |
| 426 | + _cryolo_model_path( |
| 427 | + murfey_session.visit, murfey_session.instrument_name |
| 428 | + ) |
| 429 | + ), |
427 | 430 | "foil_hole_id": foil_hole_id, |
428 | 431 | }, |
429 | 432 | } |
|
0 commit comments