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

Fix triple clinvar filter #5006

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Conversation

northwestwitch
Copy link
Member

@northwestwitch northwestwitch commented Nov 6, 2024

This PR adds a functionality or fixes a bug.

Testing on cg-vm1 server (Clinical Genomics Stockholm)

Prepare for testing

  1. Make sure the PR is pushed and available on Docker Hub
  2. Fist book your testing time using the Pax software available at https://pax.scilifelab.se/. The resource you are going to call dibs on is scout-stage and the server is cg-vm1.
  3. ssh <USER.NAME>@cg-vm1.scilifelab.se
  4. sudo -iu hiseq.clinical
  5. ssh localhost
  6. (optional) Find out which scout branch is currently deployed on cg-vm1: podman ps
  7. Stop the service with current deployed branch: systemctl --user stop scout.target
  8. Start the scout service with the branch to test: systemctl --user start scout@<this_branch>
  9. Make sure the branch is deployed: systemctl --user status scout.target
  10. After testing is done, repeat procedure at https://pax.scilifelab.se/, which will release the allocated resource (scout-stage) to be used for testing by other users.
Testing on hasta server (Clinical Genomics Stockholm)

Prepare for testing

  1. ssh <USER.NAME>@hasta.scilifelab.se
  2. Book your testing time using the Pax software. us; paxa -u <user> -s hasta -r scout-stage. You can also use the WSGI Pax app available at https://pax.scilifelab.se/.
  3. (optional) Find out which scout branch is currently deployed on cg-vm1: conda activate S_scout; pip freeze | grep scout-browser
  4. Deploy the branch to test: bash /home/proj/production/servers/resources/hasta.scilifelab.se/update-tool-stage.sh -e S_scout -t scout -b <this_branch>
  5. Make sure the branch is deployed: us; scout --version
  6. After testing is done, repeat the paxa procedure, which will release the allocated resource (scout-stage) to be used for testing by other users.

How to test:

  1. Using demo case, go to the SNVs filter and filter using the following criteria:
image

Check the difference between this branch and main branch!

Expected outcome:
The functionality should be working
Take a screenshot and attach or copy/paste the output.

Review:

  • code approved by
  • tests executed by CR

Chiara Rasi and others added 7 commits November 5, 2024 14:01
* Prioritise caller AF if available

* Fix #2920 - prioritise FORMAT.AF for VAF if available
* Fix ClinVar form to accept MedGen phenotypes

* typo

---------

Co-authored-by: Chiara Rasi <rasi.chiara@gmacil.com>
…5000)

Co-authored-by: Chiara Rasi <rasi.chiara@gmacil.com>
LOG.debug("add CLINSIG filter for rank: %s" % ", ".join(str(query["clinsig"])))
clnsig_query = {"clnsig": {"$elemMatch": elem_match_or}}

if query.get("clinvar_tag"):
Copy link
Member Author

@northwestwitch northwestwitch Nov 6, 2024

Choose a reason for hiding this comment

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

This is the fix: this filter is removed from the secondary query and set together with the other 2 clinvar-based filters, in the function dedicated to building the clinvar filters

@northwestwitch northwestwitch marked this pull request as ready for review November 6, 2024 11:15
Copy link

codecov bot commented Nov 6, 2024

Codecov Report

Attention: Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.

Project coverage is 84.76%. Comparing base (7c68883) to head (8cf42b6).

Files with missing lines Patch % Lines
scout/adapter/mongo/query.py 92.59% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5006   +/-   ##
=======================================
  Coverage   84.76%   84.76%           
=======================================
  Files         320      320           
  Lines       19359    19360    +1     
=======================================
+ Hits        16410    16411    +1     
  Misses       2949     2949           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

sonarcloud bot commented Nov 15, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Filtering by ClinVar clinsig + CLINSIG Confident + ClinVar hits has a bug
2 participants