Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
9192573
WIP: remove AnalysisNwbfileLog
CBroz1 Sep 6, 2024
27f0004
WIP: recompute
CBroz1 Sep 6, 2024
743502d
WIP: recompute 2
CBroz1 Sep 11, 2024
9d23949
WIP: recompute 3
CBroz1 Sep 12, 2024
39f07bf
WIP: recompute 4
CBroz1 Sep 12, 2024
1b38818
WIP: recompute 5, electrodes object
CBroz1 Sep 18, 2024
282d553
WIP: recompute 6, add file hash
CBroz1 Sep 19, 2024
94168de
WIP: recompute 7
CBroz1 Sep 20, 2024
b553f77
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Sep 20, 2024
a594786
✅ : recompute
CBroz1 Sep 20, 2024
df1800e
w
CBroz1 Oct 21, 2024
6d0df07
Handle groups and links
CBroz1 Oct 21, 2024
1587997
Remove debug
CBroz1 Oct 22, 2024
1ed831e
Add directory hasher
CBroz1 Nov 12, 2024
7547fe2
Merge branch 'rcp' of https://github.com/CBroz1/spyglass into rcp
CBroz1 Nov 13, 2024
23799f8
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Nov 13, 2024
d0011bf
Update directory hasher
CBroz1 Nov 13, 2024
ad7c74a
WIP: update hasher
CBroz1 Jan 8, 2025
558f38b
WIP: fetch upstream, resolve conflicts
CBroz1 Jan 8, 2025
54a3ca1
WIP: error specificity
CBroz1 Jan 9, 2025
1e41698
Add tables for recompute processing
CBroz1 Feb 4, 2025
ae52aed
WIP: incorporate feedback
CBroz1 Feb 21, 2025
0795fa6
WIP: fetch upstream
CBroz1 Mar 3, 2025
2e89070
WIP: enforce environment restriction
CBroz1 Mar 3, 2025
8c172aa
WIP: fetch upstream
CBroz1 Mar 3, 2025
bfe49d1
WIP: typo
CBroz1 Mar 3, 2025
72f8a25
WIP: add tests
CBroz1 Mar 4, 2025
9c27d87
WIP: start add V0 hasher
CBroz1 Mar 5, 2025
8835794
See details
CBroz1 Mar 6, 2025
ea9b5f0
WIP: test fixes
CBroz1 Mar 6, 2025
57961e0
WIP: test fixes
CBroz1 Mar 7, 2025
403bfbe
WIP: add safe round trip v0
CBroz1 Mar 7, 2025
eccb727
WIP: add doc
CBroz1 Mar 7, 2025
c73a576
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Mar 7, 2025
8435985
✅ : Update docs
CBroz1 Mar 7, 2025
8ac4116
Fetch upstream
CBroz1 Mar 7, 2025
49ef439
Skip failing decoding tests
CBroz1 Mar 7, 2025
3de994b
nwb deps -> blob, future proof
CBroz1 Mar 7, 2025
0b01e79
Remove extra fields
CBroz1 Mar 7, 2025
f24d7f2
WIP: store full env
CBroz1 Mar 14, 2025
6351890
Merge branch 'rcp' of https://github.com/CBroz1/spyglass into rcp
CBroz1 Mar 14, 2025
66facbb
Update comparators
CBroz1 Mar 18, 2025
c18d318
Bypass spikeinterface version restriction
CBroz1 Mar 18, 2025
56d655a
Minor fixes
CBroz1 Mar 18, 2025
46ddb04
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Mar 18, 2025
b239130
Typo
CBroz1 Mar 18, 2025
e8204e1
Merge branch 'rcp' of https://github.com/CBroz1/spyglass into rcp
CBroz1 Mar 18, 2025
40f0959
Fix tests
CBroz1 Mar 19, 2025
3b6c35b
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Mar 24, 2025
47a82e0
Allow export env yml
CBroz1 Mar 24, 2025
45524ed
Add note about conda required
CBroz1 Mar 25, 2025
f5e69a3
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Mar 27, 2025
0688287
Update limit docstring re random select
CBroz1 Mar 27, 2025
88d77a7
Update src/spyglass/common/common_lab.py
CBroz1 Apr 10, 2025
e7a2624
Review comments
CBroz1 Apr 10, 2025
b448df3
Defer recompute to after kachery/dandi fetch
CBroz1 Apr 11, 2025
3870db2
Only fetch env once
CBroz1 Apr 11, 2025
0e41578
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Apr 11, 2025
7c84460
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Apr 14, 2025
a472cd9
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 Apr 24, 2025
f5f6bdf
Review suggestions @edeno
CBroz1 Apr 29, 2025
f56dcfd
Increase UserEnv varchar
CBroz1 Apr 29, 2025
50e7cf4
Warn on null restriction for 'attempt_all'
CBroz1 Apr 29, 2025
2395033
Handle 'no conda' case. Protect from partial v0 delete case.
CBroz1 Apr 29, 2025
fef63d7
More comment responses
CBroz1 Apr 30, 2025
3558d22
v0.Recording also pops v0.Versions - fix pytest
CBroz1 May 1, 2025
5dbdc66
PR review @samuelbray32
CBroz1 May 2, 2025
2b05e15
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 May 8, 2025
36bc63e
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
CBroz1 May 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ repos:
- tomli

- repo: https://github.com/ambv/black
rev: 24.1.1
rev: 25.1.0
hooks:
- id: black
language_version: python3.9
language_version: python3
30 changes: 27 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,30 @@

## [0.5.5] (Unreleased)

### Release Notes

<!-- Running draft to be removed immediately prior to release. -->

<!-- When altering tables, import all foreign key references. -->

Table update script

```py
```python
# -- For recompute --
import datajoint as dj
from spyglass.spikesorting.v1 import recording as v1rec # noqa
from spyglass.spikesorting.v0 import spikesorting_recording as v0rec # noqa
from spyglass.linearization.v1.main import TrackGraph # noqa

dj.FreeTable(dj.conn(), "common_nwbfile.analysis_nwbfile_log").drop()
dj.FreeTable(dj.conn(), "common_session.session_group").drop()
TrackGraph.alter() # Add edge map parameter
v0rec.SpikeSortingRecording().alter()
v0rec.SpikeSortingRecording().update_ids()
v1rec.SpikeSortingRecording().alter()
v1rec.SpikeSortingRecording().update_ids()

# -- For LFP pipeline --
from spyglass.lfp.lfp_imported import ImportedLFP
from spyglass.lfp.lfp_merge import LFPOutput

Expand Down Expand Up @@ -41,6 +62,7 @@ ImportedLFP().drop()
- Only add merge parts to `source_class_dict` if present in codebase #1237
- Remove cli module #1250
- Fix column error in `check_threads` method #1256
- Add recompute ability for `SpikeSortingRecording` for both v0 and v1 #1093
- Track Spyglass version in dedicated table for enforcing updates #1281
- Pin to `datajoint>=0.14.4` for `dj.Top` and long make call fix #1281
- Remove outdated code comments #1304
Expand Down Expand Up @@ -87,8 +109,7 @@ ImportedLFP().drop()
and transactional insertion. #1280, #1302
- Updating the LFPBandSelection logic with comprehensive validation and batch
insertion for electrodes and references. #1280
- Implement `ImportedLFP.make()` for ingestion from nwb files #1278, #1302

- Implement `ImportedLFP.make()` for ingestion from nwb files #1278, #1302

## [0.5.4] (December 20, 2024)

Expand All @@ -98,6 +119,7 @@ ImportedLFP().drop()
#1108, #1172, #1187
- Add docstrings to all public methods #1076
- Update DataJoint to 0.14.2 #1081
- Remove `AnalysisNwbfileLog` #1093
- Allow restriction based on parent keys in `Merge.fetch_nwb()` #1086, #1126
- Import `datajoint.dependencies.unite_master_parts` -> `topo_sort` #1116,
#1137, #1162
Expand All @@ -109,6 +131,7 @@ ImportedLFP().drop()
- Update DataJoint install and password instructions #1131
- Fix dandi upload process for nwb's with video or linked objects #1095, #1151
- Minor docs fixes #1145
- Add Nwb hashing tool #1093
- Test fixes
- Remove stored hashes from pytests #1152
- Remove mambaforge from tests #1153
Expand Down Expand Up @@ -168,6 +191,7 @@ ImportedLFP().drop()
- Fix bug in `get_group_by_shank` #1096
- Fix bug in `_compute_metric` #1099
- Fix bug in `insert_curation` returned key #1114
- Add fields to `SpikeSortingRecording` to allow recompute #1093
- Fix handling of waveform extraction sparse parameter #1132
- Limit Artifact detection intervals to valid times #1196

Expand Down
5 changes: 4 additions & 1 deletion docs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ nav:
- Merge Tables: Features/Merge.md
- Export: Features/Export.md
- Centralized Code: Features/Mixin.md
- Recompute: Features/Recompute.md
- For Developers:
- Overview: ForDevelopers/index.md
- How to Contribute: ForDevelopers/Contribute.md
Expand All @@ -93,6 +94,7 @@ extra_css:

plugins:
- search
- mermaid2 # for graphs
- exclude:
glob:
- "temp*"
Expand Down Expand Up @@ -125,7 +127,6 @@ plugins:
include_source: False
ignore_h1_titles: True
ignore: ["*make_pages.py", "**checkpoints**", "*/py_scripts/*"]
- mermaid2 # for graphs

markdown_extensions:
- attr_list
Expand All @@ -139,6 +140,8 @@ markdown_extensions:
- pymdownx.inlinehilite
- pymdownx.snippets
- pymdownx.superfences
- pymdownx.tabbed:
alternate_style: true

extra:
generator: false # Disable watermark
Expand Down
Loading
Loading