-
Notifications
You must be signed in to change notification settings - Fork 43
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
Fault-permit insert and remove mutual exclusivity protections on Merge #824
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
edeno
requested changes
Feb 9, 2024
edeno
requested changes
Feb 9, 2024
edeno
approved these changes
Feb 10, 2024
This was referenced Feb 10, 2024
edeno
added a commit
that referenced
this pull request
Feb 20, 2024
* Fault-permit insert and remove mutual exclusivity protections on Merge (#824) * #719, #804, #212 * #768 * Add merge delete and populate * Changes following PR review @edeno * Replace delayed import of ImportedSpikeSorting * Update CITATION.cff (#826) * Update CITATION.cff * Update change log * Update ref * Add MUA notebook and fix numbering. * Only apply include labels filter if include_labels not empty (#827) * dont skip unit if include_labels list is empty * update check for np array size * gh-actions docs fixes (#828) * Update 'latest' in docs deploy * Docs bugfix. Rename Link action, incorporate cspell. * MUA as own heading * Update README.md * Fix citation * Fix citation * include all relevant restrictions on video file * Proposed structure for user roles. (#832) * Add roles * Remove use of unix user group. Add note for retroactive role assign * Add docs on roles and external tables. Reduce key length * Fix test for update of position tools (#835) Related to single LED halving the data bug * fix build error in mamba and restriction for dlc * flush stdout before converting mp4 * Fix notebook name (#840) * remove deprecated yaml.safe_load function * Fix test * replace deprecated yaml.safe_load function * only call no_transaction_make if video key not present --------- Co-authored-by: Chris Brozdowski <Chris.Broz@ucsf.edu> Co-authored-by: Eric Denovellis <edeno@users.noreply.github.com> Co-authored-by: Eric Denovellis <edeno@bu.edu>
edeno
added a commit
that referenced
this pull request
Feb 21, 2024
* allow for multicamera epochs * change VideoFile definition * update video_file_num iteration * add update methods * change VideoFile restriction in get_video_path * modify formatting in position_dlc_project * allow selective video selection in pose estimation * add NotImplementedError to DLCProject insert * allow for video file addition after proj creation * fix add_video_files * fix video_file_num determination in VideoFile * modify add_video_files method * change call to add_video_files * modify interval_list_name call * Fix linting errors * Tested DLC multicam pipeline (#841) * Fault-permit insert and remove mutual exclusivity protections on Merge (#824) * #719, #804, #212 * #768 * Add merge delete and populate * Changes following PR review @edeno * Replace delayed import of ImportedSpikeSorting * Update CITATION.cff (#826) * Update CITATION.cff * Update change log * Update ref * Add MUA notebook and fix numbering. * Only apply include labels filter if include_labels not empty (#827) * dont skip unit if include_labels list is empty * update check for np array size * gh-actions docs fixes (#828) * Update 'latest' in docs deploy * Docs bugfix. Rename Link action, incorporate cspell. * MUA as own heading * Update README.md * Fix citation * Fix citation * include all relevant restrictions on video file * Proposed structure for user roles. (#832) * Add roles * Remove use of unix user group. Add note for retroactive role assign * Add docs on roles and external tables. Reduce key length * Fix test for update of position tools (#835) Related to single LED halving the data bug * fix build error in mamba and restriction for dlc * flush stdout before converting mp4 * Fix notebook name (#840) * remove deprecated yaml.safe_load function * Fix test * replace deprecated yaml.safe_load function * only call no_transaction_make if video key not present --------- Co-authored-by: dpeg22 <dpeg22@gmail.com> Co-authored-by: CBroz1 <CBrozdowski@yahoo.com> Co-authored-by: Samuel Bray <sam.bray@ucsf.edu> Co-authored-by: Chris Brozdowski <Chris.Broz@ucsf.edu>
This was referenced Apr 4, 2024
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.
Description
Adds fault-permit insert process and a new table to common_usage to keep track of errors across sessions. Will help monitor for recurring issues.
insert_sessions
more robust to failures to populate #719: Adds try/catch topopulate_all_common
. For each fail, adds entry toInsertError
table and returns the IDs of entries to the user.common/populate_all_common.py
: Turn tables into a list to loop through, avoiding repeated logger calls.common/common_behav.py
: Adds apopulate
method to handle the fact thatPositionSource
was the only table in the previous list without a populate method. If unwanted, this change could instead be migrated topopulate_all_common
which would loop through a set of tables and methods to be run for each.source
to uuid generation for merge tables, avoiding the case where the same PK set across part-parents results in collisionutils/dj_merge.py
: add secondary key to hashing func.path/file.py
: Description of the changedelete
method to further enforce the use ofcautious_delete
delete_downstream_merge
yields nothingmerge_populate
to avoid mess of part parent populate inserting into merge tablePositionOutput
Checklist:
CITATION.cff
CHANGELOG.md