Skip to content

Commit fa6c5c8

Browse files
committed
Reverted entry point group name to 'murfey.workflows' to facilitate generalisability to other workflows in future
1 parent 5397c0e commit fa6c5c8

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ murfey = "murfey.client:run"
9797
"password" = "murfey.server.api.auth:password_token_validation"
9898
[project.entry-points."murfey.config.extraction"]
9999
"murfey_machine" = "murfey.util.config:get_extended_machine_config"
100-
[project.entry-points."murfey.workflows.clem"]
100+
[project.entry-points."murfey.workflows"]
101101
"process_raw_lifs" = "murfey.workflows.clem.process_raw_lifs:zocalo_cluster_request"
102102
"process_raw_tiffs" = "murfey.workflows.clem.process_raw_tiffs:zocalo_cluster_request"
103103
"register_lif_preprocessing_result" = "murfey.workflows.clem.register_preprocessing_results:register_lif_preprocessing_result"

src/murfey/server/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2972,13 +2972,12 @@ def feedback_callback(header: dict, message: dict) -> None:
29722972
_transport_object.transport.ack(header)
29732973
return None
29742974
elif (
2975-
message["register"]
2976-
in entry_points().select(group="murfey.workflows.clem").names
2975+
message["register"] in entry_points().select(group="murfey.workflows").names
29772976
):
29782977
# Run the workflow if a match is found
29792978
workflow: EntryPoint = list( # Returns a list of either 1 or 0
29802979
entry_points().select(
2981-
group="murfey.workflows.clem", name=message["register"]
2980+
group="murfey.workflows", name=message["register"]
29822981
)
29832982
)[0]
29842983
result = workflow.load()(

src/murfey/server/api/clem.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ def process_raw_lifs(
641641
):
642642
# Get command line entry point
643643
murfey_workflows = entry_points().select(
644-
group="murfey.workflows.clem", name="process_raw_lifs"
644+
group="murfey.workflows", name="process_raw_lifs"
645645
)
646646

647647
# Use entry point if found
@@ -679,7 +679,7 @@ def process_raw_tiffs(
679679
):
680680
# Get command line entry point
681681
murfey_workflows = entry_points().select(
682-
group="murfey.workflows.clem", name="process_raw_tiffs"
682+
group="murfey.workflows", name="process_raw_tiffs"
683683
)
684684

685685
# Use entry point if found

0 commit comments

Comments
 (0)