Skip to content

Commit fbc9fe5

Browse files
committed
Fixed broken database refreshes and updated logged messages
1 parent 4e5b202 commit fbc9fe5

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

src/murfey/workflows/clem/register_results.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import json
1111
import logging
1212
import re
13+
import traceback
1314
from pathlib import Path
1415
from typing import Optional, Type, Union
1516

@@ -214,18 +215,16 @@ def register_lif_preprocessing_result(
214215
try:
215216
json_obj: dict = json.loads(message["result"])
216217
result = LIFPreprocessingResult(**json_obj)
217-
except Exception as e:
218-
logger.error(
219-
f"Exception encountered when parsing LIF preprocessing result: {e}"
220-
)
218+
except Exception:
219+
logger.error(traceback.format_exc())
220+
logger.error("Exception encountered when parsing LIF preprocessing result")
221221
return False
222222
elif isinstance(message["result"], dict):
223223
try:
224224
result = LIFPreprocessingResult(**message["result"])
225-
except Exception as e:
226-
logger.error(
227-
f"Exception encountered when parsing LIF preprocessing result: {e}"
228-
)
225+
except Exception:
226+
logger.error(traceback.format_exc())
227+
logger.error("Exception encountered when parsing LIF preprocessing result")
229228
return False
230229
else:
231230
logger.error(
@@ -271,27 +270,29 @@ def register_lif_preprocessing_result(
271270
clem_img_stk.stack_created = True
272271
db.add(clem_img_stk)
273272
db.commit()
274-
db.refresh()
273+
db.refresh(clem_img_stk)
275274

276275
clem_img_series.associated_metadata = clem_metadata
277276
clem_img_series.parent_lif = clem_lif_file
278277
clem_img_series.number_of_members = result.number_of_members
279278
db.add(clem_img_series)
280279
db.commit()
281-
db.refresh()
280+
db.refresh(clem_img_series)
282281

283282
clem_metadata.parent_lif = clem_lif_file
284283
db.add(clem_metadata)
285284
db.commit()
286-
db.refresh()
287-
288-
logger.info(f"LIF preprocessing results registered for {result.series_name}")
285+
db.refresh(clem_metadata)
289286

287+
logger.info(
288+
f"LIF preprocessing results registered for {result.series_name!r} {result.channel!r} image stack"
289+
)
290290
return True
291291

292-
except Exception as e:
292+
except Exception:
293+
logger.error(traceback.format_exc())
293294
logger.error(
294-
f"Exception encountered when registering LIF preprocessing result: {e}"
295+
f"Exception encountered when registering LIF preprocessing result for {result.series_name!r} {result.channel!r} image stack"
295296
)
296297
return False
297298

0 commit comments

Comments
 (0)