Skip to content

Commit befd420

Browse files
committed
Rewrote function to iterate over entry point names and run the match
1 parent 9cd58ff commit befd420

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

src/murfey/server/__init__.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2971,27 +2971,25 @@ def feedback_callback(header: dict, message: dict) -> None:
29712971
if _transport_object:
29722972
_transport_object.transport.ack(header)
29732973
return None
2974-
elif message["register"] in (
2975-
"register_lif_preprocessing_result",
2976-
"register_tiff_preprocessing_result",
2974+
elif (
2975+
message["register"]
2976+
in entry_points().select(group="murfey.workflows.clem").names
29772977
):
2978-
murfey_workflows = list(
2978+
# Run the workflow if a match is found
2979+
workflow: EntryPoint = list( # Returns a list of either 1 or 0
29792980
entry_points().select(
29802981
group="murfey.workflows.clem", name=message["register"]
29812982
)
2983+
)[0]
2984+
result = workflow.load()(
2985+
message=message,
2986+
db=murfey_db,
29822987
)
2983-
# Run the workflow if a match is found
2984-
if len(murfey_workflows) > 0:
2985-
workflow: EntryPoint = murfey_workflows[0]
2986-
workflow.load()(
2987-
message=message,
2988-
db=murfey_db,
2989-
)
2990-
if _transport_object:
2988+
print(f"Workflow returned {result}")
2989+
if _transport_object:
2990+
if result:
29912991
_transport_object.transport.ack(header)
2992-
# Nack message if no workflow found for message
2993-
else:
2994-
if _transport_object:
2992+
else:
29952993
_transport_object.transport.nack(header)
29962994
return None
29972995
if _transport_object:

0 commit comments

Comments
 (0)