|
10 | 10 | import json |
11 | 11 | import logging |
12 | 12 | import re |
| 13 | +import traceback |
13 | 14 | from pathlib import Path |
14 | 15 | from typing import Optional, Type, Union |
15 | 16 |
|
@@ -214,18 +215,16 @@ def register_lif_preprocessing_result( |
214 | 215 | try: |
215 | 216 | json_obj: dict = json.loads(message["result"]) |
216 | 217 | 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") |
221 | 221 | return False |
222 | 222 | elif isinstance(message["result"], dict): |
223 | 223 | try: |
224 | 224 | 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") |
229 | 228 | return False |
230 | 229 | else: |
231 | 230 | logger.error( |
@@ -271,27 +270,29 @@ def register_lif_preprocessing_result( |
271 | 270 | clem_img_stk.stack_created = True |
272 | 271 | db.add(clem_img_stk) |
273 | 272 | db.commit() |
274 | | - db.refresh() |
| 273 | + db.refresh(clem_img_stk) |
275 | 274 |
|
276 | 275 | clem_img_series.associated_metadata = clem_metadata |
277 | 276 | clem_img_series.parent_lif = clem_lif_file |
278 | 277 | clem_img_series.number_of_members = result.number_of_members |
279 | 278 | db.add(clem_img_series) |
280 | 279 | db.commit() |
281 | | - db.refresh() |
| 280 | + db.refresh(clem_img_series) |
282 | 281 |
|
283 | 282 | clem_metadata.parent_lif = clem_lif_file |
284 | 283 | db.add(clem_metadata) |
285 | 284 | db.commit() |
286 | | - db.refresh() |
287 | | - |
288 | | - logger.info(f"LIF preprocessing results registered for {result.series_name}") |
| 285 | + db.refresh(clem_metadata) |
289 | 286 |
|
| 287 | + logger.info( |
| 288 | + f"LIF preprocessing results registered for {result.series_name!r} {result.channel!r} image stack" |
| 289 | + ) |
290 | 290 | return True |
291 | 291 |
|
292 | | - except Exception as e: |
| 292 | + except Exception: |
| 293 | + logger.error(traceback.format_exc()) |
293 | 294 | 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" |
295 | 296 | ) |
296 | 297 | return False |
297 | 298 |
|
|
0 commit comments