Skip to content

Commit af6bbe1

Browse files
authored
Renamed 'clem' backend server module to 'workflow_clem' to bring it in line with other workflow-related endpoint modules (#794)
1 parent 546dbac commit af6bbe1

5 files changed

Lines changed: 27 additions & 27 deletions

File tree

src/murfey/cli/repost_failed_calls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
9393
# These imports need to happen after transport object is configured
9494
import murfey.server.api.auth
9595
import murfey.server.api.bootstrap
96-
import murfey.server.api.clem
9796
import murfey.server.api.display
9897
import murfey.server.api.file_io_frontend
9998
import murfey.server.api.file_io_instrument
@@ -106,6 +105,7 @@ def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
106105
import murfey.server.api.session_info
107106
import murfey.server.api.websocket
108107
import murfey.server.api.workflow
108+
import murfey.server.api.workflow_clem
109109

110110
for json_file in messages_path:
111111
with open(json_file, "r") as json_data:

src/murfey/client/contexts/clem.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def process_lif_file(
326326
try:
327327
capture_post(
328328
base_url=str(environment.url.geturl()),
329-
router_name="clem.router",
329+
router_name="workflow_clem.router",
330330
function_name="process_raw_lifs",
331331
token=self._token,
332332
instrument_name=environment.instrument_name,
@@ -351,7 +351,7 @@ def process_tiff_series(
351351
try:
352352
capture_post(
353353
base_url=str(environment.url.geturl()),
354-
router_name="clem.router",
354+
router_name="workflow_clem.router",
355355
function_name="process_raw_tiffs",
356356
token=self._token,
357357
instrument_name=environment.instrument_name,

src/murfey/server/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import murfey.server
1313
import murfey.server.api.auth
1414
import murfey.server.api.bootstrap
15-
import murfey.server.api.clem
1615
import murfey.server.api.display
1716
import murfey.server.api.file_io_frontend
1817
import murfey.server.api.file_io_instrument
@@ -26,6 +25,7 @@
2625
import murfey.server.api.session_info
2726
import murfey.server.api.websocket
2827
import murfey.server.api.workflow
28+
import murfey.server.api.workflow_clem
2929
import murfey.server.api.workflow_fib
3030
from murfey.server import template_files
3131
from murfey.util.config import get_security_config
@@ -97,7 +97,7 @@ class Settings(BaseSettings):
9797
app.include_router(murfey.server.api.workflow.correlative_router)
9898
app.include_router(murfey.server.api.workflow.spa_router)
9999
app.include_router(murfey.server.api.workflow.tomo_router)
100-
app.include_router(murfey.server.api.clem.router)
100+
app.include_router(murfey.server.api.workflow_clem.router)
101101
app.include_router(murfey.server.api.workflow_fib.router)
102102

103103
app.include_router(murfey.server.api.prometheus.router)

src/murfey/util/route_manifest.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -382,28 +382,6 @@ murfey.server.api.bootstrap.version:
382382
path_params: []
383383
methods:
384384
- GET
385-
murfey.server.api.clem.router:
386-
- path: /workflow/clem/sessions/{session_id}/process_raw_lifs
387-
function: process_raw_lifs
388-
path_params:
389-
- name: session_id
390-
type: int
391-
methods:
392-
- POST
393-
- path: /workflow/clem/sessions/{session_id}/process_raw_tiffs
394-
function: process_raw_tiffs
395-
path_params:
396-
- name: session_id
397-
type: int
398-
methods:
399-
- POST
400-
- path: /workflow/clem/sessions/{session_id}/align_and_merge_stacks
401-
function: align_and_merge_stacks
402-
path_params:
403-
- name: session_id
404-
type: int
405-
methods:
406-
- POST
407385
murfey.server.api.display.router:
408386
- path: /display/instruments/{instrument_name}/instrument_name
409387
function: get_instrument_display_name
@@ -1432,6 +1410,28 @@ murfey.server.api.workflow.tomo_router:
14321410
type: int
14331411
methods:
14341412
- POST
1413+
murfey.server.api.workflow_clem.router:
1414+
- path: /workflow/clem/sessions/{session_id}/process_raw_lifs
1415+
function: process_raw_lifs
1416+
path_params:
1417+
- name: session_id
1418+
type: int
1419+
methods:
1420+
- POST
1421+
- path: /workflow/clem/sessions/{session_id}/process_raw_tiffs
1422+
function: process_raw_tiffs
1423+
path_params:
1424+
- name: session_id
1425+
type: int
1426+
methods:
1427+
- POST
1428+
- path: /workflow/clem/sessions/{session_id}/align_and_merge_stacks
1429+
function: align_and_merge_stacks
1430+
path_params:
1431+
- name: session_id
1432+
type: int
1433+
methods:
1434+
- POST
14351435
murfey.server.api.workflow_fib.router:
14361436
- path: /workflow/fib/sessions/{session_id}/register_atlas
14371437
function: register_fib_atlas

0 commit comments

Comments
 (0)