Register FIB data in ISPyB#805
Conversation
7c7f895 to
c747bfb
Compare
c747bfb to
67bf24f
Compare
…t the end of the function, and both new and old entries are populated or updated correctly
67bf24f to
409f9a4
Compare
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #805 +/- ##
==========================================
+ Coverage 52.20% 52.30% +0.10%
==========================================
Files 96 97 +1
Lines 10379 10436 +57
Branches 1373 1380 +7
==========================================
+ Hits 5418 5459 +41
- Misses 4677 4689 +12
- Partials 284 288 +4 🚀 New features to boost your workflow:
|
… using FIB atlas data
949aa3c to
df5c51a
Compare
df5c51a to
06d9cac
Compare
… needed for one function
| ) | ||
|
|
||
| # Mock the metadata returned from the image file | ||
| import murfey.workflows.fib.register_atlas |
stephen-riggs
left a comment
There was a problem hiding this comment.
This all looks like it will work, just a few queries about the structure
| if entry_point_result := entry_points( | ||
| group="murfey.workflows", name="atlas_update" | ||
| ): | ||
| (workflow,) = entry_point_result |
There was a problem hiding this comment.
Does this (and the dcg one below) need to be done here rather than sending a message to the feedback queue?
There was a problem hiding this comment.
As discussed, fully modularising this is too much effort for too little gain at the moment. However, I have rewritten this workflow so that it is triggered by the feedback_callback function instead, and can be safely acked or nacked.
| ) | ||
| visit_number = visit_name.split("-")[-1] | ||
|
|
||
| # Register using thumbnail values if they are provided |
There was a problem hiding this comment.
What circumstance do you want thumbnail vs full image sizes? Could these ever get mixed up?
| .where(MurfeyDB.DataCollectionGroup.tag == imaging_site.site_name) | ||
| ).one() | ||
|
|
||
| imaging_site.dcg_id = dcg_entry.id |
There was a problem hiding this comment.
Looks like you do need the dcg workflow run, this id is a bit challenging
| murfey_db=murfey_db, | ||
| ) | ||
| except Exception: | ||
| # Log error but allow workflow to proceed |
There was a problem hiding this comment.
Do you want this to proceed? If you fail would it be better to dlq the message?
There was a problem hiding this comment.
As discussed, we'll DLQ the message instead.
…nd run through the RabbitMQ feedback queue instead of being loaded directly
…ib_atlas' API endpoint
Extends the existing FIB data registration workflow to insert a DataCollectionGroup and Atlas into ISPyB for each unique sample detected.
Currently inserts the path to the real image, as thumbnail generation logic hasn't been implemented yet.