Skip to content

Make the murfey client config file optional #768

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 4 commits into from
Mar 30, 2026
Merged

Make the murfey client config file optional #768

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aeb6cd4
Make the murfey client config file optional
stephen-riggs Mar 27, 2026
43a36be
Update tests
stephen-riggs Mar 27, 2026
5d116b6
Add example of server url
stephen-riggs Mar 27, 2026
afea0a7
Remove accidental change
stephen-riggs Mar 30, 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
1 change: 1 addition & 0 deletions src/murfey/client/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ def ensure_dcg_exists(
router_name="workflow.router",
function_name="register_dc_group",
token=token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data=dcg_data,
Expand Down
3 changes: 3 additions & 0 deletions src/murfey/client/contexts/atlas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def post_transfer_serialem(
router_name="session_control.spa_router",
function_name="register_atlas",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
data={
"name": transferred_file.stem,
Expand Down Expand Up @@ -85,6 +86,7 @@ def post_transfer_epu(
router_name="session_control.spa_router",
function_name="make_atlas_jpg",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
data={"path": str(transferred_atlas_name).replace("//", "/")},
)
Expand Down Expand Up @@ -138,6 +140,7 @@ def post_transfer_epu(
router_name="workflow.router",
function_name="register_dc_group",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data=dcg_data,
Expand Down
2 changes: 2 additions & 0 deletions src/murfey/client/contexts/clem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ def process_lif_file(
router_name="clem.router",
function_name="process_raw_lifs",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
data={"lif_file": str(lif_file)},
)
Expand All @@ -353,6 +354,7 @@ def process_tiff_series(
router_name="clem.router",
function_name="process_raw_tiffs",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
data=tiff_dataset,
)
Expand Down
1 change: 1 addition & 0 deletions src/murfey/client/contexts/fib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ def post_transfer(
router_name="workflow.correlative_router",
function_name="make_gif",
token=self._token,
instrument_name=environment.instrument_name,
year=datetime.now().year,
visit_name=environment.visit,
session_id=environment.murfey_session,
Expand Down
5 changes: 5 additions & 0 deletions src/murfey/client/contexts/spa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ def _position_analysis(
router_name="session_control.spa_router",
function_name="register_grid_square",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
gsid=grid_square,
data={
Expand Down Expand Up @@ -378,6 +379,7 @@ def _position_analysis(
router_name="session_control.spa_router",
function_name="register_foil_hole",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
gs_name=grid_square,
data={
Expand All @@ -402,6 +404,7 @@ def _position_analysis(
router_name="session_control.spa_router",
function_name="register_foil_hole",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
gs_name=grid_square,
data={
Expand Down Expand Up @@ -476,6 +479,7 @@ def post_transfer(
router_name="file_io_instrument.router",
function_name="write_eer_fractionation_file",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data={
Expand Down Expand Up @@ -539,6 +543,7 @@ def post_transfer(
router_name="workflow.spa_router",
function_name="request_spa_preprocessing",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data={
Expand Down
3 changes: 3 additions & 0 deletions src/murfey/client/contexts/spa_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ def post_transfer(
router_name="session_control.spa_router",
function_name="register_grid_square",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
gsid=int(gs),
data={
Expand Down Expand Up @@ -213,6 +214,7 @@ def post_transfer(
router_name="session_control.spa_router",
function_name="register_grid_square",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
gsid=gs_name,
data={
Expand All @@ -232,6 +234,7 @@ def post_transfer(
router_name="session_control.spa_router",
function_name="register_foil_hole",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
gs_name=gs_name,
data={
Expand Down
3 changes: 3 additions & 0 deletions src/murfey/client/contexts/sxt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def register_sxt_data_collection(
router_name="workflow.router",
function_name="start_dc",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data=dc_data,
Expand All @@ -92,6 +93,7 @@ def register_sxt_data_collection(
router_name="workflow.router",
function_name="register_proc",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data={
Expand Down Expand Up @@ -221,6 +223,7 @@ def post_transfer(
router_name="workflow.sxt_router",
function_name="process_sxt_tilt_series",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data={
Expand Down
9 changes: 9 additions & 0 deletions src/murfey/client/contexts/tomo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ def register_tomography_data_collections(
router_name="workflow.router",
function_name="start_dc",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data=dc_data,
Expand All @@ -174,6 +175,7 @@ def register_tomography_data_collections(
router_name="workflow.router",
function_name="register_proc",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data={
Expand Down Expand Up @@ -290,6 +292,7 @@ def _add_tilt(
router_name="workflow.tomo_router",
function_name="register_tilt_series_for_rerun",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
data=rerun_data,
)
Expand All @@ -310,6 +313,7 @@ def _add_tilt(
router_name="workflow.tomo_router",
function_name="register_tilt_series",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
data=ts_data,
)
Expand Down Expand Up @@ -345,6 +349,7 @@ def _add_tilt(
router_name="workflow.tomo_router",
function_name="register_tilt",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data=tilt_data,
Expand All @@ -357,6 +362,7 @@ def _add_tilt(
router_name="file_io_instrument.router",
function_name="write_eer_fractionation_file",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data={
Expand Down Expand Up @@ -393,6 +399,7 @@ def _add_tilt(
router_name="workflow.tomo_router",
function_name="request_tomography_preprocessing",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data=preproc_data,
Expand Down Expand Up @@ -498,6 +505,7 @@ def post_transfer(
router_name="workflow.tomo_router",
function_name="register_tilt_series_length",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
data={
"tags": [tilt_series],
Expand All @@ -518,6 +526,7 @@ def post_transfer(
router_name="workflow.tomo_router",
function_name="register_completed_tilt_series",
token=self._token,
instrument_name=environment.instrument_name,
visit_name=environment.visit,
session_id=environment.murfey_session,
data={
Expand Down
5 changes: 5 additions & 0 deletions src/murfey/client/contexts/tomo_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ def post_transfer(
router_name="session_control.tomo_router",
function_name="register_search_map",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
sm_name=transferred_file.parent.name,
data={
Expand Down Expand Up @@ -213,6 +214,7 @@ def post_transfer(
router_name="session_control.tomo_router",
function_name="register_search_map",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
sm_name=transferred_file.parent.name,
data={
Expand Down Expand Up @@ -266,6 +268,7 @@ def post_transfer(
router_name="session_control.tomo_router",
function_name="register_search_map",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
sm_name=search_map_name,
data={
Expand All @@ -279,6 +282,7 @@ def post_transfer(
router_name="session_control.tomo_router",
function_name="register_batch_position",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
batch_name=batch_name,
data={
Expand Down Expand Up @@ -309,6 +313,7 @@ def post_transfer(
router_name="session_control.tomo_router",
function_name="register_batch_position",
token=self._token,
instrument_name=environment.instrument_name,
session_id=environment.murfey_session,
batch_name=beamshift_name,
data={
Expand Down
1 change: 1 addition & 0 deletions src/murfey/client/destinations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def determine_default_destination(
router_name="file_io_instrument.router",
function_name="suggest_path",
token=token,
instrument_name=environment.instrument_name,
visit_name=visit,
session_id=environment.murfey_session,
data={
Expand Down
16 changes: 16 additions & 0 deletions src/murfey/client/multigrid_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ def _rsyncer_stopped(self, source: Path, explicit_stop: bool = False):
router_name="session_control.router",
function_name="register_stopped_rsyncer",
token=self.token,
instrument_name=self._environment.instrument_name,
session_id=self.session_id,
data={"path": str(source)},
)
Expand All @@ -310,6 +311,7 @@ def _restart_rsyncer(self, source: Path):
router_name="session_control.router",
function_name="register_restarted_rsyncer",
token=self.token,
instrument_name=self._environment.instrument_name,
session_id=self.session_id,
data={"path": str(source)},
)
Expand Down Expand Up @@ -338,6 +340,7 @@ def _start_rsyncer(
router_name="file_io_instrument.router",
function_name="make_rsyncer_destination",
token=self.token,
instrument_name=self._environment.instrument_name,
session_id=self.session_id,
data={"destination": destination},
)
Expand Down Expand Up @@ -417,6 +420,7 @@ def rsync_result(update: RSyncerUpdate):
router_name="session_control.router",
function_name="register_restarted_rsyncer",
token=self.token,
instrument_name=self._environment.instrument_name,
session_id=self.session_id,
data={"path": str(source)},
)
Expand All @@ -433,6 +437,7 @@ def rsync_result(update: RSyncerUpdate):
router_name="session_control.router",
function_name="register_rsyncer",
token=self.token,
instrument_name=self._environment.instrument_name,
session_id=self._environment.murfey_session,
data=rsyncer_data,
)
Expand Down Expand Up @@ -528,6 +533,7 @@ def _start_dc(self, metadata_json):
router_name="file_io_instrument.router",
function_name="write_eer_fractionation_file",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
session_id=self._environment.murfey_session,
data={
Expand All @@ -546,6 +552,7 @@ def _start_dc(self, metadata_json):
router_name="workflow.tomo_router",
function_name="register_tomo_proc_params",
token=self.token,
instrument_name=self._environment.instrument_name,
session_id=self._environment.murfey_session,
data=metadata_json,
)
Expand All @@ -554,6 +561,7 @@ def _start_dc(self, metadata_json):
router_name="workflow.tomo_router",
function_name="flush_tomography_processing",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
session_id=self._environment.murfey_session,
data={"rsync_source": str(source)},
Expand Down Expand Up @@ -603,6 +611,7 @@ def _start_dc(self, metadata_json):
router_name="workflow.router",
function_name="start_dc",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
session_id=self.session_id,
data=data,
Expand All @@ -619,6 +628,7 @@ def _start_dc(self, metadata_json):
router_name="workflow.router",
function_name="register_proc",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
session_id=self.session_id,
data={
Expand All @@ -633,6 +643,7 @@ def _start_dc(self, metadata_json):
router_name="workflow.spa_router",
function_name="register_spa_proc_params",
token=self.token,
instrument_name=self._environment.instrument_name,
session_id=self.session_id,
data={
**{k: None if v == "None" else v for k, v in metadata_json.items()},
Expand All @@ -646,6 +657,7 @@ def _start_dc(self, metadata_json):
router_name="workflow.spa_router",
function_name="flush_spa_processing",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
session_id=self.session_id,
data={"tag": str(source)},
Expand Down Expand Up @@ -674,6 +686,7 @@ def _increment_file_count(
router_name="prometheus.router",
function_name="increment_rsync_file_count",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
data=data,
)
Expand Down Expand Up @@ -707,6 +720,7 @@ def _increment_transferred_files_prometheus(
router_name="prometheus.router",
function_name="increment_rsync_transferred_files_prometheus",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
data=data,
)
Expand All @@ -723,6 +737,7 @@ def _increment_transferred_files(
router_name="prometheus.router",
function_name="increment_rsync_skipped_files_prometheus",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
data={
"source": source,
Expand Down Expand Up @@ -758,6 +773,7 @@ def _increment_transferred_files(
router_name="prometheus.router",
function_name="increment_rsync_transferred_files",
token=self.token,
instrument_name=self._environment.instrument_name,
visit_name=self._environment.visit,
data=data,
)
Loading
Loading