Skip to content

Raise an exception if no 2D murfey ids present #683

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

Merged
stephen-riggs merged 2 commits into from
Oct 17, 2025
Merged

Raise an exception if no 2D murfey ids present #683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28240f
Raise and exception if no 2D murfey ids present
stephen-riggs Oct 16, 2025
2e79985
Raise the same error for 3D
stephen-riggs Oct 16, 2025
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
28 changes: 24 additions & 4 deletions src/murfey/server/feedback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@ def _2d_class_murfey_ids(particles_file: str, app_id: int, _db) -> Dict[str, int
db.Class2D.particles_file == particles_file and db.Class2D.pj_id == pj_id
)
).all()
if not classes:
raise ValueError(f"No 2D classification IDs found for {particles_file}")
return {str(cl.class_number): cl.murfey_id for cl in classes}


Expand All @@ -256,6 +258,8 @@ def _3d_class_murfey_ids(particles_file: str, app_id: int, _db) -> Dict[str, int
and db.Class3D.pj_id == pj_id
)
).all()
if not classes:
raise ValueError(f"No 3D classification IDs found for {particles_file}")
return {str(cl.class_number): cl.murfey_id for cl in classes}


Expand Down Expand Up @@ -623,7 +627,9 @@ def _register_incomplete_2d_batch(message: dict, _db, demo: bool = False):
)
_db.add(class2d_params)
_db.commit()
murfey_ids = _murfey_id(message["program_id"], _db, number=50)
murfey_ids = _murfey_id(
message["program_id"], _db, number=default_spa_parameters.nr_classes_2d
)
_murfey_class2ds(
murfey_ids, class2d_message["particles_file"], message["program_id"], _db
)
Expand Down Expand Up @@ -747,7 +753,9 @@ def _register_complete_2d_batch(message: dict, _db, demo: bool = False):
_db.add(class2d_params)
_db.commit()
_db.close()
murfey_ids = _murfey_id(_app_id(pj_id, _db), _db, number=50)
murfey_ids = _murfey_id(
_app_id(pj_id, _db), _db, number=default_spa_parameters.nr_classes_2d
)
_murfey_class2ds(
murfey_ids, class2d_message["particles_file"], _app_id(pj_id, _db), _db
)
Expand Down Expand Up @@ -796,7 +804,13 @@ def _register_complete_2d_batch(message: dict, _db, demo: bool = False):
else:
class_uuids = {
str(i + 1): m
for i, m in enumerate(_murfey_id(_app_id(pj_id, _db), _db, number=50))
for i, m in enumerate(
_murfey_id(
_app_id(pj_id, _db),
_db,
number=default_spa_parameters.nr_classes_2d,
)
)
}
class2d_grp_uuid = _murfey_id(_app_id(pj_id, _db), _db)[0]
zocalo_message: dict = {
Expand Down Expand Up @@ -865,7 +879,13 @@ def _register_complete_2d_batch(message: dict, _db, demo: bool = False):
else:
class_uuids = {
str(i + 1): m
for i, m in enumerate(_murfey_id(_app_id(pj_id, _db), _db, number=50))
for i, m in enumerate(
_murfey_id(
_app_id(pj_id, _db),
_db,
number=default_spa_parameters.nr_classes_2d,
)
)
}
class2d_grp_uuid = _murfey_id(_app_id(pj_id, _db), _db)[0]
zocalo_message = {
Expand Down