Skip to content

Commit 43a6d8a

Browse files
d-j-hattond-j-hatton
authored
Fixes for instrument image display endpoints (#374)
1 parent b0efbae commit 43a6d8a

File tree

12 files changed

+54
-47
lines changed

12 files changed

+54
-47
lines changed

‎src/murfey/client/analyser.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from murfey.client.instance_environment import MurfeyInstanceEnvironment
2323
from murfey.client.rsync import RSyncerUpdate, TransferResult
2424
from murfey.client.tui.forms import FormDependency
25-
from murfey.util import Observer, get_machine_config
25+
from murfey.util import Observer, get_machine_config_client
2626
from murfey.util.models import PreprocessingParametersTomo, ProcessingParametersSPA
2727

2828
logger = logging.getLogger("murfey.client.analyser")
@@ -73,7 +73,7 @@ def __init__(
7373
self._stopping = False
7474
self._halt_thread = False
7575
self._murfey_config = (
76-
get_machine_config(
76+
get_machine_config_client(
7777
str(environment.url.geturl()),
7878
instrument_name=environment.instrument_name,
7979
demo=environment.demo,
@@ -145,7 +145,7 @@ def _find_context(self, file_path: Path) -> bool:
145145
and self._environment
146146
):
147147
created_directories = set(
148-
get_machine_config(
148+
get_machine_config_client(
149149
str(self._environment.url.geturl()),
150150
instrument_name=self._environment.instrument_name,
151151
demo=self._environment.demo,
@@ -165,7 +165,7 @@ def _find_context(self, file_path: Path) -> bool:
165165
logger.info("Acquisition software: EPU")
166166
if self._environment:
167167
try:
168-
cfg = get_machine_config(
168+
cfg = get_machine_config_client(
169169
str(self._environment.url.geturl()),
170170
instrument_name=self._environment.instrument_name,
171171
demo=self._environment.demo,

‎src/murfey/client/contexts/clem.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from murfey.client.context import Context
1616
from murfey.client.instance_environment import MurfeyInstanceEnvironment
17-
from murfey.util import capture_post, get_machine_config
17+
from murfey.util import capture_post, get_machine_config_client
1818

1919
# Create logger object
2020
logger = logging.getLogger("murfey.client.contexts.clem")
@@ -26,7 +26,7 @@ def _file_transferred_to(
2626
"""
2727
Returns the Path of the transferred file on the DLS file system.
2828
"""
29-
machine_config = get_machine_config(
29+
machine_config = get_machine_config_client(
3030
str(environment.url.geturl()),
3131
instrument_name=environment.instrument_name,
3232
demo=environment.demo,

‎src/murfey/client/contexts/spa.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
authorised_requests,
2020
capture_get,
2121
capture_post,
22-
get_machine_config,
22+
get_machine_config_client,
2323
)
2424

2525
logger = logging.getLogger("murfey.client.contexts.spa")
@@ -105,7 +105,7 @@ def _get_grid_square_atlas_positions(
105105
def _file_transferred_to(
106106
environment: MurfeyInstanceEnvironment, source: Path, file_path: Path
107107
):
108-
machine_config = get_machine_config(
108+
machine_config = get_machine_config_client(
109109
str(environment.url.geturl()),
110110
instrument_name=environment.instrument_name,
111111
demo=environment.demo,
@@ -684,7 +684,7 @@ def post_transfer(
684684
if transferred_file.suffix in data_suffixes:
685685
if self._acquisition_software == "epu":
686686
if environment:
687-
machine_config = get_machine_config(
687+
machine_config = get_machine_config_client(
688688
str(environment.url.geturl()),
689689
instrument_name=environment.instrument_name,
690690
demo=environment.demo,
@@ -872,7 +872,7 @@ def _register_processing_job(
872872
parameters = parameters or {}
873873
environment.id_tag_registry["processing_job"].append(tag)
874874
proc_url = f"{str(environment.url.geturl())}/visits/{environment.visit}/{environment.murfey_session}/register_processing_job"
875-
machine_config = get_machine_config(
875+
machine_config = get_machine_config_client(
876876
str(environment.url.geturl()),
877877
instrument_name=environment.instrument_name,
878878
demo=environment.demo,

‎src/murfey/client/contexts/spa_metadata.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from murfey.client.context import Context
99
from murfey.client.contexts.spa import _get_grid_square_atlas_positions, _get_source
1010
from murfey.client.instance_environment import MurfeyInstanceEnvironment, SampleInfo
11-
from murfey.util import authorised_requests, capture_post, get_machine_config
11+
from murfey.util import authorised_requests, capture_post, get_machine_config_client
1212

1313
logger = logging.getLogger("murfey.client.contexts.spa_metadata")
1414

@@ -18,7 +18,7 @@
1818
def _atlas_destination(
1919
environment: MurfeyInstanceEnvironment, source: Path, file_path: Path
2020
) -> Path:
21-
machine_config = get_machine_config(
21+
machine_config = get_machine_config_client(
2222
str(environment.url.geturl()),
2323
instrument_name=environment.instrument_name,
2424
demo=environment.demo,

‎src/murfey/client/contexts/tomo.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
MurfeyInstanceEnvironment,
2020
global_env_lock,
2121
)
22-
from murfey.util import authorised_requests, capture_post, get_machine_config
22+
from murfey.util import authorised_requests, capture_post, get_machine_config_client
2323
from murfey.util.mdoc import get_block, get_global_data, get_num_blocks
2424

2525
logger = logging.getLogger("murfey.client.contexts.tomo")
@@ -271,7 +271,7 @@ def _complete_process_file(
271271
def _file_transferred_to(
272272
self, environment: MurfeyInstanceEnvironment, source: Path, file_path: Path
273273
):
274-
machine_config = get_machine_config(
274+
machine_config = get_machine_config_client(
275275
str(environment.url.geturl()),
276276
instrument_name=environment.instrument_name,
277277
demo=environment.demo,
@@ -714,7 +714,7 @@ def post_transfer(
714714
if transferred_file.suffix in data_suffixes:
715715
if self._acquisition_software == "tomo":
716716
if environment:
717-
machine_config = get_machine_config(
717+
machine_config = get_machine_config_client(
718718
str(environment.url.geturl()),
719719
instrument_name=environment.instrument_name,
720720
demo=environment.demo,

‎src/murfey/client/tui/app.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from murfey.client.watchdir_multigrid import MultigridDirWatcher
3535
from murfey.util import (
3636
capture_post,
37-
get_machine_config,
37+
get_machine_config_client,
3838
read_config,
3939
set_default_acquisition_output,
4040
)
@@ -104,7 +104,7 @@ def __init__(
104104
self._force_mdoc_metadata = force_mdoc_metadata
105105
self._strict = strict
106106
self._skip_existing_processing = skip_existing_processing
107-
self._machine_config = get_machine_config(
107+
self._machine_config = get_machine_config_client(
108108
str(self._environment.url.geturl()),
109109
instrument_name=self._environment.instrument_name,
110110
demo=self._environment.demo,
@@ -128,7 +128,7 @@ def _launch_multigrid_watcher(
128128
self, source: Path, destination_overrides: Dict[Path, str] | None = None
129129
):
130130
log.info(f"Launching multigrid watcher for source {source}")
131-
machine_config = get_machine_config(
131+
machine_config = get_machine_config_client(
132132
str(self._environment.url.geturl()),
133133
instrument_name=self._environment.instrument_name,
134134
demo=self._environment.demo,
@@ -688,7 +688,7 @@ def on_log_book_log(self, message):
688688
self.log_book.write(message.renderable)
689689

690690
async def reset(self):
691-
machine_config = get_machine_config(
691+
machine_config = get_machine_config_client(
692692
str(self._environment.url.geturl()),
693693
instrument_name=self._environment.instrument_name,
694694
demo=self._environment.demo,
@@ -743,7 +743,7 @@ def clean_up_quit(self) -> None:
743743
exit()
744744

745745
async def action_clear(self) -> None:
746-
machine_config = get_machine_config(
746+
machine_config = get_machine_config_client(
747747
str(self._environment.url.geturl()),
748748
instrument_name=self._environment.instrument_name,
749749
demo=self._environment.demo,

‎src/murfey/client/tui/screens.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
)
5757
from murfey.client.rsync import RSyncer
5858
from murfey.client.tui.forms import FormDependency
59-
from murfey.util import capture_post, get_machine_config, read_config
59+
from murfey.util import capture_post, get_machine_config_client, read_config
6060
from murfey.util.models import PreprocessingParametersTomo, ProcessingParametersSPA
6161

6262
log = logging.getLogger("murfey.tui.screens")
@@ -262,7 +262,7 @@ def __init__(
262262
super().__init__(*args, **kwargs)
263263
self._selected_dir = basepath
264264
self._add_basepath = add_basepath
265-
cfg = get_machine_config(
265+
cfg = get_machine_config_client(
266266
str(self.app._environment.url.geturl()),
267267
instrument_name=self.app._environment.instrument_name,
268268
demo=self.app._environment.demo,
@@ -898,7 +898,7 @@ def on_button_pressed(self, event: Button.Pressed):
898898
visit_dir = Path(str(event.button.label)) / self.app._visit
899899
visit_dir.mkdir(exist_ok=True)
900900
self.app._set_default_acquisition_directories(visit_dir)
901-
machine_config = get_machine_config(
901+
machine_config = get_machine_config_client(
902902
str(self.app._environment.url.geturl()),
903903
instrument_name=self.app._environment.instrument_name,
904904
demo=self.app._environment.demo,
@@ -940,7 +940,7 @@ def compose(self):
940940
)
941941
yield RadioButton("Tomography", value=self._context is TomographyContext)
942942
if self.app._multigrid:
943-
machine_config = get_machine_config(
943+
machine_config = get_machine_config_client(
944944
str(self.app._environment.url.geturl()),
945945
instrument_name=self.app._environment.instrument_name,
946946
)
@@ -1000,7 +1000,7 @@ def compose(self):
10001000
)
10011001
)
10021002
else:
1003-
machine_config = get_machine_config(
1003+
machine_config = get_machine_config_client(
10041004
str(self.app._environment.url.geturl()),
10051005
instrument_name=self.app._environment.instrument_name,
10061006
)
@@ -1031,7 +1031,7 @@ def compose(self):
10311031
i = Input(value=val, id=k.name, classes="input-destination")
10321032
params_bulk.append(i)
10331033
self._inputs[i] = k.name
1034-
machine_config = get_machine_config(
1034+
machine_config = get_machine_config_client(
10351035
str(self.app._environment.url.geturl()),
10361036
instrument_name=self.app._environment.instrument_name,
10371037
demo=self.app._environment.demo,
@@ -1083,7 +1083,7 @@ def on_switch_changed(self, event):
10831083

10841084
def on_radio_set_changed(self, event: RadioSet.Changed) -> None:
10851085
if event.index == 0:
1086-
cfg = get_machine_config(
1086+
cfg = get_machine_config_client(
10871087
str(self.app._environment.url.geturl()),
10881088
instrument_name=self.app._environment.instrument_name,
10891089
demo=self.app._environment.demo,

‎src/murfey/instrument_server/api.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ def get_possible_gain_references(
237237
headers={"Authorization": f"Bearer {tokens[session_id]}"},
238238
).json()
239239
candidates = []
240-
for gf in secure_path(Path(machine_config["gain_reference_directory"])).glob(
241-
"**/*"
242-
):
240+
for gf in secure_path(
241+
Path(machine_config["gain_reference_directory"]), keep_spaces=True
242+
).glob("**/*"):
243243
if gf.is_file():
244244
candidates.append(
245245
File(

‎src/murfey/server/api/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ def get_instrument_display_name(instrument_name: str) -> str:
167167
machine_config = get_machine_config(instrument_name=instrument_name)[
168168
instrument_name
169169
]
170-
if machine_config.get(instrument_name):
171-
return machine_config[instrument_name].display_name
170+
if machine_config:
171+
return machine_config.display_name
172172
return ""
173173

174174

‎src/murfey/server/api/display.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
machine_config = get_machine_config()
1414

1515

16-
@router.get("/microscope_image/")
17-
def get_mic_image():
18-
if machine_config.image_path:
19-
return FileResponse(machine_config.image_path)
16+
@router.get("/instruments/{instrument_name}/image/")
17+
def get_mic_image(instrument_name: str):
18+
if machine_config[instrument_name].image_path:
19+
return FileResponse(machine_config[instrument_name].image_path)
2020
return None
2121

2222

0 commit comments

Comments
 (0)