Skip to content

Commit f57a762

Browse files
committed
Added debug log to keep track of message contents being sent to 'cryoem-services' for subsequent processing
1 parent 3de74cd commit f57a762

File tree

2 files changed

+50
-33
lines changed

2 files changed

+50
-33
lines changed

src/murfey/workflows/clem/process_raw_lifs.py

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
The recipe referred to here is stored on GitLab.
44
"""
55

6+
from logging import getLogger
67
from pathlib import Path
78
from typing import Optional
89

@@ -11,6 +12,8 @@
1112
except AttributeError:
1213
pass # Ignore if ISPyB credentials environment variable not set
1314

15+
logger = getLogger("murfey.workflows.clem.process_raw_lifs")
16+
1417

1518
def zocalo_cluster_request(
1619
file: Path,
@@ -43,24 +46,28 @@ def zocalo_cluster_request(
4346
# Load machine config to get the feedback queue
4447
feedback_queue: str = messenger.feedback_queue
4548

46-
# Send the message
47-
# The keys under "parameters" will populate all the matching fields in {}
48-
# in the processing recipe
49-
messenger.send(
50-
"processing_recipe",
51-
{
52-
"recipes": ["clem-lif-to-stack"],
53-
"parameters": {
54-
# Job parameters
55-
"lif_file": f"{str(file)}",
56-
"root_folder": root_folder,
57-
# Other recipe parameters
58-
"session_dir": f"{str(session_dir)}",
59-
"session_id": session_id,
60-
"job_name": job_name,
61-
"feedback_queue": feedback_queue,
62-
},
49+
# Construct recipe and submit it for processing
50+
recipe = {
51+
"recipes": ["clem-lif-to-stack"],
52+
"parameters": {
53+
# Job parameters
54+
"lif_file": f"{str(file)}",
55+
"root_folder": root_folder,
56+
# Other recipe parameters
57+
"session_dir": f"{str(session_dir)}",
58+
"session_id": session_id,
59+
"job_name": job_name,
60+
"feedback_queue": feedback_queue,
6361
},
62+
}
63+
logger.debug(
64+
f"Submitting LIF processing request to {messenger.feedback_queue!r} "
65+
"with the following recipe: \n"
66+
f"{recipe}"
67+
)
68+
messenger.send(
69+
queue="processing_recipe",
70+
message=recipe,
6471
new_connection=True,
6572
)
6673
else:

src/murfey/workflows/clem/process_raw_tiffs.py

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
The recipe referred to here is stored on GitLab.
44
"""
55

6+
from logging import getLogger
67
from pathlib import Path
78
from typing import Optional
89

10+
logger = getLogger("murfey.workflows.clem.process_raw_tiffs")
11+
912
try:
1013
from murfey.server.ispyb import TransportManager # Session
1114
except AttributeError:
@@ -50,23 +53,30 @@ def zocalo_cluster_request(
5053
# Load machine config to get the feedback queue
5154
feedback_queue: str = messenger.feedback_queue
5255

53-
messenger.send(
54-
"processing_recipe",
55-
{
56-
"recipes": ["clem-tiff-to-stack"],
57-
"parameters": {
58-
# Job parameters
59-
"tiff_list": "null",
60-
"tiff_file": f"{str(tiff_list[0])}",
61-
"root_folder": root_folder,
62-
"metadata": f"{str(metadata)}",
63-
# Other recipe parameters
64-
"session_dir": f"{str(session_dir)}",
65-
"session_id": session_id,
66-
"job_name": job_name,
67-
"feedback_queue": feedback_queue,
68-
},
56+
# Construct recipe and submit it for processing
57+
recipe = {
58+
"recipes": ["clem-tiff-to-stack"],
59+
"parameters": {
60+
# Job parameters
61+
"tiff_list": "null",
62+
"tiff_file": f"{str(tiff_list[0])}",
63+
"root_folder": root_folder,
64+
"metadata": f"{str(metadata)}",
65+
# Other recipe parameters
66+
"session_dir": f"{str(session_dir)}",
67+
"session_id": session_id,
68+
"job_name": job_name,
69+
"feedback_queue": feedback_queue,
6970
},
71+
}
72+
logger.debug(
73+
f"Submitting TIFF processing request to {messenger.feedback_queue!r} "
74+
"with the following recipe: \n"
75+
f"{recipe}"
76+
)
77+
messenger.send(
78+
queue="processing_recipe",
79+
message=recipe,
7080
new_connection=True,
7181
)
7282
else:

0 commit comments

Comments
 (0)