Skip to content

Use configuration for all recipes #800

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
d-j-hatton merged 2 commits into from
May 19, 2026
+10 −10
Merged

Use configuration for all recipes #800

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0275c5a
use configuration for more recipes
d-j-hatton May 15, 2026
fe607a1
more recipe locations
d-j-hatton May 15, 2026
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
20 changes: 10 additions & 10 deletions src/murfey/server/feedback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def _release_2d_hold(message: dict, _db):
"session_id": message["session_id"],
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class2d"],
"recipes": [machine_config.recipes.get("em-spa-class2d", "em-spa-class2d")],
}
if first_class2d.complete:
feedback_params.next_job += (
Expand Down Expand Up @@ -458,7 +458,7 @@ def _release_3d_hold(message: dict, _db):
),
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class3d"],
"recipes": [machine_config.recipes.get("em-spa-class3d", "em-spa-class3d")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -539,7 +539,7 @@ def _release_refine_hold(message: dict, _db):
_pj_id(message["program_id"], _db, recipe="em-spa-refine"), _db
),
},
"recipes": ["em-spa-refine"],
"recipes": [machine_config.recipes.get("em-spa-refine", "em-spa-refine")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -649,7 +649,7 @@ def _register_incomplete_2d_batch(message: dict, _db):
),
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class2d"],
"recipes": [machine_config.recipes.get("em-spa-class2d", "em-spa-class2d")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -800,7 +800,7 @@ def _register_complete_2d_batch(message: dict, _db):
),
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class2d"],
"recipes": [machine_config.recipes.get("em-spa-class2d", "em-spa-class2d")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -875,7 +875,7 @@ def _register_complete_2d_batch(message: dict, _db):
),
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class2d"],
"recipes": [machine_config.recipes.get("em-spa-class2d", "em-spa-class2d")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -965,7 +965,7 @@ def _flush_class2d(
"autoproc_program_id": _app_id(pj_id, _db),
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class2d"],
"recipes": [machine_config.recipes.get("em-spa-class2d", "em-spa-class2d")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -1283,7 +1283,7 @@ def _register_3d_batch(message: dict, _db):
),
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class3d"],
"recipes": [machine_config.recipes.get("em-spa-class3d", "em-spa-class3d")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -1326,7 +1326,7 @@ def _register_3d_batch(message: dict, _db):
),
"node_creator_queue": machine_config.node_creator_queue,
},
"recipes": ["em-spa-class3d"],
"recipes": [machine_config.recipes.get("em-spa-class3d", "em-spa-class3d")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down Expand Up @@ -1631,7 +1631,7 @@ def _register_refinement(message: dict, _db):
_pj_id(message["program_id"], _db, recipe="em-spa-refine"), _db
),
},
"recipes": ["em-spa-refine"],
"recipes": [machine_config.recipes.get("em-spa-refine", "em-spa-refine")],
}
if murfey.server._transport_object:
zocalo_message["parameters"]["feedback_queue"] = (
Expand Down