forked from pinellolab/CRISPResso2
-
Notifications
You must be signed in to change notification settings - Fork 1
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
2 flexible pooled input #3
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit f917366.
Closed
Replace process to read header, increase flexibility for column order
Snicker7
added a commit
that referenced
this pull request
Jul 27, 2023
e18807d Merge remote-tracking branch 'origin/githubActions' into fig_name_fix c3ac8f4 Merge remote-tracking branch 'origin/Reports_refactor' into fig_name_fix c0fdbfa Update README.md efc3b73 Fix 10f and 10g not showing up error f793516 Use --fail-under 68668c3 Print score alone 8a7f387 Print score 83cce0b Add print statement 145b47e Alternate fix for comparison c07c509 Fix comparison statement 317852b Print report score f9b4cb1 Lower bound ab25d2e Prevent pylint from failing b77b6df Fail if pylint score is below 9 276f3fa Pylint fixes: unused variables ed5be7a Dangerous defaults fix 63d7333 Pylint fixes f7a1596 Loosen restrictions on local variables and arguments 27baaa3 Fix tab issue 87aa300 Change failure to warning 78ae177 Add custom configurations 67f4a3e path fix e6cc4a2 print working directory 38a8155 Another path fix 7c677c4 Fix pylintrc path e424e7f Update to use .pylintrc 6275e3a Create .pylintrc 3c2ee52 Update to only use python 3.10 1f290fc Create pylint.yml f3c325f Merge pull request #6 from edilytics/print_styles 8e3dbf5 Remove borders when printing f215d74 Fix div issue, breakinpage at all points dcef278 Debugging for error 8cbafda Spacing fix for empty page problem e1652ab Restore block statement 4fe3bc3 Remove some page breaks a8fa963 Increase the size of the center column when printing f462bfd Working in docker c38a1b4 Switch reports branch 418d811 Fix command used and parameters elements. Increase print width and height to 100% 40330d5 Adding styling for print-only and screen only 57d910f Load favicon from web server 598d03d Indentation and parenthesis 21f63d0 Replace tabs with spaces and reindent template files a3bcfeb Fix hamburger menu and add -bs- to data-target and data-toggle bd0c0f1 Resize images and fix filepath 02f94fd Add spacing around body and footer tags e514cdc Final style fixes, color circles for style files a6700c0 Merge commit '90392b44c4bf86da0940887f85401072f4190428' as 'CRISPRessoWEB/CRISPRessoReports' 1343942 Removing CRISPRessoReport files 17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes 9ebd458 Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 7d9b4e5 04558fb Remove extra files 8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix 980fdc4 Styling and bootstrap changes 9d40474 Centering issue and submit button fix 4cbbda7 Subtree working 35741c3 Jinja choice loader e30fc40 Path correction 89864b1 Bootstrap 5 and partials changes 6740185 Layout.html for C2WEB and CLI 61f5287 Fix error when rendering multi reports 240e910 summaries partials and html updates bc7535f fig_reports and replacement dd02b44 Added a few changes from the selenium-tests branch on C2Web c1e572a Update indentation in report.html and extract log params into partial c7a6974 Update path to template directory to include `CRISPRessoReports` 90108fa Use the `render_template` function for each report 125e989 Add function to render template partials without using Flask 56b1d26 Web updates refactoring done 40ac3cb Adding files ef333f0 Removing reports found in subtree 1bae0df Commit before adding subtree 1fbb427 Add server file to render js d1d6fdf Move styling to main.css file 1241569 Jinja partials for all submissions 0534637 New submission.js template file c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial ecd03f6 Working file upload in partial. ce5d20f Working, missing custom label 6ba73e7 Bootstrap 5 changes e05d146 Layout and report update 517e9f8 Replace sub, ins, del with Substitution, Insertion, Deletion ea44128 Move where the style files are stored in Docker 7f03e98 Implement creating styles from the admin panel 9b27a2e Rename style_file references to style a233d10 Add some default styles and rename the default to "Original" 43a8d29 Remove style file card from admin index page 1a8f332 Refactor saving style files when there is no name specified 64a7b1c Implement color pickers in style admin view 17c93c1 Succesfully implemented selecting default style fd79cdd Restyle the colors in the admin view 3cd94b8 Fix error when the default style can't be read from the database 5e626bd Refactor `style_handler` to read the style from the database 0f66d4a Refactor styles to be part of the database instead of files 6c7d3c8 Move style folder inside of server folder 9f71f21 Add margins around style file elements 2a28549 Restyle the color pickers 2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files dc4f2c7 Style dropdown - allow save json only for admin 15e7483 Style file check 7bd0e91 Remove style from Compare 0ab45f5 Colors function refactored and working for all types 2e24f8b Adding styling d6621f1 Debuging ed00c82 Merge with master 5150f9b Adding style_files to partial 957a9ca Add style files to pooled and wgs 66dc2d3 Changes to pooled and wgs, reset Dockerfile fa6b1cf Updated Docker file and style_files.html ee0fcfc Optional save file 229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder 0f26e2c Working style FileAdmin, access button, and further partial refactoring b3b70bd Rough framework for style admin page e4731d7 Style menu completed 1bb37bc New style menu with tabs 58f7e56 Tabs for different style options 3de893d Compare (#34) e66bef1 Update AWS EB instructions.docx 658a218 Fix bug when trying to send recovery password with bad email creds ee32e36 Adding color-picker partial to wgs and pooled 34ea688 Fix for responsiveness on cup and title f0c4d07 Adding color routes to other versions 110fe14 Color picker input added to cmd_to_run e732478 Names for color fields 2934631 Jinja partial for color picker and pip install in dockerfile 48bbf9c Cup animation (#33) 2905248 Selenium tests (#31) 5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides 570e42a Don't remove commas from amplicons or guides 0d70425 Add smallGenome.fa fc33197 Writing text for pooled dccfcb3 Files for testing 4cea67c Changes for WGS selenium tests. All tests functional. ff05713 Changes for WGS selenium test file loading 495a98d Changes for pooled testing 0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix 127eb8f PopulatePooled error 30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests 7847687 Add link to CRISPRessoWGS from profile page and change header 666f73b Remove example block from CRISPRessoWGS submission page 27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled 8d979a4 Fix bug where files_to_delete was being replaced and standardize append 09e55fc Changes to make interleaved and pooled tests possible f89eca8 Changes necessary for selenium tests 3efe4f9 Clean up test files a696363 Merge pull request #28 from edilytics/s3 dcef708 Remove changes for CRISPRessoCompare e0c79cf Add demo config file for eb 03aba8e Update AWS EB instructions.docx a671c4e Set version to 2.6.3 3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled da5b15b Timezone for history is displayed in user local timezone e11691f Update history to show time of previous run be675fb Update pooled with s3 4c7d429 Add data links to pooled report 353e88f Update admin portal landing page 712e828 Show run type in history 2802252 s3 and user updates efc3ed8 S3 error catching af68341 New S3 Validation f7d64e0 AWS validation before submission 8446093 Update s3 for batch and paired modes 0e7d327 S3_Upload function imrpvoed -JF b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3 c991d52 added s3 user database model ab4aa54 add model for s3 bucket 853cda9 S3_Functionality improved -JF 2f060a6 Implemented front-end s3 browsing e082a5f stub out viewing method c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length c85a93f Merge pull request #15 from edilytics/wgs-interface 712270a Add support for CRISPRessoWGS deaacee Extract out function to get server files in submit_routes 151eb15 Update crispresso2_info object fields b2a974d Bump CRISPResso verion to 2.2.4 58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2 7f2dc1c Stop trimming json error messages, fix #11 d28c03b Update reporting logic to use the new CRISPResso2_info schema 03ee46f Bump CRISPResso version in Dockerfile and download release from Github 9151c5d Add CRISPRessoPooled report template 25a6e37 Merge pull request #6 from edilytics/pooled-interface b47d288 Check length of amplicons for hosted version, closes #4 54c28b6 Update submission file extension check 8fcadee Add a link to CRISPRessoPooled interface in user dashboard 7fd0283 Implement CRISPRessoPooled backend and report functionality 4063eb3 Modify submission.js to accept .txt and .tsv files b770323 Create template file for CRISPRessoPooled submission interface d4f2ed0 Merge pull request #5 from edilytics/flask-modularization 8527384 Convert some celery configurations settings to new format 962a209 Install less and vim in Dockerfile c693668 Read CRISPResso2_info from json files instead of pickle files a469e08 Move LoginManager to user_routes.py f62e67a Create db tables in init_db.py 0d85c90 Move login_required to user_routes 6f5e33e Reformatting of remaining __init__.py e615c0b Extract report routes out of __init__.py 20f2601 Extract user routes out from __init__.py 5582612 Extract status routes out from __init__.py 2406a10 Extract submit routes out from __init__.py b562fcd Extract celery tasks from __init__.py faa785d Extract views out from __init__.py ff44576 Extract model classes out from __init__.py 914498f Merge pull request #3 from edilytics/2to3 86ea7da Replace RabbitMQ with Redis adca9fb Upgrade celery to version 5.0.5 244ec33 Convert from Python 2 to Python 3 28b4f37 Refactor Docker image to use Python 3 via micromamba 2359800 Allow interleaved batches 428720b Add features: Allow admin init, server discovery depth 11df5d8 Client and server-side checks for invalid characters on sgRNA and amplicon 5062365 Update README.md 51e02f4 Update README.md ac4a6d5 delete other images 4f3ad88 Update README.md fc0de1d Update README.md 08defa1 Update README.md 9604983 Trycatch pickle loads c1facd7 get rid of debug print of email d699d4d crispresso2.0.45 e7ff079 Update param descriptions 1f12d59 2.0.44 b81febe crispresso to 2.0.42 1a967a8 update report 178c56d 2.4 e41076d Job expiration 41d1a4c check progress on setinterval 756e488 server-side files ad19c3c Update to crispresso 2.0.40 prime editing e3a194a update errors and ignore email config 2efb0bb Update README.md 58844a6 initial commit 8ff1878 Initial commit git-subtree-dir: CRISPResso2/CRISPRessoReports git-subtree-split: e18807d9d287f583d7176a668d12590f69cdf78a
Colelyman
pushed a commit
that referenced
this pull request
Sep 21, 2023
e18807d Merge remote-tracking branch 'origin/githubActions' into fig_name_fix c3ac8f4 Merge remote-tracking branch 'origin/Reports_refactor' into fig_name_fix c0fdbfa Update README.md efc3b73 Fix 10f and 10g not showing up error f793516 Use --fail-under 68668c3 Print score alone 8a7f387 Print score 83cce0b Add print statement 145b47e Alternate fix for comparison c07c509 Fix comparison statement 317852b Print report score f9b4cb1 Lower bound ab25d2e Prevent pylint from failing b77b6df Fail if pylint score is below 9 276f3fa Pylint fixes: unused variables ed5be7a Dangerous defaults fix 63d7333 Pylint fixes f7a1596 Loosen restrictions on local variables and arguments 27baaa3 Fix tab issue 87aa300 Change failure to warning 78ae177 Add custom configurations 67f4a3e path fix e6cc4a2 print working directory 38a8155 Another path fix 7c677c4 Fix pylintrc path e424e7f Update to use .pylintrc 6275e3a Create .pylintrc 3c2ee52 Update to only use python 3.10 1f290fc Create pylint.yml f3c325f Merge pull request #6 from edilytics/print_styles 8e3dbf5 Remove borders when printing f215d74 Fix div issue, breakinpage at all points dcef278 Debugging for error 8cbafda Spacing fix for empty page problem e1652ab Restore block statement 4fe3bc3 Remove some page breaks a8fa963 Increase the size of the center column when printing f462bfd Working in docker c38a1b4 Switch reports branch 418d811 Fix command used and parameters elements. Increase print width and height to 100% 40330d5 Adding styling for print-only and screen only 57d910f Load favicon from web server 598d03d Indentation and parenthesis 21f63d0 Replace tabs with spaces and reindent template files a3bcfeb Fix hamburger menu and add -bs- to data-target and data-toggle bd0c0f1 Resize images and fix filepath 02f94fd Add spacing around body and footer tags e514cdc Final style fixes, color circles for style files a6700c0 Merge commit '90392b44c4bf86da0940887f85401072f4190428' as 'CRISPRessoWEB/CRISPRessoReports' 1343942 Removing CRISPRessoReport files 17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes 9ebd458 Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit ba01a8f 04558fb Remove extra files 8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix 980fdc4 Styling and bootstrap changes 9d40474 Centering issue and submit button fix 4cbbda7 Subtree working 35741c3 Jinja choice loader e30fc40 Path correction 89864b1 Bootstrap 5 and partials changes 6740185 Layout.html for C2WEB and CLI 61f5287 Fix error when rendering multi reports 240e910 summaries partials and html updates bc7535f fig_reports and replacement dd02b44 Added a few changes from the selenium-tests branch on C2Web c1e572a Update indentation in report.html and extract log params into partial c7a6974 Update path to template directory to include `CRISPRessoReports` 90108fa Use the `render_template` function for each report 125e989 Add function to render template partials without using Flask 56b1d26 Web updates refactoring done 40ac3cb Adding files ef333f0 Removing reports found in subtree 1bae0df Commit before adding subtree 1fbb427 Add server file to render js d1d6fdf Move styling to main.css file 1241569 Jinja partials for all submissions 0534637 New submission.js template file c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial ecd03f6 Working file upload in partial. ce5d20f Working, missing custom label 6ba73e7 Bootstrap 5 changes e05d146 Layout and report update 517e9f8 Replace sub, ins, del with Substitution, Insertion, Deletion ea44128 Move where the style files are stored in Docker 7f03e98 Implement creating styles from the admin panel 9b27a2e Rename style_file references to style a233d10 Add some default styles and rename the default to "Original" 43a8d29 Remove style file card from admin index page 1a8f332 Refactor saving style files when there is no name specified 64a7b1c Implement color pickers in style admin view 17c93c1 Succesfully implemented selecting default style fd79cdd Restyle the colors in the admin view 3cd94b8 Fix error when the default style can't be read from the database 5e626bd Refactor `style_handler` to read the style from the database 0f66d4a Refactor styles to be part of the database instead of files 6c7d3c8 Move style folder inside of server folder 9f71f21 Add margins around style file elements 2a28549 Restyle the color pickers 2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files dc4f2c7 Style dropdown - allow save json only for admin 15e7483 Style file check 7bd0e91 Remove style from Compare 0ab45f5 Colors function refactored and working for all types 2e24f8b Adding styling d6621f1 Debuging ed00c82 Merge with master 5150f9b Adding style_files to partial 957a9ca Add style files to pooled and wgs 66dc2d3 Changes to pooled and wgs, reset Dockerfile fa6b1cf Updated Docker file and style_files.html ee0fcfc Optional save file 229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder 0f26e2c Working style FileAdmin, access button, and further partial refactoring b3b70bd Rough framework for style admin page e4731d7 Style menu completed 1bb37bc New style menu with tabs 58f7e56 Tabs for different style options 3de893d Compare (#34) e66bef1 Update AWS EB instructions.docx 658a218 Fix bug when trying to send recovery password with bad email creds ee32e36 Adding color-picker partial to wgs and pooled 34ea688 Fix for responsiveness on cup and title f0c4d07 Adding color routes to other versions 110fe14 Color picker input added to cmd_to_run e732478 Names for color fields 2934631 Jinja partial for color picker and pip install in dockerfile 48bbf9c Cup animation (#33) 2905248 Selenium tests (#31) 5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides 570e42a Don't remove commas from amplicons or guides 0d70425 Add smallGenome.fa fc33197 Writing text for pooled dccfcb3 Files for testing 4cea67c Changes for WGS selenium tests. All tests functional. ff05713 Changes for WGS selenium test file loading 495a98d Changes for pooled testing 0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix 127eb8f PopulatePooled error 30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests 7847687 Add link to CRISPRessoWGS from profile page and change header 666f73b Remove example block from CRISPRessoWGS submission page 27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled 8d979a4 Fix bug where files_to_delete was being replaced and standardize append 09e55fc Changes to make interleaved and pooled tests possible f89eca8 Changes necessary for selenium tests 3efe4f9 Clean up test files a696363 Merge pull request #28 from edilytics/s3 dcef708 Remove changes for CRISPRessoCompare e0c79cf Add demo config file for eb 03aba8e Update AWS EB instructions.docx a671c4e Set version to 2.6.3 3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled da5b15b Timezone for history is displayed in user local timezone e11691f Update history to show time of previous run be675fb Update pooled with s3 4c7d429 Add data links to pooled report 353e88f Update admin portal landing page 712e828 Show run type in history 2802252 s3 and user updates efc3ed8 S3 error catching af68341 New S3 Validation f7d64e0 AWS validation before submission 8446093 Update s3 for batch and paired modes 0e7d327 S3_Upload function imrpvoed -JF b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3 c991d52 added s3 user database model ab4aa54 add model for s3 bucket 853cda9 S3_Functionality improved -JF 2f060a6 Implemented front-end s3 browsing e082a5f stub out viewing method c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length c85a93f Merge pull request #15 from edilytics/wgs-interface 712270a Add support for CRISPRessoWGS deaacee Extract out function to get server files in submit_routes 151eb15 Update crispresso2_info object fields b2a974d Bump CRISPResso verion to 2.2.4 58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2 7f2dc1c Stop trimming json error messages, fix #11 d28c03b Update reporting logic to use the new CRISPResso2_info schema 03ee46f Bump CRISPResso version in Dockerfile and download release from Github 9151c5d Add CRISPRessoPooled report template 25a6e37 Merge pull request #6 from edilytics/pooled-interface b47d288 Check length of amplicons for hosted version, closes #4 54c28b6 Update submission file extension check 8fcadee Add a link to CRISPRessoPooled interface in user dashboard 7fd0283 Implement CRISPRessoPooled backend and report functionality 4063eb3 Modify submission.js to accept .txt and .tsv files b770323 Create template file for CRISPRessoPooled submission interface d4f2ed0 Merge pull request #5 from edilytics/flask-modularization 8527384 Convert some celery configurations settings to new format 962a209 Install less and vim in Dockerfile c693668 Read CRISPResso2_info from json files instead of pickle files a469e08 Move LoginManager to user_routes.py f62e67a Create db tables in init_db.py 0d85c90 Move login_required to user_routes 6f5e33e Reformatting of remaining __init__.py e615c0b Extract report routes out of __init__.py 20f2601 Extract user routes out from __init__.py 5582612 Extract status routes out from __init__.py 2406a10 Extract submit routes out from __init__.py b562fcd Extract celery tasks from __init__.py faa785d Extract views out from __init__.py ff44576 Extract model classes out from __init__.py 914498f Merge pull request #3 from edilytics/2to3 86ea7da Replace RabbitMQ with Redis adca9fb Upgrade celery to version 5.0.5 244ec33 Convert from Python 2 to Python 3 28b4f37 Refactor Docker image to use Python 3 via micromamba 2359800 Allow interleaved batches 428720b Add features: Allow admin init, server discovery depth 11df5d8 Client and server-side checks for invalid characters on sgRNA and amplicon 5062365 Update README.md 51e02f4 Update README.md ac4a6d5 delete other images 4f3ad88 Update README.md fc0de1d Update README.md 08defa1 Update README.md 9604983 Trycatch pickle loads c1facd7 get rid of debug print of email d699d4d crispresso2.0.45 e7ff079 Update param descriptions 1f12d59 2.0.44 b81febe crispresso to 2.0.42 1a967a8 update report 178c56d 2.4 e41076d Job expiration 41d1a4c check progress on setinterval 756e488 server-side files ad19c3c Update to crispresso 2.0.40 prime editing e3a194a update errors and ignore email config 2efb0bb Update README.md 58844a6 initial commit 8ff1878 Initial commit git-subtree-dir: CRISPResso2/CRISPRessoReports git-subtree-split: e18807d9d287f583d7176a668d12590f69cdf78a
Colelyman
pushed a commit
that referenced
this pull request
Sep 21, 2023
Colelyman
pushed a commit
that referenced
this pull request
Sep 21, 2023
…63d0 21f63d0 Replace tabs with spaces and reindent template files a3bcfeb Fix hamburger menu and add -bs- to data-target and data-toggle bd0c0f1 Resize images and fix filepath 02f94fd Add spacing around body and footer tags e514cdc Final style fixes, color circles for style files a6700c0 Merge commit '6986c2ba2c6ea96db2498a1e5711dbba1f0d5d17' as 'CRISPRessoWEB/CRISPRessoReports' 7c6dfcd Removing CRISPRessoReport files 17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes 202c31f Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit ba01a8f 04558fb Remove extra files 8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix 980fdc4 Styling and bootstrap changes 9d40474 Centering issue and submit button fix e0c67a9 Subtree working ca7b25a Jinja choice loader e0b6d7b Path correction 5a9cd38 Bootstrap 5 and partials changes 49e4332 Layout.html for C2WEB and CLI b83bafa Fix error when rendering multi reports 99a8fa7 summaries partials and html updates bc5b3df fig_reports and replacement e4e482a Added a few changes from the selenium-tests branch on C2Web 2feadf4 Update indentation in report.html and extract log params into partial 480060c Update path to template directory to include `CRISPRessoReports` bbd49ed Use the `render_template` function for each report d9829c5 Add function to render template partials without using Flask 5941a02 Web updates refactoring done 452db8b Adding files ef333f0 Removing reports found in subtree 1bae0df Commit before adding subtree 1fbb427 Add server file to render js d1d6fdf Move styling to main.css file 1241569 Jinja partials for all submissions 0534637 New submission.js template file c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial ecd03f6 Working file upload in partial. ce5d20f Working, missing custom label b30725e Bootstrap 5 changes e05d146 Layout and report update 70a0589 Replace sub, ins, del with Substitution, Insertion, Deletion 69c3656 Move where the style files are stored in Docker 7f03e98 Implement creating styles from the admin panel 9b27a2e Rename style_file references to style 5d3675f Add some default styles and rename the default to "Original" 43a8d29 Remove style file card from admin index page 1a8f332 Refactor saving style files when there is no name specified 64a7b1c Implement color pickers in style admin view 17c93c1 Succesfully implemented selecting default style fd79cdd Restyle the colors in the admin view 3cd94b8 Fix error when the default style can't be read from the database 5e626bd Refactor `style_handler` to read the style from the database 0f66d4a Refactor styles to be part of the database instead of files 9859812 Move style folder inside of server folder 9f71f21 Add margins around style file elements 2a28549 Restyle the color pickers 2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files dc4f2c7 Style dropdown - allow save json only for admin 15e7483 Style file check 7bd0e91 Remove style from Compare 0ab45f5 Colors function refactored and working for all types 2e24f8b Adding styling d6621f1 Debuging 0de02b5 Merge with master 5150f9b Adding style_files to partial 957a9ca Add style files to pooled and wgs b92c83e Changes to pooled and wgs, reset Dockerfile 7b56a89 Updated Docker file and style_files.html ee0fcfc Optional save file 229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder d906da9 Working style FileAdmin, access button, and further partial refactoring b3b70bd Rough framework for style admin page e4731d7 Style menu completed 1bb37bc New style menu with tabs 58f7e56 Tabs for different style options 8338067 Compare (#34) d4e9ef3 Update AWS EB instructions.docx 658a218 Fix bug when trying to send recovery password with bad email creds ee32e36 Adding color-picker partial to wgs and pooled 34ea688 Fix for responsiveness on cup and title f0c4d07 Adding color routes to other versions 110fe14 Color picker input added to cmd_to_run e732478 Names for color fields 036a229 Jinja partial for color picker and pip install in dockerfile 48bbf9c Cup animation (#33) 2905248 Selenium tests (#31) 5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides 570e42a Don't remove commas from amplicons or guides 0d70425 Add smallGenome.fa fc33197 Writing text for pooled dccfcb3 Files for testing 4cea67c Changes for WGS selenium tests. All tests functional. ff05713 Changes for WGS selenium test file loading 495a98d Changes for pooled testing 0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix 127eb8f PopulatePooled error 30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests 7847687 Add link to CRISPRessoWGS from profile page and change header 666f73b Remove example block from CRISPRessoWGS submission page 27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled 8d979a4 Fix bug where files_to_delete was being replaced and standardize append 09e55fc Changes to make interleaved and pooled tests possible f89eca8 Changes necessary for selenium tests 3efe4f9 Clean up test files 6394dcd Merge pull request #28 from edilytics/s3 dcef708 Remove changes for CRISPRessoCompare e0c79cf Add demo config file for eb c9fc141 Update AWS EB instructions.docx a671c4e Set version to 2.6.3 3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled da5b15b Timezone for history is displayed in user local timezone e11691f Update history to show time of previous run 3e5f136 Update pooled with s3 4c7d429 Add data links to pooled report 353e88f Update admin portal landing page 712e828 Show run type in history 2802252 s3 and user updates efc3ed8 S3 error catching af68341 New S3 Validation f7d64e0 AWS validation before submission 8446093 Update s3 for batch and paired modes 0e7d327 S3_Upload function imrpvoed -JF b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3 c991d52 added s3 user database model ab4aa54 add model for s3 bucket 853cda9 S3_Functionality improved -JF 8a4b554 Implemented front-end s3 browsing e082a5f stub out viewing method c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length 222de5b Merge pull request #15 from edilytics/wgs-interface 712270a Add support for CRISPRessoWGS deaacee Extract out function to get server files in submit_routes 151eb15 Update crispresso2_info object fields d6b3789 Bump CRISPResso verion to 2.2.4 58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2 7f2dc1c Stop trimming json error messages, fix #11 d28c03b Update reporting logic to use the new CRISPResso2_info schema ed8ea68 Bump CRISPResso version in Dockerfile and download release from Github 9151c5d Add CRISPRessoPooled report template 25a6e37 Merge pull request #6 from edilytics/pooled-interface b47d288 Check length of amplicons for hosted version, closes #4 54c28b6 Update submission file extension check 8fcadee Add a link to CRISPRessoPooled interface in user dashboard 7fd0283 Implement CRISPRessoPooled backend and report functionality 4063eb3 Modify submission.js to accept .txt and .tsv files b770323 Create template file for CRISPRessoPooled submission interface 396a7f5 Merge pull request #5 from edilytics/flask-modularization 8527384 Convert some celery configurations settings to new format ca1c175 Install less and vim in Dockerfile c693668 Read CRISPResso2_info from json files instead of pickle files a469e08 Move LoginManager to user_routes.py f62e67a Create db tables in init_db.py 0d85c90 Move login_required to user_routes 6f5e33e Reformatting of remaining __init__.py e615c0b Extract report routes out of __init__.py 20f2601 Extract user routes out from __init__.py 5582612 Extract status routes out from __init__.py 2406a10 Extract submit routes out from __init__.py b562fcd Extract celery tasks from __init__.py faa785d Extract views out from __init__.py ff44576 Extract model classes out from __init__.py f0c2e85 Merge pull request #3 from edilytics/2to3 8851603 Replace RabbitMQ with Redis bc1fcb5 Upgrade celery to version 5.0.5 244ec33 Convert from Python 2 to Python 3 cd3746b Refactor Docker image to use Python 3 via micromamba 2359800 Allow interleaved batches 926f84e Add features: Allow admin init, server discovery depth cb0146f Client and server-side checks for invalid characters on sgRNA and amplicon aa670f6 Update README.md c8faee0 Update README.md 84b2fed delete other images 0c007ee Update README.md 8a5d552 Update README.md ee5c151 Update README.md c8cd4f7 Trycatch pickle loads c1facd7 get rid of debug print of email e46a04e crispresso2.0.45 28c861c Update param descriptions 22b4a57 2.0.44 f4686be crispresso to 2.0.42 1a967a8 update report 265e796 2.4 70822d2 Job expiration d3e6d6e check progress on setinterval 2e8249b server-side files 4602c2d Update to crispresso 2.0.40 prime editing 21ed9d4 update errors and ignore email config 5bcb603 Update README.md a587444 initial commit 8ff1878 Initial commit git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 21f63d05a15e1f48ec14db46fa0e5bc5f0ea5344
Colelyman
pushed a commit
that referenced
this pull request
Sep 21, 2023
…d811 418d811 Fix command used and parameters elements. Increase print width and height to 100% 40330d5 Adding styling for print-only and screen only REVERT: 21f63d0 Replace tabs with spaces and reindent template files REVERT: a3bcfeb Fix hamburger menu and add -bs- to data-target and data-toggle REVERT: bd0c0f1 Resize images and fix filepath REVERT: 02f94fd Add spacing around body and footer tags REVERT: e514cdc Final style fixes, color circles for style files REVERT: a6700c0 Merge commit '6986c2ba2c6ea96db2498a1e5711dbba1f0d5d17' as 'CRISPRessoWEB/CRISPRessoReports' REVERT: 7c6dfcd Removing CRISPRessoReport files REVERT: 17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes REVERT: 202c31f Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit ba01a8f REVERT: 04558fb Remove extra files REVERT: 8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix REVERT: 980fdc4 Styling and bootstrap changes REVERT: 9d40474 Centering issue and submit button fix REVERT: e0c67a9 Subtree working REVERT: ca7b25a Jinja choice loader REVERT: e0b6d7b Path correction REVERT: 5a9cd38 Bootstrap 5 and partials changes REVERT: 49e4332 Layout.html for C2WEB and CLI REVERT: b83bafa Fix error when rendering multi reports REVERT: 99a8fa7 summaries partials and html updates REVERT: bc5b3df fig_reports and replacement REVERT: e4e482a Added a few changes from the selenium-tests branch on C2Web REVERT: 2feadf4 Update indentation in report.html and extract log params into partial REVERT: 480060c Update path to template directory to include `CRISPRessoReports` REVERT: bbd49ed Use the `render_template` function for each report REVERT: d9829c5 Add function to render template partials without using Flask REVERT: 5941a02 Web updates refactoring done REVERT: 452db8b Adding files REVERT: ef333f0 Removing reports found in subtree REVERT: 1bae0df Commit before adding subtree REVERT: 1fbb427 Add server file to render js REVERT: d1d6fdf Move styling to main.css file REVERT: 1241569 Jinja partials for all submissions REVERT: 0534637 New submission.js template file REVERT: c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial REVERT: ecd03f6 Working file upload in partial. REVERT: ce5d20f Working, missing custom label REVERT: b30725e Bootstrap 5 changes REVERT: e05d146 Layout and report update REVERT: 70a0589 Replace sub, ins, del with Substitution, Insertion, Deletion REVERT: 69c3656 Move where the style files are stored in Docker REVERT: 7f03e98 Implement creating styles from the admin panel REVERT: 9b27a2e Rename style_file references to style REVERT: 5d3675f Add some default styles and rename the default to "Original" REVERT: 43a8d29 Remove style file card from admin index page REVERT: 1a8f332 Refactor saving style files when there is no name specified REVERT: 64a7b1c Implement color pickers in style admin view REVERT: 17c93c1 Succesfully implemented selecting default style REVERT: fd79cdd Restyle the colors in the admin view REVERT: 3cd94b8 Fix error when the default style can't be read from the database REVERT: 5e626bd Refactor `style_handler` to read the style from the database REVERT: 0f66d4a Refactor styles to be part of the database instead of files REVERT: 9859812 Move style folder inside of server folder REVERT: 9f71f21 Add margins around style file elements REVERT: 2a28549 Restyle the color pickers REVERT: 2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files REVERT: dc4f2c7 Style dropdown - allow save json only for admin REVERT: 15e7483 Style file check REVERT: 7bd0e91 Remove style from Compare REVERT: 0ab45f5 Colors function refactored and working for all types REVERT: 2e24f8b Adding styling REVERT: d6621f1 Debuging REVERT: 0de02b5 Merge with master REVERT: 5150f9b Adding style_files to partial REVERT: 957a9ca Add style files to pooled and wgs REVERT: b92c83e Changes to pooled and wgs, reset Dockerfile REVERT: 7b56a89 Updated Docker file and style_files.html REVERT: ee0fcfc Optional save file REVERT: 229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder REVERT: d906da9 Working style FileAdmin, access button, and further partial refactoring REVERT: b3b70bd Rough framework for style admin page REVERT: e4731d7 Style menu completed REVERT: 1bb37bc New style menu with tabs REVERT: 58f7e56 Tabs for different style options REVERT: 8338067 Compare (#34) REVERT: d4e9ef3 Update AWS EB instructions.docx REVERT: 658a218 Fix bug when trying to send recovery password with bad email creds REVERT: ee32e36 Adding color-picker partial to wgs and pooled REVERT: 34ea688 Fix for responsiveness on cup and title REVERT: f0c4d07 Adding color routes to other versions REVERT: 110fe14 Color picker input added to cmd_to_run REVERT: e732478 Names for color fields REVERT: 036a229 Jinja partial for color picker and pip install in dockerfile REVERT: 48bbf9c Cup animation (#33) REVERT: 2905248 Selenium tests (#31) REVERT: 5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides REVERT: 570e42a Don't remove commas from amplicons or guides REVERT: 0d70425 Add smallGenome.fa REVERT: fc33197 Writing text for pooled REVERT: dccfcb3 Files for testing REVERT: 4cea67c Changes for WGS selenium tests. All tests functional. REVERT: ff05713 Changes for WGS selenium test file loading REVERT: 495a98d Changes for pooled testing REVERT: 0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix REVERT: 127eb8f PopulatePooled error REVERT: 30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests REVERT: 7847687 Add link to CRISPRessoWGS from profile page and change header REVERT: 666f73b Remove example block from CRISPRessoWGS submission page REVERT: 27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled REVERT: 8d979a4 Fix bug where files_to_delete was being replaced and standardize append REVERT: 09e55fc Changes to make interleaved and pooled tests possible REVERT: f89eca8 Changes necessary for selenium tests REVERT: 3efe4f9 Clean up test files REVERT: 6394dcd Merge pull request #28 from edilytics/s3 REVERT: dcef708 Remove changes for CRISPRessoCompare REVERT: e0c79cf Add demo config file for eb REVERT: c9fc141 Update AWS EB instructions.docx REVERT: a671c4e Set version to 2.6.3 REVERT: 3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled REVERT: da5b15b Timezone for history is displayed in user local timezone REVERT: e11691f Update history to show time of previous run REVERT: 3e5f136 Update pooled with s3 REVERT: 4c7d429 Add data links to pooled report REVERT: 353e88f Update admin portal landing page REVERT: 712e828 Show run type in history REVERT: 2802252 s3 and user updates REVERT: efc3ed8 S3 error catching REVERT: af68341 New S3 Validation REVERT: f7d64e0 AWS validation before submission REVERT: 8446093 Update s3 for batch and paired modes REVERT: 0e7d327 S3_Upload function imrpvoed -JF REVERT: b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3 REVERT: c991d52 added s3 user database model REVERT: ab4aa54 add model for s3 bucket REVERT: 853cda9 S3_Functionality improved -JF REVERT: 8a4b554 Implemented front-end s3 browsing REVERT: e082a5f stub out viewing method REVERT: c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length REVERT: 222de5b Merge pull request #15 from edilytics/wgs-interface REVERT: 712270a Add support for CRISPRessoWGS REVERT: deaacee Extract out function to get server files in submit_routes REVERT: 151eb15 Update crispresso2_info object fields REVERT: d6b3789 Bump CRISPResso verion to 2.2.4 REVERT: 58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2 REVERT: 7f2dc1c Stop trimming json error messages, fix #11 REVERT: d28c03b Update reporting logic to use the new CRISPResso2_info schema REVERT: ed8ea68 Bump CRISPResso version in Dockerfile and download release from Github REVERT: 9151c5d Add CRISPRessoPooled report template REVERT: 25a6e37 Merge pull request #6 from edilytics/pooled-interface REVERT: b47d288 Check length of amplicons for hosted version, closes #4 REVERT: 54c28b6 Update submission file extension check REVERT: 8fcadee Add a link to CRISPRessoPooled interface in user dashboard REVERT: 7fd0283 Implement CRISPRessoPooled backend and report functionality REVERT: 4063eb3 Modify submission.js to accept .txt and .tsv files REVERT: b770323 Create template file for CRISPRessoPooled submission interface REVERT: 396a7f5 Merge pull request #5 from edilytics/flask-modularization REVERT: 8527384 Convert some celery configurations settings to new format REVERT: ca1c175 Install less and vim in Dockerfile REVERT: c693668 Read CRISPResso2_info from json files instead of pickle files REVERT: a469e08 Move LoginManager to user_routes.py REVERT: f62e67a Create db tables in init_db.py REVERT: 0d85c90 Move login_required to user_routes REVERT: 6f5e33e Reformatting of remaining __init__.py REVERT: e615c0b Extract report routes out of __init__.py REVERT: 20f2601 Extract user routes out from __init__.py REVERT: 5582612 Extract status routes out from __init__.py REVERT: 2406a10 Extract submit routes out from __init__.py REVERT: b562fcd Extract celery tasks from __init__.py REVERT: faa785d Extract views out from __init__.py REVERT: ff44576 Extract model classes out from __init__.py REVERT: f0c2e85 Merge pull request #3 from edilytics/2to3 REVERT: 8851603 Replace RabbitMQ with Redis REVERT: bc1fcb5 Upgrade celery to version 5.0.5 REVERT: 244ec33 Convert from Python 2 to Python 3 REVERT: cd3746b Refactor Docker image to use Python 3 via micromamba REVERT: 2359800 Allow interleaved batches REVERT: 926f84e Add features: Allow admin init, server discovery depth REVERT: cb0146f Client and server-side checks for invalid characters on sgRNA and amplicon REVERT: aa670f6 Update README.md REVERT: c8faee0 Update README.md REVERT: 84b2fed delete other images REVERT: 0c007ee Update README.md REVERT: 8a5d552 Update README.md REVERT: ee5c151 Update README.md REVERT: c8cd4f7 Trycatch pickle loads REVERT: c1facd7 get rid of debug print of email REVERT: e46a04e crispresso2.0.45 REVERT: 28c861c Update param descriptions REVERT: 22b4a57 2.0.44 REVERT: f4686be crispresso to 2.0.42 REVERT: 1a967a8 update report REVERT: 265e796 2.4 REVERT: 70822d2 Job expiration REVERT: d3e6d6e check progress on setinterval REVERT: 2e8249b server-side files REVERT: 4602c2d Update to crispresso 2.0.40 prime editing REVERT: 21ed9d4 update errors and ignore email config REVERT: 5bcb603 Update README.md REVERT: a587444 initial commit REVERT: 8ff1878 Initial commit git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 418d811a007d782bef7c319358bb13702e97b1bf
mbowcut2
added a commit
that referenced
this pull request
Feb 15, 2024
commit c909ea3b34e87ce637e00dac075d2bb2f8bfb954 Author: McKay <[email protected]> Date: Thu Feb 15 15:55:23 2024 -0700 added plotly dependency for pro commit 76b3601f6a0144f100266153f1c999e0c5de65de Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:56:19 2024 -0700 Squashed commit of the following: commit 603f2eff9d1aa21ae95f3e134da303b8018d3a33 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:48:20 2024 -0700 fix guardrials partial commit 22fc03183a8070c30dfb74d5c23575ac19019855 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 08:54:01 2024 -0700 Add guardrail partial commit e55f6b21972b578261bc5a864ce1d653d98f9e34 Author: Samuel Nichols <[email protected]> Date: Mon Jan 8 07:50:59 2024 -0700 Functional guardrails, needs reports update commit 6e968e9699ed59a47d88191d03768e042d8b60a4 Merge: 32b49685 e948ce10 Author: Samuel Nichols <[email protected]> Date: Mon Dec 18 13:34:36 2023 -0700 Merge branch 'guardrails-clean-history' of https://github.com/edilytics/CRISPResso2 into guardrails-clean-history commit 32b49685da320501dad2b0ebbb57887b66220ba8 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit 4e309cf6f732565d635de3d4c5d074ada3027e2d Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:55 2023 -0700 Refactor to use CRISPRessoReports module commit e648dc087c0055bc5d2fca13c64071a371dea941 Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:11 2023 -0700 Add CRISPRessoReports subtree commit e948ce107ebb0d1d99010ed12e937f34b5e607d4 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit d33c748871a625facfe8d792e29c77ab9779138f Author: Kendell Clement <[email protected]> Date: Tue Nov 7 16:31:06 2023 -0700 Include parameter --assign_ambiguous_alignments_to_first_reference in readme commit a1435f7f491a6a61434f3051e39f39a4c9bf1edc Author: Kendell Clement <[email protected]> Date: Wed Oct 11 17:17:30 2023 -0600 Enable quantification by sgRNA (#348) This PR includes: - storing the sgRNA-specific editing locations in the crispresso2_info object. Previously, each amplicon would record the indices of quantification windows across the guide, but not for individual guides. This stores the information for each guide in crispresso2_info['results']['refs'][reference_name]['sgRNA_include_idxs'] - a script (count_sgRNA_specific_edits.py) to parse through an allele table output from a completed CRISPResso run (`--write_detailed_allele_table` flag required) to count edits in each sgRNA separately. I don't have a good double-edited sample handy, but it can be run on the demo HDR data [hdr.fastq.gz](http://crispresso.pinellolab.org/static/demo/hdr.fastq.gz) using the command: ``` CRISPResso -r1 hdr.fastq.gz -a acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -e acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcaCctgactccGgaggagaagtctgccgttactgcGctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -c atggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcag -g TGCACCATGGTGTCTGTTTG,GATGAAGTTGGTGGTGAGGCCC --write_detailed_allele_table -n hdr3 -p max -gn guide1,guide2 ``` ``` python CRISPResso2/scripts/count_sgRNA_specific_edits.py -f CRISPResso_on_hdr3 ``` This produces: ``` Processed 25000 alleles Reference: Reference (2391/23415 modified reads) UNMODIFIED: 21024 MODIFIED guide1: 2359 MODIFIED guide2: 32 Reference: HDR (856/1577 modified reads) UNMODIFIED: 721 MODIFIED guide1: 854 MODIFIED guide1 + guide2: 1 MODIFIED guide2: 1 ``` commit 2e3da02fdbed2fa8ae02a277763d65a502459827 Author: Cole Lyman <[email protected]> Date: Tue Oct 10 15:29:08 2023 -0600 changed tuple to list for matplotlib change (#31) (#346) Co-authored-by: mbowcut2 <[email protected]> commit cd3c332135fe4db0f9218e3d87263d5c65838ed9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:54:46 2023 -0600 rename script to camel case commit 7c719d65fb36ac7654db9040f226564ea28fcab9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:53:44 2023 -0600 Add new script for counting high quality bases commit f97cd2795e89464bcc9321ccfdbca3e6af2bcb4f Author: Kendell Clement <[email protected]> Date: Thu Sep 14 15:15:30 2023 -0600 Prime editing alignment params (#336) Adds two parameters to control alignment of pegRNA components: --prime_editing_gap_open_penalty and --prime_editing_gap_extend_penalty. CRISPResso checks to see whether the pegRNA spacer and extension sequence are in the correct orientation, but sometimes they could align in the incorrect orientation with a higher score (e.g. via insertion of multiple gaps, whereas a single long gap would be preferred). Introducing these two parameters allows users to adjust the alignment parameters specifically for these prime-editing checks without adjusting the global alignment parameters which will be applied to reads that are aligned to the WT reference/prime-editing reference sequences. The new prime_editing_gap_open_penalty is set to -50, a higher gap open penalty than the default needleman_wunsch_gap_open penalty (-20). This commit breaks backward-reproducibility, but mostly in the checking of pegRNA component orientation - so previously some CRISPResso runs would have failed and produced an error, but now they will (hopefully) succeed. To achieve complete backward reproducibility, add the flag --prime_editing_gap_open_penalty -20 to runs. commit 64cbf36dae85cffa2c15e73f2a7ee8aa1077d917 Author: Cole Lyman <[email protected]> Date: Thu Sep 7 16:43:30 2023 -0600 Fix samtools piping (#325) * Remove samtools pipe stderr to stdout Sometimes some of the libraries that samtools depends on don't have the correct version information, and as such samtools will report this to stderr when run. Because we pipe the output of samtools, we expect it to be valid SAM format, but when these library version messages are reported, it breaks CRISPRessoWGS. * Remove extra spacing at end of lines and add missing comma in WGS * Log stderr from samtools in CRISPRessoWGS commit 8feff4101f27406d9d88ace97d31a518276bff3f Author: Cole Lyman <[email protected]> Date: Fri Sep 1 09:43:56 2023 -0600 Replace link to CRISPResso schematic with raw URL in README (#329) * Replace link to CRISPResso schematic with raw URL * Add new lines to the beginning of unordered lists commit 2e9e6bff5bcc536d5e2ba1440d1ab96d9d47efd6 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:52:12 2023 -0600 Try to unbreak CircleCI commit ae5b95246cb0f6d66c4cbfb50cf8f5a9626b0827 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:27 2023 -0600 Center command line text messages commit 4d9c71ecf2248c9bb1e10430178dc318b6621c8b Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:07 2023 -0600 Fix bug in prime-editing scaffold-incorporation plotting If read is too short, scaffold incorporation detection will fail because it will check beyond the length of the read. commit 2b36a1a5c35e8a93516ce8baf464595615e0f402 Author: Kendell Clement <[email protected]> Date: Wed Aug 9 15:29:48 2023 -0600 CRISPRessoPooled --compile_postrun_references bug fixes commit 3e04d1d402bcf95edd39fc7c8c9af61bb380f9db Author: Kendell Clement <[email protected]> Date: Tue Aug 8 23:30:15 2023 -0600 Fix missing ' in Pooled --demultiplex_only_at_amplicons commit 06af527f9e2020c5cf251e7f1cec0b1eca1c1664 Author: Cole Lyman <[email protected]> Date: Mon Jul 24 10:47:46 2023 -0600 Sort pandas dataframes by # of reads and sequences so that the order is consistent (#316) * Make sorting stable * Including c files * Sort by #Reads instead of %Reads to avoid floating point errors --------- Co-authored-by: Samuel Nichols <[email protected]> commit de05533b3511a84f3b6b14fc2ef64db041613261 Author: Cole Lyman <[email protected]> Date: Thu Jul 6 13:54:45 2023 -0600 Fix multiprocessing lambda pickling (#311) * Fix running plots in parallel The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. * Fix multiprocessing lambda pickling (#20) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Further fixes to pickling multiprocessing error (#21) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Use Counter instead of defaultdict in CRISPRessoCORE * Update process_futures to dict in Batch and Aggregate commit ebb016dff46c280dce8c3c09e8ac0e0cc25d4d74 Author: Kendell Clement <[email protected]> Date: Mon Jul 3 17:12:09 2023 -0600 Enable CRISPRessoPooled multiprocessing when os allows multi-thread file append commit 7285da0e987b77b72c8885bb35940e0f50c146bd Author: Kendell Clement <[email protected]> Date: Fri Jun 23 16:50:33 2023 -0600 Fix print bug for invalid fastq commit 9acdeac67441f9a1d55ac94b153bcb68fb89b92c Author: kclem <[email protected]> Date: Wed Jun 21 16:03:48 2023 -0600 Slugify before creating filename - replaces invalid characters in batch names with _ commit f97e29c67de4c80b8d6b9cf334f363be4b514ade Author: Cole Lyman <[email protected]> Date: Wed Jun 21 14:43:43 2023 -0600 Add verbosity argument to CRISPRessoAggregate (#18) fixes #306 (#307) * Add verbosity argument to CRISPRessoAggregate (#18) * Allow for amplicon and guide seqs to be some variant of NA in batch (#19) This was discovered when attempting to infer amplicon sequences in batch mode on the web interface, NAs were supplied for the amplicon sequences to the sub CRISPResso commands. commit 32e1e9797da5c3033cdc588e92f06b8813961953 Author: Mark Clement <[email protected]> Date: Wed Jun 21 14:01:00 2023 -0600 Allow for interrogation of overlapping sgRNA sites commit 7248ba8c4deee125ad1ec12fdf1294a84d5f6f93 Author: Kendell Clement <[email protected]> Date: Mon Jun 12 12:16:47 2023 -0600 Check input fastq file format Asserts input format of fastq files - including if gzipped files are missing the gz suffix. commit 83c8ab8f462e7d8c1d04c08c1a398b874f517251 Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:41:55 2023 -0600 Fix CRISPRessoArgParser commit 14a2c8577f566e1b72d5f4e72cd6cd22079610be Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:29:31 2023 -0600 Cosmetic updates for command-line use - version bump to 2.2.13 - If no args are provided, the command line version will print out an abbreviated help message - parameters can be excluded from CRISPRessoArgParser commit 1cd54bc1d03360c3d8121ba9e66b3589fe1cf252 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:47 2023 -0600 Fix multiprocessing error, don't start pool when only using single thread (#302) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload * Only start process pools when using multiple processes This is mainly to solve the issue when running on AWS Lambda, but this should improve single core performance overall. --------- Co-authored-by: Kendell Clement <[email protected]> commit 92a705c939b370373a70cf6ae9f1616de33288b9 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:06 2023 -0600 Update `base_editor` parameters in README and add Plot Harness (#301) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload --------- Co-authored-by: Kendell Clement <[email protected]> commit 7d46c4490235df45c5546b1b470e4e6a99727031 Author: Cole Lyman <[email protected]> Date: Wed May 10 15:41:33 2023 -0600 Clarify CRISPRessoWGS intended use (#303) * Update README to have consistent use of `--base_editor_output` (#16) * Add sample plotting jupyter notebook * Add clarifying info to CRISPRessoWGS description Clarify WGS usage commit 833a701787bb47674b3e921c38cac6189c775cf7 Author: Kendell Clement <[email protected]> Date: Thu May 4 17:02:46 2023 -0400 Remove debug print statements commit 712eb2a11825e8d36f2870deb12b35486bd633fb Author: Kendell Clement <[email protected]> Date: Thu May 4 16:40:07 2023 -0400 Allow dashes in filenames resolve #73 commit a439f094745b2b5e7f032f0777d4c67e6d6f93c5 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:41:58 2023 -0400 Raise exceptions from within futures in plot_pool commit 7e807a60de2a9d18bccd034b87106ceaf7153338 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:38:56 2023 -0400 Fix future pandas indexing warning Pandas error was "FutureWarning: Calling float on a single element Series is deprecated and will raise a TypeError in the future. Use float(ser.iloc[0]) instead" commit 304a92aa7a7ef8c705cb070dce25d9a2e5745ba9 Author: Cole Lyman <[email protected]> Date: Thu Apr 20 13:59:27 2023 -0600 Remove debug print statements fixes #295 (#297) The format string option used here is only available in Python version >=3.8. commit 478c06f784603e96d20f96e91993fdcc4ac35c8a Author: Kendell Clement <[email protected]> Date: Thu Apr 13 12:09:26 2023 -0400 Update plotCustomAllelePlot.py script for #292 (#293) Update type of 'max_rows' param to int Fix location of 'args' in crispresso2_info object commit bcdae39e05d530f4a4e78738c3b30f7664981919 Author: Kendell Clement <[email protected]> Date: Mon Mar 27 13:18:34 2023 -0400 Update pooled parameter format commit 546446e36e7e68b527767d6c31ec341a49df2059 Author: Kendell Clement <[email protected]> Date: Tue Feb 14 16:26:23 2023 -0500 Fix running plots in parallel (#286) The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. Co-authored-by: Cole Lyman <[email protected]> commit d75f32a2eb5aeaaee866c09e5655a3e27af8b1a1 Author: kclem <[email protected]> Date: Fri Feb 10 15:45:15 2023 -0500 Fix #283 to avoid filename collisions Previously, amplicon names longer than 21bp were truncated, but the check for uniqueness wasn't working, so it would overwrite some plot files. This fixes the filename collision and enforces uniqueness in reference filename prefixes. Thanks @mbiokyle29 commit e577318006cd17b2725bd028e5e56634c6eb829a Author: kclem <[email protected]> Date: Mon Feb 6 16:37:25 2023 -0500 Case-insensitive headers accepted in CRISPRessoPooled commit d34927620a4a6126a9988b3041e76f60728abbfe Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:48:33 2023 -0500 Fix print statement in CORE commit ee88b7ed89c395f68225a50dea44a2ad69d5e9a5 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:22:51 2023 -0500 Version bump to 2.2.12 commit 1d4679c72d0c8b4154317c9aff5179217198e2d7 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:01:31 2023 -0500 Status Updates + Pooled Mixed Mode Update (#279) * Implement logging handler to overwrite the latest log status to file * Add StatusHandler to CRISPRessoCORE log This will take the latest log output and write it to a file (`status.txt`), the catch being that with each log the file is overwritten so that one can easily tell where CRISPResso currently is and what the error is (if any). These changes include some slight refactoring in order to accomodate any potential parameter exceptions. * Add StatusHandler to CRISPRessoBatch and refactor `logger.warn` to `warn` * Add StatusHandler to CRISPRessoPooled and a little refactoring * Implement `percent_complete` to the status log * Add StatusHandler to CRISPRessoAggregate log * Add StatusHandler to CRISPRessoCompare log * Add StatusHandler to CRISPRessoPooledWGSCompare log * Add StatusHandler to CRISPRessoWGS log * Rename `status.txt` to `CRISPResso_status.txt` * Modify status log names to match the tool they are generated from * Add percent_complete stages to CRISPRessoCORE These also include log statements of each plot that is being generated as well as fixing some variable name collisions with `ind`. * Format the percentage in the log to be 2 decimal places * Change all plotting logs from `info` to `debug` and simplify progress This refactors how the progress of the plots is calculated, making it much simplier. Before this change we would of had to keep track of the number of times `percent_complete` was output, but now it simply updates the percent complete after each amplicon is finished processing. Hopefully this will make things easier to mantain even though it will be a little less "accurate" (not sure how accurate the original implementation was...). * Implemented shared console log handler across all CRISPResso* calls This allows for easy changes to logging formatting, which was inspired by having to change the default logging level. The default logging level needs to be set at `logging.DEBUG` in order for the debug log statements to not be ignored for the running and status logs. * Add ability to set the verbosity level to each CRISPResso* tool This allows users to set a verbosity level between 1 and 4 using the `-v`/`--verbosity` CLI parameter. If the `--debug` flag is present, then the level will default to 4, being the most verbose. * Implement showing the last seen `percent_compelte` when none is provided * Keep track of and log when multiple parallel runs are completed These changes modify `CRISPRessoMultiProcessing.run_crispresso_cmds` such that we can now display when a run is completed. This potentially breaks how signals and interupts are handled with multiple runs happening, but this needs to be reviewed. * Add debug and percentage complete to CRISPRessoBatch * Add percent complete to CRISPRessoPooled * Add debug and percent_complete message to CRISPRessoAggregate * Add `percent_complete` to CRISPRessoCompare * Add `percent_complete` to CRISPRessoPooledWGSCompare * Add status and `percent_complete` to CRISPRessoMeta * Add `verbosity` arguments to CRISPRessoCompare and CRISPRessoPooledWGSCompare * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name * Fix bug to flow CRISPRessoPooled options to sub command * Make amplicon file args variable name clear * Update how parameters are set and retrieved from parameter object The refactor in the previous commit changed the type of the arguments to a dictionary which doesn't have the parameters as attributes, and this commit fixes that error. * Add note in output header for change in default CRISPRessoPooled In the next release (2.3.0) the `--demultiplex_only_at_amplicons` will be the default when running in mixed-mode. This is to allow for inexact alignments of the reads and the amplicons to the genome. For more context, see this issue https://github.com/pinellolab/CRISPResso2/issues/276 * Clarify the verbosity parameter help message * Separate out parameters to `normalize_name` in CRISPRessoCORE * Separate out parameters to `normalize_name` in CRISPRessoWGS * Separate out parameters to `normalize_name` in CRISPRessoPooled * Separate out parameters to `normalize_name` in CRISPRessoCompare * Fix bug in CRISPRessoPooled by replacing `database_id` with `normalize_name` * Refactor `run_crispresso_cmds` to not require a `logger` This commit implements the functionality to make the `logger` object optional by seeing which module called the `run_crispresso_cmds` function and obtaining the correct object from that module name. The function also immediately returns when no commands are passed to it. * Add amplicon name to plotting debug statements in CRISPRessoCORE --------- Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit ff7eca76e6a3a08af4ac18ac4e88d20f2a06b1f9 Author: Kendell Clement <[email protected]> Date: Thu Jan 26 15:27:27 2023 -0500 CRISPRessoPooled custom header fix (#278) * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name Co-authored-by: Samuel Nichols <[email protected]> commit 104866e1080c973bb025d1a5ba59b19dca1658af Author: Cole Lyman <[email protected]> Date: Thu Jan 5 14:00:26 2023 -0700 Fix deprecated numpy type names (fixes #269) (#270) In the most recent version of numpy (1.24) some of the types have been deprecated. This commit fixes these errors. commit 58a8e42df88b66fad6b4f6ad04a5b9d9d43d01b4 Author: Cole Lyman <[email protected]> Date: Thu Jan 5 06:49:35 2023 -0700 Add snippet about installing CRISPResso2 via bioconda on Apple silicon (#274) I have suffered enough trying to debug my installation, so hopefully this helps someone else. Co-authored-by: Cole Lyman <[email protected]> commit b9851e98104602eb78c2b384105267624295e9d3 Author: Cole Lyman <[email protected]> Date: Thu Dec 22 13:30:23 2022 -0700 Fix bug when pooled bam is input (#265) This change checks to see if a bam file was input, and if so it doesn't try to remove any intermediate files because there aren't any. Co-authored-by: Cole Lyman <[email protected]> commit b822612642043e75a19042941f69b457ce51f517 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 15:26:45 2022 -0500 Delete vscode settings commit b99aa624dec68ef7d19264340ce0cafa829625f4 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:29:14 2022 -0500 Clarify input param help for pooled bam commit 3fae1e8b821ec6b1890bff6561fa8fa67dc49a04 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:28:54 2022 -0500 Fix #235 - Cigar string is * if read unaligned Previously, the bam would set the cigar string to 0 if the read was unaligned. This breaks the sam->bam conversion and causes the errors in #235. commit c65ba07dc5a983453cdf7bb1e27005230dac6f1b Author: Cole Lyman <[email protected]> Date: Thu Dec 8 13:48:17 2022 -0700 Add deprecation notice (#260) * Add FLASh and Trimmomatic deprecation notice to CLI output * Add Edilytics email address to CLI output commit 2a30e5a45f5350ee7c6435bce1cd4edc4d31668a Author: Kendell Clement <[email protected]> Date: Tue Dec 6 12:16:19 2022 -0500 Format filterReadsOnSequencePresence script commit 9d764414edd88a46ad5e4f496e4f1c8d5d60ce3e Author: Kendell Clement <[email protected]> Date: Fri Dec 2 22:12:54 2022 -0500 Clarify default CRISPRessoPooled settings for use_legacy_bowtie2_options_string commit 9ddea40f7f02b546941ddaa4c71fc5283075051a Author: kclem <[email protected]> Date: Mon Nov 14 10:33:04 2022 -0500 Add check for prime editing extension sequence in prime edited sequence if the user specifies the prime_editing_override_prime_edited_ref_seq, it could not contain the extension seq (if they don't provide the extension seq in the appropriate orientation), so check that here. Extension sequence should be provided reverse-complement to the prime edited sequence. commit 152f2dd5001da7090641ee8a1326bde9f7e8104e Author: kclem <[email protected]> Date: Wed Nov 9 11:53:41 2022 -0500 Version bump to 2.2.11a commit 9ed356e3a0c6c316d0860d121772f80ddca6de1d Author: kclem <[email protected]> Date: Wed Nov 9 11:47:30 2022 -0500 Add param to override prime editing sequence checks CRISPResso checks that prime editing guides are provided in the proper orientation (e.g. pegRNA 3'->5', spacer sequence 5'->3') and checks these orientations by alignment. Sometimes, the alignment can be better in the opposite direction, and this parameter allows these checks to be overridden. Otherwise, these checks would halt the program and produce the output 'The prime editing pegRNA spacer sequence appears to be given in the 3\'->5\' order. The prime editing pegRNA spacer sequence (--prime_editing_pegRNA_spacer_seq) must be given in the RNA 5\'->3\' order.' commit 39dd80afb98a22b7edb6f801c363d86bb77eeb5b Author: kclem <[email protected]> Date: Wed Nov 9 10:06:51 2022 -0500 Update filterReadsOnSequencePresence.py commit fe55526927e3fb6e17c9a8a6f59c7057bc1e14eb Author: Kendell Clement <[email protected]> Date: Mon Nov 7 22:25:16 2022 -0500 Add script to filter input based on sequence presence commit 713e57a19c35180035ca35e11a5820065eda0198 Author: Kendell Clement <[email protected]> Date: Tue Oct 18 16:02:26 2022 -0400 Allow spaces in read names for CRISPRessoWGS commit 39ce008bdddccdd8229c0ba185dce78bc2f66968 Author: Cole Lyman <[email protected]> Date: Sat Oct 8 21:09:58 2022 -0600 Fix typo of CRISPResssoPlot when plotting nucleotide quilt (#250) commit 6a2b342c8503b7327c0a2414edfbd16912d60ca5 Author: Kendell Clement <[email protected]> Date: Sat Oct 8 23:08:47 2022 -0400 Batch amplicon plots (#251) * Error out if HDR amplicon matches existing amplicon * Add check for amplicon sequence uniqueness * Fix bug with bam_input not having bam_output * Test for no returned lines in auto mode, version bump to 2.2.11 * Fix pandas deprecation of df.append commit 726b2b93d6e419a1b0aa6a968c97edc55b4cc5a8 Author: Kendell Clement <[email protected]> Date: Thu Oct 6 16:32:02 2022 -0400 Fix CRISPRessoBatch plot pool bug when plots are suppressed commit 7e5049c4dfb88cbc87c91935a91d1f51120a10c2 Author: Cole Lyman <[email protected]> Date: Wed Sep 21 21:04:51 2022 -0600 Fix batch quilt plot name (#249) This fixes an incorrectly named allele quilt plot input in CRISPRessoBatch. commit 1821ca5029c5a1485733f13ab3f2048b4f1fa04e Author: Kendell Clement <[email protected]> Date: Thu Sep 15 15:49:08 2022 -0400 Version bump to 2.2.10 commit c5f79aebfc1ae209f4ee320df250eed89a02787c Author: Cole Lyman <[email protected]> Date: Wed Sep 14 14:24:55 2022 -0600 Parallel plot refactor (#247) * Fix duplicate plotting in CRISPRessoBatch aggregate * Refactor mulltiprocessing plots in CRISPRessoBatch * Refactor multiprocessing plots in CRISPRessoCORE * Refactor multiprocessing plots for CRISPRessoAggregate commit 4ed5e24e6cc1dd8068e2391573ae2438acd32db2 Author: Kendell Clement <[email protected]> Date: Tue Sep 13 14:12:11 2022 -0400 print files in curr dir if Aggregate can't find files commit ce25bc06f29988e7a10afd0b6a09ba0caf0950e0 Author: Kendell Clement <[email protected]> Date: Mon Sep 12 10:32:57 2022 -0400 Spelling typo commit c15f01c75083403f17c58c121b2afe97e9f2a1ec Author: Kendell Clement <[email protected]> Date: Tue Sep 6 17:49:52 2022 -0400 Add helper function to create alignment scoring matrix New scoring matrix can be created using CRISPResso2Align.make_matrix() commit c80f82838c5a228b79ad4484092877cfee08e02c Author: Cole Lyman <[email protected]> Date: Mon Aug 22 18:28:33 2022 -0600 Add `zip_output` (#240) * Making zip of results * Zip command added, if zip is true place_report_in_output_folder is also true, zip removes all files while zipping * Adding --zip to compare and pooled/wgs compare * Add more formatting changes to CRISPRessoShared * Refactoring propagate_crispress_options so only one version exists * Zip added to arguments_to_ignore and warning added when changing arguments * Restore styling * Update README to include --zip * Rename --zip to --zip_output * Change --zip to --zip_output in CompareCORE and PooledWGSCompareCORE * Bug fix arg to args Co-authored-by: Samuel Nichols <[email protected]> commit 5de3d7286d8e33c7cf4d3615fce715806e72f511 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:42:34 2022 -0400 Fix fix to aggregate for CRISPRessoWGS commit a2294c266f43b14969a5d6474076f31a77a57173 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:40:50 2022 -0400 Fix bug in aggregate for WGS commit 7ce3eb4abe4b8ceac933272ac9cb16a8bedf26a3 Author: Kendell Clement <[email protected]> Date: Mon Aug 8 21:53:45 2022 -0400 Update CRISPRessoWGS to allow non-word characters in region names commit 040ac0033d6e250f4e3a412101874cf5e914e08a Author: kclem <[email protected]> Date: Mon Aug 8 16:04:59 2022 -0400 Enable processing of cram files by CRISPRessoWGS Adds --reference to samtools view when viewing cram files commit cf112a0caba8789e28530cc09171285ec6ea9b4c Author: kclem <[email protected]> Date: Mon Aug 8 14:55:46 2022 -0400 Auto amplicon detection for interleaved input Enables processing of interleaved fastq files for guess_guides and guess_amplicons, as well as get_most_frequent_reads. When interleaved input is present, the input is first separated into R1/R2 files, then processing is performed. commit 4ba524dc7b947feca8a0f743837844f9febc2171 Author: Cole Lyman <[email protected]> Date: Thu Aug 4 11:32:11 2022 -0600 Potential fix for aggregate plots in Batch mode (#237) commit 6097a8a104d3f156ef7c08e196ac37e32bf04c71 Author: Kendell Clement <[email protected]> Date: Thu Jul 21 22:45:48 2022 -0400 Fix pct_vectors in crispresso2_info json object commit 65a079d86d6f386793397398f839c46014b54543 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:46:37 2022 -0400 Fix more readme spelling bugs commit e817376ecd54cdea1f29e303ca25b9e7d1d38333 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:42:23 2022 -0400 Fix bug in readme spelling commit 49740ba1d66ed6d13a9e154b8b17bc8b5186581d Author: Kendell Clement <[email protected]> Date: Wed Jul 20 16:10:09 2022 -0400 Fix loading of crispresso info from WGS and Pooled commit b68a43271115251b18e8955e285ccc18f549e8cd Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:11:04 2022 -0400 Add plotly to dockerfile commit b0b7d41d697304d0d5fc93e3346c9de1b98ba41d Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:10:00 2022 -0400 Fix #231 Allow N's in bam output (Try 2) commit c460b3e73fd06a230dbac2e37c86b833144ebf94 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:09:10 2022 -0400 Revert "Fix #231 Allow N's in bam output" This reverts commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3. commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 13:52:37 2022 -0400 Fix #231 Allow N's in bam output commit 0a2419e518dc9b3520058c3927f98b31cd51347e Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:10:01 2022 -0600 Fix bug when name is provided instead of amplicon_name in pooled input file (#229) Also, raise an exception (instead of incorrectly executing) when there are not enough matched parameters in the pooled input file. commit cb58212379803788c04ca5793baaa760cbbeaa81 Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:09:49 2022 -0600 Fix bug when comparing two samples with the same name. (#228) commit e8a796f5f451409cbafed4404dfba4b6b8a124ca Author: Kendell Clement <[email protected]> Date: Thu Jun 23 21:30:23 2022 -0400 Version bump to 2.2.9 commit 632143ddedea48bab9229baeb4bf3ea4d1f658d6 Author: Cole Lyman <[email protected]> Date: Mon Jun 20 19:53:14 2022 -0600 Don't run global frameshift plot when there are no reads (#226) When there are no reads (i.e. global_MODIFIED_FRAMESHIFT + global_MODIFIED_NON_FRAMESHIFT + global_NON_MODIFIED_NON_FRAMESHIFT == 0) there was a bug when trying to compute the pie chart, because all of the values in the pie chart are 0. This fix, will make sure that there is at least one read in order for the plot to bee constructed properly. commit 4bb06218e835d2624d53fd401542caef6f8a3a55 Author: kclem <[email protected]> Date: Fri Jun 3 16:57:02 2022 -0400 Improvements for guide inference in 'auto' mode In 'auto' mode, a putative guide sequence is selected at the site of maximal editing. If the site of maximal editing happens near the end of the guide (e.g. base 0) many things will break (e.g. quantification windows, etc). This update excludes bases from being used to find the guide using the --exclude_bp_from_left and --exclude_bp_from_right parameters. At default, these parameters are 15bp, so the first and last 15bp would not be selected for the site of maximal editing and thus be the site of a guide sequence. In addition, the site of maximal editing must have 3x the magnitude over the background. commit 9d64de187835b2553ad2b4374d32edab27f83645 Author: Kendell Clement <[email protected]> Date: Thu Jun 2 20:22:25 2022 -0400 Update README.md commit 6aafc5387986f5089ba55b68d128343d68052792 Author: Simon P Shen <[email protected]> Date: Tue May 31 17:42:53 2022 -0400 directory in quotes in batch cmd (#222) Add quotes around output folder for folders that have spaces. commit 432f163ac68b9a650d1fd326171aadc505ee87f4 Author: Kendell Clement <[email protected]> Date: Tue May 24 23:38:36 2022 -0400 CRISPRessoBatch fills NA values in batch settings NA values in CRISPRessoBatch are filled with the value from args - either the default value or the value from the command line args (if set) commit 6de774adbad3aa8cd99d07b0ba7692984b356cd4 Author: kclem <[email protected]> Date: Mon May 23 14:18:02 2022 -0400 Fix file naming bug for HDR outputs In html file, figures 4e and 4f incorrectly referenced figure 4d. This fixes this bug. commit b88fec0668a4082a12ead3d26582e86d829dd7cc Author: Kendell Clement <[email protected]> Date: Sat May 21 00:32:15 2022 -0400 For bam_output, fix bug that wrote unaligned lines twice commit 3564e77ebcdedb4b01cc01dcca18ba3221fac67c Author: Kendell Clement <[email protected]> Date: Thu May 19 16:32:18 2022 -0400 Update README with CRISPRessoPooled headers and bam_output parameters commit bc08d81f17cb1929d1c37a1773cffcf36fb12fe2 Author: Kendell Clement <[email protected]> Date: Thu May 19 16:11:30 2022 -0400 Add more links to tools commit 006c497a379ecd94b017a883a5db887861e1586a Author: Kendell Clement <[email protected]> Date: Thu May 19 16:08:14 2022 -0400 Add links to tools commit dc8243373ad00d6bd467fc30c59942596ff0c5d6 Author: Kendell Clement <[email protected]> Date: Mon May 16 21:38:06 2022 -0400 fastq_to_bam implementation (#219) commit e88b6833977c6b2768299e0b2e7af623e3a9ae7c Author: Kendell Clement <[email protected]> Date: Sun May 8 02:14:13 2022 -0400 Fix bug for when guides don't agree in CRISPRessoAggregate commit 7eb763116a8c60603f1cd654645215767ee8eb52 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:21 2022 -0400 Fix bug for case of empty summary plots in report generation commit 0324fa67d14ed945f0c9531d9bcf73ebcf4ca042 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:02 2022 -0400 Create report for number of significant bases in CRISPRessoCompare commit e3c9d0026a9ee6732f3ed6bdcf2a824850d7e66a Author: Kendell Clement <[email protected]> Date: Wed May 4 22:43:11 2022 -0400 Update pickle to json in readme and CRISPRessoPooledWGSCompare commit 1553f7977c12bf1091a20ca55b878bccfb739b61 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:10:04 2022 -0400 Merge pull request #4 from pinellolab/master (#218) commit bcecbfc047d294e26f381a6668e08cb4db24445c Merge: 15b0e05b bb13e007 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:06:37 2022 -0400 Merge branch 'master' into master commit bb13e007738d6e7a4909e01f03daff592f334f36 Merge: af4ab6e8 d0b41483 Author: Kendell Clement <[email protected]> Date: Wed May 4 17:59:32 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 15b0e05b9e03bbec5236e58776ddf9aa2f93180e Author: Kendell Clement <[email protected]> Date: Wed May 4 17:54:52 2022 -0400 2 flexible pooled input (#217) * Batch type coerce and r2 file check * Upgrade tabs for bootstrap5 * Update readme with additional pooled amplicon file headers Co-authored-by: Samuel Nichols <[email protected]> commit d0b41483bee704940ba60c58289f412b04c71659 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:43:43 2022 -0400 Update README.md commit ce49fab5301cb73ba0daf6c765e350eb083c76f1 Merge: 5f909713 b913fcb4 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:40:30 2022 -0400 Merge pull request #3 from edilytics/2-flexible-pooled-input Add flexibility to CRISPRessoPooled amplicon input by allowing headers. Also, prime editing and quantification window coordinate parameters can be passed to CRISPRessoPooled. commit b913fcb402a8ba3106c3ff7913563a33d8d19fca Author: Kendell Clement <[email protected]> Date: Wed May 4 13:38:25 2022 -0400 Update CRISPRessoPooledCORE.py Replace process to read header, increase flexibility for column order commit 945bf31f16530b7ce25b89095b2c7005bf146117 Merge: 7b8f6788 5f909713 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:45:24 2022 -0400 Merge branch 'master' into 2-flexible-pooled-input commit 5f9097133765736a7c2fe3c8e9b730845fed0b70 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:23:44 2022 -0400 Version bump to 2.2.8 commit c4a94ce0e06c6ebae13e128fbe6b708e635121c4 Author: Kendell Clement <[email protected]> Date: Wed May 4 00:13:17 2022 -0400 Fix summary plot representation for multi reports *fixed old reference to make_multi_report which called old summary plot format * renamed summary_plot to summary_plots to reflect a dict with multiple plots commit 62900e9ae6fa37ce99a04f12a63ed5c912f75042 Author: Cole Lyman <[email protected]> Date: Tue May 3 20:47:52 2022 -0600 Large aggregation (#192) * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add plotly requrement to setup.py * Remove space around vertical barcharts * Add scrollbar to long images in multiReport * Fill in default (empty) values to allele modification plots When not running CRISPRessoAggregate, default values for the `allele_modification_heatmap_plot` and `allele_modification_lin_plot` dictionaries will be set so that the template can be properly rendered. * Include CRISPRessoBatch in the refactor of how summary_plot dicts are handled * Update dockerfile for new docker * minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) * Allow for flexible parsing of quant window coordinates * CRISPRessoPooled debug flash command, fix pep formatting * Set flexiguide homology parameter type to int * Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values * Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. * Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. * Create allele modification heatmaps and line plots in CRISPRessoBatch * Add allele modification heatmaps and line plots to CRISPRessoBatch * Make all plots in CRISPRessoBatch run in parallel * Make `--suppress_batch_summary_plots` store true Also, only open and shutdown the process pool when necessary. * Add blank values for allele_modification entries when not present Co-authored-by: Kendell Clement <[email protected]> Co-authored-by: dharjanto <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit f67376fc9ab0e407d4086aa42fd1c77706ebc9c0 Author: Kendell Clement <[email protected]> Date: Fri Apr 15 00:46:30 2022 -0400 Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. commit b34fe2956ff88629809b2434878028723dfc4895 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 23:58:07 2022 -0400 Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. commit c94e3b9f2e301bda91e9c1e6f4ef794b33b5dbf0 Author: Samuel Nichols <[email protected]> Date: Thu Apr 14 21:48:32 2022 -0600 Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values commit fc4542491bb86eb143db0044a848a56234403496 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:13:23 2022 -0400 Set flexiguide homology parameter type to int commit 23fe2aa8e26067d1bcf36bfafc67e023c7588d2f Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:12:37 2022 -0400 CRISPRessoPooled debug flash command, fix pep formatting commit d292d33d8c1fa3bfd2cee656643fd47bcdab161d Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:00:19 2022 -0400 Allow for flexible parsing of quant window coordinates commit e1667cb53a7ea6fbb33369c8530a78639ed423ec Author: dharjanto <[email protected]> Date: Mon Apr 11 22:08:21 2022 -0400 minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) commit 7b8f6788da18f6ab173fa3c3d10f4ab6bb2acc26 Author: Samuel Nichols <[email protected]> Date: Fri Apr 8 10:21:00 2022 -0600 Update README commit 9bc24cd0474ed9f398dff64274d3181c4b2f8637 Author: Samuel Nichols <[email protected]> Date: Tue Mar 29 11:25:09 2022 -0600 Using Amplicon_Name commit 88ac5d72074b3da63de035e02c911ce34cd29414 Merge: b6057a2d e5afa478 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 22:32:09 2022 -0600 Merge remote-tracking branch 'origin/master' into 2-flexible-pooled-input commit b6057a2d54cb8637ff0900416de8e2de72213f76 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 20:53:05 2022 -0600 Printing info statements for matched headers commit af4ab6e8507d7aa4b7b68f217a458e0d9c966f55 Merge: bbb7d6f0 51a943c3 Author: Cole Lyman <[email protected]> Date: Fri Mar 25 09:44:13 2022 -0600 Merge branch 'pinellolab:master' into master commit 3c1eb012fc02563e3e963f17a62c7e932f5bcddc Author: Samuel Nichols <[email protected]> Date: Thu Mar 24 12:31:43 2022 -0600 Debugging and column checking commit 0b47acbc592a6df6adf14641357b2104b76be691 Author: Samuel Nichols <[email protected]> Date: Wed Mar 23 09:42:51 2022 -0600 New variables added to pooled commit a0ff3a44d6d19d7b37f91919b5c0180206f72d53 Author: Samuel Nichols <[email protected]> Date: Mon Mar 21 09:32:28 2022 -0600 Read as string not bytes commit 710675fc3c0307e21103abd604315b47ff80a894 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 13:51:30 2022 -0600 Adding command building for new options commit f386818a48e5c840bd567611e6f1320c8146cac7 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 10:08:33 2022 -0600 Comment out df_template.iloc instance commit eb5e309da57c8b96cd760728ddbf67be05f30d1c Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 09:59:19 2022 -0600 Potential solution for flexible headers commit 51a943c3a8f8181963acc420e75a5e8ee103cf7c Author: Kendell Clement <[email protected]> Date: Tue Mar 15 11:00:46 2022 -0400 CRISPRessoPooled pep formatting and fix CRISPRessoPooled doesn't re-count reads if it has been run once and the `aligned_pooled_bam` is provided as input pep code formatting changes commit bbb7d6f0907aa13518d20e7f470e7de518b825f4 Merge: ddbd39f0 5a10d638 Author: Kendell Clement <[email protected]> Date: Tue Mar 15 10:23:38 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 5a10d638c638f21f8a2934955e92ef7e117b889e Author: Kendell Clement <[email protected]> Date: Sat Feb 26 14:21:57 2022 -0500 Move metadata for bam input and output commit e5afa4784d5330a1dc95c5deafcd9217edeac631 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:20:24 2022 -0700 Coerce int values commit ede7d85b50055311908000578c76a1860ae9de4d Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:18:29 2022 -0700 Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. commit f91736688ea9739cf3063e3601c52ad6da1116a4 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:10:52 2022 -0700 Batch type coerce and r2 file check commit 7b4a310b0f8b64c00e02eca3d522ad50d39b43ae Author: Kendell Clement <[email protected]> Date: Tue Feb 15 22:18:05 2022 -0500 Reiterate WGS region file is tab-separated Add note to WGS description that region file should be tab-separated. Closes #199 commit b8497542e388ad401d0815d426f27abc3201a76d Author: kclem <[email protected]> Date: Fri Feb 11 15:07:14 2022 -0500 Extend x-axis to longest scaffold incorporation length commit ab7248947afade089809c74bfe6e9d5394e8f6dc Author: kclem <[email protected]> Date: Wed Feb 9 17:05:11 2022 -0500 Fix prime editing indexing for plots commit ddbd39f06b262d5ebd2cc69e116c08b22b6bd84e Merge: a7ffd468 442a48c7 Author: Kendell Clement <[email protected]> Date: Thu Jan 13 15:35:36 2022 -0500 Merge branch 'pinellolab:master' into master commit 442a48c7f4c62ec2ebc95fe268475e5e2a4b2f0c Author: Cole Lyman <[email protected]> Date: Tue Jan 11 15:28:28 2022 -0700 Indel alignment fix (#182) * Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. * Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. * Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. * Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. * Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. * Add a unit test for `find_indels…
Colelyman
pushed a commit
that referenced
this pull request
Mar 22, 2024
…ad70 1efad70 Replace tabs with spaces and reindent template files e7ef285 Fix hamburger menu and add -bs- to data-target and data-toggle df896b0 Resize images and fix filepath 2f70855 Add spacing around body and footer tags 5cd6d27 Final style fixes, color circles for style files f8d7d92 Merge commit 'e7de9b7745a71bbc9fedf2c8fc6396fcc898f2c5' as 'CRISPRessoWEB/CRISPRessoReports' 321815d Removing CRISPRessoReport files 17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes 84174e6 Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 461ca93 04558fb Remove extra files 8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix 980fdc4 Styling and bootstrap changes 9d40474 Centering issue and submit button fix aa5071c Subtree working db30843 Jinja choice loader 3b67ac0 Path correction 3aaca48 Bootstrap 5 and partials changes 8f5d8a1 Layout.html for C2WEB and CLI 290d829 Fix error when rendering multi reports 546397a summaries partials and html updates 858a751 fig_reports and replacement 073f1fe Added a few changes from the selenium-tests branch on C2Web 1061ebb Update indentation in report.html and extract log params into partial c3781e9 Update path to template directory to include `CRISPRessoReports` 84e0969 Use the `render_template` function for each report ee721b3 Add function to render template partials without using Flask 08fcd4e Web updates refactoring done 99c8e22 Adding files ef333f0 Removing reports found in subtree 1bae0df Commit before adding subtree 1fbb427 Add server file to render js d1d6fdf Move styling to main.css file 1241569 Jinja partials for all submissions 0534637 New submission.js template file c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial ecd03f6 Working file upload in partial. ce5d20f Working, missing custom label 6ba73e7 Bootstrap 5 changes e05d146 Layout and report update 517e9f8 Replace sub, ins, del with Substitution, Insertion, Deletion ea44128 Move where the style files are stored in Docker 7f03e98 Implement creating styles from the admin panel 9b27a2e Rename style_file references to style a233d10 Add some default styles and rename the default to "Original" 43a8d29 Remove style file card from admin index page 1a8f332 Refactor saving style files when there is no name specified 64a7b1c Implement color pickers in style admin view 17c93c1 Succesfully implemented selecting default style fd79cdd Restyle the colors in the admin view 3cd94b8 Fix error when the default style can't be read from the database 5e626bd Refactor `style_handler` to read the style from the database 0f66d4a Refactor styles to be part of the database instead of files 6c7d3c8 Move style folder inside of server folder 9f71f21 Add margins around style file elements 2a28549 Restyle the color pickers 2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files dc4f2c7 Style dropdown - allow save json only for admin 15e7483 Style file check 7bd0e91 Remove style from Compare 0ab45f5 Colors function refactored and working for all types 2e24f8b Adding styling d6621f1 Debuging ed00c82 Merge with master 5150f9b Adding style_files to partial 957a9ca Add style files to pooled and wgs 66dc2d3 Changes to pooled and wgs, reset Dockerfile fa6b1cf Updated Docker file and style_files.html ee0fcfc Optional save file 229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder 0f26e2c Working style FileAdmin, access button, and further partial refactoring b3b70bd Rough framework for style admin page e4731d7 Style menu completed 1bb37bc New style menu with tabs 58f7e56 Tabs for different style options 3de893d Compare (#34) e66bef1 Update AWS EB instructions.docx 658a218 Fix bug when trying to send recovery password with bad email creds ee32e36 Adding color-picker partial to wgs and pooled 34ea688 Fix for responsiveness on cup and title f0c4d07 Adding color routes to other versions 110fe14 Color picker input added to cmd_to_run e732478 Names for color fields 2934631 Jinja partial for color picker and pip install in dockerfile 48bbf9c Cup animation (#33) 2905248 Selenium tests (#31) 5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides 570e42a Don't remove commas from amplicons or guides 0d70425 Add smallGenome.fa fc33197 Writing text for pooled dccfcb3 Files for testing 4cea67c Changes for WGS selenium tests. All tests functional. ff05713 Changes for WGS selenium test file loading 495a98d Changes for pooled testing 0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix 127eb8f PopulatePooled error 30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests 7847687 Add link to CRISPRessoWGS from profile page and change header 666f73b Remove example block from CRISPRessoWGS submission page 27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled 8d979a4 Fix bug where files_to_delete was being replaced and standardize append 09e55fc Changes to make interleaved and pooled tests possible f89eca8 Changes necessary for selenium tests 3efe4f9 Clean up test files a696363 Merge pull request #28 from edilytics/s3 dcef708 Remove changes for CRISPRessoCompare e0c79cf Add demo config file for eb 03aba8e Update AWS EB instructions.docx a671c4e Set version to 2.6.3 3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled da5b15b Timezone for history is displayed in user local timezone e11691f Update history to show time of previous run be675fb Update pooled with s3 4c7d429 Add data links to pooled report 353e88f Update admin portal landing page 712e828 Show run type in history 2802252 s3 and user updates efc3ed8 S3 error catching af68341 New S3 Validation f7d64e0 AWS validation before submission 8446093 Update s3 for batch and paired modes 0e7d327 S3_Upload function imrpvoed -JF b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3 c991d52 added s3 user database model ab4aa54 add model for s3 bucket 853cda9 S3_Functionality improved -JF 2f060a6 Implemented front-end s3 browsing e082a5f stub out viewing method c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length c85a93f Merge pull request #15 from edilytics/wgs-interface 712270a Add support for CRISPRessoWGS deaacee Extract out function to get server files in submit_routes 151eb15 Update crispresso2_info object fields b2a974d Bump CRISPResso verion to 2.2.4 58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2 7f2dc1c Stop trimming json error messages, fix #11 d28c03b Update reporting logic to use the new CRISPResso2_info schema 03ee46f Bump CRISPResso version in Dockerfile and download release from Github 9151c5d Add CRISPRessoPooled report template 25a6e37 Merge pull request #6 from edilytics/pooled-interface b47d288 Check length of amplicons for hosted version, closes #4 54c28b6 Update submission file extension check 8fcadee Add a link to CRISPRessoPooled interface in user dashboard 7fd0283 Implement CRISPRessoPooled backend and report functionality 4063eb3 Modify submission.js to accept .txt and .tsv files b770323 Create template file for CRISPRessoPooled submission interface d4f2ed0 Merge pull request #5 from edilytics/flask-modularization 8527384 Convert some celery configurations settings to new format 962a209 Install less and vim in Dockerfile c693668 Read CRISPResso2_info from json files instead of pickle files a469e08 Move LoginManager to user_routes.py f62e67a Create db tables in init_db.py 0d85c90 Move login_required to user_routes 6f5e33e Reformatting of remaining __init__.py e615c0b Extract report routes out of __init__.py 20f2601 Extract user routes out from __init__.py 5582612 Extract status routes out from __init__.py 2406a10 Extract submit routes out from __init__.py b562fcd Extract celery tasks from __init__.py faa785d Extract views out from __init__.py ff44576 Extract model classes out from __init__.py 914498f Merge pull request #3 from edilytics/2to3 86ea7da Replace RabbitMQ with Redis adca9fb Upgrade celery to version 5.0.5 244ec33 Convert from Python 2 to Python 3 28b4f37 Refactor Docker image to use Python 3 via micromamba 2359800 Allow interleaved batches 428720b Add features: Allow admin init, server discovery depth 11df5d8 Client and server-side checks for invalid characters on sgRNA and amplicon 5062365 Update README.md 51e02f4 Update README.md ac4a6d5 delete other images 4f3ad88 Update README.md fc0de1d Update README.md 08defa1 Update README.md 9604983 Trycatch pickle loads c1facd7 get rid of debug print of email d699d4d crispresso2.0.45 e7ff079 Update param descriptions 1f12d59 2.0.44 b81febe crispresso to 2.0.42 1a967a8 update report 178c56d 2.4 e41076d Job expiration 41d1a4c check progress on setinterval 756e488 server-side files ad19c3c Update to crispresso 2.0.40 prime editing e3a194a update errors and ignore email config 2efb0bb Update README.md 58844a6 initial commit 8ff1878 Initial commit git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 1efad70
Colelyman
pushed a commit
that referenced
this pull request
Mar 22, 2024
…7ae2 13f7ae2 Fix command used and parameters elements. Increase print width and height to 100% dcf7391 Adding styling for print-only and screen only REVERT: 1efad70 Replace tabs with spaces and reindent template files REVERT: e7ef285 Fix hamburger menu and add -bs- to data-target and data-toggle REVERT: df896b0 Resize images and fix filepath REVERT: 2f70855 Add spacing around body and footer tags REVERT: 5cd6d27 Final style fixes, color circles for style files REVERT: f8d7d92 Merge commit 'e7de9b7745a71bbc9fedf2c8fc6396fcc898f2c5' as 'CRISPRessoWEB/CRISPRessoReports' REVERT: 321815d Removing CRISPRessoReport files REVERT: 17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes REVERT: 84174e6 Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 461ca93 REVERT: 04558fb Remove extra files REVERT: 8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix REVERT: 980fdc4 Styling and bootstrap changes REVERT: 9d40474 Centering issue and submit button fix REVERT: aa5071c Subtree working REVERT: db30843 Jinja choice loader REVERT: 3b67ac0 Path correction REVERT: 3aaca48 Bootstrap 5 and partials changes REVERT: 8f5d8a1 Layout.html for C2WEB and CLI REVERT: 290d829 Fix error when rendering multi reports REVERT: 546397a summaries partials and html updates REVERT: 858a751 fig_reports and replacement REVERT: 073f1fe Added a few changes from the selenium-tests branch on C2Web REVERT: 1061ebb Update indentation in report.html and extract log params into partial REVERT: c3781e9 Update path to template directory to include `CRISPRessoReports` REVERT: 84e0969 Use the `render_template` function for each report REVERT: ee721b3 Add function to render template partials without using Flask REVERT: 08fcd4e Web updates refactoring done REVERT: 99c8e22 Adding files REVERT: ef333f0 Removing reports found in subtree REVERT: 1bae0df Commit before adding subtree REVERT: 1fbb427 Add server file to render js REVERT: d1d6fdf Move styling to main.css file REVERT: 1241569 Jinja partials for all submissions REVERT: 0534637 New submission.js template file REVERT: c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial REVERT: ecd03f6 Working file upload in partial. REVERT: ce5d20f Working, missing custom label REVERT: 6ba73e7 Bootstrap 5 changes REVERT: e05d146 Layout and report update REVERT: 517e9f8 Replace sub, ins, del with Substitution, Insertion, Deletion REVERT: ea44128 Move where the style files are stored in Docker REVERT: 7f03e98 Implement creating styles from the admin panel REVERT: 9b27a2e Rename style_file references to style REVERT: a233d10 Add some default styles and rename the default to "Original" REVERT: 43a8d29 Remove style file card from admin index page REVERT: 1a8f332 Refactor saving style files when there is no name specified REVERT: 64a7b1c Implement color pickers in style admin view REVERT: 17c93c1 Succesfully implemented selecting default style REVERT: fd79cdd Restyle the colors in the admin view REVERT: 3cd94b8 Fix error when the default style can't be read from the database REVERT: 5e626bd Refactor `style_handler` to read the style from the database REVERT: 0f66d4a Refactor styles to be part of the database instead of files REVERT: 6c7d3c8 Move style folder inside of server folder REVERT: 9f71f21 Add margins around style file elements REVERT: 2a28549 Restyle the color pickers REVERT: 2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files REVERT: dc4f2c7 Style dropdown - allow save json only for admin REVERT: 15e7483 Style file check REVERT: 7bd0e91 Remove style from Compare REVERT: 0ab45f5 Colors function refactored and working for all types REVERT: 2e24f8b Adding styling REVERT: d6621f1 Debuging REVERT: ed00c82 Merge with master REVERT: 5150f9b Adding style_files to partial REVERT: 957a9ca Add style files to pooled and wgs REVERT: 66dc2d3 Changes to pooled and wgs, reset Dockerfile REVERT: fa6b1cf Updated Docker file and style_files.html REVERT: ee0fcfc Optional save file REVERT: 229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder REVERT: 0f26e2c Working style FileAdmin, access button, and further partial refactoring REVERT: b3b70bd Rough framework for style admin page REVERT: e4731d7 Style menu completed REVERT: 1bb37bc New style menu with tabs REVERT: 58f7e56 Tabs for different style options REVERT: 3de893d Compare (#34) REVERT: e66bef1 Update AWS EB instructions.docx REVERT: 658a218 Fix bug when trying to send recovery password with bad email creds REVERT: ee32e36 Adding color-picker partial to wgs and pooled REVERT: 34ea688 Fix for responsiveness on cup and title REVERT: f0c4d07 Adding color routes to other versions REVERT: 110fe14 Color picker input added to cmd_to_run REVERT: e732478 Names for color fields REVERT: 2934631 Jinja partial for color picker and pip install in dockerfile REVERT: 48bbf9c Cup animation (#33) REVERT: 2905248 Selenium tests (#31) REVERT: 5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides REVERT: 570e42a Don't remove commas from amplicons or guides REVERT: 0d70425 Add smallGenome.fa REVERT: fc33197 Writing text for pooled REVERT: dccfcb3 Files for testing REVERT: 4cea67c Changes for WGS selenium tests. All tests functional. REVERT: ff05713 Changes for WGS selenium test file loading REVERT: 495a98d Changes for pooled testing REVERT: 0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix REVERT: 127eb8f PopulatePooled error REVERT: 30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests REVERT: 7847687 Add link to CRISPRessoWGS from profile page and change header REVERT: 666f73b Remove example block from CRISPRessoWGS submission page REVERT: 27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled REVERT: 8d979a4 Fix bug where files_to_delete was being replaced and standardize append REVERT: 09e55fc Changes to make interleaved and pooled tests possible REVERT: f89eca8 Changes necessary for selenium tests REVERT: 3efe4f9 Clean up test files REVERT: a696363 Merge pull request #28 from edilytics/s3 REVERT: dcef708 Remove changes for CRISPRessoCompare REVERT: e0c79cf Add demo config file for eb REVERT: 03aba8e Update AWS EB instructions.docx REVERT: a671c4e Set version to 2.6.3 REVERT: 3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled REVERT: da5b15b Timezone for history is displayed in user local timezone REVERT: e11691f Update history to show time of previous run REVERT: be675fb Update pooled with s3 REVERT: 4c7d429 Add data links to pooled report REVERT: 353e88f Update admin portal landing page REVERT: 712e828 Show run type in history REVERT: 2802252 s3 and user updates REVERT: efc3ed8 S3 error catching REVERT: af68341 New S3 Validation REVERT: f7d64e0 AWS validation before submission REVERT: 8446093 Update s3 for batch and paired modes REVERT: 0e7d327 S3_Upload function imrpvoed -JF REVERT: b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3 REVERT: c991d52 added s3 user database model REVERT: ab4aa54 add model for s3 bucket REVERT: 853cda9 S3_Functionality improved -JF REVERT: 2f060a6 Implemented front-end s3 browsing REVERT: e082a5f stub out viewing method REVERT: c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length REVERT: c85a93f Merge pull request #15 from edilytics/wgs-interface REVERT: 712270a Add support for CRISPRessoWGS REVERT: deaacee Extract out function to get server files in submit_routes REVERT: 151eb15 Update crispresso2_info object fields REVERT: b2a974d Bump CRISPResso verion to 2.2.4 REVERT: 58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2 REVERT: 7f2dc1c Stop trimming json error messages, fix #11 REVERT: d28c03b Update reporting logic to use the new CRISPResso2_info schema REVERT: 03ee46f Bump CRISPResso version in Dockerfile and download release from Github REVERT: 9151c5d Add CRISPRessoPooled report template REVERT: 25a6e37 Merge pull request #6 from edilytics/pooled-interface REVERT: b47d288 Check length of amplicons for hosted version, closes #4 REVERT: 54c28b6 Update submission file extension check REVERT: 8fcadee Add a link to CRISPRessoPooled interface in user dashboard REVERT: 7fd0283 Implement CRISPRessoPooled backend and report functionality REVERT: 4063eb3 Modify submission.js to accept .txt and .tsv files REVERT: b770323 Create template file for CRISPRessoPooled submission interface REVERT: d4f2ed0 Merge pull request #5 from edilytics/flask-modularization REVERT: 8527384 Convert some celery configurations settings to new format REVERT: 962a209 Install less and vim in Dockerfile REVERT: c693668 Read CRISPResso2_info from json files instead of pickle files REVERT: a469e08 Move LoginManager to user_routes.py REVERT: f62e67a Create db tables in init_db.py REVERT: 0d85c90 Move login_required to user_routes REVERT: 6f5e33e Reformatting of remaining __init__.py REVERT: e615c0b Extract report routes out of __init__.py REVERT: 20f2601 Extract user routes out from __init__.py REVERT: 5582612 Extract status routes out from __init__.py REVERT: 2406a10 Extract submit routes out from __init__.py REVERT: b562fcd Extract celery tasks from __init__.py REVERT: faa785d Extract views out from __init__.py REVERT: ff44576 Extract model classes out from __init__.py REVERT: 914498f Merge pull request #3 from edilytics/2to3 REVERT: 86ea7da Replace RabbitMQ with Redis REVERT: adca9fb Upgrade celery to version 5.0.5 REVERT: 244ec33 Convert from Python 2 to Python 3 REVERT: 28b4f37 Refactor Docker image to use Python 3 via micromamba REVERT: 2359800 Allow interleaved batches REVERT: 428720b Add features: Allow admin init, server discovery depth REVERT: 11df5d8 Client and server-side checks for invalid characters on sgRNA and amplicon REVERT: 5062365 Update README.md REVERT: 51e02f4 Update README.md REVERT: ac4a6d5 delete other images REVERT: 4f3ad88 Update README.md REVERT: fc0de1d Update README.md REVERT: 08defa1 Update README.md REVERT: 9604983 Trycatch pickle loads REVERT: c1facd7 get rid of debug print of email REVERT: d699d4d crispresso2.0.45 REVERT: e7ff079 Update param descriptions REVERT: 1f12d59 2.0.44 REVERT: b81febe crispresso to 2.0.42 REVERT: 1a967a8 update report REVERT: 178c56d 2.4 REVERT: e41076d Job expiration REVERT: 41d1a4c check progress on setinterval REVERT: 756e488 server-side files REVERT: ad19c3c Update to crispresso 2.0.40 prime editing REVERT: e3a194a update errors and ignore email config REVERT: 2efb0bb Update README.md REVERT: 58844a6 initial commit REVERT: 8ff1878 Initial commit git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 13f7ae2
Colelyman
added a commit
that referenced
this pull request
Mar 22, 2024
* Reports refactor (#37) * Changes necessary for selenium tests * Changes to make interleaved and pooled tests possible * PopulatePooled error * Changes for pooled testing * Changes for WGS selenium test file loading * Changes for WGS selenium tests. All tests functional. * Files for testing * Writing text for pooled * Add smallGenome.fa * Jinja partial for color picker and pip install in dockerfile * Names for color fields * Color picker input added to cmd_to_run * Adding color routes to other versions * Fix for responsiveness on cup and title * Adding color-picker partial to wgs and pooled * Tabs for different style options * New style menu with tabs * Style menu completed * Rough framework for style admin page * Working style FileAdmin, access button, and further partial refactoring * Checkbox for custom colors that shows and hides color selectors, box on home page for style folder * Optional save file * Updated Docker file and style_files.html * Changes to pooled and wgs, reset Dockerfile * Add style files to pooled and wgs * Adding style_files to partial * Debuging * Adding styling * Colors function refactored and working for all types * Remove style from Compare * Style file check * Style dropdown - allow save json only for admin * DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files * Restyle the color pickers These changes make it so that the colors are in a row instead of a column when the screen is wide enough. They are also responsive, so when the screen is small the color pickers will return to a column. * Add margins around style file elements * Move style folder inside of server folder * Refactor styles to be part of the database instead of files This allows for greater flexibility in displaying and updating them through the web interface. * Refactor `style_handler` to read the style from the database This completes the refactor to store style parameters using the database instead of storing the styles as files. * Fix error when the default style can't be read from the database The intended and proper behavior is that no style parameter is added to the command, and that is what happens now. * Restyle the colors in the admin view Add border around the colors in the admin view as well as moving them to be more vertically centered with the name. * Succesfully implemented selecting default style * Implement color pickers in style admin view * Refactor saving style files when there is no name specified * Remove style file card from admin index page * Add some default styles and rename the default to "Original" * Rename style_file references to style This is a final clean up of refactoring how the different style properties are stored. They are now stored in the database, so it doesn't make much sense to call them style files. * Implement creating styles from the admin panel * Move where the style files are stored in Docker * Implement Docker Compose for both production and development * Replace sub, ins, del with Substitution, Insertion, Deletion * Replace WSGI with Gunicorn for both development and production This allows us to hotreload the code when running the development version and also adds the Flask Debug Toolbar Extension which will be helpful in debugging. * Add a Makefile for commonly used Docker compose commands * Add reverse proxy to make Apache redirects work properly * Layout and report update * Bootstrap 5 changes * Working, missing custom label * Working file upload in partial. * Changes to submission.js for bootstrap 5 and load file upload partial * New submission.js template file * Jinja partials for all submissions * Move styling to main.css file * Add server file to render js * Commit before adding subtree * Removing reports found in subtree * Adding files * Web updates refactoring done * Add function to render template partials without using Flask * Use the `render_template` function for each report * Update path to template directory to include `CRISPRessoReports` * Update indentation in report.html and extract log params into partial * Added a few changes from the selenium-tests branch on C2Web * fig_reports and replacement * summaries partials and html updates * Fix error when rendering multi reports * Layout.html for C2WEB and CLI * Bootstrap 5 and partials changes * Path correction * Jinja choice loader * Subtree working * Centering issue and submit button fix * Styling and bootstrap changes * Spacing changes, submission_compared fix, and submission_wgs file upload fix * Remove extra files * Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 461ca93 git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 461ca93 * Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes * Removing CRISPRessoReport files * Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 461ca93 git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 461ca93 * Removing unecessary logic from submission_compare * Set up standalone Apache server container in Docker Compose * Add C2Web conda environment file * Make C2Web Docker image smaller (now 2.25 GB uncompressed) * Change style to styles * Fix for updating labels * Make C2Web Dockerfile multi-stage and make CRISPResso2 hot-reloadable These changes modify the C2Web Dockerfile to be multi-stage, so that there is a base stage (shared between dev and prod), a dev stage, and a prod stage. The dev stage doesn't install CRISPResso2, but binds a local copy of CRISPResso2 so that it can be hot reloaded. In the prod stage, this installs CRISPResso2 via conda. * Clean up Dockerfile and add CRISPResso2 dependencies to C2Web Docker These dependencies (plotly, seaborn-base, and matplotlib-base) are added so that they don't need to be added when CRISPResso2 is installed. * Final style fixes, color circles for style files * Update README.md with Docker compose details and update ignore files * Install CRISPResso2 in the build stage of Dockerfile * Removed docker-compose.prod.yml and created docker-compose.public.yml Also, updated the Makefile. Now, the default docker-compose.yml should be a suitable configuration for client facing production. The docker-compose.public.yml is a good configuration for the public facing site and the docker-compose.override.yml is a good configuration for development. * Share environment variables between web and celery and update README * Add spacing around body and footer tags * Replace spacing utilities classes with Bootstrap 5 versions * Resize images and fix filepath * Hide base editing if checkbox unchecked * Base editing partial * Add padding around pegRNA radio buttons and plot window size Also, add a margin around the JSON file upload box. * Increase size of Submit buttons * Fix hamburger menu and add -bs- to data-target and data-toggle * Fix plot window size spacing in Pooled * Fix the vertical span of the input labels in WGS, Pooled and Batch * Fix Pooled layout * Make input labels in the forms the same width * Remove ALLOW_USER_STYLE_UPLOAD parameter * Remove jinja loader from report_routes * Reformat style in submit_routes.py and update docs * Convert tabs to spaces in style_selection.html * Use string interpolation instead of concatenation in submission.js * Add an authentication check before exposing server_files in submission.js * Fix indentation and convert tabs to spaces in many templates * Clean up old files and comments * Replace tabs with spaces and reindent template files * Update README.md with git alias and subtree information * Squashed 'CRISPRessoWEB/CRISPRessoReports/' changes from 461ca93..1efad70 1efad70 Replace tabs with spaces and reindent template files e7ef285 Fix hamburger menu and add -bs- to data-target and data-toggle df896b0 Resize images and fix filepath 2f70855 Add spacing around body and footer tags 5cd6d27 Final style fixes, color circles for style files f8d7d92 Merge commit 'e7de9b7745a71bbc9fedf2c8fc6396fcc898f2c5' as 'CRISPRessoWEB/CRISPRessoReports' 321815d Removing CRISPRessoReport files 17d9ead Radio buttons, center buttons and inputs (login, register, new password), new div name for style dropdown fixes 84174e6 Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 461ca93 04558fb Remove extra files 8e3a590 Spacing changes, submission_compared fix, and submission_wgs file upload fix 980fdc4 Styling and bootstrap changes 9d40474 Centering issue and submit button fix aa5071c Subtree working db30843 Jinja choice loader 3b67ac0 Path correction 3aaca48 Bootstrap 5 and partials changes 8f5d8a1 Layout.html for C2WEB and CLI 290d829 Fix error when rendering multi reports 546397a summaries partials and html updates 858a751 fig_reports and replacement 073f1fe Added a few changes from the selenium-tests branch on C2Web 1061ebb Update indentation in report.html and extract log params into partial c3781e9 Update path to template directory to include `CRISPRessoReports` 84e0969 Use the `render_template` function for each report ee721b3 Add function to render template partials without using Flask 08fcd4e Web updates refactoring done 99c8e22 Adding files ef333f0 Removing reports found in subtree 1bae0df Commit before adding subtree 1fbb427 Add server file to render js d1d6fdf Move styling to main.css file 1241569 Jinja partials for all submissions 0534637 New submission.js template file c5406d1 Changes to submission.js for bootstrap 5 and load file upload partial ecd03f6 Working file upload in partial. ce5d20f Working, missing custom label 6ba73e7 Bootstrap 5 changes e05d146 Layout and report update 517e9f8 Replace sub, ins, del with Substitution, Insertion, Deletion ea44128 Move where the style files are stored in Docker 7f03e98 Implement creating styles from the admin panel 9b27a2e Rename style_file references to style a233d10 Add some default styles and rename the default to "Original" 43a8d29 Remove style file card from admin index page 1a8f332 Refactor saving style files when there is no name specified 64a7b1c Implement color pickers in style admin view 17c93c1 Succesfully implemented selecting default style fd79cdd Restyle the colors in the admin view 3cd94b8 Fix error when the default style can't be read from the database 5e626bd Refactor `style_handler` to read the style from the database 0f66d4a Refactor styles to be part of the database instead of files 6c7d3c8 Move style folder inside of server folder 9f71f21 Add margins around style file elements 2a28549 Restyle the color pickers 2c82c08 DEFAULTUSER can't see style_dropdown and variable for ALLOW_USER_STYLE_UPLOAD for users to upload style files dc4f2c7 Style dropdown - allow save json only for admin 15e7483 Style file check 7bd0e91 Remove style from Compare 0ab45f5 Colors function refactored and working for all types 2e24f8b Adding styling d6621f1 Debuging ed00c82 Merge with master 5150f9b Adding style_files to partial 957a9ca Add style files to pooled and wgs 66dc2d3 Changes to pooled and wgs, reset Dockerfile fa6b1cf Updated Docker file and style_files.html ee0fcfc Optional save file 229e21d Checkbox for custom colors that shows and hides color selectors, box on home page for style folder 0f26e2c Working style FileAdmin, access button, and further partial refactoring b3b70bd Rough framework for style admin page e4731d7 Style menu completed 1bb37bc New style menu with tabs 58f7e56 Tabs for different style options 3de893d Compare (#34) e66bef1 Update AWS EB instructions.docx 658a218 Fix bug when trying to send recovery password with bad email creds ee32e36 Adding color-picker partial to wgs and pooled 34ea688 Fix for responsiveness on cup and title f0c4d07 Adding color routes to other versions 110fe14 Color picker input added to cmd_to_run e732478 Names for color fields 2934631 Jinja partial for color picker and pip install in dockerfile 48bbf9c Cup animation (#33) 2905248 Selenium tests (#31) 5641fd3 Merge pull request #32 from edilytics/multi-amplicon-guides 570e42a Don't remove commas from amplicons or guides 0d70425 Add smallGenome.fa fc33197 Writing text for pooled dccfcb3 Files for testing 4cea67c Changes for WGS selenium tests. All tests functional. ff05713 Changes for WGS selenium test file loading 495a98d Changes for pooled testing 0ad86a5 Merge pull request pinellolab#30 from edilytics/pooled-upload-fix 127eb8f PopulatePooled error 30ff7a7 Merge remote-tracking branch 'origin/pooled-upload-fix' into selenium_tests 7847687 Add link to CRISPRessoWGS from profile page and change header 666f73b Remove example block from CRISPRessoWGS submission page 27fcc13 Fix bug where amplicon file isn't being uploaded properly in CRISPRessoPooled 8d979a4 Fix bug where files_to_delete was being replaced and standardize append 09e55fc Changes to make interleaved and pooled tests possible f89eca8 Changes necessary for selenium tests 3efe4f9 Clean up test files a696363 Merge pull request #28 from edilytics/s3 dcef708 Remove changes for CRISPRessoCompare e0c79cf Add demo config file for eb 03aba8e Update AWS EB instructions.docx a671c4e Set version to 2.6.3 3bb3a8d Pull out s3 javascript for use in crispresso and crispressopooled da5b15b Timezone for history is displayed in user local timezone e11691f Update history to show time of previous run be675fb Update pooled with s3 4c7d429 Add data links to pooled report 353e88f Update admin portal landing page 712e828 Show run type in history 2802252 s3 and user updates efc3ed8 S3 error catching af68341 New S3 Validation f7d64e0 AWS validation before submission 8446093 Update s3 for batch and paired modes 0e7d327 S3_Upload function imrpvoed -JF b48e0dc Merge branch 's3' of https://github.com/edilytics/C2Web into s3 c991d52 added s3 user database model ab4aa54 add model for s3 bucket 853cda9 S3_Functionality improved -JF 2f060a6 Implemented front-end s3 browsing e082a5f stub out viewing method c5b6d13 Merge pull request #7 from edilytics/check-amplicon-length c85a93f Merge pull request #15 from edilytics/wgs-interface 712270a Add support for CRISPRessoWGS deaacee Extract out function to get server files in submit_routes 151eb15 Update crispresso2_info object fields b2a974d Bump CRISPResso verion to 2.2.4 58ae313 Merge pull request #10 from edilytics/update-to-crispresso-2.2.2 7f2dc1c Stop trimming json error messages, fix #11 d28c03b Update reporting logic to use the new CRISPResso2_info schema 03ee46f Bump CRISPResso version in Dockerfile and download release from Github 9151c5d Add CRISPRessoPooled report template 25a6e37 Merge pull request #6 from edilytics/pooled-interface b47d288 Check length of amplicons for hosted version, closes #4 54c28b6 Update submission file extension check 8fcadee Add a link to CRISPRessoPooled interface in user dashboard 7fd0283 Implement CRISPRessoPooled backend and report functionality 4063eb3 Modify submission.js to accept .txt and .tsv files b770323 Create template file for CRISPRessoPooled submission interface d4f2ed0 Merge pull request #5 from edilytics/flask-modularization 8527384 Convert some celery configurations settings to new format 962a209 Install less and vim in Dockerfile c693668 Read CRISPResso2_info from json files instead of pickle files a469e08 Move LoginManager to user_routes.py f62e67a Create db tables in init_db.py 0d85c90 Move login_required to user_routes 6f5e33e Reformatting of remaining __init__.py e615c0b Extract report routes out of __init__.py 20f2601 Extract user routes out from __init__.py 5582612 Extract status routes out from __init__.py 2406a10 Extract submit routes out from __init__.py b562fcd Extract celery tasks from __init__.py faa785d Extract views out from __init__.py ff44576 Extract model classes out from __init__.py 914498f Merge pull request #3 from edilytics/2to3 86ea7da Replace RabbitMQ with Redis adca9fb Upgrade celery to version 5.0.5 244ec33 Convert from Python 2 to Python 3 28b4f37 Refactor Docker image to use Python 3 via micromamba 2359800 Allow interleaved batches 428720b Add features: Allow admin init, server discovery depth 11df5d8 Client and server-side checks for invalid characters on sgRNA and amplicon 5062365 Update README.md 51e02f4 Update README.md ac4a6d5 delete other images 4f3ad88 Update README.md fc0de1d Update README.md 08defa1 Update README.md 9604983 Trycatch pickle loads c1facd7 get rid of debug print of email d699d4d crispresso2.0.45 e7ff079 Update param descriptions 1f12d59 2.0.44 b81febe crispresso to 2.0.42 1a967a8 update report 178c56d 2.4 e41076d Job expiration 41d1a4c check progress on setinterval 756e488 server-side files ad19c3c Update to crispresso 2.0.40 prime editing e3a194a update errors and ignore email config 2efb0bb Update README.md 58844a6 initial commit 8ff1878 Initial commit git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 1efad70 * Indentation and parenthesis * Semi-colon to README * Add targets for .env and clean in Makefile * Add flower support to the development version * Add support to map individual directories in Docker Compose * Fix typo in README * Squashed 'CRISPRessoWEB/CRISPRessoReports/' changes from 1efad70..13f7ae2 13f7ae2 Fix command used and parameters elements. Increase print width and height to 100% dcf7391 Adding styling for print-only and screen only git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 13f7ae2 * Working in docker * Increase the size of the center column when printing * Remove some page breaks * Restore block statement * Spacing fix for empty page problem * Change gunicorn reload engine to poll This is because when running through x86 emulation (on M1 Mac), the inotify file system events are blocked. But reloading works with polling! * Pin SQLAlchemy version to 2.5.1 because newer versions don't work Also, this fixes the entrypoint for the dev build stage. * Make clarifications in README and fix more spelling * Add back in deleted report.html * Don't add styles to the database if they already exist * Upgrade to python 3.9 * Add report_data object to render templates * Reset subtree * Squashed 'CRISPRessoWEB/CRISPRessoReports/' content from commit 69cb5e2 git-subtree-dir: CRISPRessoWEB/CRISPRessoReports git-subtree-split: 69cb5e2 * Fix region_name to be run_names * Update sizing on graphs * Create environmental variable for crispresso_version and load colors if version is above 2.2.12 * Make env variable use ARG * Add version check * Changes to work with Docker compose * Fix style selection database path * Add pe_ref_seq to WGS input and update to data-bs-toggle * Remove extra div that affected the height of prime edited ref seq * Fix gene annotation file label cut off on WGS * Move style function to after folder_id is declared * Docker compose pin versions and search C2 args for --config_files * Remove gtag code * Update CRISPResso to 2.2.14 * Specify platform in docker compose file * Move jinja_partials install from dev to build stage * Fix running when no default style is selected (or when selected style isn't available) * Add zip and unzip to prod step * Clean execution logs after run finishes This will clean the full paths from the execution logs so that those aren't exposed to the user. This also ensures that this only happens in one place in the code (instead of multiple). * Update path to favicon * Reorder conda channels, remove flask-sqlalchemy pin, and fix wtforms The latest version of wtforms has moved ColorInput from `wtforms.widgets.html5` to `wtforms.widgets`, which is reflected in this commit. * Fix S3 file upload by adding form field * Remove pyopenssl pin * Add create_styles and createUsers to app context in init_db.py * Fixed padding in S3 file upload * Removed commented out S3 upload code for CRISPRessoPooled * Add volume mount to Apache in dev version This allows any files that are edited in the static folder to hot reload. * Don't show root folder of S3 buckets because it leads to weird behavior * Fix old Bootstrap margin and padding utilities The new version of Bootstrap has replaced `ml-1` with `ms-1` and `mr-1` with `me-1`, etc. Instead of being "left" and "right", it is now "start" and "end" to account for right to left languages. * Fix the close button on the S3 modal * Fix positive quantification window in radio button label * Add another app context to init_db.py * Update IDs for jQuery examples and how radio buttons are selected Because of upgrading to Bootstrap 5, the way that labels and inputs needed to be formatted, the previous way of selecting a radio button input no longer worked. Now to select a radio button element programmatically, you can issue a `.click()` and it will be selected. * Remove extra report file * Replace deprecated padding utility classes in report * Remove duplicate id's and add a few aria labels * Add correct MIME type to submission.js file * Disable caching on submission pages to improve back button behavior * Add + to quantification window for pooled and WGS * Add S3 buckets to WGS and Compare * Remove S3 buckets from WGS Not going to implement this now, because it would be a significant effort to do it correctly. * Add note to S3 modal about large files being expensive * Don't show style selector when `--config_file` parameter isn't available * Install CRISPRessoPro in the dev environment * Fix error with app contexts and databases in unit tests * Implement handling duplicate style names when saving to db * Move Plotly JS import to reports templates and out of layout.html * Remove font installer, less, and vim dependencies --------- Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> * added metadata to report partial * fixed logout button condition in banner * Fix loading favicon.ico, remove duplicate log_params, and fix README typos * Fix bug where `metadata` key is not found in `report_data` --------- Co-authored-by: Samuel Nichols <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: McKay <[email protected]>
Snicker7
added a commit
that referenced
this pull request
Apr 4, 2024
* imports C2Pro plots if available * added --use_matplotlib flag * added C2Pro matched api funciton signatures * added api args for plotly * added **kwargs * renamed config to custom_config, more specificity * added backend flag for plotly kaleido * added pro_installed boolean for templates, added plotly dependency to report templates * Squashed commit of the following: commit c909ea3b34e87ce637e00dac075d2bb2f8bfb954 Author: McKay <[email protected]> Date: Thu Feb 15 15:55:23 2024 -0700 added plotly dependency for pro commit 76b3601f6a0144f100266153f1c999e0c5de65de Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:56:19 2024 -0700 Squashed commit of the following: commit 603f2eff9d1aa21ae95f3e134da303b8018d3a33 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:48:20 2024 -0700 fix guardrials partial commit 22fc03183a8070c30dfb74d5c23575ac19019855 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 08:54:01 2024 -0700 Add guardrail partial commit e55f6b21972b578261bc5a864ce1d653d98f9e34 Author: Samuel Nichols <[email protected]> Date: Mon Jan 8 07:50:59 2024 -0700 Functional guardrails, needs reports update commit 6e968e9699ed59a47d88191d03768e042d8b60a4 Merge: 32b49685 e948ce10 Author: Samuel Nichols <[email protected]> Date: Mon Dec 18 13:34:36 2023 -0700 Merge branch 'guardrails-clean-history' of https://github.com/edilytics/CRISPResso2 into guardrails-clean-history commit 32b49685da320501dad2b0ebbb57887b66220ba8 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit 4e309cf6f732565d635de3d4c5d074ada3027e2d Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:55 2023 -0700 Refactor to use CRISPRessoReports module commit e648dc087c0055bc5d2fca13c64071a371dea941 Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:11 2023 -0700 Add CRISPRessoReports subtree commit e948ce107ebb0d1d99010ed12e937f34b5e607d4 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit d33c748871a625facfe8d792e29c77ab9779138f Author: Kendell Clement <[email protected]> Date: Tue Nov 7 16:31:06 2023 -0700 Include parameter --assign_ambiguous_alignments_to_first_reference in readme commit a1435f7f491a6a61434f3051e39f39a4c9bf1edc Author: Kendell Clement <[email protected]> Date: Wed Oct 11 17:17:30 2023 -0600 Enable quantification by sgRNA (#348) This PR includes: - storing the sgRNA-specific editing locations in the crispresso2_info object. Previously, each amplicon would record the indices of quantification windows across the guide, but not for individual guides. This stores the information for each guide in crispresso2_info['results']['refs'][reference_name]['sgRNA_include_idxs'] - a script (count_sgRNA_specific_edits.py) to parse through an allele table output from a completed CRISPResso run (`--write_detailed_allele_table` flag required) to count edits in each sgRNA separately. I don't have a good double-edited sample handy, but it can be run on the demo HDR data [hdr.fastq.gz](http://crispresso.pinellolab.org/static/demo/hdr.fastq.gz) using the command: ``` CRISPResso -r1 hdr.fastq.gz -a acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -e acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcaCctgactccGgaggagaagtctgccgttactgcGctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -c atggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcag -g TGCACCATGGTGTCTGTTTG,GATGAAGTTGGTGGTGAGGCCC --write_detailed_allele_table -n hdr3 -p max -gn guide1,guide2 ``` ``` python CRISPResso2/scripts/count_sgRNA_specific_edits.py -f CRISPResso_on_hdr3 ``` This produces: ``` Processed 25000 alleles Reference: Reference (2391/23415 modified reads) UNMODIFIED: 21024 MODIFIED guide1: 2359 MODIFIED guide2: 32 Reference: HDR (856/1577 modified reads) UNMODIFIED: 721 MODIFIED guide1: 854 MODIFIED guide1 + guide2: 1 MODIFIED guide2: 1 ``` commit 2e3da02fdbed2fa8ae02a277763d65a502459827 Author: Cole Lyman <[email protected]> Date: Tue Oct 10 15:29:08 2023 -0600 changed tuple to list for matplotlib change (#31) (#346) Co-authored-by: mbowcut2 <[email protected]> commit cd3c332135fe4db0f9218e3d87263d5c65838ed9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:54:46 2023 -0600 rename script to camel case commit 7c719d65fb36ac7654db9040f226564ea28fcab9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:53:44 2023 -0600 Add new script for counting high quality bases commit f97cd2795e89464bcc9321ccfdbca3e6af2bcb4f Author: Kendell Clement <[email protected]> Date: Thu Sep 14 15:15:30 2023 -0600 Prime editing alignment params (#336) Adds two parameters to control alignment of pegRNA components: --prime_editing_gap_open_penalty and --prime_editing_gap_extend_penalty. CRISPResso checks to see whether the pegRNA spacer and extension sequence are in the correct orientation, but sometimes they could align in the incorrect orientation with a higher score (e.g. via insertion of multiple gaps, whereas a single long gap would be preferred). Introducing these two parameters allows users to adjust the alignment parameters specifically for these prime-editing checks without adjusting the global alignment parameters which will be applied to reads that are aligned to the WT reference/prime-editing reference sequences. The new prime_editing_gap_open_penalty is set to -50, a higher gap open penalty than the default needleman_wunsch_gap_open penalty (-20). This commit breaks backward-reproducibility, but mostly in the checking of pegRNA component orientation - so previously some CRISPResso runs would have failed and produced an error, but now they will (hopefully) succeed. To achieve complete backward reproducibility, add the flag --prime_editing_gap_open_penalty -20 to runs. commit 64cbf36dae85cffa2c15e73f2a7ee8aa1077d917 Author: Cole Lyman <[email protected]> Date: Thu Sep 7 16:43:30 2023 -0600 Fix samtools piping (#325) * Remove samtools pipe stderr to stdout Sometimes some of the libraries that samtools depends on don't have the correct version information, and as such samtools will report this to stderr when run. Because we pipe the output of samtools, we expect it to be valid SAM format, but when these library version messages are reported, it breaks CRISPRessoWGS. * Remove extra spacing at end of lines and add missing comma in WGS * Log stderr from samtools in CRISPRessoWGS commit 8feff4101f27406d9d88ace97d31a518276bff3f Author: Cole Lyman <[email protected]> Date: Fri Sep 1 09:43:56 2023 -0600 Replace link to CRISPResso schematic with raw URL in README (#329) * Replace link to CRISPResso schematic with raw URL * Add new lines to the beginning of unordered lists commit 2e9e6bff5bcc536d5e2ba1440d1ab96d9d47efd6 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:52:12 2023 -0600 Try to unbreak CircleCI commit ae5b95246cb0f6d66c4cbfb50cf8f5a9626b0827 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:27 2023 -0600 Center command line text messages commit 4d9c71ecf2248c9bb1e10430178dc318b6621c8b Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:07 2023 -0600 Fix bug in prime-editing scaffold-incorporation plotting If read is too short, scaffold incorporation detection will fail because it will check beyond the length of the read. commit 2b36a1a5c35e8a93516ce8baf464595615e0f402 Author: Kendell Clement <[email protected]> Date: Wed Aug 9 15:29:48 2023 -0600 CRISPRessoPooled --compile_postrun_references bug fixes commit 3e04d1d402bcf95edd39fc7c8c9af61bb380f9db Author: Kendell Clement <[email protected]> Date: Tue Aug 8 23:30:15 2023 -0600 Fix missing ' in Pooled --demultiplex_only_at_amplicons commit 06af527f9e2020c5cf251e7f1cec0b1eca1c1664 Author: Cole Lyman <[email protected]> Date: Mon Jul 24 10:47:46 2023 -0600 Sort pandas dataframes by # of reads and sequences so that the order is consistent (#316) * Make sorting stable * Including c files * Sort by #Reads instead of %Reads to avoid floating point errors --------- Co-authored-by: Samuel Nichols <[email protected]> commit de05533b3511a84f3b6b14fc2ef64db041613261 Author: Cole Lyman <[email protected]> Date: Thu Jul 6 13:54:45 2023 -0600 Fix multiprocessing lambda pickling (#311) * Fix running plots in parallel The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. * Fix multiprocessing lambda pickling (#20) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Further fixes to pickling multiprocessing error (#21) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Use Counter instead of defaultdict in CRISPRessoCORE * Update process_futures to dict in Batch and Aggregate commit ebb016dff46c280dce8c3c09e8ac0e0cc25d4d74 Author: Kendell Clement <[email protected]> Date: Mon Jul 3 17:12:09 2023 -0600 Enable CRISPRessoPooled multiprocessing when os allows multi-thread file append commit 7285da0e987b77b72c8885bb35940e0f50c146bd Author: Kendell Clement <[email protected]> Date: Fri Jun 23 16:50:33 2023 -0600 Fix print bug for invalid fastq commit 9acdeac67441f9a1d55ac94b153bcb68fb89b92c Author: kclem <[email protected]> Date: Wed Jun 21 16:03:48 2023 -0600 Slugify before creating filename - replaces invalid characters in batch names with _ commit f97e29c67de4c80b8d6b9cf334f363be4b514ade Author: Cole Lyman <[email protected]> Date: Wed Jun 21 14:43:43 2023 -0600 Add verbosity argument to CRISPRessoAggregate (#18) fixes #306 (#307) * Add verbosity argument to CRISPRessoAggregate (#18) * Allow for amplicon and guide seqs to be some variant of NA in batch (#19) This was discovered when attempting to infer amplicon sequences in batch mode on the web interface, NAs were supplied for the amplicon sequences to the sub CRISPResso commands. commit 32e1e9797da5c3033cdc588e92f06b8813961953 Author: Mark Clement <[email protected]> Date: Wed Jun 21 14:01:00 2023 -0600 Allow for interrogation of overlapping sgRNA sites commit 7248ba8c4deee125ad1ec12fdf1294a84d5f6f93 Author: Kendell Clement <[email protected]> Date: Mon Jun 12 12:16:47 2023 -0600 Check input fastq file format Asserts input format of fastq files - including if gzipped files are missing the gz suffix. commit 83c8ab8f462e7d8c1d04c08c1a398b874f517251 Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:41:55 2023 -0600 Fix CRISPRessoArgParser commit 14a2c8577f566e1b72d5f4e72cd6cd22079610be Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:29:31 2023 -0600 Cosmetic updates for command-line use - version bump to 2.2.13 - If no args are provided, the command line version will print out an abbreviated help message - parameters can be excluded from CRISPRessoArgParser commit 1cd54bc1d03360c3d8121ba9e66b3589fe1cf252 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:47 2023 -0600 Fix multiprocessing error, don't start pool when only using single thread (#302) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload * Only start process pools when using multiple processes This is mainly to solve the issue when running on AWS Lambda, but this should improve single core performance overall. --------- Co-authored-by: Kendell Clement <[email protected]> commit 92a705c939b370373a70cf6ae9f1616de33288b9 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:06 2023 -0600 Update `base_editor` parameters in README and add Plot Harness (#301) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload --------- Co-authored-by: Kendell Clement <[email protected]> commit 7d46c4490235df45c5546b1b470e4e6a99727031 Author: Cole Lyman <[email protected]> Date: Wed May 10 15:41:33 2023 -0600 Clarify CRISPRessoWGS intended use (#303) * Update README to have consistent use of `--base_editor_output` (#16) * Add sample plotting jupyter notebook * Add clarifying info to CRISPRessoWGS description Clarify WGS usage commit 833a701787bb47674b3e921c38cac6189c775cf7 Author: Kendell Clement <[email protected]> Date: Thu May 4 17:02:46 2023 -0400 Remove debug print statements commit 712eb2a11825e8d36f2870deb12b35486bd633fb Author: Kendell Clement <[email protected]> Date: Thu May 4 16:40:07 2023 -0400 Allow dashes in filenames resolve #73 commit a439f094745b2b5e7f032f0777d4c67e6d6f93c5 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:41:58 2023 -0400 Raise exceptions from within futures in plot_pool commit 7e807a60de2a9d18bccd034b87106ceaf7153338 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:38:56 2023 -0400 Fix future pandas indexing warning Pandas error was "FutureWarning: Calling float on a single element Series is deprecated and will raise a TypeError in the future. Use float(ser.iloc[0]) instead" commit 304a92aa7a7ef8c705cb070dce25d9a2e5745ba9 Author: Cole Lyman <[email protected]> Date: Thu Apr 20 13:59:27 2023 -0600 Remove debug print statements fixes #295 (#297) The format string option used here is only available in Python version >=3.8. commit 478c06f784603e96d20f96e91993fdcc4ac35c8a Author: Kendell Clement <[email protected]> Date: Thu Apr 13 12:09:26 2023 -0400 Update plotCustomAllelePlot.py script for #292 (#293) Update type of 'max_rows' param to int Fix location of 'args' in crispresso2_info object commit bcdae39e05d530f4a4e78738c3b30f7664981919 Author: Kendell Clement <[email protected]> Date: Mon Mar 27 13:18:34 2023 -0400 Update pooled parameter format commit 546446e36e7e68b527767d6c31ec341a49df2059 Author: Kendell Clement <[email protected]> Date: Tue Feb 14 16:26:23 2023 -0500 Fix running plots in parallel (#286) The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. Co-authored-by: Cole Lyman <[email protected]> commit d75f32a2eb5aeaaee866c09e5655a3e27af8b1a1 Author: kclem <[email protected]> Date: Fri Feb 10 15:45:15 2023 -0500 Fix #283 to avoid filename collisions Previously, amplicon names longer than 21bp were truncated, but the check for uniqueness wasn't working, so it would overwrite some plot files. This fixes the filename collision and enforces uniqueness in reference filename prefixes. Thanks @mbiokyle29 commit e577318006cd17b2725bd028e5e56634c6eb829a Author: kclem <[email protected]> Date: Mon Feb 6 16:37:25 2023 -0500 Case-insensitive headers accepted in CRISPRessoPooled commit d34927620a4a6126a9988b3041e76f60728abbfe Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:48:33 2023 -0500 Fix print statement in CORE commit ee88b7ed89c395f68225a50dea44a2ad69d5e9a5 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:22:51 2023 -0500 Version bump to 2.2.12 commit 1d4679c72d0c8b4154317c9aff5179217198e2d7 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:01:31 2023 -0500 Status Updates + Pooled Mixed Mode Update (#279) * Implement logging handler to overwrite the latest log status to file * Add StatusHandler to CRISPRessoCORE log This will take the latest log output and write it to a file (`status.txt`), the catch being that with each log the file is overwritten so that one can easily tell where CRISPResso currently is and what the error is (if any). These changes include some slight refactoring in order to accomodate any potential parameter exceptions. * Add StatusHandler to CRISPRessoBatch and refactor `logger.warn` to `warn` * Add StatusHandler to CRISPRessoPooled and a little refactoring * Implement `percent_complete` to the status log * Add StatusHandler to CRISPRessoAggregate log * Add StatusHandler to CRISPRessoCompare log * Add StatusHandler to CRISPRessoPooledWGSCompare log * Add StatusHandler to CRISPRessoWGS log * Rename `status.txt` to `CRISPResso_status.txt` * Modify status log names to match the tool they are generated from * Add percent_complete stages to CRISPRessoCORE These also include log statements of each plot that is being generated as well as fixing some variable name collisions with `ind`. * Format the percentage in the log to be 2 decimal places * Change all plotting logs from `info` to `debug` and simplify progress This refactors how the progress of the plots is calculated, making it much simplier. Before this change we would of had to keep track of the number of times `percent_complete` was output, but now it simply updates the percent complete after each amplicon is finished processing. Hopefully this will make things easier to mantain even though it will be a little less "accurate" (not sure how accurate the original implementation was...). * Implemented shared console log handler across all CRISPResso* calls This allows for easy changes to logging formatting, which was inspired by having to change the default logging level. The default logging level needs to be set at `logging.DEBUG` in order for the debug log statements to not be ignored for the running and status logs. * Add ability to set the verbosity level to each CRISPResso* tool This allows users to set a verbosity level between 1 and 4 using the `-v`/`--verbosity` CLI parameter. If the `--debug` flag is present, then the level will default to 4, being the most verbose. * Implement showing the last seen `percent_compelte` when none is provided * Keep track of and log when multiple parallel runs are completed These changes modify `CRISPRessoMultiProcessing.run_crispresso_cmds` such that we can now display when a run is completed. This potentially breaks how signals and interupts are handled with multiple runs happening, but this needs to be reviewed. * Add debug and percentage complete to CRISPRessoBatch * Add percent complete to CRISPRessoPooled * Add debug and percent_complete message to CRISPRessoAggregate * Add `percent_complete` to CRISPRessoCompare * Add `percent_complete` to CRISPRessoPooledWGSCompare * Add status and `percent_complete` to CRISPRessoMeta * Add `verbosity` arguments to CRISPRessoCompare and CRISPRessoPooledWGSCompare * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name * Fix bug to flow CRISPRessoPooled options to sub command * Make amplicon file args variable name clear * Update how parameters are set and retrieved from parameter object The refactor in the previous commit changed the type of the arguments to a dictionary which doesn't have the parameters as attributes, and this commit fixes that error. * Add note in output header for change in default CRISPRessoPooled In the next release (2.3.0) the `--demultiplex_only_at_amplicons` will be the default when running in mixed-mode. This is to allow for inexact alignments of the reads and the amplicons to the genome. For more context, see this issue https://github.com/pinellolab/CRISPResso2/issues/276 * Clarify the verbosity parameter help message * Separate out parameters to `normalize_name` in CRISPRessoCORE * Separate out parameters to `normalize_name` in CRISPRessoWGS * Separate out parameters to `normalize_name` in CRISPRessoPooled * Separate out parameters to `normalize_name` in CRISPRessoCompare * Fix bug in CRISPRessoPooled by replacing `database_id` with `normalize_name` * Refactor `run_crispresso_cmds` to not require a `logger` This commit implements the functionality to make the `logger` object optional by seeing which module called the `run_crispresso_cmds` function and obtaining the correct object from that module name. The function also immediately returns when no commands are passed to it. * Add amplicon name to plotting debug statements in CRISPRessoCORE --------- Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit ff7eca76e6a3a08af4ac18ac4e88d20f2a06b1f9 Author: Kendell Clement <[email protected]> Date: Thu Jan 26 15:27:27 2023 -0500 CRISPRessoPooled custom header fix (#278) * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name Co-authored-by: Samuel Nichols <[email protected]> commit 104866e1080c973bb025d1a5ba59b19dca1658af Author: Cole Lyman <[email protected]> Date: Thu Jan 5 14:00:26 2023 -0700 Fix deprecated numpy type names (fixes #269) (#270) In the most recent version of numpy (1.24) some of the types have been deprecated. This commit fixes these errors. commit 58a8e42df88b66fad6b4f6ad04a5b9d9d43d01b4 Author: Cole Lyman <[email protected]> Date: Thu Jan 5 06:49:35 2023 -0700 Add snippet about installing CRISPResso2 via bioconda on Apple silicon (#274) I have suffered enough trying to debug my installation, so hopefully this helps someone else. Co-authored-by: Cole Lyman <[email protected]> commit b9851e98104602eb78c2b384105267624295e9d3 Author: Cole Lyman <[email protected]> Date: Thu Dec 22 13:30:23 2022 -0700 Fix bug when pooled bam is input (#265) This change checks to see if a bam file was input, and if so it doesn't try to remove any intermediate files because there aren't any. Co-authored-by: Cole Lyman <[email protected]> commit b822612642043e75a19042941f69b457ce51f517 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 15:26:45 2022 -0500 Delete vscode settings commit b99aa624dec68ef7d19264340ce0cafa829625f4 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:29:14 2022 -0500 Clarify input param help for pooled bam commit 3fae1e8b821ec6b1890bff6561fa8fa67dc49a04 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:28:54 2022 -0500 Fix #235 - Cigar string is * if read unaligned Previously, the bam would set the cigar string to 0 if the read was unaligned. This breaks the sam->bam conversion and causes the errors in #235. commit c65ba07dc5a983453cdf7bb1e27005230dac6f1b Author: Cole Lyman <[email protected]> Date: Thu Dec 8 13:48:17 2022 -0700 Add deprecation notice (#260) * Add FLASh and Trimmomatic deprecation notice to CLI output * Add Edilytics email address to CLI output commit 2a30e5a45f5350ee7c6435bce1cd4edc4d31668a Author: Kendell Clement <[email protected]> Date: Tue Dec 6 12:16:19 2022 -0500 Format filterReadsOnSequencePresence script commit 9d764414edd88a46ad5e4f496e4f1c8d5d60ce3e Author: Kendell Clement <[email protected]> Date: Fri Dec 2 22:12:54 2022 -0500 Clarify default CRISPRessoPooled settings for use_legacy_bowtie2_options_string commit 9ddea40f7f02b546941ddaa4c71fc5283075051a Author: kclem <[email protected]> Date: Mon Nov 14 10:33:04 2022 -0500 Add check for prime editing extension sequence in prime edited sequence if the user specifies the prime_editing_override_prime_edited_ref_seq, it could not contain the extension seq (if they don't provide the extension seq in the appropriate orientation), so check that here. Extension sequence should be provided reverse-complement to the prime edited sequence. commit 152f2dd5001da7090641ee8a1326bde9f7e8104e Author: kclem <[email protected]> Date: Wed Nov 9 11:53:41 2022 -0500 Version bump to 2.2.11a commit 9ed356e3a0c6c316d0860d121772f80ddca6de1d Author: kclem <[email protected]> Date: Wed Nov 9 11:47:30 2022 -0500 Add param to override prime editing sequence checks CRISPResso checks that prime editing guides are provided in the proper orientation (e.g. pegRNA 3'->5', spacer sequence 5'->3') and checks these orientations by alignment. Sometimes, the alignment can be better in the opposite direction, and this parameter allows these checks to be overridden. Otherwise, these checks would halt the program and produce the output 'The prime editing pegRNA spacer sequence appears to be given in the 3\'->5\' order. The prime editing pegRNA spacer sequence (--prime_editing_pegRNA_spacer_seq) must be given in the RNA 5\'->3\' order.' commit 39dd80afb98a22b7edb6f801c363d86bb77eeb5b Author: kclem <[email protected]> Date: Wed Nov 9 10:06:51 2022 -0500 Update filterReadsOnSequencePresence.py commit fe55526927e3fb6e17c9a8a6f59c7057bc1e14eb Author: Kendell Clement <[email protected]> Date: Mon Nov 7 22:25:16 2022 -0500 Add script to filter input based on sequence presence commit 713e57a19c35180035ca35e11a5820065eda0198 Author: Kendell Clement <[email protected]> Date: Tue Oct 18 16:02:26 2022 -0400 Allow spaces in read names for CRISPRessoWGS commit 39ce008bdddccdd8229c0ba185dce78bc2f66968 Author: Cole Lyman <[email protected]> Date: Sat Oct 8 21:09:58 2022 -0600 Fix typo of CRISPResssoPlot when plotting nucleotide quilt (#250) commit 6a2b342c8503b7327c0a2414edfbd16912d60ca5 Author: Kendell Clement <[email protected]> Date: Sat Oct 8 23:08:47 2022 -0400 Batch amplicon plots (#251) * Error out if HDR amplicon matches existing amplicon * Add check for amplicon sequence uniqueness * Fix bug with bam_input not having bam_output * Test for no returned lines in auto mode, version bump to 2.2.11 * Fix pandas deprecation of df.append commit 726b2b93d6e419a1b0aa6a968c97edc55b4cc5a8 Author: Kendell Clement <[email protected]> Date: Thu Oct 6 16:32:02 2022 -0400 Fix CRISPRessoBatch plot pool bug when plots are suppressed commit 7e5049c4dfb88cbc87c91935a91d1f51120a10c2 Author: Cole Lyman <[email protected]> Date: Wed Sep 21 21:04:51 2022 -0600 Fix batch quilt plot name (#249) This fixes an incorrectly named allele quilt plot input in CRISPRessoBatch. commit 1821ca5029c5a1485733f13ab3f2048b4f1fa04e Author: Kendell Clement <[email protected]> Date: Thu Sep 15 15:49:08 2022 -0400 Version bump to 2.2.10 commit c5f79aebfc1ae209f4ee320df250eed89a02787c Author: Cole Lyman <[email protected]> Date: Wed Sep 14 14:24:55 2022 -0600 Parallel plot refactor (#247) * Fix duplicate plotting in CRISPRessoBatch aggregate * Refactor mulltiprocessing plots in CRISPRessoBatch * Refactor multiprocessing plots in CRISPRessoCORE * Refactor multiprocessing plots for CRISPRessoAggregate commit 4ed5e24e6cc1dd8068e2391573ae2438acd32db2 Author: Kendell Clement <[email protected]> Date: Tue Sep 13 14:12:11 2022 -0400 print files in curr dir if Aggregate can't find files commit ce25bc06f29988e7a10afd0b6a09ba0caf0950e0 Author: Kendell Clement <[email protected]> Date: Mon Sep 12 10:32:57 2022 -0400 Spelling typo commit c15f01c75083403f17c58c121b2afe97e9f2a1ec Author: Kendell Clement <[email protected]> Date: Tue Sep 6 17:49:52 2022 -0400 Add helper function to create alignment scoring matrix New scoring matrix can be created using CRISPResso2Align.make_matrix() commit c80f82838c5a228b79ad4484092877cfee08e02c Author: Cole Lyman <[email protected]> Date: Mon Aug 22 18:28:33 2022 -0600 Add `zip_output` (#240) * Making zip of results * Zip command added, if zip is true place_report_in_output_folder is also true, zip removes all files while zipping * Adding --zip to compare and pooled/wgs compare * Add more formatting changes to CRISPRessoShared * Refactoring propagate_crispress_options so only one version exists * Zip added to arguments_to_ignore and warning added when changing arguments * Restore styling * Update README to include --zip * Rename --zip to --zip_output * Change --zip to --zip_output in CompareCORE and PooledWGSCompareCORE * Bug fix arg to args Co-authored-by: Samuel Nichols <[email protected]> commit 5de3d7286d8e33c7cf4d3615fce715806e72f511 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:42:34 2022 -0400 Fix fix to aggregate for CRISPRessoWGS commit a2294c266f43b14969a5d6474076f31a77a57173 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:40:50 2022 -0400 Fix bug in aggregate for WGS commit 7ce3eb4abe4b8ceac933272ac9cb16a8bedf26a3 Author: Kendell Clement <[email protected]> Date: Mon Aug 8 21:53:45 2022 -0400 Update CRISPRessoWGS to allow non-word characters in region names commit 040ac0033d6e250f4e3a412101874cf5e914e08a Author: kclem <[email protected]> Date: Mon Aug 8 16:04:59 2022 -0400 Enable processing of cram files by CRISPRessoWGS Adds --reference to samtools view when viewing cram files commit cf112a0caba8789e28530cc09171285ec6ea9b4c Author: kclem <[email protected]> Date: Mon Aug 8 14:55:46 2022 -0400 Auto amplicon detection for interleaved input Enables processing of interleaved fastq files for guess_guides and guess_amplicons, as well as get_most_frequent_reads. When interleaved input is present, the input is first separated into R1/R2 files, then processing is performed. commit 4ba524dc7b947feca8a0f743837844f9febc2171 Author: Cole Lyman <[email protected]> Date: Thu Aug 4 11:32:11 2022 -0600 Potential fix for aggregate plots in Batch mode (#237) commit 6097a8a104d3f156ef7c08e196ac37e32bf04c71 Author: Kendell Clement <[email protected]> Date: Thu Jul 21 22:45:48 2022 -0400 Fix pct_vectors in crispresso2_info json object commit 65a079d86d6f386793397398f839c46014b54543 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:46:37 2022 -0400 Fix more readme spelling bugs commit e817376ecd54cdea1f29e303ca25b9e7d1d38333 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:42:23 2022 -0400 Fix bug in readme spelling commit 49740ba1d66ed6d13a9e154b8b17bc8b5186581d Author: Kendell Clement <[email protected]> Date: Wed Jul 20 16:10:09 2022 -0400 Fix loading of crispresso info from WGS and Pooled commit b68a43271115251b18e8955e285ccc18f549e8cd Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:11:04 2022 -0400 Add plotly to dockerfile commit b0b7d41d697304d0d5fc93e3346c9de1b98ba41d Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:10:00 2022 -0400 Fix #231 Allow N's in bam output (Try 2) commit c460b3e73fd06a230dbac2e37c86b833144ebf94 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:09:10 2022 -0400 Revert "Fix #231 Allow N's in bam output" This reverts commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3. commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 13:52:37 2022 -0400 Fix #231 Allow N's in bam output commit 0a2419e518dc9b3520058c3927f98b31cd51347e Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:10:01 2022 -0600 Fix bug when name is provided instead of amplicon_name in pooled input file (#229) Also, raise an exception (instead of incorrectly executing) when there are not enough matched parameters in the pooled input file. commit cb58212379803788c04ca5793baaa760cbbeaa81 Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:09:49 2022 -0600 Fix bug when comparing two samples with the same name. (#228) commit e8a796f5f451409cbafed4404dfba4b6b8a124ca Author: Kendell Clement <[email protected]> Date: Thu Jun 23 21:30:23 2022 -0400 Version bump to 2.2.9 commit 632143ddedea48bab9229baeb4bf3ea4d1f658d6 Author: Cole Lyman <[email protected]> Date: Mon Jun 20 19:53:14 2022 -0600 Don't run global frameshift plot when there are no reads (#226) When there are no reads (i.e. global_MODIFIED_FRAMESHIFT + global_MODIFIED_NON_FRAMESHIFT + global_NON_MODIFIED_NON_FRAMESHIFT == 0) there was a bug when trying to compute the pie chart, because all of the values in the pie chart are 0. This fix, will make sure that there is at least one read in order for the plot to bee constructed properly. commit 4bb06218e835d2624d53fd401542caef6f8a3a55 Author: kclem <[email protected]> Date: Fri Jun 3 16:57:02 2022 -0400 Improvements for guide inference in 'auto' mode In 'auto' mode, a putative guide sequence is selected at the site of maximal editing. If the site of maximal editing happens near the end of the guide (e.g. base 0) many things will break (e.g. quantification windows, etc). This update excludes bases from being used to find the guide using the --exclude_bp_from_left and --exclude_bp_from_right parameters. At default, these parameters are 15bp, so the first and last 15bp would not be selected for the site of maximal editing and thus be the site of a guide sequence. In addition, the site of maximal editing must have 3x the magnitude over the background. commit 9d64de187835b2553ad2b4374d32edab27f83645 Author: Kendell Clement <[email protected]> Date: Thu Jun 2 20:22:25 2022 -0400 Update README.md commit 6aafc5387986f5089ba55b68d128343d68052792 Author: Simon P Shen <[email protected]> Date: Tue May 31 17:42:53 2022 -0400 directory in quotes in batch cmd (#222) Add quotes around output folder for folders that have spaces. commit 432f163ac68b9a650d1fd326171aadc505ee87f4 Author: Kendell Clement <[email protected]> Date: Tue May 24 23:38:36 2022 -0400 CRISPRessoBatch fills NA values in batch settings NA values in CRISPRessoBatch are filled with the value from args - either the default value or the value from the command line args (if set) commit 6de774adbad3aa8cd99d07b0ba7692984b356cd4 Author: kclem <[email protected]> Date: Mon May 23 14:18:02 2022 -0400 Fix file naming bug for HDR outputs In html file, figures 4e and 4f incorrectly referenced figure 4d. This fixes this bug. commit b88fec0668a4082a12ead3d26582e86d829dd7cc Author: Kendell Clement <[email protected]> Date: Sat May 21 00:32:15 2022 -0400 For bam_output, fix bug that wrote unaligned lines twice commit 3564e77ebcdedb4b01cc01dcca18ba3221fac67c Author: Kendell Clement <[email protected]> Date: Thu May 19 16:32:18 2022 -0400 Update README with CRISPRessoPooled headers and bam_output parameters commit bc08d81f17cb1929d1c37a1773cffcf36fb12fe2 Author: Kendell Clement <[email protected]> Date: Thu May 19 16:11:30 2022 -0400 Add more links to tools commit 006c497a379ecd94b017a883a5db887861e1586a Author: Kendell Clement <[email protected]> Date: Thu May 19 16:08:14 2022 -0400 Add links to tools commit dc8243373ad00d6bd467fc30c59942596ff0c5d6 Author: Kendell Clement <[email protected]> Date: Mon May 16 21:38:06 2022 -0400 fastq_to_bam implementation (#219) commit e88b6833977c6b2768299e0b2e7af623e3a9ae7c Author: Kendell Clement <[email protected]> Date: Sun May 8 02:14:13 2022 -0400 Fix bug for when guides don't agree in CRISPRessoAggregate commit 7eb763116a8c60603f1cd654645215767ee8eb52 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:21 2022 -0400 Fix bug for case of empty summary plots in report generation commit 0324fa67d14ed945f0c9531d9bcf73ebcf4ca042 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:02 2022 -0400 Create report for number of significant bases in CRISPRessoCompare commit e3c9d0026a9ee6732f3ed6bdcf2a824850d7e66a Author: Kendell Clement <[email protected]> Date: Wed May 4 22:43:11 2022 -0400 Update pickle to json in readme and CRISPRessoPooledWGSCompare commit 1553f7977c12bf1091a20ca55b878bccfb739b61 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:10:04 2022 -0400 Merge pull request #4 from pinellolab/master (#218) commit bcecbfc047d294e26f381a6668e08cb4db24445c Merge: 15b0e05b bb13e007 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:06:37 2022 -0400 Merge branch 'master' into master commit bb13e007738d6e7a4909e01f03daff592f334f36 Merge: af4ab6e8 d0b41483 Author: Kendell Clement <[email protected]> Date: Wed May 4 17:59:32 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 15b0e05b9e03bbec5236e58776ddf9aa2f93180e Author: Kendell Clement <[email protected]> Date: Wed May 4 17:54:52 2022 -0400 2 flexible pooled input (#217) * Batch type coerce and r2 file check * Upgrade tabs for bootstrap5 * Update readme with additional pooled amplicon file headers Co-authored-by: Samuel Nichols <[email protected]> commit d0b41483bee704940ba60c58289f412b04c71659 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:43:43 2022 -0400 Update README.md commit ce49fab5301cb73ba0daf6c765e350eb083c76f1 Merge: 5f909713 b913fcb4 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:40:30 2022 -0400 Merge pull request #3 from edilytics/2-flexible-pooled-input Add flexibility to CRISPRessoPooled amplicon input by allowing headers. Also, prime editing and quantification window coordinate parameters can be passed to CRISPRessoPooled. commit b913fcb402a8ba3106c3ff7913563a33d8d19fca Author: Kendell Clement <[email protected]> Date: Wed May 4 13:38:25 2022 -0400 Update CRISPRessoPooledCORE.py Replace process to read header, increase flexibility for column order commit 945bf31f16530b7ce25b89095b2c7005bf146117 Merge: 7b8f6788 5f909713 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:45:24 2022 -0400 Merge branch 'master' into 2-flexible-pooled-input commit 5f9097133765736a7c2fe3c8e9b730845fed0b70 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:23:44 2022 -0400 Version bump to 2.2.8 commit c4a94ce0e06c6ebae13e128fbe6b708e635121c4 Author: Kendell Clement <[email protected]> Date: Wed May 4 00:13:17 2022 -0400 Fix summary plot representation for multi reports *fixed old reference to make_multi_report which called old summary plot format * renamed summary_plot to summary_plots to reflect a dict with multiple plots commit 62900e9ae6fa37ce99a04f12a63ed5c912f75042 Author: Cole Lyman <[email protected]> Date: Tue May 3 20:47:52 2022 -0600 Large aggregation (#192) * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add plotly requrement to setup.py * Remove space around vertical barcharts * Add scrollbar to long images in multiReport * Fill in default (empty) values to allele modification plots When not running CRISPRessoAggregate, default values for the `allele_modification_heatmap_plot` and `allele_modification_lin_plot` dictionaries will be set so that the template can be properly rendered. * Include CRISPRessoBatch in the refactor of how summary_plot dicts are handled * Update dockerfile for new docker * minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) * Allow for flexible parsing of quant window coordinates * CRISPRessoPooled debug flash command, fix pep formatting * Set flexiguide homology parameter type to int * Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values * Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. * Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. * Create allele modification heatmaps and line plots in CRISPRessoBatch * Add allele modification heatmaps and line plots to CRISPRessoBatch * Make all plots in CRISPRessoBatch run in parallel * Make `--suppress_batch_summary_plots` store true Also, only open and shutdown the process pool when necessary. * Add blank values for allele_modification entries when not present Co-authored-by: Kendell Clement <[email protected]> Co-authored-by: dharjanto <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit f67376fc9ab0e407d4086aa42fd1c77706ebc9c0 Author: Kendell Clement <[email protected]> Date: Fri Apr 15 00:46:30 2022 -0400 Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. commit b34fe2956ff88629809b2434878028723dfc4895 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 23:58:07 2022 -0400 Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. commit c94e3b9f2e301bda91e9c1e6f4ef794b33b5dbf0 Author: Samuel Nichols <[email protected]> Date: Thu Apr 14 21:48:32 2022 -0600 Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values commit fc4542491bb86eb143db0044a848a56234403496 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:13:23 2022 -0400 Set flexiguide homology parameter type to int commit 23fe2aa8e26067d1bcf36bfafc67e023c7588d2f Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:12:37 2022 -0400 CRISPRessoPooled debug flash command, fix pep formatting commit d292d33d8c1fa3bfd2cee656643fd47bcdab161d Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:00:19 2022 -0400 Allow for flexible parsing of quant window coordinates commit e1667cb53a7ea6fbb33369c8530a78639ed423ec Author: dharjanto <[email protected]> Date: Mon Apr 11 22:08:21 2022 -0400 minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) commit 7b8f6788da18f6ab173fa3c3d10f4ab6bb2acc26 Author: Samuel Nichols <[email protected]> Date: Fri Apr 8 10:21:00 2022 -0600 Update README commit 9bc24cd0474ed9f398dff64274d3181c4b2f8637 Author: Samuel Nichols <[email protected]> Date: Tue Mar 29 11:25:09 2022 -0600 Using Amplicon_Name commit 88ac5d72074b3da63de035e02c911ce34cd29414 Merge: b6057a2d e5afa478 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 22:32:09 2022 -0600 Merge remote-tracking branch 'origin/master' into 2-flexible-pooled-input commit b6057a2d54cb8637ff0900416de8e2de72213f76 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 20:53:05 2022 -0600 Printing info statements for matched headers commit af4ab6e8507d7aa4b7b68f217a458e0d9c966f55 Merge: bbb7d6f0 51a943c3 Author: Cole Lyman <[email protected]> Date: Fri Mar 25 09:44:13 2022 -0600 Merge branch 'pinellolab:master' into master commit 3c1eb012fc02563e3e963f17a62c7e932f5bcddc Author: Samuel Nichols <[email protected]> Date: Thu Mar 24 12:31:43 2022 -0600 Debugging and column checking commit 0b47acbc592a6df6adf14641357b2104b76be691 Author: Samuel Nichols <[email protected]> Date: Wed Mar 23 09:42:51 2022 -0600 New variables added to pooled commit a0ff3a44d6d19d7b37f91919b5c0180206f72d53 Author: Samuel Nichols <[email protected]> Date: Mon Mar 21 09:32:28 2022 -0600 Read as string not bytes commit 710675fc3c0307e21103abd604315b47ff80a894 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 13:51:30 2022 -0600 Adding command building for new options commit f386818a48e5c840bd567611e6f1320c8146cac7 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 10:08:33 2022 -0600 Comment out df_template.iloc instance commit eb5e309da57c8b96cd760728ddbf67be05f30d1c Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 09:59:19 2022 -0600 Potential solution for flexible headers commit 51a943c3a8f8181963acc420e75a5e8ee103cf7c Author: Kendell Clement <[email protected]> Date: Tue Mar 15 11:00:46 2022 -0400 CRISPRessoPooled pep formatting and fix CRISPRessoPooled doesn't re-count reads if it has been run once and the `aligned_pooled_bam` is provided as input pep code formatting changes commit bbb7d6f0907aa13518d20e7f470e7de518b825f4 Merge: ddbd39f0 5a10d638 Author: Kendell Clement <[email protected]> Date: Tue Mar 15 10:23:38 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 5a10d638c638f21f8a2934955e92ef7e117b889e Author: Kendell Clement <[email protected]> Date: Sat Feb 26 14:21:57 2022 -0500 Move metadata for bam input and output commit e5afa4784d5330a1dc95c5deafcd9217edeac631 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:20:24 2022 -0700 Coerce int values commit ede7d85b50055311908000578c76a1860ae9de4d Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:18:29 2022 -0700 Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. commit f91736688ea9739cf3063e3601c52ad6da1116a4 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:10:52 2022 -0700 Batch type coerce and r2 file check commit 7b4a310b0f8b64c00e02eca3d522ad50d39b43ae Author: Kendell Clement <[email protected]> Date: Tue Feb 15 22:18:05 2022 -0500 Reiterate WGS region file is tab-separated Add note to WGS description that region file should be tab-separated. Closes #199 commit b8497542e388ad401d0815d426f27abc3201a76d Author: kclem <[email protected]> Date: Fri Feb 11 15:07:14 2022 -0500 Extend x-axis to longest scaffold incorporation length commit ab7248947afade089809c74bfe6e9d5394e8f6dc Author: kclem <[email protected]> Date: Wed Feb 9 17:05:11 2022 -0500 Fix prime editing indexing for plots commit ddbd39f06b262d5ebd2cc69e116c08b22b6bd84e Merge: a7ffd468 442a48c7 Author: Kendell Clement <[email protected]> Date: Thu Jan 13 15:35:36 2022 -0500 Merge branch 'pinellolab:master' into master …
Snicker7
added a commit
that referenced
this pull request
Apr 4, 2024
commit 22fc03183a8070c30dfb74d5c23575ac19019855 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 08:54:01 2024 -0700 Add guardrail partial commit e55f6b21972b578261bc5a864ce1d653d98f9e34 Author: Samuel Nichols <[email protected]> Date: Mon Jan 8 07:50:59 2024 -0700 Functional guardrails, needs reports update commit 6e968e9699ed59a47d88191d03768e042d8b60a4 Merge: 32b49685 e948ce10 Author: Samuel Nichols <[email protected]> Date: Mon Dec 18 13:34:36 2023 -0700 Merge branch 'guardrails-clean-history' of https://github.com/edilytics/CRISPResso2 into guardrails-clean-history commit 32b49685da320501dad2b0ebbb57887b66220ba8 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit 4e309cf6f732565d635de3d4c5d074ada3027e2d Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:55 2023 -0700 Refactor to use CRISPRessoReports module commit e648dc087c0055bc5d2fca13c64071a371dea941 Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:11 2023 -0700 Add CRISPRessoReports subtree commit e948ce107ebb0d1d99010ed12e937f34b5e607d4 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit d33c748871a625facfe8d792e29c77ab9779138f Author: Kendell Clement <[email protected]> Date: Tue Nov 7 16:31:06 2023 -0700 Include parameter --assign_ambiguous_alignments_to_first_reference in readme commit a1435f7f491a6a61434f3051e39f39a4c9bf1edc Author: Kendell Clement <[email protected]> Date: Wed Oct 11 17:17:30 2023 -0600 Enable quantification by sgRNA (#348) This PR includes: - storing the sgRNA-specific editing locations in the crispresso2_info object. Previously, each amplicon would record the indices of quantification windows across the guide, but not for individual guides. This stores the information for each guide in crispresso2_info['results']['refs'][reference_name]['sgRNA_include_idxs'] - a script (count_sgRNA_specific_edits.py) to parse through an allele table output from a completed CRISPResso run (`--write_detailed_allele_table` flag required) to count edits in each sgRNA separately. I don't have a good double-edited sample handy, but it can be run on the demo HDR data [hdr.fastq.gz](http://crispresso.pinellolab.org/static/demo/hdr.fastq.gz) using the command: ``` CRISPResso -r1 hdr.fastq.gz -a acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -e acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcaCctgactccGgaggagaagtctgccgttactgcGctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -c atggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcag -g TGCACCATGGTGTCTGTTTG,GATGAAGTTGGTGGTGAGGCCC --write_detailed_allele_table -n hdr3 -p max -gn guide1,guide2 ``` ``` python CRISPResso2/scripts/count_sgRNA_specific_edits.py -f CRISPResso_on_hdr3 ``` This produces: ``` Processed 25000 alleles Reference: Reference (2391/23415 modified reads) UNMODIFIED: 21024 MODIFIED guide1: 2359 MODIFIED guide2: 32 Reference: HDR (856/1577 modified reads) UNMODIFIED: 721 MODIFIED guide1: 854 MODIFIED guide1 + guide2: 1 MODIFIED guide2: 1 ``` commit 2e3da02fdbed2fa8ae02a277763d65a502459827 Author: Cole Lyman <[email protected]> Date: Tue Oct 10 15:29:08 2023 -0600 changed tuple to list for matplotlib change (#31) (#346) Co-authored-by: mbowcut2 <[email protected]> commit cd3c332135fe4db0f9218e3d87263d5c65838ed9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:54:46 2023 -0600 rename script to camel case commit 7c719d65fb36ac7654db9040f226564ea28fcab9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:53:44 2023 -0600 Add new script for counting high quality bases commit f97cd2795e89464bcc9321ccfdbca3e6af2bcb4f Author: Kendell Clement <[email protected]> Date: Thu Sep 14 15:15:30 2023 -0600 Prime editing alignment params (#336) Adds two parameters to control alignment of pegRNA components: --prime_editing_gap_open_penalty and --prime_editing_gap_extend_penalty. CRISPResso checks to see whether the pegRNA spacer and extension sequence are in the correct orientation, but sometimes they could align in the incorrect orientation with a higher score (e.g. via insertion of multiple gaps, whereas a single long gap would be preferred). Introducing these two parameters allows users to adjust the alignment parameters specifically for these prime-editing checks without adjusting the global alignment parameters which will be applied to reads that are aligned to the WT reference/prime-editing reference sequences. The new prime_editing_gap_open_penalty is set to -50, a higher gap open penalty than the default needleman_wunsch_gap_open penalty (-20). This commit breaks backward-reproducibility, but mostly in the checking of pegRNA component orientation - so previously some CRISPResso runs would have failed and produced an error, but now they will (hopefully) succeed. To achieve complete backward reproducibility, add the flag --prime_editing_gap_open_penalty -20 to runs. commit 64cbf36dae85cffa2c15e73f2a7ee8aa1077d917 Author: Cole Lyman <[email protected]> Date: Thu Sep 7 16:43:30 2023 -0600 Fix samtools piping (#325) * Remove samtools pipe stderr to stdout Sometimes some of the libraries that samtools depends on don't have the correct version information, and as such samtools will report this to stderr when run. Because we pipe the output of samtools, we expect it to be valid SAM format, but when these library version messages are reported, it breaks CRISPRessoWGS. * Remove extra spacing at end of lines and add missing comma in WGS * Log stderr from samtools in CRISPRessoWGS commit 8feff4101f27406d9d88ace97d31a518276bff3f Author: Cole Lyman <[email protected]> Date: Fri Sep 1 09:43:56 2023 -0600 Replace link to CRISPResso schematic with raw URL in README (#329) * Replace link to CRISPResso schematic with raw URL * Add new lines to the beginning of unordered lists commit 2e9e6bff5bcc536d5e2ba1440d1ab96d9d47efd6 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:52:12 2023 -0600 Try to unbreak CircleCI commit ae5b95246cb0f6d66c4cbfb50cf8f5a9626b0827 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:27 2023 -0600 Center command line text messages commit 4d9c71ecf2248c9bb1e10430178dc318b6621c8b Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:07 2023 -0600 Fix bug in prime-editing scaffold-incorporation plotting If read is too short, scaffold incorporation detection will fail because it will check beyond the length of the read. commit 2b36a1a5c35e8a93516ce8baf464595615e0f402 Author: Kendell Clement <[email protected]> Date: Wed Aug 9 15:29:48 2023 -0600 CRISPRessoPooled --compile_postrun_references bug fixes commit 3e04d1d402bcf95edd39fc7c8c9af61bb380f9db Author: Kendell Clement <[email protected]> Date: Tue Aug 8 23:30:15 2023 -0600 Fix missing ' in Pooled --demultiplex_only_at_amplicons commit 06af527f9e2020c5cf251e7f1cec0b1eca1c1664 Author: Cole Lyman <[email protected]> Date: Mon Jul 24 10:47:46 2023 -0600 Sort pandas dataframes by # of reads and sequences so that the order is consistent (#316) * Make sorting stable * Including c files * Sort by #Reads instead of %Reads to avoid floating point errors --------- Co-authored-by: Samuel Nichols <[email protected]> commit de05533b3511a84f3b6b14fc2ef64db041613261 Author: Cole Lyman <[email protected]> Date: Thu Jul 6 13:54:45 2023 -0600 Fix multiprocessing lambda pickling (#311) * Fix running plots in parallel The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. * Fix multiprocessing lambda pickling (#20) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Further fixes to pickling multiprocessing error (#21) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Use Counter instead of defaultdict in CRISPRessoCORE * Update process_futures to dict in Batch and Aggregate commit ebb016dff46c280dce8c3c09e8ac0e0cc25d4d74 Author: Kendell Clement <[email protected]> Date: Mon Jul 3 17:12:09 2023 -0600 Enable CRISPRessoPooled multiprocessing when os allows multi-thread file append commit 7285da0e987b77b72c8885bb35940e0f50c146bd Author: Kendell Clement <[email protected]> Date: Fri Jun 23 16:50:33 2023 -0600 Fix print bug for invalid fastq commit 9acdeac67441f9a1d55ac94b153bcb68fb89b92c Author: kclem <[email protected]> Date: Wed Jun 21 16:03:48 2023 -0600 Slugify before creating filename - replaces invalid characters in batch names with _ commit f97e29c67de4c80b8d6b9cf334f363be4b514ade Author: Cole Lyman <[email protected]> Date: Wed Jun 21 14:43:43 2023 -0600 Add verbosity argument to CRISPRessoAggregate (#18) fixes #306 (#307) * Add verbosity argument to CRISPRessoAggregate (#18) * Allow for amplicon and guide seqs to be some variant of NA in batch (#19) This was discovered when attempting to infer amplicon sequences in batch mode on the web interface, NAs were supplied for the amplicon sequences to the sub CRISPResso commands. commit 32e1e9797da5c3033cdc588e92f06b8813961953 Author: Mark Clement <[email protected]> Date: Wed Jun 21 14:01:00 2023 -0600 Allow for interrogation of overlapping sgRNA sites commit 7248ba8c4deee125ad1ec12fdf1294a84d5f6f93 Author: Kendell Clement <[email protected]> Date: Mon Jun 12 12:16:47 2023 -0600 Check input fastq file format Asserts input format of fastq files - including if gzipped files are missing the gz suffix. commit 83c8ab8f462e7d8c1d04c08c1a398b874f517251 Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:41:55 2023 -0600 Fix CRISPRessoArgParser commit 14a2c8577f566e1b72d5f4e72cd6cd22079610be Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:29:31 2023 -0600 Cosmetic updates for command-line use - version bump to 2.2.13 - If no args are provided, the command line version will print out an abbreviated help message - parameters can be excluded from CRISPRessoArgParser commit 1cd54bc1d03360c3d8121ba9e66b3589fe1cf252 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:47 2023 -0600 Fix multiprocessing error, don't start pool when only using single thread (#302) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload * Only start process pools when using multiple processes This is mainly to solve the issue when running on AWS Lambda, but this should improve single core performance overall. --------- Co-authored-by: Kendell Clement <[email protected]> commit 92a705c939b370373a70cf6ae9f1616de33288b9 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:06 2023 -0600 Update `base_editor` parameters in README and add Plot Harness (#301) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload --------- Co-authored-by: Kendell Clement <[email protected]> commit 7d46c4490235df45c5546b1b470e4e6a99727031 Author: Cole Lyman <[email protected]> Date: Wed May 10 15:41:33 2023 -0600 Clarify CRISPRessoWGS intended use (#303) * Update README to have consistent use of `--base_editor_output` (#16) * Add sample plotting jupyter notebook * Add clarifying info to CRISPRessoWGS description Clarify WGS usage commit 833a701787bb47674b3e921c38cac6189c775cf7 Author: Kendell Clement <[email protected]> Date: Thu May 4 17:02:46 2023 -0400 Remove debug print statements commit 712eb2a11825e8d36f2870deb12b35486bd633fb Author: Kendell Clement <[email protected]> Date: Thu May 4 16:40:07 2023 -0400 Allow dashes in filenames resolve #73 commit a439f094745b2b5e7f032f0777d4c67e6d6f93c5 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:41:58 2023 -0400 Raise exceptions from within futures in plot_pool commit 7e807a60de2a9d18bccd034b87106ceaf7153338 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:38:56 2023 -0400 Fix future pandas indexing warning Pandas error was "FutureWarning: Calling float on a single element Series is deprecated and will raise a TypeError in the future. Use float(ser.iloc[0]) instead" commit 304a92aa7a7ef8c705cb070dce25d9a2e5745ba9 Author: Cole Lyman <[email protected]> Date: Thu Apr 20 13:59:27 2023 -0600 Remove debug print statements fixes #295 (#297) The format string option used here is only available in Python version >=3.8. commit 478c06f784603e96d20f96e91993fdcc4ac35c8a Author: Kendell Clement <[email protected]> Date: Thu Apr 13 12:09:26 2023 -0400 Update plotCustomAllelePlot.py script for #292 (#293) Update type of 'max_rows' param to int Fix location of 'args' in crispresso2_info object commit bcdae39e05d530f4a4e78738c3b30f7664981919 Author: Kendell Clement <[email protected]> Date: Mon Mar 27 13:18:34 2023 -0400 Update pooled parameter format commit 546446e36e7e68b527767d6c31ec341a49df2059 Author: Kendell Clement <[email protected]> Date: Tue Feb 14 16:26:23 2023 -0500 Fix running plots in parallel (#286) The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. Co-authored-by: Cole Lyman <[email protected]> commit d75f32a2eb5aeaaee866c09e5655a3e27af8b1a1 Author: kclem <[email protected]> Date: Fri Feb 10 15:45:15 2023 -0500 Fix #283 to avoid filename collisions Previously, amplicon names longer than 21bp were truncated, but the check for uniqueness wasn't working, so it would overwrite some plot files. This fixes the filename collision and enforces uniqueness in reference filename prefixes. Thanks @mbiokyle29 commit e577318006cd17b2725bd028e5e56634c6eb829a Author: kclem <[email protected]> Date: Mon Feb 6 16:37:25 2023 -0500 Case-insensitive headers accepted in CRISPRessoPooled commit d34927620a4a6126a9988b3041e76f60728abbfe Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:48:33 2023 -0500 Fix print statement in CORE commit ee88b7ed89c395f68225a50dea44a2ad69d5e9a5 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:22:51 2023 -0500 Version bump to 2.2.12 commit 1d4679c72d0c8b4154317c9aff5179217198e2d7 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:01:31 2023 -0500 Status Updates + Pooled Mixed Mode Update (#279) * Implement logging handler to overwrite the latest log status to file * Add StatusHandler to CRISPRessoCORE log This will take the latest log output and write it to a file (`status.txt`), the catch being that with each log the file is overwritten so that one can easily tell where CRISPResso currently is and what the error is (if any). These changes include some slight refactoring in order to accomodate any potential parameter exceptions. * Add StatusHandler to CRISPRessoBatch and refactor `logger.warn` to `warn` * Add StatusHandler to CRISPRessoPooled and a little refactoring * Implement `percent_complete` to the status log * Add StatusHandler to CRISPRessoAggregate log * Add StatusHandler to CRISPRessoCompare log * Add StatusHandler to CRISPRessoPooledWGSCompare log * Add StatusHandler to CRISPRessoWGS log * Rename `status.txt` to `CRISPResso_status.txt` * Modify status log names to match the tool they are generated from * Add percent_complete stages to CRISPRessoCORE These also include log statements of each plot that is being generated as well as fixing some variable name collisions with `ind`. * Format the percentage in the log to be 2 decimal places * Change all plotting logs from `info` to `debug` and simplify progress This refactors how the progress of the plots is calculated, making it much simplier. Before this change we would of had to keep track of the number of times `percent_complete` was output, but now it simply updates the percent complete after each amplicon is finished processing. Hopefully this will make things easier to mantain even though it will be a little less "accurate" (not sure how accurate the original implementation was...). * Implemented shared console log handler across all CRISPResso* calls This allows for easy changes to logging formatting, which was inspired by having to change the default logging level. The default logging level needs to be set at `logging.DEBUG` in order for the debug log statements to not be ignored for the running and status logs. * Add ability to set the verbosity level to each CRISPResso* tool This allows users to set a verbosity level between 1 and 4 using the `-v`/`--verbosity` CLI parameter. If the `--debug` flag is present, then the level will default to 4, being the most verbose. * Implement showing the last seen `percent_compelte` when none is provided * Keep track of and log when multiple parallel runs are completed These changes modify `CRISPRessoMultiProcessing.run_crispresso_cmds` such that we can now display when a run is completed. This potentially breaks how signals and interupts are handled with multiple runs happening, but this needs to be reviewed. * Add debug and percentage complete to CRISPRessoBatch * Add percent complete to CRISPRessoPooled * Add debug and percent_complete message to CRISPRessoAggregate * Add `percent_complete` to CRISPRessoCompare * Add `percent_complete` to CRISPRessoPooledWGSCompare * Add status and `percent_complete` to CRISPRessoMeta * Add `verbosity` arguments to CRISPRessoCompare and CRISPRessoPooledWGSCompare * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name * Fix bug to flow CRISPRessoPooled options to sub command * Make amplicon file args variable name clear * Update how parameters are set and retrieved from parameter object The refactor in the previous commit changed the type of the arguments to a dictionary which doesn't have the parameters as attributes, and this commit fixes that error. * Add note in output header for change in default CRISPRessoPooled In the next release (2.3.0) the `--demultiplex_only_at_amplicons` will be the default when running in mixed-mode. This is to allow for inexact alignments of the reads and the amplicons to the genome. For more context, see this issue https://github.com/pinellolab/CRISPResso2/issues/276 * Clarify the verbosity parameter help message * Separate out parameters to `normalize_name` in CRISPRessoCORE * Separate out parameters to `normalize_name` in CRISPRessoWGS * Separate out parameters to `normalize_name` in CRISPRessoPooled * Separate out parameters to `normalize_name` in CRISPRessoCompare * Fix bug in CRISPRessoPooled by replacing `database_id` with `normalize_name` * Refactor `run_crispresso_cmds` to not require a `logger` This commit implements the functionality to make the `logger` object optional by seeing which module called the `run_crispresso_cmds` function and obtaining the correct object from that module name. The function also immediately returns when no commands are passed to it. * Add amplicon name to plotting debug statements in CRISPRessoCORE --------- Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit ff7eca76e6a3a08af4ac18ac4e88d20f2a06b1f9 Author: Kendell Clement <[email protected]> Date: Thu Jan 26 15:27:27 2023 -0500 CRISPRessoPooled custom header fix (#278) * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name Co-authored-by: Samuel Nichols <[email protected]> commit 104866e1080c973bb025d1a5ba59b19dca1658af Author: Cole Lyman <[email protected]> Date: Thu Jan 5 14:00:26 2023 -0700 Fix deprecated numpy type names (fixes #269) (#270) In the most recent version of numpy (1.24) some of the types have been deprecated. This commit fixes these errors. commit 58a8e42df88b66fad6b4f6ad04a5b9d9d43d01b4 Author: Cole Lyman <[email protected]> Date: Thu Jan 5 06:49:35 2023 -0700 Add snippet about installing CRISPResso2 via bioconda on Apple silicon (#274) I have suffered enough trying to debug my installation, so hopefully this helps someone else. Co-authored-by: Cole Lyman <[email protected]> commit b9851e98104602eb78c2b384105267624295e9d3 Author: Cole Lyman <[email protected]> Date: Thu Dec 22 13:30:23 2022 -0700 Fix bug when pooled bam is input (#265) This change checks to see if a bam file was input, and if so it doesn't try to remove any intermediate files because there aren't any. Co-authored-by: Cole Lyman <[email protected]> commit b822612642043e75a19042941f69b457ce51f517 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 15:26:45 2022 -0500 Delete vscode settings commit b99aa624dec68ef7d19264340ce0cafa829625f4 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:29:14 2022 -0500 Clarify input param help for pooled bam commit 3fae1e8b821ec6b1890bff6561fa8fa67dc49a04 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:28:54 2022 -0500 Fix #235 - Cigar string is * if read unaligned Previously, the bam would set the cigar string to 0 if the read was unaligned. This breaks the sam->bam conversion and causes the errors in #235. commit c65ba07dc5a983453cdf7bb1e27005230dac6f1b Author: Cole Lyman <[email protected]> Date: Thu Dec 8 13:48:17 2022 -0700 Add deprecation notice (#260) * Add FLASh and Trimmomatic deprecation notice to CLI output * Add Edilytics email address to CLI output commit 2a30e5a45f5350ee7c6435bce1cd4edc4d31668a Author: Kendell Clement <[email protected]> Date: Tue Dec 6 12:16:19 2022 -0500 Format filterReadsOnSequencePresence script commit 9d764414edd88a46ad5e4f496e4f1c8d5d60ce3e Author: Kendell Clement <[email protected]> Date: Fri Dec 2 22:12:54 2022 -0500 Clarify default CRISPRessoPooled settings for use_legacy_bowtie2_options_string commit 9ddea40f7f02b546941ddaa4c71fc5283075051a Author: kclem <[email protected]> Date: Mon Nov 14 10:33:04 2022 -0500 Add check for prime editing extension sequence in prime edited sequence if the user specifies the prime_editing_override_prime_edited_ref_seq, it could not contain the extension seq (if they don't provide the extension seq in the appropriate orientation), so check that here. Extension sequence should be provided reverse-complement to the prime edited sequence. commit 152f2dd5001da7090641ee8a1326bde9f7e8104e Author: kclem <[email protected]> Date: Wed Nov 9 11:53:41 2022 -0500 Version bump to 2.2.11a commit 9ed356e3a0c6c316d0860d121772f80ddca6de1d Author: kclem <[email protected]> Date: Wed Nov 9 11:47:30 2022 -0500 Add param to override prime editing sequence checks CRISPResso checks that prime editing guides are provided in the proper orientation (e.g. pegRNA 3'->5', spacer sequence 5'->3') and checks these orientations by alignment. Sometimes, the alignment can be better in the opposite direction, and this parameter allows these checks to be overridden. Otherwise, these checks would halt the program and produce the output 'The prime editing pegRNA spacer sequence appears to be given in the 3\'->5\' order. The prime editing pegRNA spacer sequence (--prime_editing_pegRNA_spacer_seq) must be given in the RNA 5\'->3\' order.' commit 39dd80afb98a22b7edb6f801c363d86bb77eeb5b Author: kclem <[email protected]> Date: Wed Nov 9 10:06:51 2022 -0500 Update filterReadsOnSequencePresence.py commit fe55526927e3fb6e17c9a8a6f59c7057bc1e14eb Author: Kendell Clement <[email protected]> Date: Mon Nov 7 22:25:16 2022 -0500 Add script to filter input based on sequence presence commit 713e57a19c35180035ca35e11a5820065eda0198 Author: Kendell Clement <[email protected]> Date: Tue Oct 18 16:02:26 2022 -0400 Allow spaces in read names for CRISPRessoWGS commit 39ce008bdddccdd8229c0ba185dce78bc2f66968 Author: Cole Lyman <[email protected]> Date: Sat Oct 8 21:09:58 2022 -0600 Fix typo of CRISPResssoPlot when plotting nucleotide quilt (#250) commit 6a2b342c8503b7327c0a2414edfbd16912d60ca5 Author: Kendell Clement <[email protected]> Date: Sat Oct 8 23:08:47 2022 -0400 Batch amplicon plots (#251) * Error out if HDR amplicon matches existing amplicon * Add check for amplicon sequence uniqueness * Fix bug with bam_input not having bam_output * Test for no returned lines in auto mode, version bump to 2.2.11 * Fix pandas deprecation of df.append commit 726b2b93d6e419a1b0aa6a968c97edc55b4cc5a8 Author: Kendell Clement <[email protected]> Date: Thu Oct 6 16:32:02 2022 -0400 Fix CRISPRessoBatch plot pool bug when plots are suppressed commit 7e5049c4dfb88cbc87c91935a91d1f51120a10c2 Author: Cole Lyman <[email protected]> Date: Wed Sep 21 21:04:51 2022 -0600 Fix batch quilt plot name (#249) This fixes an incorrectly named allele quilt plot input in CRISPRessoBatch. commit 1821ca5029c5a1485733f13ab3f2048b4f1fa04e Author: Kendell Clement <[email protected]> Date: Thu Sep 15 15:49:08 2022 -0400 Version bump to 2.2.10 commit c5f79aebfc1ae209f4ee320df250eed89a02787c Author: Cole Lyman <[email protected]> Date: Wed Sep 14 14:24:55 2022 -0600 Parallel plot refactor (#247) * Fix duplicate plotting in CRISPRessoBatch aggregate * Refactor mulltiprocessing plots in CRISPRessoBatch * Refactor multiprocessing plots in CRISPRessoCORE * Refactor multiprocessing plots for CRISPRessoAggregate commit 4ed5e24e6cc1dd8068e2391573ae2438acd32db2 Author: Kendell Clement <[email protected]> Date: Tue Sep 13 14:12:11 2022 -0400 print files in curr dir if Aggregate can't find files commit ce25bc06f29988e7a10afd0b6a09ba0caf0950e0 Author: Kendell Clement <[email protected]> Date: Mon Sep 12 10:32:57 2022 -0400 Spelling typo commit c15f01c75083403f17c58c121b2afe97e9f2a1ec Author: Kendell Clement <[email protected]> Date: Tue Sep 6 17:49:52 2022 -0400 Add helper function to create alignment scoring matrix New scoring matrix can be created using CRISPResso2Align.make_matrix() commit c80f82838c5a228b79ad4484092877cfee08e02c Author: Cole Lyman <[email protected]> Date: Mon Aug 22 18:28:33 2022 -0600 Add `zip_output` (#240) * Making zip of results * Zip command added, if zip is true place_report_in_output_folder is also true, zip removes all files while zipping * Adding --zip to compare and pooled/wgs compare * Add more formatting changes to CRISPRessoShared * Refactoring propagate_crispress_options so only one version exists * Zip added to arguments_to_ignore and warning added when changing arguments * Restore styling * Update README to include --zip * Rename --zip to --zip_output * Change --zip to --zip_output in CompareCORE and PooledWGSCompareCORE * Bug fix arg to args Co-authored-by: Samuel Nichols <[email protected]> commit 5de3d7286d8e33c7cf4d3615fce715806e72f511 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:42:34 2022 -0400 Fix fix to aggregate for CRISPRessoWGS commit a2294c266f43b14969a5d6474076f31a77a57173 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:40:50 2022 -0400 Fix bug in aggregate for WGS commit 7ce3eb4abe4b8ceac933272ac9cb16a8bedf26a3 Author: Kendell Clement <[email protected]> Date: Mon Aug 8 21:53:45 2022 -0400 Update CRISPRessoWGS to allow non-word characters in region names commit 040ac0033d6e250f4e3a412101874cf5e914e08a Author: kclem <[email protected]> Date: Mon Aug 8 16:04:59 2022 -0400 Enable processing of cram files by CRISPRessoWGS Adds --reference to samtools view when viewing cram files commit cf112a0caba8789e28530cc09171285ec6ea9b4c Author: kclem <[email protected]> Date: Mon Aug 8 14:55:46 2022 -0400 Auto amplicon detection for interleaved input Enables processing of interleaved fastq files for guess_guides and guess_amplicons, as well as get_most_frequent_reads. When interleaved input is present, the input is first separated into R1/R2 files, then processing is performed. commit 4ba524dc7b947feca8a0f743837844f9febc2171 Author: Cole Lyman <[email protected]> Date: Thu Aug 4 11:32:11 2022 -0600 Potential fix for aggregate plots in Batch mode (#237) commit 6097a8a104d3f156ef7c08e196ac37e32bf04c71 Author: Kendell Clement <[email protected]> Date: Thu Jul 21 22:45:48 2022 -0400 Fix pct_vectors in crispresso2_info json object commit 65a079d86d6f386793397398f839c46014b54543 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:46:37 2022 -0400 Fix more readme spelling bugs commit e817376ecd54cdea1f29e303ca25b9e7d1d38333 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:42:23 2022 -0400 Fix bug in readme spelling commit 49740ba1d66ed6d13a9e154b8b17bc8b5186581d Author: Kendell Clement <[email protected]> Date: Wed Jul 20 16:10:09 2022 -0400 Fix loading of crispresso info from WGS and Pooled commit b68a43271115251b18e8955e285ccc18f549e8cd Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:11:04 2022 -0400 Add plotly to dockerfile commit b0b7d41d697304d0d5fc93e3346c9de1b98ba41d Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:10:00 2022 -0400 Fix #231 Allow N's in bam output (Try 2) commit c460b3e73fd06a230dbac2e37c86b833144ebf94 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:09:10 2022 -0400 Revert "Fix #231 Allow N's in bam output" This reverts commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3. commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 13:52:37 2022 -0400 Fix #231 Allow N's in bam output commit 0a2419e518dc9b3520058c3927f98b31cd51347e Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:10:01 2022 -0600 Fix bug when name is provided instead of amplicon_name in pooled input file (#229) Also, raise an exception (instead of incorrectly executing) when there are not enough matched parameters in the pooled input file. commit cb58212379803788c04ca5793baaa760cbbeaa81 Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:09:49 2022 -0600 Fix bug when comparing two samples with the same name. (#228) commit e8a796f5f451409cbafed4404dfba4b6b8a124ca Author: Kendell Clement <[email protected]> Date: Thu Jun 23 21:30:23 2022 -0400 Version bump to 2.2.9 commit 632143ddedea48bab9229baeb4bf3ea4d1f658d6 Author: Cole Lyman <[email protected]> Date: Mon Jun 20 19:53:14 2022 -0600 Don't run global frameshift plot when there are no reads (#226) When there are no reads (i.e. global_MODIFIED_FRAMESHIFT + global_MODIFIED_NON_FRAMESHIFT + global_NON_MODIFIED_NON_FRAMESHIFT == 0) there was a bug when trying to compute the pie chart, because all of the values in the pie chart are 0. This fix, will make sure that there is at least one read in order for the plot to bee constructed properly. commit 4bb06218e835d2624d53fd401542caef6f8a3a55 Author: kclem <[email protected]> Date: Fri Jun 3 16:57:02 2022 -0400 Improvements for guide inference in 'auto' mode In 'auto' mode, a putative guide sequence is selected at the site of maximal editing. If the site of maximal editing happens near the end of the guide (e.g. base 0) many things will break (e.g. quantification windows, etc). This update excludes bases from being used to find the guide using the --exclude_bp_from_left and --exclude_bp_from_right parameters. At default, these parameters are 15bp, so the first and last 15bp would not be selected for the site of maximal editing and thus be the site of a guide sequence. In addition, the site of maximal editing must have 3x the magnitude over the background. commit 9d64de187835b2553ad2b4374d32edab27f83645 Author: Kendell Clement <[email protected]> Date: Thu Jun 2 20:22:25 2022 -0400 Update README.md commit 6aafc5387986f5089ba55b68d128343d68052792 Author: Simon P Shen <[email protected]> Date: Tue May 31 17:42:53 2022 -0400 directory in quotes in batch cmd (#222) Add quotes around output folder for folders that have spaces. commit 432f163ac68b9a650d1fd326171aadc505ee87f4 Author: Kendell Clement <[email protected]> Date: Tue May 24 23:38:36 2022 -0400 CRISPRessoBatch fills NA values in batch settings NA values in CRISPRessoBatch are filled with the value from args - either the default value or the value from the command line args (if set) commit 6de774adbad3aa8cd99d07b0ba7692984b356cd4 Author: kclem <[email protected]> Date: Mon May 23 14:18:02 2022 -0400 Fix file naming bug for HDR outputs In html file, figures 4e and 4f incorrectly referenced figure 4d. This fixes this bug. commit b88fec0668a4082a12ead3d26582e86d829dd7cc Author: Kendell Clement <[email protected]> Date: Sat May 21 00:32:15 2022 -0400 For bam_output, fix bug that wrote unaligned lines twice commit 3564e77ebcdedb4b01cc01dcca18ba3221fac67c Author: Kendell Clement <[email protected]> Date: Thu May 19 16:32:18 2022 -0400 Update README with CRISPRessoPooled headers and bam_output parameters commit bc08d81f17cb1929d1c37a1773cffcf36fb12fe2 Author: Kendell Clement <[email protected]> Date: Thu May 19 16:11:30 2022 -0400 Add more links to tools commit 006c497a379ecd94b017a883a5db887861e1586a Author: Kendell Clement <[email protected]> Date: Thu May 19 16:08:14 2022 -0400 Add links to tools commit dc8243373ad00d6bd467fc30c59942596ff0c5d6 Author: Kendell Clement <[email protected]> Date: Mon May 16 21:38:06 2022 -0400 fastq_to_bam implementation (#219) commit e88b6833977c6b2768299e0b2e7af623e3a9ae7c Author: Kendell Clement <[email protected]> Date: Sun May 8 02:14:13 2022 -0400 Fix bug for when guides don't agree in CRISPRessoAggregate commit 7eb763116a8c60603f1cd654645215767ee8eb52 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:21 2022 -0400 Fix bug for case of empty summary plots in report generation commit 0324fa67d14ed945f0c9531d9bcf73ebcf4ca042 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:02 2022 -0400 Create report for number of significant bases in CRISPRessoCompare commit e3c9d0026a9ee6732f3ed6bdcf2a824850d7e66a Author: Kendell Clement <[email protected]> Date: Wed May 4 22:43:11 2022 -0400 Update pickle to json in readme and CRISPRessoPooledWGSCompare commit 1553f7977c12bf1091a20ca55b878bccfb739b61 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:10:04 2022 -0400 Merge pull request #4 from pinellolab/master (#218) commit bcecbfc047d294e26f381a6668e08cb4db24445c Merge: 15b0e05b bb13e007 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:06:37 2022 -0400 Merge branch 'master' into master commit bb13e007738d6e7a4909e01f03daff592f334f36 Merge: af4ab6e8 d0b41483 Author: Kendell Clement <[email protected]> Date: Wed May 4 17:59:32 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 15b0e05b9e03bbec5236e58776ddf9aa2f93180e Author: Kendell Clement <[email protected]> Date: Wed May 4 17:54:52 2022 -0400 2 flexible pooled input (#217) * Batch type coerce and r2 file check * Upgrade tabs for bootstrap5 * Update readme with additional pooled amplicon file headers Co-authored-by: Samuel Nichols <[email protected]> commit d0b41483bee704940ba60c58289f412b04c71659 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:43:43 2022 -0400 Update README.md commit ce49fab5301cb73ba0daf6c765e350eb083c76f1 Merge: 5f909713 b913fcb4 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:40:30 2022 -0400 Merge pull request #3 from edilytics/2-flexible-pooled-input Add flexibility to CRISPRessoPooled amplicon input by allowing headers. Also, prime editing and quantification window coordinate parameters can be passed to CRISPRessoPooled. commit b913fcb402a8ba3106c3ff7913563a33d8d19fca Author: Kendell Clement <[email protected]> Date: Wed May 4 13:38:25 2022 -0400 Update CRISPRessoPooledCORE.py Replace process to read header, increase flexibility for column order commit 945bf31f16530b7ce25b89095b2c7005bf146117 Merge: 7b8f6788 5f909713 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:45:24 2022 -0400 Merge branch 'master' into 2-flexible-pooled-input commit 5f9097133765736a7c2fe3c8e9b730845fed0b70 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:23:44 2022 -0400 Version bump to 2.2.8 commit c4a94ce0e06c6ebae13e128fbe6b708e635121c4 Author: Kendell Clement <[email protected]> Date: Wed May 4 00:13:17 2022 -0400 Fix summary plot representation for multi reports *fixed old reference to make_multi_report which called old summary plot format * renamed summary_plot to summary_plots to reflect a dict with multiple plots commit 62900e9ae6fa37ce99a04f12a63ed5c912f75042 Author: Cole Lyman <[email protected]> Date: Tue May 3 20:47:52 2022 -0600 Large aggregation (#192) * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add plotly requrement to setup.py * Remove space around vertical barcharts * Add scrollbar to long images in multiReport * Fill in default (empty) values to allele modification plots When not running CRISPRessoAggregate, default values for the `allele_modification_heatmap_plot` and `allele_modification_lin_plot` dictionaries will be set so that the template can be properly rendered. * Include CRISPRessoBatch in the refactor of how summary_plot dicts are handled * Update dockerfile for new docker * minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) * Allow for flexible parsing of quant window coordinates * CRISPRessoPooled debug flash command, fix pep formatting * Set flexiguide homology parameter type to int * Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values * Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. * Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. * Create allele modification heatmaps and line plots in CRISPRessoBatch * Add allele modification heatmaps and line plots to CRISPRessoBatch * Make all plots in CRISPRessoBatch run in parallel * Make `--suppress_batch_summary_plots` store true Also, only open and shutdown the process pool when necessary. * Add blank values for allele_modification entries when not present Co-authored-by: Kendell Clement <[email protected]> Co-authored-by: dharjanto <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit f67376fc9ab0e407d4086aa42fd1c77706ebc9c0 Author: Kendell Clement <[email protected]> Date: Fri Apr 15 00:46:30 2022 -0400 Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. commit b34fe2956ff88629809b2434878028723dfc4895 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 23:58:07 2022 -0400 Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. commit c94e3b9f2e301bda91e9c1e6f4ef794b33b5dbf0 Author: Samuel Nichols <[email protected]> Date: Thu Apr 14 21:48:32 2022 -0600 Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values commit fc4542491bb86eb143db0044a848a56234403496 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:13:23 2022 -0400 Set flexiguide homology parameter type to int commit 23fe2aa8e26067d1bcf36bfafc67e023c7588d2f Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:12:37 2022 -0400 CRISPRessoPooled debug flash command, fix pep formatting commit d292d33d8c1fa3bfd2cee656643fd47bcdab161d Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:00:19 2022 -0400 Allow for flexible parsing of quant window coordinates commit e1667cb53a7ea6fbb33369c8530a78639ed423ec Author: dharjanto <[email protected]> Date: Mon Apr 11 22:08:21 2022 -0400 minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) commit 7b8f6788da18f6ab173fa3c3d10f4ab6bb2acc26 Author: Samuel Nichols <[email protected]> Date: Fri Apr 8 10:21:00 2022 -0600 Update README commit 9bc24cd0474ed9f398dff64274d3181c4b2f8637 Author: Samuel Nichols <[email protected]> Date: Tue Mar 29 11:25:09 2022 -0600 Using Amplicon_Name commit 88ac5d72074b3da63de035e02c911ce34cd29414 Merge: b6057a2d e5afa478 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 22:32:09 2022 -0600 Merge remote-tracking branch 'origin/master' into 2-flexible-pooled-input commit b6057a2d54cb8637ff0900416de8e2de72213f76 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 20:53:05 2022 -0600 Printing info statements for matched headers commit af4ab6e8507d7aa4b7b68f217a458e0d9c966f55 Merge: bbb7d6f0 51a943c3 Author: Cole Lyman <[email protected]> Date: Fri Mar 25 09:44:13 2022 -0600 Merge branch 'pinellolab:master' into master commit 3c1eb012fc02563e3e963f17a62c7e932f5bcddc Author: Samuel Nichols <[email protected]> Date: Thu Mar 24 12:31:43 2022 -0600 Debugging and column checking commit 0b47acbc592a6df6adf14641357b2104b76be691 Author: Samuel Nichols <[email protected]> Date: Wed Mar 23 09:42:51 2022 -0600 New variables added to pooled commit a0ff3a44d6d19d7b37f91919b5c0180206f72d53 Author: Samuel Nichols <[email protected]> Date: Mon Mar 21 09:32:28 2022 -0600 Read as string not bytes commit 710675fc3c0307e21103abd604315b47ff80a894 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 13:51:30 2022 -0600 Adding command building for new options commit f386818a48e5c840bd567611e6f1320c8146cac7 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 10:08:33 2022 -0600 Comment out df_template.iloc instance commit eb5e309da57c8b96cd760728ddbf67be05f30d1c Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 09:59:19 2022 -0600 Potential solution for flexible headers commit 51a943c3a8f8181963acc420e75a5e8ee103cf7c Author: Kendell Clement <[email protected]> Date: Tue Mar 15 11:00:46 2022 -0400 CRISPRessoPooled pep formatting and fix CRISPRessoPooled doesn't re-count reads if it has been run once and the `aligned_pooled_bam` is provided as input pep code formatting changes commit bbb7d6f0907aa13518d20e7f470e7de518b825f4 Merge: ddbd39f0 5a10d638 Author: Kendell Clement <[email protected]> Date: Tue Mar 15 10:23:38 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 5a10d638c638f21f8a2934955e92ef7e117b889e Author: Kendell Clement <[email protected]> Date: Sat Feb 26 14:21:57 2022 -0500 Move metadata for bam input and output commit e5afa4784d5330a1dc95c5deafcd9217edeac631 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:20:24 2022 -0700 Coerce int values commit ede7d85b50055311908000578c76a1860ae9de4d Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:18:29 2022 -0700 Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. commit f91736688ea9739cf3063e3601c52ad6da1116a4 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:10:52 2022 -0700 Batch type coerce and r2 file check commit 7b4a310b0f8b64c00e02eca3d522ad50d39b43ae Author: Kendell Clement <[email protected]> Date: Tue Feb 15 22:18:05 2022 -0500 Reiterate WGS region file is tab-separated Add note to WGS description that region file should be tab-separated. Closes #199 commit b8497542e388ad401d0815d426f27abc3201a76d Author: kclem <[email protected]> Date: Fri Feb 11 15:07:14 2022 -0500 Extend x-axis to longest scaffold incorporation length commit ab7248947afade089809c74bfe6e9d5394e8f6dc Author: kclem <[email protected]> Date: Wed Feb 9 17:05:11 2022 -0500 Fix prime editing indexing for plots commit ddbd39f06b262d5ebd2cc69e116c08b22b6bd84e Merge: a7ffd468 442a48c7 Author: Kendell Clement <[email protected]> Date: Thu Jan 13 15:35:36 2022 -0500 Merge branch 'pinellolab:master' into master commit 442a48c7f4c62ec2ebc95fe268475e5e2a4b2f0c Author: Cole Lyman <[email protected]> Date: Tue Jan 11 15:28:28 2022 -0700 Indel alignment fix (#182) * Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. * Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. * Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. * Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. * Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. * Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. * Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. * Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. Co-authored-by: Kendell Clement <k.clement…
Snicker7
added a commit
that referenced
this pull request
Apr 4, 2024
commit 603f2eff9d1aa21ae95f3e134da303b8018d3a33 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:48:20 2024 -0700 fix guardrials partial commit 22fc03183a8070c30dfb74d5c23575ac19019855 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 08:54:01 2024 -0700 Add guardrail partial commit e55f6b21972b578261bc5a864ce1d653d98f9e34 Author: Samuel Nichols <[email protected]> Date: Mon Jan 8 07:50:59 2024 -0700 Functional guardrails, needs reports update commit 6e968e9699ed59a47d88191d03768e042d8b60a4 Merge: 32b49685 e948ce10 Author: Samuel Nichols <[email protected]> Date: Mon Dec 18 13:34:36 2023 -0700 Merge branch 'guardrails-clean-history' of https://github.com/edilytics/CRISPResso2 into guardrails-clean-history commit 32b49685da320501dad2b0ebbb57887b66220ba8 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit 4e309cf6f732565d635de3d4c5d074ada3027e2d Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:55 2023 -0700 Refactor to use CRISPRessoReports module commit e648dc087c0055bc5d2fca13c64071a371dea941 Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:11 2023 -0700 Add CRISPRessoReports subtree commit e948ce107ebb0d1d99010ed12e937f34b5e607d4 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit d33c748871a625facfe8d792e29c77ab9779138f Author: Kendell Clement <[email protected]> Date: Tue Nov 7 16:31:06 2023 -0700 Include parameter --assign_ambiguous_alignments_to_first_reference in readme commit a1435f7f491a6a61434f3051e39f39a4c9bf1edc Author: Kendell Clement <[email protected]> Date: Wed Oct 11 17:17:30 2023 -0600 Enable quantification by sgRNA (#348) This PR includes: - storing the sgRNA-specific editing locations in the crispresso2_info object. Previously, each amplicon would record the indices of quantification windows across the guide, but not for individual guides. This stores the information for each guide in crispresso2_info['results']['refs'][reference_name]['sgRNA_include_idxs'] - a script (count_sgRNA_specific_edits.py) to parse through an allele table output from a completed CRISPResso run (`--write_detailed_allele_table` flag required) to count edits in each sgRNA separately. I don't have a good double-edited sample handy, but it can be run on the demo HDR data [hdr.fastq.gz](http://crispresso.pinellolab.org/static/demo/hdr.fastq.gz) using the command: ``` CRISPResso -r1 hdr.fastq.gz -a acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -e acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcaCctgactccGgaggagaagtctgccgttactgcGctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -c atggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcag -g TGCACCATGGTGTCTGTTTG,GATGAAGTTGGTGGTGAGGCCC --write_detailed_allele_table -n hdr3 -p max -gn guide1,guide2 ``` ``` python CRISPResso2/scripts/count_sgRNA_specific_edits.py -f CRISPResso_on_hdr3 ``` This produces: ``` Processed 25000 alleles Reference: Reference (2391/23415 modified reads) UNMODIFIED: 21024 MODIFIED guide1: 2359 MODIFIED guide2: 32 Reference: HDR (856/1577 modified reads) UNMODIFIED: 721 MODIFIED guide1: 854 MODIFIED guide1 + guide2: 1 MODIFIED guide2: 1 ``` commit 2e3da02fdbed2fa8ae02a277763d65a502459827 Author: Cole Lyman <[email protected]> Date: Tue Oct 10 15:29:08 2023 -0600 changed tuple to list for matplotlib change (#31) (#346) Co-authored-by: mbowcut2 <[email protected]> commit cd3c332135fe4db0f9218e3d87263d5c65838ed9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:54:46 2023 -0600 rename script to camel case commit 7c719d65fb36ac7654db9040f226564ea28fcab9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:53:44 2023 -0600 Add new script for counting high quality bases commit f97cd2795e89464bcc9321ccfdbca3e6af2bcb4f Author: Kendell Clement <[email protected]> Date: Thu Sep 14 15:15:30 2023 -0600 Prime editing alignment params (#336) Adds two parameters to control alignment of pegRNA components: --prime_editing_gap_open_penalty and --prime_editing_gap_extend_penalty. CRISPResso checks to see whether the pegRNA spacer and extension sequence are in the correct orientation, but sometimes they could align in the incorrect orientation with a higher score (e.g. via insertion of multiple gaps, whereas a single long gap would be preferred). Introducing these two parameters allows users to adjust the alignment parameters specifically for these prime-editing checks without adjusting the global alignment parameters which will be applied to reads that are aligned to the WT reference/prime-editing reference sequences. The new prime_editing_gap_open_penalty is set to -50, a higher gap open penalty than the default needleman_wunsch_gap_open penalty (-20). This commit breaks backward-reproducibility, but mostly in the checking of pegRNA component orientation - so previously some CRISPResso runs would have failed and produced an error, but now they will (hopefully) succeed. To achieve complete backward reproducibility, add the flag --prime_editing_gap_open_penalty -20 to runs. commit 64cbf36dae85cffa2c15e73f2a7ee8aa1077d917 Author: Cole Lyman <[email protected]> Date: Thu Sep 7 16:43:30 2023 -0600 Fix samtools piping (#325) * Remove samtools pipe stderr to stdout Sometimes some of the libraries that samtools depends on don't have the correct version information, and as such samtools will report this to stderr when run. Because we pipe the output of samtools, we expect it to be valid SAM format, but when these library version messages are reported, it breaks CRISPRessoWGS. * Remove extra spacing at end of lines and add missing comma in WGS * Log stderr from samtools in CRISPRessoWGS commit 8feff4101f27406d9d88ace97d31a518276bff3f Author: Cole Lyman <[email protected]> Date: Fri Sep 1 09:43:56 2023 -0600 Replace link to CRISPResso schematic with raw URL in README (#329) * Replace link to CRISPResso schematic with raw URL * Add new lines to the beginning of unordered lists commit 2e9e6bff5bcc536d5e2ba1440d1ab96d9d47efd6 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:52:12 2023 -0600 Try to unbreak CircleCI commit ae5b95246cb0f6d66c4cbfb50cf8f5a9626b0827 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:27 2023 -0600 Center command line text messages commit 4d9c71ecf2248c9bb1e10430178dc318b6621c8b Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:07 2023 -0600 Fix bug in prime-editing scaffold-incorporation plotting If read is too short, scaffold incorporation detection will fail because it will check beyond the length of the read. commit 2b36a1a5c35e8a93516ce8baf464595615e0f402 Author: Kendell Clement <[email protected]> Date: Wed Aug 9 15:29:48 2023 -0600 CRISPRessoPooled --compile_postrun_references bug fixes commit 3e04d1d402bcf95edd39fc7c8c9af61bb380f9db Author: Kendell Clement <[email protected]> Date: Tue Aug 8 23:30:15 2023 -0600 Fix missing ' in Pooled --demultiplex_only_at_amplicons commit 06af527f9e2020c5cf251e7f1cec0b1eca1c1664 Author: Cole Lyman <[email protected]> Date: Mon Jul 24 10:47:46 2023 -0600 Sort pandas dataframes by # of reads and sequences so that the order is consistent (#316) * Make sorting stable * Including c files * Sort by #Reads instead of %Reads to avoid floating point errors --------- Co-authored-by: Samuel Nichols <[email protected]> commit de05533b3511a84f3b6b14fc2ef64db041613261 Author: Cole Lyman <[email protected]> Date: Thu Jul 6 13:54:45 2023 -0600 Fix multiprocessing lambda pickling (#311) * Fix running plots in parallel The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. * Fix multiprocessing lambda pickling (#20) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Further fixes to pickling multiprocessing error (#21) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Use Counter instead of defaultdict in CRISPRessoCORE * Update process_futures to dict in Batch and Aggregate commit ebb016dff46c280dce8c3c09e8ac0e0cc25d4d74 Author: Kendell Clement <[email protected]> Date: Mon Jul 3 17:12:09 2023 -0600 Enable CRISPRessoPooled multiprocessing when os allows multi-thread file append commit 7285da0e987b77b72c8885bb35940e0f50c146bd Author: Kendell Clement <[email protected]> Date: Fri Jun 23 16:50:33 2023 -0600 Fix print bug for invalid fastq commit 9acdeac67441f9a1d55ac94b153bcb68fb89b92c Author: kclem <[email protected]> Date: Wed Jun 21 16:03:48 2023 -0600 Slugify before creating filename - replaces invalid characters in batch names with _ commit f97e29c67de4c80b8d6b9cf334f363be4b514ade Author: Cole Lyman <[email protected]> Date: Wed Jun 21 14:43:43 2023 -0600 Add verbosity argument to CRISPRessoAggregate (#18) fixes #306 (#307) * Add verbosity argument to CRISPRessoAggregate (#18) * Allow for amplicon and guide seqs to be some variant of NA in batch (#19) This was discovered when attempting to infer amplicon sequences in batch mode on the web interface, NAs were supplied for the amplicon sequences to the sub CRISPResso commands. commit 32e1e9797da5c3033cdc588e92f06b8813961953 Author: Mark Clement <[email protected]> Date: Wed Jun 21 14:01:00 2023 -0600 Allow for interrogation of overlapping sgRNA sites commit 7248ba8c4deee125ad1ec12fdf1294a84d5f6f93 Author: Kendell Clement <[email protected]> Date: Mon Jun 12 12:16:47 2023 -0600 Check input fastq file format Asserts input format of fastq files - including if gzipped files are missing the gz suffix. commit 83c8ab8f462e7d8c1d04c08c1a398b874f517251 Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:41:55 2023 -0600 Fix CRISPRessoArgParser commit 14a2c8577f566e1b72d5f4e72cd6cd22079610be Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:29:31 2023 -0600 Cosmetic updates for command-line use - version bump to 2.2.13 - If no args are provided, the command line version will print out an abbreviated help message - parameters can be excluded from CRISPRessoArgParser commit 1cd54bc1d03360c3d8121ba9e66b3589fe1cf252 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:47 2023 -0600 Fix multiprocessing error, don't start pool when only using single thread (#302) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload * Only start process pools when using multiple processes This is mainly to solve the issue when running on AWS Lambda, but this should improve single core performance overall. --------- Co-authored-by: Kendell Clement <[email protected]> commit 92a705c939b370373a70cf6ae9f1616de33288b9 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:06 2023 -0600 Update `base_editor` parameters in README and add Plot Harness (#301) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload --------- Co-authored-by: Kendell Clement <[email protected]> commit 7d46c4490235df45c5546b1b470e4e6a99727031 Author: Cole Lyman <[email protected]> Date: Wed May 10 15:41:33 2023 -0600 Clarify CRISPRessoWGS intended use (#303) * Update README to have consistent use of `--base_editor_output` (#16) * Add sample plotting jupyter notebook * Add clarifying info to CRISPRessoWGS description Clarify WGS usage commit 833a701787bb47674b3e921c38cac6189c775cf7 Author: Kendell Clement <[email protected]> Date: Thu May 4 17:02:46 2023 -0400 Remove debug print statements commit 712eb2a11825e8d36f2870deb12b35486bd633fb Author: Kendell Clement <[email protected]> Date: Thu May 4 16:40:07 2023 -0400 Allow dashes in filenames resolve #73 commit a439f094745b2b5e7f032f0777d4c67e6d6f93c5 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:41:58 2023 -0400 Raise exceptions from within futures in plot_pool commit 7e807a60de2a9d18bccd034b87106ceaf7153338 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:38:56 2023 -0400 Fix future pandas indexing warning Pandas error was "FutureWarning: Calling float on a single element Series is deprecated and will raise a TypeError in the future. Use float(ser.iloc[0]) instead" commit 304a92aa7a7ef8c705cb070dce25d9a2e5745ba9 Author: Cole Lyman <[email protected]> Date: Thu Apr 20 13:59:27 2023 -0600 Remove debug print statements fixes #295 (#297) The format string option used here is only available in Python version >=3.8. commit 478c06f784603e96d20f96e91993fdcc4ac35c8a Author: Kendell Clement <[email protected]> Date: Thu Apr 13 12:09:26 2023 -0400 Update plotCustomAllelePlot.py script for #292 (#293) Update type of 'max_rows' param to int Fix location of 'args' in crispresso2_info object commit bcdae39e05d530f4a4e78738c3b30f7664981919 Author: Kendell Clement <[email protected]> Date: Mon Mar 27 13:18:34 2023 -0400 Update pooled parameter format commit 546446e36e7e68b527767d6c31ec341a49df2059 Author: Kendell Clement <[email protected]> Date: Tue Feb 14 16:26:23 2023 -0500 Fix running plots in parallel (#286) The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. Co-authored-by: Cole Lyman <[email protected]> commit d75f32a2eb5aeaaee866c09e5655a3e27af8b1a1 Author: kclem <[email protected]> Date: Fri Feb 10 15:45:15 2023 -0500 Fix #283 to avoid filename collisions Previously, amplicon names longer than 21bp were truncated, but the check for uniqueness wasn't working, so it would overwrite some plot files. This fixes the filename collision and enforces uniqueness in reference filename prefixes. Thanks @mbiokyle29 commit e577318006cd17b2725bd028e5e56634c6eb829a Author: kclem <[email protected]> Date: Mon Feb 6 16:37:25 2023 -0500 Case-insensitive headers accepted in CRISPRessoPooled commit d34927620a4a6126a9988b3041e76f60728abbfe Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:48:33 2023 -0500 Fix print statement in CORE commit ee88b7ed89c395f68225a50dea44a2ad69d5e9a5 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:22:51 2023 -0500 Version bump to 2.2.12 commit 1d4679c72d0c8b4154317c9aff5179217198e2d7 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:01:31 2023 -0500 Status Updates + Pooled Mixed Mode Update (#279) * Implement logging handler to overwrite the latest log status to file * Add StatusHandler to CRISPRessoCORE log This will take the latest log output and write it to a file (`status.txt`), the catch being that with each log the file is overwritten so that one can easily tell where CRISPResso currently is and what the error is (if any). These changes include some slight refactoring in order to accomodate any potential parameter exceptions. * Add StatusHandler to CRISPRessoBatch and refactor `logger.warn` to `warn` * Add StatusHandler to CRISPRessoPooled and a little refactoring * Implement `percent_complete` to the status log * Add StatusHandler to CRISPRessoAggregate log * Add StatusHandler to CRISPRessoCompare log * Add StatusHandler to CRISPRessoPooledWGSCompare log * Add StatusHandler to CRISPRessoWGS log * Rename `status.txt` to `CRISPResso_status.txt` * Modify status log names to match the tool they are generated from * Add percent_complete stages to CRISPRessoCORE These also include log statements of each plot that is being generated as well as fixing some variable name collisions with `ind`. * Format the percentage in the log to be 2 decimal places * Change all plotting logs from `info` to `debug` and simplify progress This refactors how the progress of the plots is calculated, making it much simplier. Before this change we would of had to keep track of the number of times `percent_complete` was output, but now it simply updates the percent complete after each amplicon is finished processing. Hopefully this will make things easier to mantain even though it will be a little less "accurate" (not sure how accurate the original implementation was...). * Implemented shared console log handler across all CRISPResso* calls This allows for easy changes to logging formatting, which was inspired by having to change the default logging level. The default logging level needs to be set at `logging.DEBUG` in order for the debug log statements to not be ignored for the running and status logs. * Add ability to set the verbosity level to each CRISPResso* tool This allows users to set a verbosity level between 1 and 4 using the `-v`/`--verbosity` CLI parameter. If the `--debug` flag is present, then the level will default to 4, being the most verbose. * Implement showing the last seen `percent_compelte` when none is provided * Keep track of and log when multiple parallel runs are completed These changes modify `CRISPRessoMultiProcessing.run_crispresso_cmds` such that we can now display when a run is completed. This potentially breaks how signals and interupts are handled with multiple runs happening, but this needs to be reviewed. * Add debug and percentage complete to CRISPRessoBatch * Add percent complete to CRISPRessoPooled * Add debug and percent_complete message to CRISPRessoAggregate * Add `percent_complete` to CRISPRessoCompare * Add `percent_complete` to CRISPRessoPooledWGSCompare * Add status and `percent_complete` to CRISPRessoMeta * Add `verbosity` arguments to CRISPRessoCompare and CRISPRessoPooledWGSCompare * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name * Fix bug to flow CRISPRessoPooled options to sub command * Make amplicon file args variable name clear * Update how parameters are set and retrieved from parameter object The refactor in the previous commit changed the type of the arguments to a dictionary which doesn't have the parameters as attributes, and this commit fixes that error. * Add note in output header for change in default CRISPRessoPooled In the next release (2.3.0) the `--demultiplex_only_at_amplicons` will be the default when running in mixed-mode. This is to allow for inexact alignments of the reads and the amplicons to the genome. For more context, see this issue https://github.com/pinellolab/CRISPResso2/issues/276 * Clarify the verbosity parameter help message * Separate out parameters to `normalize_name` in CRISPRessoCORE * Separate out parameters to `normalize_name` in CRISPRessoWGS * Separate out parameters to `normalize_name` in CRISPRessoPooled * Separate out parameters to `normalize_name` in CRISPRessoCompare * Fix bug in CRISPRessoPooled by replacing `database_id` with `normalize_name` * Refactor `run_crispresso_cmds` to not require a `logger` This commit implements the functionality to make the `logger` object optional by seeing which module called the `run_crispresso_cmds` function and obtaining the correct object from that module name. The function also immediately returns when no commands are passed to it. * Add amplicon name to plotting debug statements in CRISPRessoCORE --------- Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit ff7eca76e6a3a08af4ac18ac4e88d20f2a06b1f9 Author: Kendell Clement <[email protected]> Date: Thu Jan 26 15:27:27 2023 -0500 CRISPRessoPooled custom header fix (#278) * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name Co-authored-by: Samuel Nichols <[email protected]> commit 104866e1080c973bb025d1a5ba59b19dca1658af Author: Cole Lyman <[email protected]> Date: Thu Jan 5 14:00:26 2023 -0700 Fix deprecated numpy type names (fixes #269) (#270) In the most recent version of numpy (1.24) some of the types have been deprecated. This commit fixes these errors. commit 58a8e42df88b66fad6b4f6ad04a5b9d9d43d01b4 Author: Cole Lyman <[email protected]> Date: Thu Jan 5 06:49:35 2023 -0700 Add snippet about installing CRISPResso2 via bioconda on Apple silicon (#274) I have suffered enough trying to debug my installation, so hopefully this helps someone else. Co-authored-by: Cole Lyman <[email protected]> commit b9851e98104602eb78c2b384105267624295e9d3 Author: Cole Lyman <[email protected]> Date: Thu Dec 22 13:30:23 2022 -0700 Fix bug when pooled bam is input (#265) This change checks to see if a bam file was input, and if so it doesn't try to remove any intermediate files because there aren't any. Co-authored-by: Cole Lyman <[email protected]> commit b822612642043e75a19042941f69b457ce51f517 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 15:26:45 2022 -0500 Delete vscode settings commit b99aa624dec68ef7d19264340ce0cafa829625f4 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:29:14 2022 -0500 Clarify input param help for pooled bam commit 3fae1e8b821ec6b1890bff6561fa8fa67dc49a04 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:28:54 2022 -0500 Fix #235 - Cigar string is * if read unaligned Previously, the bam would set the cigar string to 0 if the read was unaligned. This breaks the sam->bam conversion and causes the errors in #235. commit c65ba07dc5a983453cdf7bb1e27005230dac6f1b Author: Cole Lyman <[email protected]> Date: Thu Dec 8 13:48:17 2022 -0700 Add deprecation notice (#260) * Add FLASh and Trimmomatic deprecation notice to CLI output * Add Edilytics email address to CLI output commit 2a30e5a45f5350ee7c6435bce1cd4edc4d31668a Author: Kendell Clement <[email protected]> Date: Tue Dec 6 12:16:19 2022 -0500 Format filterReadsOnSequencePresence script commit 9d764414edd88a46ad5e4f496e4f1c8d5d60ce3e Author: Kendell Clement <[email protected]> Date: Fri Dec 2 22:12:54 2022 -0500 Clarify default CRISPRessoPooled settings for use_legacy_bowtie2_options_string commit 9ddea40f7f02b546941ddaa4c71fc5283075051a Author: kclem <[email protected]> Date: Mon Nov 14 10:33:04 2022 -0500 Add check for prime editing extension sequence in prime edited sequence if the user specifies the prime_editing_override_prime_edited_ref_seq, it could not contain the extension seq (if they don't provide the extension seq in the appropriate orientation), so check that here. Extension sequence should be provided reverse-complement to the prime edited sequence. commit 152f2dd5001da7090641ee8a1326bde9f7e8104e Author: kclem <[email protected]> Date: Wed Nov 9 11:53:41 2022 -0500 Version bump to 2.2.11a commit 9ed356e3a0c6c316d0860d121772f80ddca6de1d Author: kclem <[email protected]> Date: Wed Nov 9 11:47:30 2022 -0500 Add param to override prime editing sequence checks CRISPResso checks that prime editing guides are provided in the proper orientation (e.g. pegRNA 3'->5', spacer sequence 5'->3') and checks these orientations by alignment. Sometimes, the alignment can be better in the opposite direction, and this parameter allows these checks to be overridden. Otherwise, these checks would halt the program and produce the output 'The prime editing pegRNA spacer sequence appears to be given in the 3\'->5\' order. The prime editing pegRNA spacer sequence (--prime_editing_pegRNA_spacer_seq) must be given in the RNA 5\'->3\' order.' commit 39dd80afb98a22b7edb6f801c363d86bb77eeb5b Author: kclem <[email protected]> Date: Wed Nov 9 10:06:51 2022 -0500 Update filterReadsOnSequencePresence.py commit fe55526927e3fb6e17c9a8a6f59c7057bc1e14eb Author: Kendell Clement <[email protected]> Date: Mon Nov 7 22:25:16 2022 -0500 Add script to filter input based on sequence presence commit 713e57a19c35180035ca35e11a5820065eda0198 Author: Kendell Clement <[email protected]> Date: Tue Oct 18 16:02:26 2022 -0400 Allow spaces in read names for CRISPRessoWGS commit 39ce008bdddccdd8229c0ba185dce78bc2f66968 Author: Cole Lyman <[email protected]> Date: Sat Oct 8 21:09:58 2022 -0600 Fix typo of CRISPResssoPlot when plotting nucleotide quilt (#250) commit 6a2b342c8503b7327c0a2414edfbd16912d60ca5 Author: Kendell Clement <[email protected]> Date: Sat Oct 8 23:08:47 2022 -0400 Batch amplicon plots (#251) * Error out if HDR amplicon matches existing amplicon * Add check for amplicon sequence uniqueness * Fix bug with bam_input not having bam_output * Test for no returned lines in auto mode, version bump to 2.2.11 * Fix pandas deprecation of df.append commit 726b2b93d6e419a1b0aa6a968c97edc55b4cc5a8 Author: Kendell Clement <[email protected]> Date: Thu Oct 6 16:32:02 2022 -0400 Fix CRISPRessoBatch plot pool bug when plots are suppressed commit 7e5049c4dfb88cbc87c91935a91d1f51120a10c2 Author: Cole Lyman <[email protected]> Date: Wed Sep 21 21:04:51 2022 -0600 Fix batch quilt plot name (#249) This fixes an incorrectly named allele quilt plot input in CRISPRessoBatch. commit 1821ca5029c5a1485733f13ab3f2048b4f1fa04e Author: Kendell Clement <[email protected]> Date: Thu Sep 15 15:49:08 2022 -0400 Version bump to 2.2.10 commit c5f79aebfc1ae209f4ee320df250eed89a02787c Author: Cole Lyman <[email protected]> Date: Wed Sep 14 14:24:55 2022 -0600 Parallel plot refactor (#247) * Fix duplicate plotting in CRISPRessoBatch aggregate * Refactor mulltiprocessing plots in CRISPRessoBatch * Refactor multiprocessing plots in CRISPRessoCORE * Refactor multiprocessing plots for CRISPRessoAggregate commit 4ed5e24e6cc1dd8068e2391573ae2438acd32db2 Author: Kendell Clement <[email protected]> Date: Tue Sep 13 14:12:11 2022 -0400 print files in curr dir if Aggregate can't find files commit ce25bc06f29988e7a10afd0b6a09ba0caf0950e0 Author: Kendell Clement <[email protected]> Date: Mon Sep 12 10:32:57 2022 -0400 Spelling typo commit c15f01c75083403f17c58c121b2afe97e9f2a1ec Author: Kendell Clement <[email protected]> Date: Tue Sep 6 17:49:52 2022 -0400 Add helper function to create alignment scoring matrix New scoring matrix can be created using CRISPResso2Align.make_matrix() commit c80f82838c5a228b79ad4484092877cfee08e02c Author: Cole Lyman <[email protected]> Date: Mon Aug 22 18:28:33 2022 -0600 Add `zip_output` (#240) * Making zip of results * Zip command added, if zip is true place_report_in_output_folder is also true, zip removes all files while zipping * Adding --zip to compare and pooled/wgs compare * Add more formatting changes to CRISPRessoShared * Refactoring propagate_crispress_options so only one version exists * Zip added to arguments_to_ignore and warning added when changing arguments * Restore styling * Update README to include --zip * Rename --zip to --zip_output * Change --zip to --zip_output in CompareCORE and PooledWGSCompareCORE * Bug fix arg to args Co-authored-by: Samuel Nichols <[email protected]> commit 5de3d7286d8e33c7cf4d3615fce715806e72f511 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:42:34 2022 -0400 Fix fix to aggregate for CRISPRessoWGS commit a2294c266f43b14969a5d6474076f31a77a57173 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:40:50 2022 -0400 Fix bug in aggregate for WGS commit 7ce3eb4abe4b8ceac933272ac9cb16a8bedf26a3 Author: Kendell Clement <[email protected]> Date: Mon Aug 8 21:53:45 2022 -0400 Update CRISPRessoWGS to allow non-word characters in region names commit 040ac0033d6e250f4e3a412101874cf5e914e08a Author: kclem <[email protected]> Date: Mon Aug 8 16:04:59 2022 -0400 Enable processing of cram files by CRISPRessoWGS Adds --reference to samtools view when viewing cram files commit cf112a0caba8789e28530cc09171285ec6ea9b4c Author: kclem <[email protected]> Date: Mon Aug 8 14:55:46 2022 -0400 Auto amplicon detection for interleaved input Enables processing of interleaved fastq files for guess_guides and guess_amplicons, as well as get_most_frequent_reads. When interleaved input is present, the input is first separated into R1/R2 files, then processing is performed. commit 4ba524dc7b947feca8a0f743837844f9febc2171 Author: Cole Lyman <[email protected]> Date: Thu Aug 4 11:32:11 2022 -0600 Potential fix for aggregate plots in Batch mode (#237) commit 6097a8a104d3f156ef7c08e196ac37e32bf04c71 Author: Kendell Clement <[email protected]> Date: Thu Jul 21 22:45:48 2022 -0400 Fix pct_vectors in crispresso2_info json object commit 65a079d86d6f386793397398f839c46014b54543 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:46:37 2022 -0400 Fix more readme spelling bugs commit e817376ecd54cdea1f29e303ca25b9e7d1d38333 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:42:23 2022 -0400 Fix bug in readme spelling commit 49740ba1d66ed6d13a9e154b8b17bc8b5186581d Author: Kendell Clement <[email protected]> Date: Wed Jul 20 16:10:09 2022 -0400 Fix loading of crispresso info from WGS and Pooled commit b68a43271115251b18e8955e285ccc18f549e8cd Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:11:04 2022 -0400 Add plotly to dockerfile commit b0b7d41d697304d0d5fc93e3346c9de1b98ba41d Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:10:00 2022 -0400 Fix #231 Allow N's in bam output (Try 2) commit c460b3e73fd06a230dbac2e37c86b833144ebf94 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:09:10 2022 -0400 Revert "Fix #231 Allow N's in bam output" This reverts commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3. commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 13:52:37 2022 -0400 Fix #231 Allow N's in bam output commit 0a2419e518dc9b3520058c3927f98b31cd51347e Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:10:01 2022 -0600 Fix bug when name is provided instead of amplicon_name in pooled input file (#229) Also, raise an exception (instead of incorrectly executing) when there are not enough matched parameters in the pooled input file. commit cb58212379803788c04ca5793baaa760cbbeaa81 Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:09:49 2022 -0600 Fix bug when comparing two samples with the same name. (#228) commit e8a796f5f451409cbafed4404dfba4b6b8a124ca Author: Kendell Clement <[email protected]> Date: Thu Jun 23 21:30:23 2022 -0400 Version bump to 2.2.9 commit 632143ddedea48bab9229baeb4bf3ea4d1f658d6 Author: Cole Lyman <[email protected]> Date: Mon Jun 20 19:53:14 2022 -0600 Don't run global frameshift plot when there are no reads (#226) When there are no reads (i.e. global_MODIFIED_FRAMESHIFT + global_MODIFIED_NON_FRAMESHIFT + global_NON_MODIFIED_NON_FRAMESHIFT == 0) there was a bug when trying to compute the pie chart, because all of the values in the pie chart are 0. This fix, will make sure that there is at least one read in order for the plot to bee constructed properly. commit 4bb06218e835d2624d53fd401542caef6f8a3a55 Author: kclem <[email protected]> Date: Fri Jun 3 16:57:02 2022 -0400 Improvements for guide inference in 'auto' mode In 'auto' mode, a putative guide sequence is selected at the site of maximal editing. If the site of maximal editing happens near the end of the guide (e.g. base 0) many things will break (e.g. quantification windows, etc). This update excludes bases from being used to find the guide using the --exclude_bp_from_left and --exclude_bp_from_right parameters. At default, these parameters are 15bp, so the first and last 15bp would not be selected for the site of maximal editing and thus be the site of a guide sequence. In addition, the site of maximal editing must have 3x the magnitude over the background. commit 9d64de187835b2553ad2b4374d32edab27f83645 Author: Kendell Clement <[email protected]> Date: Thu Jun 2 20:22:25 2022 -0400 Update README.md commit 6aafc5387986f5089ba55b68d128343d68052792 Author: Simon P Shen <[email protected]> Date: Tue May 31 17:42:53 2022 -0400 directory in quotes in batch cmd (#222) Add quotes around output folder for folders that have spaces. commit 432f163ac68b9a650d1fd326171aadc505ee87f4 Author: Kendell Clement <[email protected]> Date: Tue May 24 23:38:36 2022 -0400 CRISPRessoBatch fills NA values in batch settings NA values in CRISPRessoBatch are filled with the value from args - either the default value or the value from the command line args (if set) commit 6de774adbad3aa8cd99d07b0ba7692984b356cd4 Author: kclem <[email protected]> Date: Mon May 23 14:18:02 2022 -0400 Fix file naming bug for HDR outputs In html file, figures 4e and 4f incorrectly referenced figure 4d. This fixes this bug. commit b88fec0668a4082a12ead3d26582e86d829dd7cc Author: Kendell Clement <[email protected]> Date: Sat May 21 00:32:15 2022 -0400 For bam_output, fix bug that wrote unaligned lines twice commit 3564e77ebcdedb4b01cc01dcca18ba3221fac67c Author: Kendell Clement <[email protected]> Date: Thu May 19 16:32:18 2022 -0400 Update README with CRISPRessoPooled headers and bam_output parameters commit bc08d81f17cb1929d1c37a1773cffcf36fb12fe2 Author: Kendell Clement <[email protected]> Date: Thu May 19 16:11:30 2022 -0400 Add more links to tools commit 006c497a379ecd94b017a883a5db887861e1586a Author: Kendell Clement <[email protected]> Date: Thu May 19 16:08:14 2022 -0400 Add links to tools commit dc8243373ad00d6bd467fc30c59942596ff0c5d6 Author: Kendell Clement <[email protected]> Date: Mon May 16 21:38:06 2022 -0400 fastq_to_bam implementation (#219) commit e88b6833977c6b2768299e0b2e7af623e3a9ae7c Author: Kendell Clement <[email protected]> Date: Sun May 8 02:14:13 2022 -0400 Fix bug for when guides don't agree in CRISPRessoAggregate commit 7eb763116a8c60603f1cd654645215767ee8eb52 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:21 2022 -0400 Fix bug for case of empty summary plots in report generation commit 0324fa67d14ed945f0c9531d9bcf73ebcf4ca042 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:02 2022 -0400 Create report for number of significant bases in CRISPRessoCompare commit e3c9d0026a9ee6732f3ed6bdcf2a824850d7e66a Author: Kendell Clement <[email protected]> Date: Wed May 4 22:43:11 2022 -0400 Update pickle to json in readme and CRISPRessoPooledWGSCompare commit 1553f7977c12bf1091a20ca55b878bccfb739b61 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:10:04 2022 -0400 Merge pull request #4 from pinellolab/master (#218) commit bcecbfc047d294e26f381a6668e08cb4db24445c Merge: 15b0e05b bb13e007 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:06:37 2022 -0400 Merge branch 'master' into master commit bb13e007738d6e7a4909e01f03daff592f334f36 Merge: af4ab6e8 d0b41483 Author: Kendell Clement <[email protected]> Date: Wed May 4 17:59:32 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 15b0e05b9e03bbec5236e58776ddf9aa2f93180e Author: Kendell Clement <[email protected]> Date: Wed May 4 17:54:52 2022 -0400 2 flexible pooled input (#217) * Batch type coerce and r2 file check * Upgrade tabs for bootstrap5 * Update readme with additional pooled amplicon file headers Co-authored-by: Samuel Nichols <[email protected]> commit d0b41483bee704940ba60c58289f412b04c71659 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:43:43 2022 -0400 Update README.md commit ce49fab5301cb73ba0daf6c765e350eb083c76f1 Merge: 5f909713 b913fcb4 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:40:30 2022 -0400 Merge pull request #3 from edilytics/2-flexible-pooled-input Add flexibility to CRISPRessoPooled amplicon input by allowing headers. Also, prime editing and quantification window coordinate parameters can be passed to CRISPRessoPooled. commit b913fcb402a8ba3106c3ff7913563a33d8d19fca Author: Kendell Clement <[email protected]> Date: Wed May 4 13:38:25 2022 -0400 Update CRISPRessoPooledCORE.py Replace process to read header, increase flexibility for column order commit 945bf31f16530b7ce25b89095b2c7005bf146117 Merge: 7b8f6788 5f909713 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:45:24 2022 -0400 Merge branch 'master' into 2-flexible-pooled-input commit 5f9097133765736a7c2fe3c8e9b730845fed0b70 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:23:44 2022 -0400 Version bump to 2.2.8 commit c4a94ce0e06c6ebae13e128fbe6b708e635121c4 Author: Kendell Clement <[email protected]> Date: Wed May 4 00:13:17 2022 -0400 Fix summary plot representation for multi reports *fixed old reference to make_multi_report which called old summary plot format * renamed summary_plot to summary_plots to reflect a dict with multiple plots commit 62900e9ae6fa37ce99a04f12a63ed5c912f75042 Author: Cole Lyman <[email protected]> Date: Tue May 3 20:47:52 2022 -0600 Large aggregation (#192) * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add plotly requrement to setup.py * Remove space around vertical barcharts * Add scrollbar to long images in multiReport * Fill in default (empty) values to allele modification plots When not running CRISPRessoAggregate, default values for the `allele_modification_heatmap_plot` and `allele_modification_lin_plot` dictionaries will be set so that the template can be properly rendered. * Include CRISPRessoBatch in the refactor of how summary_plot dicts are handled * Update dockerfile for new docker * minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) * Allow for flexible parsing of quant window coordinates * CRISPRessoPooled debug flash command, fix pep formatting * Set flexiguide homology parameter type to int * Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values * Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. * Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. * Create allele modification heatmaps and line plots in CRISPRessoBatch * Add allele modification heatmaps and line plots to CRISPRessoBatch * Make all plots in CRISPRessoBatch run in parallel * Make `--suppress_batch_summary_plots` store true Also, only open and shutdown the process pool when necessary. * Add blank values for allele_modification entries when not present Co-authored-by: Kendell Clement <[email protected]> Co-authored-by: dharjanto <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit f67376fc9ab0e407d4086aa42fd1c77706ebc9c0 Author: Kendell Clement <[email protected]> Date: Fri Apr 15 00:46:30 2022 -0400 Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. commit b34fe2956ff88629809b2434878028723dfc4895 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 23:58:07 2022 -0400 Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. commit c94e3b9f2e301bda91e9c1e6f4ef794b33b5dbf0 Author: Samuel Nichols <[email protected]> Date: Thu Apr 14 21:48:32 2022 -0600 Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values commit fc4542491bb86eb143db0044a848a56234403496 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:13:23 2022 -0400 Set flexiguide homology parameter type to int commit 23fe2aa8e26067d1bcf36bfafc67e023c7588d2f Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:12:37 2022 -0400 CRISPRessoPooled debug flash command, fix pep formatting commit d292d33d8c1fa3bfd2cee656643fd47bcdab161d Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:00:19 2022 -0400 Allow for flexible parsing of quant window coordinates commit e1667cb53a7ea6fbb33369c8530a78639ed423ec Author: dharjanto <[email protected]> Date: Mon Apr 11 22:08:21 2022 -0400 minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) commit 7b8f6788da18f6ab173fa3c3d10f4ab6bb2acc26 Author: Samuel Nichols <[email protected]> Date: Fri Apr 8 10:21:00 2022 -0600 Update README commit 9bc24cd0474ed9f398dff64274d3181c4b2f8637 Author: Samuel Nichols <[email protected]> Date: Tue Mar 29 11:25:09 2022 -0600 Using Amplicon_Name commit 88ac5d72074b3da63de035e02c911ce34cd29414 Merge: b6057a2d e5afa478 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 22:32:09 2022 -0600 Merge remote-tracking branch 'origin/master' into 2-flexible-pooled-input commit b6057a2d54cb8637ff0900416de8e2de72213f76 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 20:53:05 2022 -0600 Printing info statements for matched headers commit af4ab6e8507d7aa4b7b68f217a458e0d9c966f55 Merge: bbb7d6f0 51a943c3 Author: Cole Lyman <[email protected]> Date: Fri Mar 25 09:44:13 2022 -0600 Merge branch 'pinellolab:master' into master commit 3c1eb012fc02563e3e963f17a62c7e932f5bcddc Author: Samuel Nichols <[email protected]> Date: Thu Mar 24 12:31:43 2022 -0600 Debugging and column checking commit 0b47acbc592a6df6adf14641357b2104b76be691 Author: Samuel Nichols <[email protected]> Date: Wed Mar 23 09:42:51 2022 -0600 New variables added to pooled commit a0ff3a44d6d19d7b37f91919b5c0180206f72d53 Author: Samuel Nichols <[email protected]> Date: Mon Mar 21 09:32:28 2022 -0600 Read as string not bytes commit 710675fc3c0307e21103abd604315b47ff80a894 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 13:51:30 2022 -0600 Adding command building for new options commit f386818a48e5c840bd567611e6f1320c8146cac7 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 10:08:33 2022 -0600 Comment out df_template.iloc instance commit eb5e309da57c8b96cd760728ddbf67be05f30d1c Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 09:59:19 2022 -0600 Potential solution for flexible headers commit 51a943c3a8f8181963acc420e75a5e8ee103cf7c Author: Kendell Clement <[email protected]> Date: Tue Mar 15 11:00:46 2022 -0400 CRISPRessoPooled pep formatting and fix CRISPRessoPooled doesn't re-count reads if it has been run once and the `aligned_pooled_bam` is provided as input pep code formatting changes commit bbb7d6f0907aa13518d20e7f470e7de518b825f4 Merge: ddbd39f0 5a10d638 Author: Kendell Clement <[email protected]> Date: Tue Mar 15 10:23:38 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 5a10d638c638f21f8a2934955e92ef7e117b889e Author: Kendell Clement <[email protected]> Date: Sat Feb 26 14:21:57 2022 -0500 Move metadata for bam input and output commit e5afa4784d5330a1dc95c5deafcd9217edeac631 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:20:24 2022 -0700 Coerce int values commit ede7d85b50055311908000578c76a1860ae9de4d Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:18:29 2022 -0700 Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. commit f91736688ea9739cf3063e3601c52ad6da1116a4 Author: Samuel Nichols <[email protected]> Date: Wed Feb 16 10:10:52 2022 -0700 Batch type coerce and r2 file check commit 7b4a310b0f8b64c00e02eca3d522ad50d39b43ae Author: Kendell Clement <[email protected]> Date: Tue Feb 15 22:18:05 2022 -0500 Reiterate WGS region file is tab-separated Add note to WGS description that region file should be tab-separated. Closes #199 commit b8497542e388ad401d0815d426f27abc3201a76d Author: kclem <[email protected]> Date: Fri Feb 11 15:07:14 2022 -0500 Extend x-axis to longest scaffold incorporation length commit ab7248947afade089809c74bfe6e9d5394e8f6dc Author: kclem <[email protected]> Date: Wed Feb 9 17:05:11 2022 -0500 Fix prime editing indexing for plots commit ddbd39f06b262d5ebd2cc69e116c08b22b6bd84e Merge: a7ffd468 442a48c7 Author: Kendell Clement <[email protected]> Date: Thu Jan 13 15:35:36 2022 -0500 Merge branch 'pinellolab:master' into master commit 442a48c7f4c62ec2ebc95fe268475e5e2a4b2f0c Author: Cole Lyman <[email protected]> Date: Tue Jan 11 15:28:28 2022 -0700 Indel alignment fix (#182) * Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. * Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. * Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. * Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. * Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. * Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. * Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. * Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Fix bug in `find_indels_substitutions` Th…
Snicker7
added a commit
that referenced
this pull request
Apr 4, 2024
commit 6f4b0ad885e1d72413a034bf7abaaa0360a3b0c4 Author: Samuel Nichols <[email protected]> Date: Thu Apr 4 15:18:09 2024 -0600 Batch d3 clean (#55) * imports C2Pro plots if available * added --use_matplotlib flag * added C2Pro matched api funciton signatures * added api args for plotly * added **kwargs * renamed config to custom_config, more specificity * added backend flag for plotly kaleido * added pro_installed boolean for templates, added plotly dependency to report templates * Squashed commit of the following: commit c909ea3b34e87ce637e00dac075d2bb2f8bfb954 Author: McKay <[email protected]> Date: Thu Feb 15 15:55:23 2024 -0700 added plotly dependency for pro commit 76b3601f6a0144f100266153f1c999e0c5de65de Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:56:19 2024 -0700 Squashed commit of the following: commit 603f2eff9d1aa21ae95f3e134da303b8018d3a33 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:48:20 2024 -0700 fix guardrials partial commit 22fc03183a8070c30dfb74d5c23575ac19019855 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 08:54:01 2024 -0700 Add guardrail partial commit e55f6b21972b578261bc5a864ce1d653d98f9e34 Author: Samuel Nichols <[email protected]> Date: Mon Jan 8 07:50:59 2024 -0700 Functional guardrails, needs reports update commit 6e968e9699ed59a47d88191d03768e042d8b60a4 Merge: 32b49685 e948ce10 Author: Samuel Nichols <[email protected]> Date: Mon Dec 18 13:34:36 2023 -0700 Merge branch 'guardrails-clean-history' of https://github.com/edilytics/CRISPResso2 into guardrails-clean-history commit 32b49685da320501dad2b0ebbb57887b66220ba8 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit 4e309cf6f732565d635de3d4c5d074ada3027e2d Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:55 2023 -0700 Refactor to use CRISPRessoReports module commit e648dc087c0055bc5d2fca13c64071a371dea941 Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:11 2023 -0700 Add CRISPRessoReports subtree commit e948ce107ebb0d1d99010ed12e937f34b5e607d4 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit d33c748871a625facfe8d792e29c77ab9779138f Author: Kendell Clement <[email protected]> Date: Tue Nov 7 16:31:06 2023 -0700 Include parameter --assign_ambiguous_alignments_to_first_reference in readme commit a1435f7f491a6a61434f3051e39f39a4c9bf1edc Author: Kendell Clement <[email protected]> Date: Wed Oct 11 17:17:30 2023 -0600 Enable quantification by sgRNA (#348) This PR includes: - storing the sgRNA-specific editing locations in the crispresso2_info object. Previously, each amplicon would record the indices of quantification windows across the guide, but not for individual guides. This stores the information for each guide in crispresso2_info['results']['refs'][reference_name]['sgRNA_include_idxs'] - a script (count_sgRNA_specific_edits.py) to parse through an allele table output from a completed CRISPResso run (`--write_detailed_allele_table` flag required) to count edits in each sgRNA separately. I don't have a good double-edited sample handy, but it can be run on the demo HDR data [hdr.fastq.gz](http://crispresso.pinellolab.org/static/demo/hdr.fastq.gz) using the command: ``` CRISPResso -r1 hdr.fastq.gz -a acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -e acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcaCctgactccGgaggagaagtctgccgttactgcGctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -c atggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcag -g TGCACCATGGTGTCTGTTTG,GATGAAGTTGGTGGTGAGGCCC --write_detailed_allele_table -n hdr3 -p max -gn guide1,guide2 ``` ``` python CRISPResso2/scripts/count_sgRNA_specific_edits.py -f CRISPResso_on_hdr3 ``` This produces: ``` Processed 25000 alleles Reference: Reference (2391/23415 modified reads) UNMODIFIED: 21024 MODIFIED guide1: 2359 MODIFIED guide2: 32 Reference: HDR (856/1577 modified reads) UNMODIFIED: 721 MODIFIED guide1: 854 MODIFIED guide1 + guide2: 1 MODIFIED guide2: 1 ``` commit 2e3da02fdbed2fa8ae02a277763d65a502459827 Author: Cole Lyman <[email protected]> Date: Tue Oct 10 15:29:08 2023 -0600 changed tuple to list for matplotlib change (#31) (#346) Co-authored-by: mbowcut2 <[email protected]> commit cd3c332135fe4db0f9218e3d87263d5c65838ed9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:54:46 2023 -0600 rename script to camel case commit 7c719d65fb36ac7654db9040f226564ea28fcab9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:53:44 2023 -0600 Add new script for counting high quality bases commit f97cd2795e89464bcc9321ccfdbca3e6af2bcb4f Author: Kendell Clement <[email protected]> Date: Thu Sep 14 15:15:30 2023 -0600 Prime editing alignment params (#336) Adds two parameters to control alignment of pegRNA components: --prime_editing_gap_open_penalty and --prime_editing_gap_extend_penalty. CRISPResso checks to see whether the pegRNA spacer and extension sequence are in the correct orientation, but sometimes they could align in the incorrect orientation with a higher score (e.g. via insertion of multiple gaps, whereas a single long gap would be preferred). Introducing these two parameters allows users to adjust the alignment parameters specifically for these prime-editing checks without adjusting the global alignment parameters which will be applied to reads that are aligned to the WT reference/prime-editing reference sequences. The new prime_editing_gap_open_penalty is set to -50, a higher gap open penalty than the default needleman_wunsch_gap_open penalty (-20). This commit breaks backward-reproducibility, but mostly in the checking of pegRNA component orientation - so previously some CRISPResso runs would have failed and produced an error, but now they will (hopefully) succeed. To achieve complete backward reproducibility, add the flag --prime_editing_gap_open_penalty -20 to runs. commit 64cbf36dae85cffa2c15e73f2a7ee8aa1077d917 Author: Cole Lyman <[email protected]> Date: Thu Sep 7 16:43:30 2023 -0600 Fix samtools piping (#325) * Remove samtools pipe stderr to stdout Sometimes some of the libraries that samtools depends on don't have the correct version information, and as such samtools will report this to stderr when run. Because we pipe the output of samtools, we expect it to be valid SAM format, but when these library version messages are reported, it breaks CRISPRessoWGS. * Remove extra spacing at end of lines and add missing comma in WGS * Log stderr from samtools in CRISPRessoWGS commit 8feff4101f27406d9d88ace97d31a518276bff3f Author: Cole Lyman <[email protected]> Date: Fri Sep 1 09:43:56 2023 -0600 Replace link to CRISPResso schematic with raw URL in README (#329) * Replace link to CRISPResso schematic with raw URL * Add new lines to the beginning of unordered lists commit 2e9e6bff5bcc536d5e2ba1440d1ab96d9d47efd6 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:52:12 2023 -0600 Try to unbreak CircleCI commit ae5b95246cb0f6d66c4cbfb50cf8f5a9626b0827 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:27 2023 -0600 Center command line text messages commit 4d9c71ecf2248c9bb1e10430178dc318b6621c8b Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:07 2023 -0600 Fix bug in prime-editing scaffold-incorporation plotting If read is too short, scaffold incorporation detection will fail because it will check beyond the length of the read. commit 2b36a1a5c35e8a93516ce8baf464595615e0f402 Author: Kendell Clement <[email protected]> Date: Wed Aug 9 15:29:48 2023 -0600 CRISPRessoPooled --compile_postrun_references bug fixes commit 3e04d1d402bcf95edd39fc7c8c9af61bb380f9db Author: Kendell Clement <[email protected]> Date: Tue Aug 8 23:30:15 2023 -0600 Fix missing ' in Pooled --demultiplex_only_at_amplicons commit 06af527f9e2020c5cf251e7f1cec0b1eca1c1664 Author: Cole Lyman <[email protected]> Date: Mon Jul 24 10:47:46 2023 -0600 Sort pandas dataframes by # of reads and sequences so that the order is consistent (#316) * Make sorting stable * Including c files * Sort by #Reads instead of %Reads to avoid floating point errors --------- Co-authored-by: Samuel Nichols <[email protected]> commit de05533b3511a84f3b6b14fc2ef64db041613261 Author: Cole Lyman <[email protected]> Date: Thu Jul 6 13:54:45 2023 -0600 Fix multiprocessing lambda pickling (#311) * Fix running plots in parallel The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. * Fix multiprocessing lambda pickling (#20) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Further fixes to pickling multiprocessing error (#21) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Use Counter instead of defaultdict in CRISPRessoCORE * Update process_futures to dict in Batch and Aggregate commit ebb016dff46c280dce8c3c09e8ac0e0cc25d4d74 Author: Kendell Clement <[email protected]> Date: Mon Jul 3 17:12:09 2023 -0600 Enable CRISPRessoPooled multiprocessing when os allows multi-thread file append commit 7285da0e987b77b72c8885bb35940e0f50c146bd Author: Kendell Clement <[email protected]> Date: Fri Jun 23 16:50:33 2023 -0600 Fix print bug for invalid fastq commit 9acdeac67441f9a1d55ac94b153bcb68fb89b92c Author: kclem <[email protected]> Date: Wed Jun 21 16:03:48 2023 -0600 Slugify before creating filename - replaces invalid characters in batch names with _ commit f97e29c67de4c80b8d6b9cf334f363be4b514ade Author: Cole Lyman <[email protected]> Date: Wed Jun 21 14:43:43 2023 -0600 Add verbosity argument to CRISPRessoAggregate (#18) fixes #306 (#307) * Add verbosity argument to CRISPRessoAggregate (#18) * Allow for amplicon and guide seqs to be some variant of NA in batch (#19) This was discovered when attempting to infer amplicon sequences in batch mode on the web interface, NAs were supplied for the amplicon sequences to the sub CRISPResso commands. commit 32e1e9797da5c3033cdc588e92f06b8813961953 Author: Mark Clement <[email protected]> Date: Wed Jun 21 14:01:00 2023 -0600 Allow for interrogation of overlapping sgRNA sites commit 7248ba8c4deee125ad1ec12fdf1294a84d5f6f93 Author: Kendell Clement <[email protected]> Date: Mon Jun 12 12:16:47 2023 -0600 Check input fastq file format Asserts input format of fastq files - including if gzipped files are missing the gz suffix. commit 83c8ab8f462e7d8c1d04c08c1a398b874f517251 Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:41:55 2023 -0600 Fix CRISPRessoArgParser commit 14a2c8577f566e1b72d5f4e72cd6cd22079610be Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:29:31 2023 -0600 Cosmetic updates for command-line use - version bump to 2.2.13 - If no args are provided, the command line version will print out an abbreviated help message - parameters can be excluded from CRISPRessoArgParser commit 1cd54bc1d03360c3d8121ba9e66b3589fe1cf252 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:47 2023 -0600 Fix multiprocessing error, don't start pool when only using single thread (#302) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload * Only start process pools when using multiple processes This is mainly to solve the issue when running on AWS Lambda, but this should improve single core performance overall. --------- Co-authored-by: Kendell Clement <[email protected]> commit 92a705c939b370373a70cf6ae9f1616de33288b9 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:06 2023 -0600 Update `base_editor` parameters in README and add Plot Harness (#301) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload --------- Co-authored-by: Kendell Clement <[email protected]> commit 7d46c4490235df45c5546b1b470e4e6a99727031 Author: Cole Lyman <[email protected]> Date: Wed May 10 15:41:33 2023 -0600 Clarify CRISPRessoWGS intended use (#303) * Update README to have consistent use of `--base_editor_output` (#16) * Add sample plotting jupyter notebook * Add clarifying info to CRISPRessoWGS description Clarify WGS usage commit 833a701787bb47674b3e921c38cac6189c775cf7 Author: Kendell Clement <[email protected]> Date: Thu May 4 17:02:46 2023 -0400 Remove debug print statements commit 712eb2a11825e8d36f2870deb12b35486bd633fb Author: Kendell Clement <[email protected]> Date: Thu May 4 16:40:07 2023 -0400 Allow dashes in filenames resolve #73 commit a439f094745b2b5e7f032f0777d4c67e6d6f93c5 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:41:58 2023 -0400 Raise exceptions from within futures in plot_pool commit 7e807a60de2a9d18bccd034b87106ceaf7153338 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:38:56 2023 -0400 Fix future pandas indexing warning Pandas error was "FutureWarning: Calling float on a single element Series is deprecated and will raise a TypeError in the future. Use float(ser.iloc[0]) instead" commit 304a92aa7a7ef8c705cb070dce25d9a2e5745ba9 Author: Cole Lyman <[email protected]> Date: Thu Apr 20 13:59:27 2023 -0600 Remove debug print statements fixes #295 (#297) The format string option used here is only available in Python version >=3.8. commit 478c06f784603e96d20f96e91993fdcc4ac35c8a Author: Kendell Clement <[email protected]> Date: Thu Apr 13 12:09:26 2023 -0400 Update plotCustomAllelePlot.py script for #292 (#293) Update type of 'max_rows' param to int Fix location of 'args' in crispresso2_info object commit bcdae39e05d530f4a4e78738c3b30f7664981919 Author: Kendell Clement <[email protected]> Date: Mon Mar 27 13:18:34 2023 -0400 Update pooled parameter format commit 546446e36e7e68b527767d6c31ec341a49df2059 Author: Kendell Clement <[email protected]> Date: Tue Feb 14 16:26:23 2023 -0500 Fix running plots in parallel (#286) The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. Co-authored-by: Cole Lyman <[email protected]> commit d75f32a2eb5aeaaee866c09e5655a3e27af8b1a1 Author: kclem <[email protected]> Date: Fri Feb 10 15:45:15 2023 -0500 Fix #283 to avoid filename collisions Previously, amplicon names longer than 21bp were truncated, but the check for uniqueness wasn't working, so it would overwrite some plot files. This fixes the filename collision and enforces uniqueness in reference filename prefixes. Thanks @mbiokyle29 commit e577318006cd17b2725bd028e5e56634c6eb829a Author: kclem <[email protected]> Date: Mon Feb 6 16:37:25 2023 -0500 Case-insensitive headers accepted in CRISPRessoPooled commit d34927620a4a6126a9988b3041e76f60728abbfe Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:48:33 2023 -0500 Fix print statement in CORE commit ee88b7ed89c395f68225a50dea44a2ad69d5e9a5 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:22:51 2023 -0500 Version bump to 2.2.12 commit 1d4679c72d0c8b4154317c9aff5179217198e2d7 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:01:31 2023 -0500 Status Updates + Pooled Mixed Mode Update (#279) * Implement logging handler to overwrite the latest log status to file * Add StatusHandler to CRISPRessoCORE log This will take the latest log output and write it to a file (`status.txt`), the catch being that with each log the file is overwritten so that one can easily tell where CRISPResso currently is and what the error is (if any). These changes include some slight refactoring in order to accomodate any potential parameter exceptions. * Add StatusHandler to CRISPRessoBatch and refactor `logger.warn` to `warn` * Add StatusHandler to CRISPRessoPooled and a little refactoring * Implement `percent_complete` to the status log * Add StatusHandler to CRISPRessoAggregate log * Add StatusHandler to CRISPRessoCompare log * Add StatusHandler to CRISPRessoPooledWGSCompare log * Add StatusHandler to CRISPRessoWGS log * Rename `status.txt` to `CRISPResso_status.txt` * Modify status log names to match the tool they are generated from * Add percent_complete stages to CRISPRessoCORE These also include log statements of each plot that is being generated as well as fixing some variable name collisions with `ind`. * Format the percentage in the log to be 2 decimal places * Change all plotting logs from `info` to `debug` and simplify progress This refactors how the progress of the plots is calculated, making it much simplier. Before this change we would of had to keep track of the number of times `percent_complete` was output, but now it simply updates the percent complete after each amplicon is finished processing. Hopefully this will make things easier to mantain even though it will be a little less "accurate" (not sure how accurate the original implementation was...). * Implemented shared console log handler across all CRISPResso* calls This allows for easy changes to logging formatting, which was inspired by having to change the default logging level. The default logging level needs to be set at `logging.DEBUG` in order for the debug log statements to not be ignored for the running and status logs. * Add ability to set the verbosity level to each CRISPResso* tool This allows users to set a verbosity level between 1 and 4 using the `-v`/`--verbosity` CLI parameter. If the `--debug` flag is present, then the level will default to 4, being the most verbose. * Implement showing the last seen `percent_compelte` when none is provided * Keep track of and log when multiple parallel runs are completed These changes modify `CRISPRessoMultiProcessing.run_crispresso_cmds` such that we can now display when a run is completed. This potentially breaks how signals and interupts are handled with multiple runs happening, but this needs to be reviewed. * Add debug and percentage complete to CRISPRessoBatch * Add percent complete to CRISPRessoPooled * Add debug and percent_complete message to CRISPRessoAggregate * Add `percent_complete` to CRISPRessoCompare * Add `percent_complete` to CRISPRessoPooledWGSCompare * Add status and `percent_complete` to CRISPRessoMeta * Add `verbosity` arguments to CRISPRessoCompare and CRISPRessoPooledWGSCompare * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name * Fix bug to flow CRISPRessoPooled options to sub command * Make amplicon file args variable name clear * Update how parameters are set and retrieved from parameter object The refactor in the previous commit changed the type of the arguments to a dictionary which doesn't have the parameters as attributes, and this commit fixes that error. * Add note in output header for change in default CRISPRessoPooled In the next release (2.3.0) the `--demultiplex_only_at_amplicons` will be the default when running in mixed-mode. This is to allow for inexact alignments of the reads and the amplicons to the genome. For more context, see this issue https://github.com/pinellolab/CRISPResso2/issues/276 * Clarify the verbosity parameter help message * Separate out parameters to `normalize_name` in CRISPRessoCORE * Separate out parameters to `normalize_name` in CRISPRessoWGS * Separate out parameters to `normalize_name` in CRISPRessoPooled * Separate out parameters to `normalize_name` in CRISPRessoCompare * Fix bug in CRISPRessoPooled by replacing `database_id` with `normalize_name` * Refactor `run_crispresso_cmds` to not require a `logger` This commit implements the functionality to make the `logger` object optional by seeing which module called the `run_crispresso_cmds` function and obtaining the correct object from that module name. The function also immediately returns when no commands are passed to it. * Add amplicon name to plotting debug statements in CRISPRessoCORE --------- Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit ff7eca76e6a3a08af4ac18ac4e88d20f2a06b1f9 Author: Kendell Clement <[email protected]> Date: Thu Jan 26 15:27:27 2023 -0500 CRISPRessoPooled custom header fix (#278) * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name Co-authored-by: Samuel Nichols <[email protected]> commit 104866e1080c973bb025d1a5ba59b19dca1658af Author: Cole Lyman <[email protected]> Date: Thu Jan 5 14:00:26 2023 -0700 Fix deprecated numpy type names (fixes #269) (#270) In the most recent version of numpy (1.24) some of the types have been deprecated. This commit fixes these errors. commit 58a8e42df88b66fad6b4f6ad04a5b9d9d43d01b4 Author: Cole Lyman <[email protected]> Date: Thu Jan 5 06:49:35 2023 -0700 Add snippet about installing CRISPResso2 via bioconda on Apple silicon (#274) I have suffered enough trying to debug my installation, so hopefully this helps someone else. Co-authored-by: Cole Lyman <[email protected]> commit b9851e98104602eb78c2b384105267624295e9d3 Author: Cole Lyman <[email protected]> Date: Thu Dec 22 13:30:23 2022 -0700 Fix bug when pooled bam is input (#265) This change checks to see if a bam file was input, and if so it doesn't try to remove any intermediate files because there aren't any. Co-authored-by: Cole Lyman <[email protected]> commit b822612642043e75a19042941f69b457ce51f517 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 15:26:45 2022 -0500 Delete vscode settings commit b99aa624dec68ef7d19264340ce0cafa829625f4 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:29:14 2022 -0500 Clarify input param help for pooled bam commit 3fae1e8b821ec6b1890bff6561fa8fa67dc49a04 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:28:54 2022 -0500 Fix #235 - Cigar string is * if read unaligned Previously, the bam would set the cigar string to 0 if the read was unaligned. This breaks the sam->bam conversion and causes the errors in #235. commit c65ba07dc5a983453cdf7bb1e27005230dac6f1b Author: Cole Lyman <[email protected]> Date: Thu Dec 8 13:48:17 2022 -0700 Add deprecation notice (#260) * Add FLASh and Trimmomatic deprecation notice to CLI output * Add Edilytics email address to CLI output commit 2a30e5a45f5350ee7c6435bce1cd4edc4d31668a Author: Kendell Clement <[email protected]> Date: Tue Dec 6 12:16:19 2022 -0500 Format filterReadsOnSequencePresence script commit 9d764414edd88a46ad5e4f496e4f1c8d5d60ce3e Author: Kendell Clement <[email protected]> Date: Fri Dec 2 22:12:54 2022 -0500 Clarify default CRISPRessoPooled settings for use_legacy_bowtie2_options_string commit 9ddea40f7f02b546941ddaa4c71fc5283075051a Author: kclem <[email protected]> Date: Mon Nov 14 10:33:04 2022 -0500 Add check for prime editing extension sequence in prime edited sequence if the user specifies the prime_editing_override_prime_edited_ref_seq, it could not contain the extension seq (if they don't provide the extension seq in the appropriate orientation), so check that here. Extension sequence should be provided reverse-complement to the prime edited sequence. commit 152f2dd5001da7090641ee8a1326bde9f7e8104e Author: kclem <[email protected]> Date: Wed Nov 9 11:53:41 2022 -0500 Version bump to 2.2.11a commit 9ed356e3a0c6c316d0860d121772f80ddca6de1d Author: kclem <[email protected]> Date: Wed Nov 9 11:47:30 2022 -0500 Add param to override prime editing sequence checks CRISPResso checks that prime editing guides are provided in the proper orientation (e.g. pegRNA 3'->5', spacer sequence 5'->3') and checks these orientations by alignment. Sometimes, the alignment can be better in the opposite direction, and this parameter allows these checks to be overridden. Otherwise, these checks would halt the program and produce the output 'The prime editing pegRNA spacer sequence appears to be given in the 3\'->5\' order. The prime editing pegRNA spacer sequence (--prime_editing_pegRNA_spacer_seq) must be given in the RNA 5\'->3\' order.' commit 39dd80afb98a22b7edb6f801c363d86bb77eeb5b Author: kclem <[email protected]> Date: Wed Nov 9 10:06:51 2022 -0500 Update filterReadsOnSequencePresence.py commit fe55526927e3fb6e17c9a8a6f59c7057bc1e14eb Author: Kendell Clement <[email protected]> Date: Mon Nov 7 22:25:16 2022 -0500 Add script to filter input based on sequence presence commit 713e57a19c35180035ca35e11a5820065eda0198 Author: Kendell Clement <[email protected]> Date: Tue Oct 18 16:02:26 2022 -0400 Allow spaces in read names for CRISPRessoWGS commit 39ce008bdddccdd8229c0ba185dce78bc2f66968 Author: Cole Lyman <[email protected]> Date: Sat Oct 8 21:09:58 2022 -0600 Fix typo of CRISPResssoPlot when plotting nucleotide quilt (#250) commit 6a2b342c8503b7327c0a2414edfbd16912d60ca5 Author: Kendell Clement <[email protected]> Date: Sat Oct 8 23:08:47 2022 -0400 Batch amplicon plots (#251) * Error out if HDR amplicon matches existing amplicon * Add check for amplicon sequence uniqueness * Fix bug with bam_input not having bam_output * Test for no returned lines in auto mode, version bump to 2.2.11 * Fix pandas deprecation of df.append commit 726b2b93d6e419a1b0aa6a968c97edc55b4cc5a8 Author: Kendell Clement <[email protected]> Date: Thu Oct 6 16:32:02 2022 -0400 Fix CRISPRessoBatch plot pool bug when plots are suppressed commit 7e5049c4dfb88cbc87c91935a91d1f51120a10c2 Author: Cole Lyman <[email protected]> Date: Wed Sep 21 21:04:51 2022 -0600 Fix batch quilt plot name (#249) This fixes an incorrectly named allele quilt plot input in CRISPRessoBatch. commit 1821ca5029c5a1485733f13ab3f2048b4f1fa04e Author: Kendell Clement <[email protected]> Date: Thu Sep 15 15:49:08 2022 -0400 Version bump to 2.2.10 commit c5f79aebfc1ae209f4ee320df250eed89a02787c Author: Cole Lyman <[email protected]> Date: Wed Sep 14 14:24:55 2022 -0600 Parallel plot refactor (#247) * Fix duplicate plotting in CRISPRessoBatch aggregate * Refactor mulltiprocessing plots in CRISPRessoBatch * Refactor multiprocessing plots in CRISPRessoCORE * Refactor multiprocessing plots for CRISPRessoAggregate commit 4ed5e24e6cc1dd8068e2391573ae2438acd32db2 Author: Kendell Clement <[email protected]> Date: Tue Sep 13 14:12:11 2022 -0400 print files in curr dir if Aggregate can't find files commit ce25bc06f29988e7a10afd0b6a09ba0caf0950e0 Author: Kendell Clement <[email protected]> Date: Mon Sep 12 10:32:57 2022 -0400 Spelling typo commit c15f01c75083403f17c58c121b2afe97e9f2a1ec Author: Kendell Clement <[email protected]> Date: Tue Sep 6 17:49:52 2022 -0400 Add helper function to create alignment scoring matrix New scoring matrix can be created using CRISPResso2Align.make_matrix() commit c80f82838c5a228b79ad4484092877cfee08e02c Author: Cole Lyman <[email protected]> Date: Mon Aug 22 18:28:33 2022 -0600 Add `zip_output` (#240) * Making zip of results * Zip command added, if zip is true place_report_in_output_folder is also true, zip removes all files while zipping * Adding --zip to compare and pooled/wgs compare * Add more formatting changes to CRISPRessoShared * Refactoring propagate_crispress_options so only one version exists * Zip added to arguments_to_ignore and warning added when changing arguments * Restore styling * Update README to include --zip * Rename --zip to --zip_output * Change --zip to --zip_output in CompareCORE and PooledWGSCompareCORE * Bug fix arg to args Co-authored-by: Samuel Nichols <[email protected]> commit 5de3d7286d8e33c7cf4d3615fce715806e72f511 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:42:34 2022 -0400 Fix fix to aggregate for CRISPRessoWGS commit a2294c266f43b14969a5d6474076f31a77a57173 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:40:50 2022 -0400 Fix bug in aggregate for WGS commit 7ce3eb4abe4b8ceac933272ac9cb16a8bedf26a3 Author: Kendell Clement <[email protected]> Date: Mon Aug 8 21:53:45 2022 -0400 Update CRISPRessoWGS to allow non-word characters in region names commit 040ac0033d6e250f4e3a412101874cf5e914e08a Author: kclem <[email protected]> Date: Mon Aug 8 16:04:59 2022 -0400 Enable processing of cram files by CRISPRessoWGS Adds --reference to samtools view when viewing cram files commit cf112a0caba8789e28530cc09171285ec6ea9b4c Author: kclem <[email protected]> Date: Mon Aug 8 14:55:46 2022 -0400 Auto amplicon detection for interleaved input Enables processing of interleaved fastq files for guess_guides and guess_amplicons, as well as get_most_frequent_reads. When interleaved input is present, the input is first separated into R1/R2 files, then processing is performed. commit 4ba524dc7b947feca8a0f743837844f9febc2171 Author: Cole Lyman <[email protected]> Date: Thu Aug 4 11:32:11 2022 -0600 Potential fix for aggregate plots in Batch mode (#237) commit 6097a8a104d3f156ef7c08e196ac37e32bf04c71 Author: Kendell Clement <[email protected]> Date: Thu Jul 21 22:45:48 2022 -0400 Fix pct_vectors in crispresso2_info json object commit 65a079d86d6f386793397398f839c46014b54543 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:46:37 2022 -0400 Fix more readme spelling bugs commit e817376ecd54cdea1f29e303ca25b9e7d1d38333 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:42:23 2022 -0400 Fix bug in readme spelling commit 49740ba1d66ed6d13a9e154b8b17bc8b5186581d Author: Kendell Clement <[email protected]> Date: Wed Jul 20 16:10:09 2022 -0400 Fix loading of crispresso info from WGS and Pooled commit b68a43271115251b18e8955e285ccc18f549e8cd Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:11:04 2022 -0400 Add plotly to dockerfile commit b0b7d41d697304d0d5fc93e3346c9de1b98ba41d Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:10:00 2022 -0400 Fix #231 Allow N's in bam output (Try 2) commit c460b3e73fd06a230dbac2e37c86b833144ebf94 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:09:10 2022 -0400 Revert "Fix #231 Allow N's in bam output" This reverts commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3. commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 13:52:37 2022 -0400 Fix #231 Allow N's in bam output commit 0a2419e518dc9b3520058c3927f98b31cd51347e Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:10:01 2022 -0600 Fix bug when name is provided instead of amplicon_name in pooled input file (#229) Also, raise an exception (instead of incorrectly executing) when there are not enough matched parameters in the pooled input file. commit cb58212379803788c04ca5793baaa760cbbeaa81 Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:09:49 2022 -0600 Fix bug when comparing two samples with the same name. (#228) commit e8a796f5f451409cbafed4404dfba4b6b8a124ca Author: Kendell Clement <[email protected]> Date: Thu Jun 23 21:30:23 2022 -0400 Version bump to 2.2.9 commit 632143ddedea48bab9229baeb4bf3ea4d1f658d6 Author: Cole Lyman <[email protected]> Date: Mon Jun 20 19:53:14 2022 -0600 Don't run global frameshift plot when there are no reads (#226) When there are no reads (i.e. global_MODIFIED_FRAMESHIFT + global_MODIFIED_NON_FRAMESHIFT + global_NON_MODIFIED_NON_FRAMESHIFT == 0) there was a bug when trying to compute the pie chart, because all of the values in the pie chart are 0. This fix, will make sure that there is at least one read in order for the plot to bee constructed properly. commit 4bb06218e835d2624d53fd401542caef6f8a3a55 Author: kclem <[email protected]> Date: Fri Jun 3 16:57:02 2022 -0400 Improvements for guide inference in 'auto' mode In 'auto' mode, a putative guide sequence is selected at the site of maximal editing. If the site of maximal editing happens near the end of the guide (e.g. base 0) many things will break (e.g. quantification windows, etc). This update excludes bases from being used to find the guide using the --exclude_bp_from_left and --exclude_bp_from_right parameters. At default, these parameters are 15bp, so the first and last 15bp would not be selected for the site of maximal editing and thus be the site of a guide sequence. In addition, the site of maximal editing must have 3x the magnitude over the background. commit 9d64de187835b2553ad2b4374d32edab27f83645 Author: Kendell Clement <[email protected]> Date: Thu Jun 2 20:22:25 2022 -0400 Update README.md commit 6aafc5387986f5089ba55b68d128343d68052792 Author: Simon P Shen <[email protected]> Date: Tue May 31 17:42:53 2022 -0400 directory in quotes in batch cmd (#222) Add quotes around output folder for folders that have spaces. commit 432f163ac68b9a650d1fd326171aadc505ee87f4 Author: Kendell Clement <[email protected]> Date: Tue May 24 23:38:36 2022 -0400 CRISPRessoBatch fills NA values in batch settings NA values in CRISPRessoBatch are filled with the value from args - either the default value or the value from the command line args (if set) commit 6de774adbad3aa8cd99d07b0ba7692984b356cd4 Author: kclem <[email protected]> Date: Mon May 23 14:18:02 2022 -0400 Fix file naming bug for HDR outputs In html file, figures 4e and 4f incorrectly referenced figure 4d. This fixes this bug. commit b88fec0668a4082a12ead3d26582e86d829dd7cc Author: Kendell Clement <[email protected]> Date: Sat May 21 00:32:15 2022 -0400 For bam_output, fix bug that wrote unaligned lines twice commit 3564e77ebcdedb4b01cc01dcca18ba3221fac67c Author: Kendell Clement <[email protected]> Date: Thu May 19 16:32:18 2022 -0400 Update README with CRISPRessoPooled headers and bam_output parameters commit bc08d81f17cb1929d1c37a1773cffcf36fb12fe2 Author: Kendell Clement <[email protected]> Date: Thu May 19 16:11:30 2022 -0400 Add more links to tools commit 006c497a379ecd94b017a883a5db887861e1586a Author: Kendell Clement <[email protected]> Date: Thu May 19 16:08:14 2022 -0400 Add links to tools commit dc8243373ad00d6bd467fc30c59942596ff0c5d6 Author: Kendell Clement <[email protected]> Date: Mon May 16 21:38:06 2022 -0400 fastq_to_bam implementation (#219) commit e88b6833977c6b2768299e0b2e7af623e3a9ae7c Author: Kendell Clement <[email protected]> Date: Sun May 8 02:14:13 2022 -0400 Fix bug for when guides don't agree in CRISPRessoAggregate commit 7eb763116a8c60603f1cd654645215767ee8eb52 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:21 2022 -0400 Fix bug for case of empty summary plots in report generation commit 0324fa67d14ed945f0c9531d9bcf73ebcf4ca042 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:02 2022 -0400 Create report for number of significant bases in CRISPRessoCompare commit e3c9d0026a9ee6732f3ed6bdcf2a824850d7e66a Author: Kendell Clement <[email protected]> Date: Wed May 4 22:43:11 2022 -0400 Update pickle to json in readme and CRISPRessoPooledWGSCompare commit 1553f7977c12bf1091a20ca55b878bccfb739b61 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:10:04 2022 -0400 Merge pull request #4 from pinellolab/master (#218) commit bcecbfc047d294e26f381a6668e08cb4db24445c Merge: 15b0e05b bb13e007 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:06:37 2022 -0400 Merge branch 'master' into master commit bb13e007738d6e7a4909e01f03daff592f334f36 Merge: af4ab6e8 d0b41483 Author: Kendell Clement <[email protected]> Date: Wed May 4 17:59:32 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 15b0e05b9e03bbec5236e58776ddf9aa2f93180e Author: Kendell Clement <[email protected]> Date: Wed May 4 17:54:52 2022 -0400 2 flexible pooled input (#217) * Batch type coerce and r2 file check * Upgrade tabs for bootstrap5 * Update readme with additional pooled amplicon file headers Co-authored-by: Samuel Nichols <[email protected]> commit d0b41483bee704940ba60c58289f412b04c71659 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:43:43 2022 -0400 Update README.md commit ce49fab5301cb73ba0daf6c765e350eb083c76f1 Merge: 5f909713 b913fcb4 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:40:30 2022 -0400 Merge pull request #3 from edilytics/2-flexible-pooled-input Add flexibility to CRISPRessoPooled amplicon input by allowing headers. Also, prime editing and quantification window coordinate parameters can be passed to CRISPRessoPooled. commit b913fcb402a8ba3106c3ff7913563a33d8d19fca Author: Kendell Clement <[email protected]> Date: Wed May 4 13:38:25 2022 -0400 Update CRISPRessoPooledCORE.py Replace process to read header, increase flexibility for column order commit 945bf31f16530b7ce25b89095b2c7005bf146117 Merge: 7b8f6788 5f909713 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:45:24 2022 -0400 Merge branch 'master' into 2-flexible-pooled-input commit 5f9097133765736a7c2fe3c8e9b730845fed0b70 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:23:44 2022 -0400 Version bump to 2.2.8 commit c4a94ce0e06c6ebae13e128fbe6b708e635121c4 Author: Kendell Clement <[email protected]> Date: Wed May 4 00:13:17 2022 -0400 Fix summary plot representation for multi reports *fixed old reference to make_multi_report which called old summary plot format * renamed summary_plot to summary_plots to reflect a dict with multiple plots commit 62900e9ae6fa37ce99a04f12a63ed5c912f75042 Author: Cole Lyman <[email protected]> Date: Tue May 3 20:47:52 2022 -0600 Large aggregation (#192) * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. I have tried countless different ways for this to work, and this is the best that I can come up with. After the modal is opened it triggers the plot to resize, and then for some reason you need to trigger the resize event. I think this is because a `div` changing size won't actually trigger the resizing of the plot (and neither will just calling `Plotly.Plots.resize`...?!). * Update the axis labels and add autosize to plotly heatmaps I'm pretty sure the autosize doesn't do anything, but it is there for good measure. * Abandon attempts to make plots fullscreen This includes removing the Bootstrap modal (two out of the three plots would resize properly and I couldn't figure out a way to have the plot displayed outside of the modal). I have left in some javascript to make the plot fullscreen, but I couldn't get the formatting quite right and the plot wasn't much bigger in the fullscreen version because there was a ton of space between the plot and the heatmap. If some brave soul would like to tackle it, feel free! * Rename and refactor how plot data is passed around I have consolidated how the plot data is passed around, so that now you can pass in only one dict with all of the information instead of 4 or 5 separate parameters. I also renamed the `heatmap_plot_*` to `allele_modification_heatmap_*`. * Implement the line plot version of the modification percentages This also includes correctly resizing the plot when the line plot tab is selected! * Change default `max_samples_per_summary_plot` to be 150 instead of 250 * Remove extra assignments of `this_number_samples` and suppress plot The plot that is suppressed is the large nucleotide quilt when there is a large number of samples. Is it okay to suppress this plot @kclem? * Implement parallel plotting in CRISPRessoAggregate * Fix sample indexing error and heatmap scaling for large number of samples * Add plotly requrement to setup.py * Remove space around vertical barcharts * Add scrollbar to long images in multiReport * Fill in default (empty) values to allele modification plots When not running CRISPRessoAggregate, default values for the `allele_modification_heatmap_plot` and `allele_modification_lin_plot` dictionaries will be set so that the template can be properly rendered. * Include CRISPRessoBatch in the refactor of how summary_plot dicts are handled * Update dockerfile for new docker * minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) * Allow for flexible parsing of quant window coordinates * CRISPRessoPooled debug flash command, fix pep formatting * Set flexiguide homology parameter type to int * Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values * Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. * Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. * Create allele modification heatmaps and line plots in CRISPRessoBatch * Add allele modification heatmaps and line plots to CRISPRessoBatch * Make all plots in CRISPRessoBatch run in parallel * Make `--suppress_batch_summary_plots` store true Also, only open and shutdown the process pool when necessary. * Add blank values for allele_modification entries when not present Co-authored-by: Kendell Clement <[email protected]> Co-authored-by: dharjanto <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit f67376fc9ab0e407d4086aa42fd1c77706ebc9c0 Author: Kendell Clement <[email protected]> Date: Fri Apr 15 00:46:30 2022 -0400 Fix bug from old pandas for int cols Evidently old pandas versions throw an error if a column doesn't exist. This checks to see if the column exists before the values are set. commit b34fe2956ff88629809b2434878028723dfc4895 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 23:58:07 2022 -0400 Handle multiple qwcs in batch mode If multiple qwcs were provided in batch mode, a parsing error would occur. This fixes this bug. commit c94e3b9f2e301bda91e9c1e6f4ef794b33b5dbf0 Author: Samuel Nichols <[email protected]> Date: Thu Apr 14 21:48:32 2022 -0600 Coerce ints in batch file checking (#200) * Batch type coerce and r2 file check * Revert "Batch type coerce and r2 file check" This reverts commit f91736688ea9739cf3063e3601c52ad6da1116a4. * Coerce int values commit fc4542491bb86eb143db0044a848a56234403496 Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:13:23 2022 -0400 Set flexiguide homology parameter type to int commit 23fe2aa8e26067d1bcf36bfafc67e023c7588d2f Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:12:37 2022 -0400 CRISPRessoPooled debug flash command, fix pep formatting commit d292d33d8c1fa3bfd2cee656643fd47bcdab161d Author: Kendell Clement <[email protected]> Date: Thu Apr 14 22:00:19 2022 -0400 Allow for flexible parsing of quant window coordinates commit e1667cb53a7ea6fbb33369c8530a78639ed423ec Author: dharjanto <[email protected]> Date: Mon Apr 11 22:08:21 2022 -0400 minor bug fixes for plotCustomAllelePlot.py to work with Python3 (#212) commit 7b8f6788da18f6ab173fa3c3d10f4ab6bb2acc26 Author: Samuel Nichols <[email protected]> Date: Fri Apr 8 10:21:00 2022 -0600 Update README commit 9bc24cd0474ed9f398dff64274d3181c4b2f8637 Author: Samuel Nichols <[email protected]> Date: Tue Mar 29 11:25:09 2022 -0600 Using Amplicon_Name commit 88ac5d72074b3da63de035e02c911ce34cd29414 Merge: b6057a2d e5afa478 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 22:32:09 2022 -0600 Merge remote-tracking branch 'origin/master' into 2-flexible-pooled-input commit b6057a2d54cb8637ff0900416de8e2de72213f76 Author: Samuel Nichols <[email protected]> Date: Mon Mar 28 20:53:05 2022 -0600 Printing info statements for matched headers commit af4ab6e8507d7aa4b7b68f217a458e0d9c966f55 Merge: bbb7d6f0 51a943c3 Author: Cole Lyman <[email protected]> Date: Fri Mar 25 09:44:13 2022 -0600 Merge branch 'pinellolab:master' into master commit 3c1eb012fc02563e3e963f17a62c7e932f5bcddc Author: Samuel Nichols <[email protected]> Date: Thu Mar 24 12:31:43 2022 -0600 Debugging and column checking commit 0b47acbc592a6df6adf14641357b2104b76be691 Author: Samuel Nichols <[email protected]> Date: Wed Mar 23 09:42:51 2022 -0600 New variables added to pooled commit a0ff3a44d6d19d7b37f91919b5c0180206f72d53 Author: Samuel Nichols <[email protected]> Date: Mon Mar 21 09:32:28 2022 -0600 Read as string not bytes commit 710675fc3c0307e21103abd604315b47ff80a894 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 13:51:30 2022 -0600 Adding command building for new options commit f386818a48e5c840bd567611e6f1320c8146cac7 Author: Samuel Nichols <[email protected]> Date: Wed Mar 16 10:08:33 2022 -0600 Comment out df_template.iloc instance commi…
mbowcut2
added a commit
that referenced
this pull request
Apr 15, 2024
commit a98d35a5d38298fa68a83aecaf80b1cb9023b5a5 Author: McKay <[email protected]> Date: Mon Apr 15 14:30:55 2024 -0600 Squashed commit of the following: commit 06f48ed73228580cfedaab389a6db55a62456b97 Author: McKay <[email protected]> Date: Mon Apr 15 14:02:58 2024 -0600 c2pro installation in dockerfile commit 38dd5150a785e65edf7308bed35001b49bbbf017 Author: McKay <[email protected]> Date: Mon Apr 15 13:20:46 2024 -0600 removed && commit ad38cee6ede27affaae6862173e912c999f32ce1 Author: McKay <[email protected]> Date: Mon Apr 15 12:12:12 2024 -0600 moved d3 import to end commit c2ba22f35c3e0a7775b3b89405c3c5ca38b3c4ee Author: McKay <[email protected]> Date: Mon Apr 15 12:11:03 2024 -0600 removed duplicate imports leave d3 in bottom plotly at top commit 44cbe598affd5176d3209fd1901db0d0c438f625 Author: McKay <[email protected]> Date: Fri Apr 12 16:07:18 2024 -0600 fixed batch rendering for d3 commit 418a6205ce52d8eb45799b34bcb47e3e5372d726 Author: McKay <[email protected]> Date: Fri Apr 12 15:47:45 2024 -0600 fixed d3 plot 2b rendering commit d4e00703ff6f023606505b787e5ddc31772d9e8c Author: McKay <[email protected]> Date: Wed Apr 10 15:52:05 2024 -0600 move C2Pro install before app run commit e8f1947a3e5e5106d74f9200a6dac93616b171bd Author: McKay <[email protected]> Date: Tue Apr 9 17:21:40 2024 -0600 fixed guardrails, paritals path commit 0a99c237b66970053a82221dba4b5aa6c2d2b568 Author: McKay <[email protected]> Date: Tue Apr 9 13:33:40 2024 -0600 fastp, htmx, jquery dependencies commit 62e8e66f62ddc226a470e82ee761279fb957c71d Author: McKay <[email protected]> Date: Tue Apr 9 12:15:49 2024 -0600 removed commented code commit 11fb95e02f6133df827798098765b07043723a4f Author: McKay <[email protected]> Date: Tue Apr 9 11:19:58 2024 -0600 reports changes commit 3220cd8c6c031c1710c72c9cf0eb7d6070757bd3 Author: McKay <[email protected]> Date: Mon Apr 8 15:50:54 2024 -0600 Squashed commit of the following: commit 53fecf71977f10c0d643887bf110cf7cbf044b8e Author: Sam <[email protected]> Date: Thu Apr 4 15:35:39 2024 -0600 Squashed commit of the following: commit 6f4b0ad885e1d72413a034bf7abaaa0360a3b0c4 Author: Samuel Nichols <[email protected]> Date: Thu Apr 4 15:18:09 2024 -0600 Batch d3 clean (#55) * imports C2Pro plots if available * added --use_matplotlib flag * added C2Pro matched api funciton signatures * added api args for plotly * added **kwargs * renamed config to custom_config, more specificity * added backend flag for plotly kaleido * added pro_installed boolean for templates, added plotly dependency to report templates * Squashed commit of the following: commit c909ea3b34e87ce637e00dac075d2bb2f8bfb954 Author: McKay <[email protected]> Date: Thu Feb 15 15:55:23 2024 -0700 added plotly dependency for pro commit 76b3601f6a0144f100266153f1c999e0c5de65de Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:56:19 2024 -0700 Squashed commit of the following: commit 603f2eff9d1aa21ae95f3e134da303b8018d3a33 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 09:48:20 2024 -0700 fix guardrials partial commit 22fc03183a8070c30dfb74d5c23575ac19019855 Author: Samuel Nichols <[email protected]> Date: Fri Jan 12 08:54:01 2024 -0700 Add guardrail partial commit e55f6b21972b578261bc5a864ce1d653d98f9e34 Author: Samuel Nichols <[email protected]> Date: Mon Jan 8 07:50:59 2024 -0700 Functional guardrails, needs reports update commit 6e968e9699ed59a47d88191d03768e042d8b60a4 Merge: 32b49685 e948ce10 Author: Samuel Nichols <[email protected]> Date: Mon Dec 18 13:34:36 2023 -0700 Merge branch 'guardrails-clean-history' of https://github.com/edilytics/CRISPResso2 into guardrails-clean-history commit 32b49685da320501dad2b0ebbb57887b66220ba8 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit 4e309cf6f732565d635de3d4c5d074ada3027e2d Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:55 2023 -0700 Refactor to use CRISPRessoReports module commit e648dc087c0055bc5d2fca13c64071a371dea941 Author: Cole Lyman <[email protected]> Date: Mon Dec 18 10:51:11 2023 -0700 Add CRISPRessoReports subtree commit e948ce107ebb0d1d99010ed12e937f34b5e607d4 Author: Samuel Nichols <[email protected]> Date: Fri Dec 15 15:27:04 2023 -0700 Include guardrail functions commit d33c748871a625facfe8d792e29c77ab9779138f Author: Kendell Clement <[email protected]> Date: Tue Nov 7 16:31:06 2023 -0700 Include parameter --assign_ambiguous_alignments_to_first_reference in readme commit a1435f7f491a6a61434f3051e39f39a4c9bf1edc Author: Kendell Clement <[email protected]> Date: Wed Oct 11 17:17:30 2023 -0600 Enable quantification by sgRNA (#348) This PR includes: - storing the sgRNA-specific editing locations in the crispresso2_info object. Previously, each amplicon would record the indices of quantification windows across the guide, but not for individual guides. This stores the information for each guide in crispresso2_info['results']['refs'][reference_name]['sgRNA_include_idxs'] - a script (count_sgRNA_specific_edits.py) to parse through an allele table output from a completed CRISPResso run (`--write_detailed_allele_table` flag required) to count edits in each sgRNA separately. I don't have a good double-edited sample handy, but it can be run on the demo HDR data [hdr.fastq.gz](http://crispresso.pinellolab.org/static/demo/hdr.fastq.gz) using the command: ``` CRISPResso -r1 hdr.fastq.gz -a acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -e acatttgcttctgacacaactgtgttcactagcaacctcaaacagacaccatggtgcaCctgactccGgaggagaagtctgccgttactgcGctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcaggttggtatcaaggtta -c atggtgcatctgactcctgTggagaagtctgccgttactgccctgtggggcaaggtgaacgtggatgaagttggtggtgaggccctgggcag -g TGCACCATGGTGTCTGTTTG,GATGAAGTTGGTGGTGAGGCCC --write_detailed_allele_table -n hdr3 -p max -gn guide1,guide2 ``` ``` python CRISPResso2/scripts/count_sgRNA_specific_edits.py -f CRISPResso_on_hdr3 ``` This produces: ``` Processed 25000 alleles Reference: Reference (2391/23415 modified reads) UNMODIFIED: 21024 MODIFIED guide1: 2359 MODIFIED guide2: 32 Reference: HDR (856/1577 modified reads) UNMODIFIED: 721 MODIFIED guide1: 854 MODIFIED guide1 + guide2: 1 MODIFIED guide2: 1 ``` commit 2e3da02fdbed2fa8ae02a277763d65a502459827 Author: Cole Lyman <[email protected]> Date: Tue Oct 10 15:29:08 2023 -0600 changed tuple to list for matplotlib change (#31) (#346) Co-authored-by: mbowcut2 <[email protected]> commit cd3c332135fe4db0f9218e3d87263d5c65838ed9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:54:46 2023 -0600 rename script to camel case commit 7c719d65fb36ac7654db9040f226564ea28fcab9 Author: Kendell Clement <[email protected]> Date: Sun Oct 1 01:53:44 2023 -0600 Add new script for counting high quality bases commit f97cd2795e89464bcc9321ccfdbca3e6af2bcb4f Author: Kendell Clement <[email protected]> Date: Thu Sep 14 15:15:30 2023 -0600 Prime editing alignment params (#336) Adds two parameters to control alignment of pegRNA components: --prime_editing_gap_open_penalty and --prime_editing_gap_extend_penalty. CRISPResso checks to see whether the pegRNA spacer and extension sequence are in the correct orientation, but sometimes they could align in the incorrect orientation with a higher score (e.g. via insertion of multiple gaps, whereas a single long gap would be preferred). Introducing these two parameters allows users to adjust the alignment parameters specifically for these prime-editing checks without adjusting the global alignment parameters which will be applied to reads that are aligned to the WT reference/prime-editing reference sequences. The new prime_editing_gap_open_penalty is set to -50, a higher gap open penalty than the default needleman_wunsch_gap_open penalty (-20). This commit breaks backward-reproducibility, but mostly in the checking of pegRNA component orientation - so previously some CRISPResso runs would have failed and produced an error, but now they will (hopefully) succeed. To achieve complete backward reproducibility, add the flag --prime_editing_gap_open_penalty -20 to runs. commit 64cbf36dae85cffa2c15e73f2a7ee8aa1077d917 Author: Cole Lyman <[email protected]> Date: Thu Sep 7 16:43:30 2023 -0600 Fix samtools piping (#325) * Remove samtools pipe stderr to stdout Sometimes some of the libraries that samtools depends on don't have the correct version information, and as such samtools will report this to stderr when run. Because we pipe the output of samtools, we expect it to be valid SAM format, but when these library version messages are reported, it breaks CRISPRessoWGS. * Remove extra spacing at end of lines and add missing comma in WGS * Log stderr from samtools in CRISPRessoWGS commit 8feff4101f27406d9d88ace97d31a518276bff3f Author: Cole Lyman <[email protected]> Date: Fri Sep 1 09:43:56 2023 -0600 Replace link to CRISPResso schematic with raw URL in README (#329) * Replace link to CRISPResso schematic with raw URL * Add new lines to the beginning of unordered lists commit 2e9e6bff5bcc536d5e2ba1440d1ab96d9d47efd6 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:52:12 2023 -0600 Try to unbreak CircleCI commit ae5b95246cb0f6d66c4cbfb50cf8f5a9626b0827 Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:27 2023 -0600 Center command line text messages commit 4d9c71ecf2248c9bb1e10430178dc318b6621c8b Author: Kendell Clement <[email protected]> Date: Thu Aug 10 00:17:07 2023 -0600 Fix bug in prime-editing scaffold-incorporation plotting If read is too short, scaffold incorporation detection will fail because it will check beyond the length of the read. commit 2b36a1a5c35e8a93516ce8baf464595615e0f402 Author: Kendell Clement <[email protected]> Date: Wed Aug 9 15:29:48 2023 -0600 CRISPRessoPooled --compile_postrun_references bug fixes commit 3e04d1d402bcf95edd39fc7c8c9af61bb380f9db Author: Kendell Clement <[email protected]> Date: Tue Aug 8 23:30:15 2023 -0600 Fix missing ' in Pooled --demultiplex_only_at_amplicons commit 06af527f9e2020c5cf251e7f1cec0b1eca1c1664 Author: Cole Lyman <[email protected]> Date: Mon Jul 24 10:47:46 2023 -0600 Sort pandas dataframes by # of reads and sequences so that the order is consistent (#316) * Make sorting stable * Including c files * Sort by #Reads instead of %Reads to avoid floating point errors --------- Co-authored-by: Samuel Nichols <[email protected]> commit de05533b3511a84f3b6b14fc2ef64db041613261 Author: Cole Lyman <[email protected]> Date: Thu Jul 6 13:54:45 2023 -0600 Fix multiprocessing lambda pickling (#311) * Fix running plots in parallel The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. * Fix multiprocessing lambda pickling (#20) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Further fixes to pickling multiprocessing error (#21) * Refactor process_futures to be a dict This makes debugging much easier because you can associate the arguments to the future with the results. * Fix the pickling error when running in multiprocessing Only top-level functions (not lambdas) can be pickled to use in multiprocessing pools, thus the lambdas are converted to a regular function. * Use Counter instead of defaultdict in CRISPRessoCORE * Update process_futures to dict in Batch and Aggregate commit ebb016dff46c280dce8c3c09e8ac0e0cc25d4d74 Author: Kendell Clement <[email protected]> Date: Mon Jul 3 17:12:09 2023 -0600 Enable CRISPRessoPooled multiprocessing when os allows multi-thread file append commit 7285da0e987b77b72c8885bb35940e0f50c146bd Author: Kendell Clement <[email protected]> Date: Fri Jun 23 16:50:33 2023 -0600 Fix print bug for invalid fastq commit 9acdeac67441f9a1d55ac94b153bcb68fb89b92c Author: kclem <[email protected]> Date: Wed Jun 21 16:03:48 2023 -0600 Slugify before creating filename - replaces invalid characters in batch names with _ commit f97e29c67de4c80b8d6b9cf334f363be4b514ade Author: Cole Lyman <[email protected]> Date: Wed Jun 21 14:43:43 2023 -0600 Add verbosity argument to CRISPRessoAggregate (#18) fixes #306 (#307) * Add verbosity argument to CRISPRessoAggregate (#18) * Allow for amplicon and guide seqs to be some variant of NA in batch (#19) This was discovered when attempting to infer amplicon sequences in batch mode on the web interface, NAs were supplied for the amplicon sequences to the sub CRISPResso commands. commit 32e1e9797da5c3033cdc588e92f06b8813961953 Author: Mark Clement <[email protected]> Date: Wed Jun 21 14:01:00 2023 -0600 Allow for interrogation of overlapping sgRNA sites commit 7248ba8c4deee125ad1ec12fdf1294a84d5f6f93 Author: Kendell Clement <[email protected]> Date: Mon Jun 12 12:16:47 2023 -0600 Check input fastq file format Asserts input format of fastq files - including if gzipped files are missing the gz suffix. commit 83c8ab8f462e7d8c1d04c08c1a398b874f517251 Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:41:55 2023 -0600 Fix CRISPRessoArgParser commit 14a2c8577f566e1b72d5f4e72cd6cd22079610be Author: Kendell Clement <[email protected]> Date: Mon Jun 5 13:29:31 2023 -0600 Cosmetic updates for command-line use - version bump to 2.2.13 - If no args are provided, the command line version will print out an abbreviated help message - parameters can be excluded from CRISPRessoArgParser commit 1cd54bc1d03360c3d8121ba9e66b3589fe1cf252 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:47 2023 -0600 Fix multiprocessing error, don't start pool when only using single thread (#302) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload * Only start process pools when using multiple processes This is mainly to solve the issue when running on AWS Lambda, but this should improve single core performance overall. --------- Co-authored-by: Kendell Clement <[email protected]> commit 92a705c939b370373a70cf6ae9f1616de33288b9 Author: Cole Lyman <[email protected]> Date: Thu May 11 14:31:06 2023 -0600 Update `base_editor` parameters in README and add Plot Harness (#301) * Update README to have consistent use of `--base_editor_output` (#16) * Add files via upload --------- Co-authored-by: Kendell Clement <[email protected]> commit 7d46c4490235df45c5546b1b470e4e6a99727031 Author: Cole Lyman <[email protected]> Date: Wed May 10 15:41:33 2023 -0600 Clarify CRISPRessoWGS intended use (#303) * Update README to have consistent use of `--base_editor_output` (#16) * Add sample plotting jupyter notebook * Add clarifying info to CRISPRessoWGS description Clarify WGS usage commit 833a701787bb47674b3e921c38cac6189c775cf7 Author: Kendell Clement <[email protected]> Date: Thu May 4 17:02:46 2023 -0400 Remove debug print statements commit 712eb2a11825e8d36f2870deb12b35486bd633fb Author: Kendell Clement <[email protected]> Date: Thu May 4 16:40:07 2023 -0400 Allow dashes in filenames resolve #73 commit a439f094745b2b5e7f032f0777d4c67e6d6f93c5 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:41:58 2023 -0400 Raise exceptions from within futures in plot_pool commit 7e807a60de2a9d18bccd034b87106ceaf7153338 Author: Kendell Clement <[email protected]> Date: Sat Apr 22 23:38:56 2023 -0400 Fix future pandas indexing warning Pandas error was "FutureWarning: Calling float on a single element Series is deprecated and will raise a TypeError in the future. Use float(ser.iloc[0]) instead" commit 304a92aa7a7ef8c705cb070dce25d9a2e5745ba9 Author: Cole Lyman <[email protected]> Date: Thu Apr 20 13:59:27 2023 -0600 Remove debug print statements fixes #295 (#297) The format string option used here is only available in Python version >=3.8. commit 478c06f784603e96d20f96e91993fdcc4ac35c8a Author: Kendell Clement <[email protected]> Date: Thu Apr 13 12:09:26 2023 -0400 Update plotCustomAllelePlot.py script for #292 (#293) Update type of 'max_rows' param to int Fix location of 'args' in crispresso2_info object commit bcdae39e05d530f4a4e78738c3b30f7664981919 Author: Kendell Clement <[email protected]> Date: Mon Mar 27 13:18:34 2023 -0400 Update pooled parameter format commit 546446e36e7e68b527767d6c31ec341a49df2059 Author: Kendell Clement <[email protected]> Date: Tue Feb 14 16:26:23 2023 -0500 Fix running plots in parallel (#286) The reason the plots were running slower before this change is because I was calling the plot function, not passing it to `submit`. So it was essentially running in serial, but worse because it was still spinning up/down the processes. Co-authored-by: Cole Lyman <[email protected]> commit d75f32a2eb5aeaaee866c09e5655a3e27af8b1a1 Author: kclem <[email protected]> Date: Fri Feb 10 15:45:15 2023 -0500 Fix #283 to avoid filename collisions Previously, amplicon names longer than 21bp were truncated, but the check for uniqueness wasn't working, so it would overwrite some plot files. This fixes the filename collision and enforces uniqueness in reference filename prefixes. Thanks @mbiokyle29 commit e577318006cd17b2725bd028e5e56634c6eb829a Author: kclem <[email protected]> Date: Mon Feb 6 16:37:25 2023 -0500 Case-insensitive headers accepted in CRISPRessoPooled commit d34927620a4a6126a9988b3041e76f60728abbfe Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:48:33 2023 -0500 Fix print statement in CORE commit ee88b7ed89c395f68225a50dea44a2ad69d5e9a5 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:22:51 2023 -0500 Version bump to 2.2.12 commit 1d4679c72d0c8b4154317c9aff5179217198e2d7 Author: Kendell Clement <[email protected]> Date: Tue Jan 31 13:01:31 2023 -0500 Status Updates + Pooled Mixed Mode Update (#279) * Implement logging handler to overwrite the latest log status to file * Add StatusHandler to CRISPRessoCORE log This will take the latest log output and write it to a file (`status.txt`), the catch being that with each log the file is overwritten so that one can easily tell where CRISPResso currently is and what the error is (if any). These changes include some slight refactoring in order to accomodate any potential parameter exceptions. * Add StatusHandler to CRISPRessoBatch and refactor `logger.warn` to `warn` * Add StatusHandler to CRISPRessoPooled and a little refactoring * Implement `percent_complete` to the status log * Add StatusHandler to CRISPRessoAggregate log * Add StatusHandler to CRISPRessoCompare log * Add StatusHandler to CRISPRessoPooledWGSCompare log * Add StatusHandler to CRISPRessoWGS log * Rename `status.txt` to `CRISPResso_status.txt` * Modify status log names to match the tool they are generated from * Add percent_complete stages to CRISPRessoCORE These also include log statements of each plot that is being generated as well as fixing some variable name collisions with `ind`. * Format the percentage in the log to be 2 decimal places * Change all plotting logs from `info` to `debug` and simplify progress This refactors how the progress of the plots is calculated, making it much simplier. Before this change we would of had to keep track of the number of times `percent_complete` was output, but now it simply updates the percent complete after each amplicon is finished processing. Hopefully this will make things easier to mantain even though it will be a little less "accurate" (not sure how accurate the original implementation was...). * Implemented shared console log handler across all CRISPResso* calls This allows for easy changes to logging formatting, which was inspired by having to change the default logging level. The default logging level needs to be set at `logging.DEBUG` in order for the debug log statements to not be ignored for the running and status logs. * Add ability to set the verbosity level to each CRISPResso* tool This allows users to set a verbosity level between 1 and 4 using the `-v`/`--verbosity` CLI parameter. If the `--debug` flag is present, then the level will default to 4, being the most verbose. * Implement showing the last seen `percent_compelte` when none is provided * Keep track of and log when multiple parallel runs are completed These changes modify `CRISPRessoMultiProcessing.run_crispresso_cmds` such that we can now display when a run is completed. This potentially breaks how signals and interupts are handled with multiple runs happening, but this needs to be reviewed. * Add debug and percentage complete to CRISPRessoBatch * Add percent complete to CRISPRessoPooled * Add debug and percent_complete message to CRISPRessoAggregate * Add `percent_complete` to CRISPRessoCompare * Add `percent_complete` to CRISPRessoPooledWGSCompare * Add status and `percent_complete` to CRISPRessoMeta * Add `verbosity` arguments to CRISPRessoCompare and CRISPRessoPooledWGSCompare * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name * Fix bug to flow CRISPRessoPooled options to sub command * Make amplicon file args variable name clear * Update how parameters are set and retrieved from parameter object The refactor in the previous commit changed the type of the arguments to a dictionary which doesn't have the parameters as attributes, and this commit fixes that error. * Add note in output header for change in default CRISPRessoPooled In the next release (2.3.0) the `--demultiplex_only_at_amplicons` will be the default when running in mixed-mode. This is to allow for inexact alignments of the reads and the amplicons to the genome. For more context, see this issue https://github.com/pinellolab/CRISPResso2/issues/276 * Clarify the verbosity parameter help message * Separate out parameters to `normalize_name` in CRISPRessoCORE * Separate out parameters to `normalize_name` in CRISPRessoWGS * Separate out parameters to `normalize_name` in CRISPRessoPooled * Separate out parameters to `normalize_name` in CRISPRessoCompare * Fix bug in CRISPRessoPooled by replacing `database_id` with `normalize_name` * Refactor `run_crispresso_cmds` to not require a `logger` This commit implements the functionality to make the `logger` object optional by seeing which module called the `run_crispresso_cmds` function and obtaining the correct object from that module name. The function also immediately returns when no commands are passed to it. * Add amplicon name to plotting debug statements in CRISPRessoCORE --------- Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Cole Lyman <[email protected]> Co-authored-by: Samuel Nichols <[email protected]> commit ff7eca76e6a3a08af4ac18ac4e88d20f2a06b1f9 Author: Kendell Clement <[email protected]> Date: Thu Jan 26 15:27:27 2023 -0500 CRISPRessoPooled custom header fix (#278) * Fixing documentation to match pooled headers * Header removal bug fix change documentation to guide_seq * Update documentation and help feature for CRISPRessoPooled * Remove extra newlines from CRISPRessoPooled -h * Make variable names as clear as my firstborn child's name * Update one more variable name Co-authored-by: Samuel Nichols <[email protected]> commit 104866e1080c973bb025d1a5ba59b19dca1658af Author: Cole Lyman <[email protected]> Date: Thu Jan 5 14:00:26 2023 -0700 Fix deprecated numpy type names (fixes #269) (#270) In the most recent version of numpy (1.24) some of the types have been deprecated. This commit fixes these errors. commit 58a8e42df88b66fad6b4f6ad04a5b9d9d43d01b4 Author: Cole Lyman <[email protected]> Date: Thu Jan 5 06:49:35 2023 -0700 Add snippet about installing CRISPResso2 via bioconda on Apple silicon (#274) I have suffered enough trying to debug my installation, so hopefully this helps someone else. Co-authored-by: Cole Lyman <[email protected]> commit b9851e98104602eb78c2b384105267624295e9d3 Author: Cole Lyman <[email protected]> Date: Thu Dec 22 13:30:23 2022 -0700 Fix bug when pooled bam is input (#265) This change checks to see if a bam file was input, and if so it doesn't try to remove any intermediate files because there aren't any. Co-authored-by: Cole Lyman <[email protected]> commit b822612642043e75a19042941f69b457ce51f517 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 15:26:45 2022 -0500 Delete vscode settings commit b99aa624dec68ef7d19264340ce0cafa829625f4 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:29:14 2022 -0500 Clarify input param help for pooled bam commit 3fae1e8b821ec6b1890bff6561fa8fa67dc49a04 Author: Kendell Clement <[email protected]> Date: Mon Dec 19 13:28:54 2022 -0500 Fix #235 - Cigar string is * if read unaligned Previously, the bam would set the cigar string to 0 if the read was unaligned. This breaks the sam->bam conversion and causes the errors in #235. commit c65ba07dc5a983453cdf7bb1e27005230dac6f1b Author: Cole Lyman <[email protected]> Date: Thu Dec 8 13:48:17 2022 -0700 Add deprecation notice (#260) * Add FLASh and Trimmomatic deprecation notice to CLI output * Add Edilytics email address to CLI output commit 2a30e5a45f5350ee7c6435bce1cd4edc4d31668a Author: Kendell Clement <[email protected]> Date: Tue Dec 6 12:16:19 2022 -0500 Format filterReadsOnSequencePresence script commit 9d764414edd88a46ad5e4f496e4f1c8d5d60ce3e Author: Kendell Clement <[email protected]> Date: Fri Dec 2 22:12:54 2022 -0500 Clarify default CRISPRessoPooled settings for use_legacy_bowtie2_options_string commit 9ddea40f7f02b546941ddaa4c71fc5283075051a Author: kclem <[email protected]> Date: Mon Nov 14 10:33:04 2022 -0500 Add check for prime editing extension sequence in prime edited sequence if the user specifies the prime_editing_override_prime_edited_ref_seq, it could not contain the extension seq (if they don't provide the extension seq in the appropriate orientation), so check that here. Extension sequence should be provided reverse-complement to the prime edited sequence. commit 152f2dd5001da7090641ee8a1326bde9f7e8104e Author: kclem <[email protected]> Date: Wed Nov 9 11:53:41 2022 -0500 Version bump to 2.2.11a commit 9ed356e3a0c6c316d0860d121772f80ddca6de1d Author: kclem <[email protected]> Date: Wed Nov 9 11:47:30 2022 -0500 Add param to override prime editing sequence checks CRISPResso checks that prime editing guides are provided in the proper orientation (e.g. pegRNA 3'->5', spacer sequence 5'->3') and checks these orientations by alignment. Sometimes, the alignment can be better in the opposite direction, and this parameter allows these checks to be overridden. Otherwise, these checks would halt the program and produce the output 'The prime editing pegRNA spacer sequence appears to be given in the 3\'->5\' order. The prime editing pegRNA spacer sequence (--prime_editing_pegRNA_spacer_seq) must be given in the RNA 5\'->3\' order.' commit 39dd80afb98a22b7edb6f801c363d86bb77eeb5b Author: kclem <[email protected]> Date: Wed Nov 9 10:06:51 2022 -0500 Update filterReadsOnSequencePresence.py commit fe55526927e3fb6e17c9a8a6f59c7057bc1e14eb Author: Kendell Clement <[email protected]> Date: Mon Nov 7 22:25:16 2022 -0500 Add script to filter input based on sequence presence commit 713e57a19c35180035ca35e11a5820065eda0198 Author: Kendell Clement <[email protected]> Date: Tue Oct 18 16:02:26 2022 -0400 Allow spaces in read names for CRISPRessoWGS commit 39ce008bdddccdd8229c0ba185dce78bc2f66968 Author: Cole Lyman <[email protected]> Date: Sat Oct 8 21:09:58 2022 -0600 Fix typo of CRISPResssoPlot when plotting nucleotide quilt (#250) commit 6a2b342c8503b7327c0a2414edfbd16912d60ca5 Author: Kendell Clement <[email protected]> Date: Sat Oct 8 23:08:47 2022 -0400 Batch amplicon plots (#251) * Error out if HDR amplicon matches existing amplicon * Add check for amplicon sequence uniqueness * Fix bug with bam_input not having bam_output * Test for no returned lines in auto mode, version bump to 2.2.11 * Fix pandas deprecation of df.append commit 726b2b93d6e419a1b0aa6a968c97edc55b4cc5a8 Author: Kendell Clement <[email protected]> Date: Thu Oct 6 16:32:02 2022 -0400 Fix CRISPRessoBatch plot pool bug when plots are suppressed commit 7e5049c4dfb88cbc87c91935a91d1f51120a10c2 Author: Cole Lyman <[email protected]> Date: Wed Sep 21 21:04:51 2022 -0600 Fix batch quilt plot name (#249) This fixes an incorrectly named allele quilt plot input in CRISPRessoBatch. commit 1821ca5029c5a1485733f13ab3f2048b4f1fa04e Author: Kendell Clement <[email protected]> Date: Thu Sep 15 15:49:08 2022 -0400 Version bump to 2.2.10 commit c5f79aebfc1ae209f4ee320df250eed89a02787c Author: Cole Lyman <[email protected]> Date: Wed Sep 14 14:24:55 2022 -0600 Parallel plot refactor (#247) * Fix duplicate plotting in CRISPRessoBatch aggregate * Refactor mulltiprocessing plots in CRISPRessoBatch * Refactor multiprocessing plots in CRISPRessoCORE * Refactor multiprocessing plots for CRISPRessoAggregate commit 4ed5e24e6cc1dd8068e2391573ae2438acd32db2 Author: Kendell Clement <[email protected]> Date: Tue Sep 13 14:12:11 2022 -0400 print files in curr dir if Aggregate can't find files commit ce25bc06f29988e7a10afd0b6a09ba0caf0950e0 Author: Kendell Clement <[email protected]> Date: Mon Sep 12 10:32:57 2022 -0400 Spelling typo commit c15f01c75083403f17c58c121b2afe97e9f2a1ec Author: Kendell Clement <[email protected]> Date: Tue Sep 6 17:49:52 2022 -0400 Add helper function to create alignment scoring matrix New scoring matrix can be created using CRISPResso2Align.make_matrix() commit c80f82838c5a228b79ad4484092877cfee08e02c Author: Cole Lyman <[email protected]> Date: Mon Aug 22 18:28:33 2022 -0600 Add `zip_output` (#240) * Making zip of results * Zip command added, if zip is true place_report_in_output_folder is also true, zip removes all files while zipping * Adding --zip to compare and pooled/wgs compare * Add more formatting changes to CRISPRessoShared * Refactoring propagate_crispress_options so only one version exists * Zip added to arguments_to_ignore and warning added when changing arguments * Restore styling * Update README to include --zip * Rename --zip to --zip_output * Change --zip to --zip_output in CompareCORE and PooledWGSCompareCORE * Bug fix arg to args Co-authored-by: Samuel Nichols <[email protected]> commit 5de3d7286d8e33c7cf4d3615fce715806e72f511 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:42:34 2022 -0400 Fix fix to aggregate for CRISPRessoWGS commit a2294c266f43b14969a5d6474076f31a77a57173 Author: Kendell Clement <[email protected]> Date: Thu Aug 11 21:40:50 2022 -0400 Fix bug in aggregate for WGS commit 7ce3eb4abe4b8ceac933272ac9cb16a8bedf26a3 Author: Kendell Clement <[email protected]> Date: Mon Aug 8 21:53:45 2022 -0400 Update CRISPRessoWGS to allow non-word characters in region names commit 040ac0033d6e250f4e3a412101874cf5e914e08a Author: kclem <[email protected]> Date: Mon Aug 8 16:04:59 2022 -0400 Enable processing of cram files by CRISPRessoWGS Adds --reference to samtools view when viewing cram files commit cf112a0caba8789e28530cc09171285ec6ea9b4c Author: kclem <[email protected]> Date: Mon Aug 8 14:55:46 2022 -0400 Auto amplicon detection for interleaved input Enables processing of interleaved fastq files for guess_guides and guess_amplicons, as well as get_most_frequent_reads. When interleaved input is present, the input is first separated into R1/R2 files, then processing is performed. commit 4ba524dc7b947feca8a0f743837844f9febc2171 Author: Cole Lyman <[email protected]> Date: Thu Aug 4 11:32:11 2022 -0600 Potential fix for aggregate plots in Batch mode (#237) commit 6097a8a104d3f156ef7c08e196ac37e32bf04c71 Author: Kendell Clement <[email protected]> Date: Thu Jul 21 22:45:48 2022 -0400 Fix pct_vectors in crispresso2_info json object commit 65a079d86d6f386793397398f839c46014b54543 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:46:37 2022 -0400 Fix more readme spelling bugs commit e817376ecd54cdea1f29e303ca25b9e7d1d38333 Author: Kendell Clement <[email protected]> Date: Wed Jul 20 23:42:23 2022 -0400 Fix bug in readme spelling commit 49740ba1d66ed6d13a9e154b8b17bc8b5186581d Author: Kendell Clement <[email protected]> Date: Wed Jul 20 16:10:09 2022 -0400 Fix loading of crispresso info from WGS and Pooled commit b68a43271115251b18e8955e285ccc18f549e8cd Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:11:04 2022 -0400 Add plotly to dockerfile commit b0b7d41d697304d0d5fc93e3346c9de1b98ba41d Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:10:00 2022 -0400 Fix #231 Allow N's in bam output (Try 2) commit c460b3e73fd06a230dbac2e37c86b833144ebf94 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 14:09:10 2022 -0400 Revert "Fix #231 Allow N's in bam output" This reverts commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3. commit 2f6ad1dbe05210af9ccc1b1f17783cd212a888d3 Author: Kendell Clement <[email protected]> Date: Thu Jul 14 13:52:37 2022 -0400 Fix #231 Allow N's in bam output commit 0a2419e518dc9b3520058c3927f98b31cd51347e Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:10:01 2022 -0600 Fix bug when name is provided instead of amplicon_name in pooled input file (#229) Also, raise an exception (instead of incorrectly executing) when there are not enough matched parameters in the pooled input file. commit cb58212379803788c04ca5793baaa760cbbeaa81 Author: Cole Lyman <[email protected]> Date: Fri Jul 8 21:09:49 2022 -0600 Fix bug when comparing two samples with the same name. (#228) commit e8a796f5f451409cbafed4404dfba4b6b8a124ca Author: Kendell Clement <[email protected]> Date: Thu Jun 23 21:30:23 2022 -0400 Version bump to 2.2.9 commit 632143ddedea48bab9229baeb4bf3ea4d1f658d6 Author: Cole Lyman <[email protected]> Date: Mon Jun 20 19:53:14 2022 -0600 Don't run global frameshift plot when there are no reads (#226) When there are no reads (i.e. global_MODIFIED_FRAMESHIFT + global_MODIFIED_NON_FRAMESHIFT + global_NON_MODIFIED_NON_FRAMESHIFT == 0) there was a bug when trying to compute the pie chart, because all of the values in the pie chart are 0. This fix, will make sure that there is at least one read in order for the plot to bee constructed properly. commit 4bb06218e835d2624d53fd401542caef6f8a3a55 Author: kclem <[email protected]> Date: Fri Jun 3 16:57:02 2022 -0400 Improvements for guide inference in 'auto' mode In 'auto' mode, a putative guide sequence is selected at the site of maximal editing. If the site of maximal editing happens near the end of the guide (e.g. base 0) many things will break (e.g. quantification windows, etc). This update excludes bases from being used to find the guide using the --exclude_bp_from_left and --exclude_bp_from_right parameters. At default, these parameters are 15bp, so the first and last 15bp would not be selected for the site of maximal editing and thus be the site of a guide sequence. In addition, the site of maximal editing must have 3x the magnitude over the background. commit 9d64de187835b2553ad2b4374d32edab27f83645 Author: Kendell Clement <[email protected]> Date: Thu Jun 2 20:22:25 2022 -0400 Update README.md commit 6aafc5387986f5089ba55b68d128343d68052792 Author: Simon P Shen <[email protected]> Date: Tue May 31 17:42:53 2022 -0400 directory in quotes in batch cmd (#222) Add quotes around output folder for folders that have spaces. commit 432f163ac68b9a650d1fd326171aadc505ee87f4 Author: Kendell Clement <[email protected]> Date: Tue May 24 23:38:36 2022 -0400 CRISPRessoBatch fills NA values in batch settings NA values in CRISPRessoBatch are filled with the value from args - either the default value or the value from the command line args (if set) commit 6de774adbad3aa8cd99d07b0ba7692984b356cd4 Author: kclem <[email protected]> Date: Mon May 23 14:18:02 2022 -0400 Fix file naming bug for HDR outputs In html file, figures 4e and 4f incorrectly referenced figure 4d. This fixes this bug. commit b88fec0668a4082a12ead3d26582e86d829dd7cc Author: Kendell Clement <[email protected]> Date: Sat May 21 00:32:15 2022 -0400 For bam_output, fix bug that wrote unaligned lines twice commit 3564e77ebcdedb4b01cc01dcca18ba3221fac67c Author: Kendell Clement <[email protected]> Date: Thu May 19 16:32:18 2022 -0400 Update README with CRISPRessoPooled headers and bam_output parameters commit bc08d81f17cb1929d1c37a1773cffcf36fb12fe2 Author: Kendell Clement <[email protected]> Date: Thu May 19 16:11:30 2022 -0400 Add more links to tools commit 006c497a379ecd94b017a883a5db887861e1586a Author: Kendell Clement <[email protected]> Date: Thu May 19 16:08:14 2022 -0400 Add links to tools commit dc8243373ad00d6bd467fc30c59942596ff0c5d6 Author: Kendell Clement <[email protected]> Date: Mon May 16 21:38:06 2022 -0400 fastq_to_bam implementation (#219) commit e88b6833977c6b2768299e0b2e7af623e3a9ae7c Author: Kendell Clement <[email protected]> Date: Sun May 8 02:14:13 2022 -0400 Fix bug for when guides don't agree in CRISPRessoAggregate commit 7eb763116a8c60603f1cd654645215767ee8eb52 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:21 2022 -0400 Fix bug for case of empty summary plots in report generation commit 0324fa67d14ed945f0c9531d9bcf73ebcf4ca042 Author: Kendell Clement <[email protected]> Date: Thu May 5 03:28:02 2022 -0400 Create report for number of significant bases in CRISPRessoCompare commit e3c9d0026a9ee6732f3ed6bdcf2a824850d7e66a Author: Kendell Clement <[email protected]> Date: Wed May 4 22:43:11 2022 -0400 Update pickle to json in readme and CRISPRessoPooledWGSCompare commit 1553f7977c12bf1091a20ca55b878bccfb739b61 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:10:04 2022 -0400 Merge pull request #4 from pinellolab/master (#218) commit bcecbfc047d294e26f381a6668e08cb4db24445c Merge: 15b0e05b bb13e007 Author: Kendell Clement <[email protected]> Date: Wed May 4 18:06:37 2022 -0400 Merge branch 'master' into master commit bb13e007738d6e7a4909e01f03daff592f334f36 Merge: af4ab6e8 d0b41483 Author: Kendell Clement <[email protected]> Date: Wed May 4 17:59:32 2022 -0400 Merge branch 'master' of https://github.com/edilytics/CRISPResso2 commit 15b0e05b9e03bbec5236e58776ddf9aa2f93180e Author: Kendell Clement <[email protected]> Date: Wed May 4 17:54:52 2022 -0400 2 flexible pooled input (#217) * Batch type coerce and r2 file check * Upgrade tabs for bootstrap5 * Update readme with additional pooled amplicon file headers Co-authored-by: Samuel Nichols <[email protected]> commit d0b41483bee704940ba60c58289f412b04c71659 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:43:43 2022 -0400 Update README.md commit ce49fab5301cb73ba0daf6c765e350eb083c76f1 Merge: 5f909713 b913fcb4 Author: Kendell Clement <[email protected]> Date: Wed May 4 13:40:30 2022 -0400 Merge pull request #3 from edilytics/2-flexible-pooled-input Add flexibility to CRISPRessoPooled amplicon input by allowing headers. Also, prime editing and quantification window coordinate parameters can be passed to CRISPRessoPooled. commit b913fcb402a8ba3106c3ff7913563a33d8d19fca Author: Kendell Clement <[email protected]> Date: Wed May 4 13:38:25 2022 -0400 Update CRISPRessoPooledCORE.py Replace process to read header, increase flexibility for column order commit 945bf31f16530b7ce25b89095b2c7005bf146117 Merge: 7b8f6788 5f909713 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:45:24 2022 -0400 Merge branch 'master' into 2-flexible-pooled-input commit 5f9097133765736a7c2fe3c8e9b730845fed0b70 Author: Kendell Clement <[email protected]> Date: Wed May 4 12:23:44 2022 -0400 Version bump to 2.2.8 commit c4a94ce0e06c6ebae13e128fbe6b708e635121c4 Author: Kendell Clement <[email protected]> Date: Wed May 4 00:13:17 2022 -0400 Fix summary plot representation for multi reports *fixed old reference to make_multi_report which called old summary plot format * renamed summary_plot to summary_plots to reflect a dict with multiple plots commit 62900e9ae6fa37ce99a04f12a63ed5c912f75042 Author: Cole Lyman <[email protected]> Date: Tue May 3 20:47:52 2022 -0600 Large aggregation (#192) * Squashed commit of the following: commit 8564eb03f0d9e62abf4b7528baf5c2ae296be8f9 Merge: f6ef62c 07cc7d8 Author: Kendell Clement <[email protected]> Date: Tue Jan 11 16:20:15 2022 -0500 Merge branch 'indel-alignment-fix' of https://github.com/edilytics/CRISPResso2 into indel-alignment-fix commit 07cc7d856ab3fcbbaa5381f17f29568192388887 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit f6ef62cfdf909adac1b10ea86555cd218f8b2a74 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:29:59 2021 -0700 Fix bug in `find_indels_substitutions` This bug occurred when there was a deletion at the end of a sequence, and was thus not properly accounted for. commit 7212f87f4be60057a6c848947ff6b5efde132a25 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d50b4e903b973c71a275e31d470b40e59280ee13 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 4db066f7bc333b7662a9232ac732ebb33ac3ace8 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 3b3a7417f5bbd6c2785a2af54a47e01d2e820451 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. commit e9f5eff3d95b676b5ee2e23371a5604f600d34b2 Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:26:17 2021 -0700 Add a unit test for `find_indels_substitutions` This unit test checks for deletions at the end of a sequence, which are inherently outside of the include_indx_set window. commit d4d45a918254ab19a7e7956e9e731389c6f36ecb Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:03:22 2021 -0700 Fix a bug in `find_indels_substitutions` The bug that this commit fixes is when an insertion occurs at the edge of the include indexes. The trouble with this earlier was that it was using the `idx` to calculate the size of the insertion, but the `idx` wasn't being incremented anymore because it was outside of the include window. commit 13f00bb40239c83e6e5cf844561fdb7000d3d9ab Author: Cole Lyman <[email protected]> Date: Fri Dec 10 15:01:39 2021 -0700 Add test case for `find_indels_substitutions` This test case is extracted from the CRISPRessoBatch integration test and provides an example where there is an insertion at the edge of the include index. commit 659ae34e8fd106f7ecc163b5bea0b5a80ab0283c Author: Cole Lyman <[email protected]> Date: Fri Dec 10 11:37:07 2021 -0700 Fix bug in CRISPRessoCompare where sample names were not properly set This was a place where it was (partially) missed during the crispresso2_info object refactoring. * Add parameter `--suppress_batch_summary_plots` If many runs are run at the same time, batch summary plots may fail because they are too large for matplotlib. This parameter `--suppress_batch_summary_plots` allows individual runs to be plotted, but suppresses batch summary plots that may otherwise be too big. * Pep formatting cleanup * Add summary nucleotide plots to aggregate * Aggregate plots are paginated * Update CRISPRessoAggregateCORE.py Remove max sample limit for plotting * Add --max_samples_per_summary_plot to CRISPRessoAggregate Parameterize the max number of samples to plot on each page of reports. Additional PDFs will be created with this number of samples on them. * Add plotly function to plot an interactive heatmap * Fix deprecated numpy type to suppress warning * Add plotting of heatmaps to CRISPRessoAggregateCORE to summarize modification types These heatmaps are interactive (zoomable and panable) and show for each sample the percentage of insertions, substitutions, and deletions. * Add the heatmap summaries to the CRISPRessoAggregate report * Update Bootstrap to 5.1.3 This is mainly so that we can use the fullscreen modal functionality in this version. * Move the plotly heatmaps to a Bootstrap modal * Fix bug where plots were not filling up entire modal. …
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Additional parameters for CRISPRessoPooled and headers can be in any order.