Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Output experimental data paths for use in F/E #1497

Open
mwinokan opened this issue Sep 3, 2024 · 17 comments
Open

Output experimental data paths for use in F/E #1497

mwinokan opened this issue Sep 3, 2024 · 17 comments
Assignees
Labels

Comments

@mwinokan
Copy link
Collaborator

mwinokan commented Sep 3, 2024

To shorten the feedback loop between alignment, upload, and reviewing of data in case there are faulty observations, @phraenquex suggests that we need some UI to be able to see the paths to the original experimental data for each observation.

This will require collator/aligner changes in XCA @tdudgeon

F/E UI specs still to follow @matej-vavrek

@mwinokan mwinokan added the 2024-06-14 mint Data dissemination 2 label Sep 3, 2024
@github-project-automation github-project-automation bot moved this to Backlog in Fragalysis Sep 3, 2024
@mwinokan mwinokan changed the title F/E functionality of original experimental data paths to aid in upload debugging loop Show experimental data paths in F/E Sep 3, 2024
@mwinokan mwinokan moved this from Backlog to FragTech in Fragalysis Sep 3, 2024
@mwinokan mwinokan self-assigned this Sep 17, 2024
@phraenquex phraenquex added the 2024-09-17 olive data curation big items (too big for mint) label Sep 17, 2024
@mwinokan mwinokan removed the 2024-09-17 olive data curation big items (too big for mint) label Sep 17, 2024
@mwinokan mwinokan changed the title Show experimental data paths in F/E Output experimental data paths for use in F/E Sep 17, 2024
@phraenquex phraenquex assigned kaliif and unassigned mwinokan Sep 17, 2024
@phraenquex
Copy link
Collaborator

What is needed is the frontend to know the original location of the PDB file - the thing that's in soakDB.

@tdudgeon needs to add to XCA/yamls
@kaliif needs to load and serve by API
@matej-vavrek needs to stick it into the extended view (probably a [copy] button next to the longcode)

@tdudgeon
Copy link
Collaborator

tdudgeon commented Sep 18, 2024

Collator now adds source_file property to the crystallographic_files entries.
Example:

    crystallographic_files:
      xtal_pdb:
        file: upload_1/crystallographic_files/A71EV2A-x0450/A71EV2A-x0450.pdb
        sha256: dec53789027de5ffc0eb42b4158c1023f96d59142291e1b67676eeaef4a17df2
        source_file: data/lb32627-66/inputs/dls/labxchem/data/lb32627/lb32627-66/processing/analysis/model_building/A71EV2A-x0450/Refine_0004/refine_4.split.bound-state.pdb
      xtal_mtz:
        file: upload_1/crystallographic_files/A71EV2A-x0450/A71EV2A-x0450.mtz
        sha256: 48ce6ce332b71246126912d05ce3ac1ab1452b9203c382c279c2fb933c4ca178
        source_file: data/lb32627-66/inputs/dls/labxchem/data/lb32627/lb32627-66/processing/analysis/model_building/A71EV2A-x0450/Refine_0004/refine_4.mtz
      ligand_cif:
        file: upload_1/crystallographic_files/A71EV2A-x0450/A71EV2A-x0450.cif
        sha256: d55dadae7fb0d7638b249b27d03c1f3207ab6065527fd6ca2d067c63759a9ee1
        source_file: data/lb32627-66/inputs/dls/labxchem/data/lb32627/lb32627-66/processing/analysis/model_building/A71EV2A-x0450/compound/Z100642432.cif
        smiles: CN(C)C(=O)c1ccc(F)cc1Br
        ligand_name: LIG
      ligand_binding_events:
      - file: upload_1/crystallographic_files/A71EV2A-x0450/A71EV2A-x0450_1_A_201.ccp4
        sha256: 56d493d405bd9bfa8105b7bba96adb3741bdac7ea13d96293fcec6f8bc59a780
        source_file: data/lb32627-66/inputs/dls/labxchem/data/lb32627/lb32627-66/processing/analysis/pandda2_remaining_screen_smallcell_2023-12-05/processed_datasets/A71EV2A-x0450/A71EV2A-x0450-event_2_1-BDC_0.9_map.native.ccp4
        model: '1'
        chain: A
        res: 201
        index: 2
        bdc: 0.9

Commit: xchem/xchem-align@c6e6ded

Example data: https://im-xchem-data.s3.amazonaws.com/lb32627-66_18-SEP.tgz

@kaliif
Copy link
Collaborator

kaliif commented Sep 18, 2024

@matej-vavrek source paths are available in api/experiments/. Site observation objects have a key to experiment.

@phraenquex
Copy link
Collaborator

@tdudgeon, @kaliif that's fantastic!

One detail: ensure it's the absolute path (which it currently isn't).

@mwinokan
Copy link
Collaborator Author

@tdudgeon to change to absolute paths (and then update the environment together with #1511)

@mwinokan
Copy link
Collaborator Author

@matej-vavrek please add a clipboard icon to the F/E observation expanded table under a heading "Path"

@mwinokan
Copy link
Collaborator Author

Latest alignment from A71EV2A on staging includes the absolute paths in the /api/experiments endpoint

@matej-vavrek
Copy link
Collaborator

@phraenquex, @mwinokan, I have updated my stack. Currently, it uses pdb_info for the path from api/experiments.

@mwinokan
Copy link
Collaborator Author

Thanks @matej-vavrek the correct field is pdb_info_source_file which will be populated in new alignments

@matej-vavrek
Copy link
Collaborator

@phraenquex, @mwinokan, changed field and also added a note into tooltip when it is empty, is it ok?

@matej-vavrek matej-vavrek moved this from In Progress (DEV) to Dev Done - Do review (DEV) in Fragalysis Sep 26, 2024
@mwinokan
Copy link
Collaborator Author

mwinokan commented Oct 1, 2024

@matej-vavrek please push this to staging so we can test with new data

@mwinokan mwinokan moved this from Dev Done - Do review (DEV) to QA done in dev.env - move to staging in Fragalysis Oct 1, 2024
@boriskovar-m2ms boriskovar-m2ms moved this from QA done in dev.env - move to staging to In staging - assess function vs spec in Fragalysis Oct 1, 2024
@phraenquex
Copy link
Collaborator

@mwinokan @matej-vavrek should I be expecting to see this in staging for the A71EV2A you uploaded yesterday? Because I don't....

https://fragalysis.xchem.diamond.ac.uk/viewer/react/projects/100/71

image

@mwinokan
Copy link
Collaborator Author

mwinokan commented Oct 2, 2024

@phraenquex it was briefly there but staging is out of date (see slack thread) they should reappear on the next staging rebuild

@phraenquex
Copy link
Collaborator

@mwinokan is this the path we'd expect - specifically the CIF file?

Image

@phraenquex phraenquex moved this from In staging - assess function vs spec to Dev Done - Do review (DEV) in Fragalysis Oct 8, 2024
@phraenquex
Copy link
Collaborator

@kaliif the path that should be served to the frontend is the path to the PDB file.

Fix that, and then we can close the ticket.

@phraenquex phraenquex moved this from Dev Done - Do review (DEV) to In Progress (DEV) in Fragalysis Oct 8, 2024
@mwinokan
Copy link
Collaborator Author

@matej-vavrek says that the f/e is using querying:

experiment.pdb_info_source_file

@kaliif it seems that you are currently serving the source_file value from the ligand_cif key. but it should be the source_file valuextal_pdb

@phraenquex phraenquex moved this from In Progress (DEV) to QA done in dev.env - move to staging in Fragalysis Oct 15, 2024
@mwinokan mwinokan moved this from QA done in dev.env - move to staging to In staging - assess function vs spec in Fragalysis Oct 15, 2024
@mwinokan
Copy link
Collaborator Author

F/E is now correctly serving the refined PDB, e.g. for A71EV2A A0207a:

/dls/labxchem/data/lb32627/lb32627-66/processing/analysis/model_building/A71EV2A-x0207/Refine_0003/refine_3.split.bound-state.pdb

@mwinokan mwinokan moved this from In staging - assess function vs spec to Approved in staging - push to production in Fragalysis Oct 22, 2024
@phraenquex phraenquex moved this from Approved in staging - push to production to In production (Done) in Fragalysis Nov 12, 2024
boriskovar-m2ms added a commit that referenced this issue Nov 26, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

* #1458 allow to tag XCA sites, temp commit

# Conflicts:
#	js/components/preview/molecule/observationsDialog.js

* #1458 adjusted functionality and styling to proper change tag

* #1508 removed TagName column in expanded observation dialog, changed order of columns, adjusted labels and tooltips, show observation dialog in its full height

* #1508 adjusted column order and width calculation

* #1501 added upload links to menu

* #1520 show tag alias instead of upload_name on hit navigator CanonSites & ConformerSites box tooltip

* #1519 keep tag in edit window after save

* #1497 added Path column for extended view of observations

---------

Co-authored-by: Boris Kovar <boris.kovar@m2ms.sk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: In production (Done)
Development

No branches or pull requests

5 participants