Skip to content

Commit 7ba1d9d

Browse files
committed
Workflow should return a boolean
1 parent dbd6ed7 commit 7ba1d9d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/murfey/server/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2948,7 +2948,10 @@ def feedback_callback(header: dict, message: dict) -> None:
29482948
else:
29492949
# Send it directly to DLQ without trying to rerun it
29502950
_transport_object.transport.nack(header, requeue=False)
2951+
if not result:
2952+
logger.error(f"Workflow {message['register']} returned {result}")
29512953
return None
2954+
logger.error(f"No workflow found for {message['register']}")
29522955
if _transport_object:
29532956
_transport_object.transport.nack(header, requeue=False)
29542957
return None

src/murfey/workflows/spa/flush_spa_preprocess.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,15 @@ def _flush_position_analysis(
291291
return foil_hole
292292

293293

294-
def flush_spa_preprocess(message: dict, db: Session, demo: bool = False):
294+
def flush_spa_preprocess(message: dict, db: Session, demo: bool = False) -> bool:
295295
session_id = message["session_id"]
296296
stashed_files = db.exec(
297297
select(PreprocessStash)
298298
.where(PreprocessStash.session_id == session_id)
299299
.where(PreprocessStash.tag == message["tag"])
300300
).all()
301301
if not stashed_files:
302-
return None
302+
return True
303303
instrument_name = (
304304
db.exec(select(MurfeySession).where(MurfeySession.id == message["session_id"]))
305305
.one()
@@ -334,9 +334,7 @@ def flush_spa_preprocess(message: dict, db: Session, demo: bool = False):
334334
logger.warning(
335335
f"No SPA processing parameters found for client processing job ID {collected_ids[2].id}"
336336
)
337-
raise ValueError(
338-
"No processing parameters were found in the database when flushing SPA preprocessing"
339-
)
337+
return False
340338

341339
murfey_ids = _murfey_id(
342340
collected_ids[3].id,
@@ -417,4 +415,4 @@ def flush_spa_preprocess(message: dict, db: Session, demo: bool = False):
417415
)
418416
db.commit()
419417
db.close()
420-
return None
418+
return True

0 commit comments

Comments
 (0)