Skip to content

LIMS-1501: Allow re-running downstream processing#948

Merged
ndg63276 merged 8 commits intopre-release/2025-R3.4from
improvement/LIMS-1501/rerun-downstream-processing
Jul 8, 2025
Merged

LIMS-1501: Allow re-running downstream processing#948
ndg63276 merged 8 commits intopre-release/2025-R3.4from
improvement/LIMS-1501/rerun-downstream-processing

Conversation

@ndg63276
Copy link
Collaborator

@ndg63276 ndg63276 commented Jun 20, 2025

JIRA ticket: LIMS-1501

Summary:

Add the ability to re-trigger downstream processing jobs.

Changes:

  • Add a button to Auto Processing jobs to bring up a new re-processing dialog
  • Display available downstream jobs (based on what @isikhar advises is available)
  • Disable jobs if the relevant PDB/sequence/anomalous scatterer are not defined
  • Submit button sends a message over rabbitmq to zocalo to enqueue the job

To test:

  • Edit your config to use the production database, as Zocalo will place results there
  • Find a data collection with sequence, PDB file, and anomalous scatterer (eg /dc/visit/mx23694-139/id/18302905), and open up the 'Auto Processing' tab.
  • Check that each tab has a new button 'Downstream Processing'
  • Check that it opens a new dialog showing the data collection and a list of pipelines
  • Check that the following pipelines are supported (others should show a message to say unsupported)
    • fast_dp - dimple, fast_ep
    • xia2 dials, xia2 3dii, multi-xia2, xia2 multiplex - dimple, MrBUMP, fast_ep, big_ep
    • autoPROC, autoPROC+staraniso - fast_ep, big_ep
  • Submit a job, check no errors appear in the dev console.
  • Check a new row appears in the ProcessingJob table, with a recipe of eg postprocessing-dimple
  • Go to a data collection with no sequence, PDB or anomalous scatterer (eg /dc/visit/mx34263-158/dcg/15347173), check each pipeline is disabled, with a reason stated
  • Switch config back to restore db if needed

@ndg63276 ndg63276 marked this pull request as ready for review June 25, 2025 10:07
@ndg63276 ndg63276 changed the title LIMS-1501: Early work on re-running downstream processing LIMS-1501: Allow re-running downstream processing Jun 25, 2025
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use a different filename, so that the purpose of this file is a bit more obvious?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah the name was to mirror the reprocess2.js file in the same directory, but you're right, better to use something that actually describes it. Have renamed to downstreamreprocess.js.

@gfrn
Copy link
Collaborator

gfrn commented Jul 1, 2025

Seems like the row isn't created on my end (at least if there's no RMQ vhost configured)... Is that expected?

@ndg63276
Copy link
Collaborator Author

ndg63276 commented Jul 1, 2025

Seems like the row isn't created on my end (at least if there's no RMQ vhost configured)... Is that expected?

Sorry, yes, that isn't very clear, The row is created by Zocalo, not by Synchweb, so if there is no RMQ vhost, you won't see one.

@ndg63276 ndg63276 changed the base branch from master to pre-release/2025-R3.4 July 8, 2025 10:29
@ndg63276 ndg63276 merged commit 883ef3b into pre-release/2025-R3.4 Jul 8, 2025
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-1501/rerun-downstream-processing branch July 8, 2025 10:30
ndg63276 added a commit that referenced this pull request Jul 22, 2025
* LIMS-1501: Allow re-running downstream processing (#948)

* LIMS-1501: Early work on re-running downstream processing

* LIMS-1501: Flesh out re-running downtream processing

* LIMS-1501: Remove unnecessary ProcessingJobParameters

* LIMS-1501: Enable fast_ep and some fast_dp

* LIMS-1501: Trigger zocalo directly

* LIMS-1501: Rename recipes for consistency

* LIMS-1501: Rename file more appropriately

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1771: Dont display zero dose on grouped collections (#951)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1688: Downstream processing wont display if filesystem not mounted (#953)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1739: Add button to say shipment is ready for scheduling (#945)

* LIMS-1739: Add button to say shipment is ready for scheduling

* LIMS-1739: Add button to say shipment is ready for scheduling

* LIMS-1739: Add contact instruction

* LIMS-1739: Dont show 'ready' button for industrial proposals

* Apply suggestions from code review

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants