Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Adding support for more .nwb training data to SLEAP #104

Open
wants to merge 92 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 89 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
70a34ed
nwb to sleap conversion function
keyaloding Jun 28, 2024
f2fd6f5
push
keyaloding Jul 12, 2024
6c062ec
fixed attribute errors
keyaloding Jul 16, 2024
f7d8a0c
test
keyaloding Jul 16, 2024
23a5a83
b
keyaloding Jul 16, 2024
cf4bcf7
n
keyaloding Jul 16, 2024
8948e92
a
keyaloding Jul 17, 2024
be6ccbc
message
keyaloding Jul 17, 2024
0aabd86
update
keyaloding Jul 17, 2024
85d47ab
change
keyaloding Jul 17, 2024
1b8e08b
black
keyaloding Jul 17, 2024
aab5a79
cab
keyaloding Jul 18, 2024
66edcd6
update
keyaloding Jul 18, 2024
1b70d5c
change
keyaloding Jul 18, 2024
c59f996
m
keyaloding Jul 18, 2024
50da4a1
black
keyaloding Jul 18, 2024
c8c173a
black
keyaloding Jul 18, 2024
0742bdf
updated skeleton naming
keyaloding Jul 18, 2024
055e3e8
updated package handling
keyaloding Jul 19, 2024
dcc3da8
added error handling
keyaloding Jul 19, 2024
0ba071e
`append_nwb_training` update
keyaloding Jul 19, 2024
0c7f048
added test
keyaloding Jul 19, 2024
6a6c38c
Merge branch 'talmolab:main' into kloding/nwb_data_structures
keyaloding Jul 22, 2024
b15471e
Code quality
keyaloding Jul 22, 2024
dd522f9
resolved some comments
keyaloding Jul 22, 2024
22ed734
resolved comments + formatting
keyaloding Jul 22, 2024
7d1737d
updated test and fixed comments
keyaloding Jul 22, 2024
6f1a7d1
added img_to_path function (not implemented)
keyaloding Jul 23, 2024
51d5623
updated img_to_path
keyaloding Jul 24, 2024
e511efa
img_to_path
keyaloding Jul 24, 2024
42da933
added test and finished img_to_path
keyaloding Jul 25, 2024
e246f8b
removed slp_pkg function and code quality
keyaloding Jul 25, 2024
13d3a47
attempted to resolve `Skeletons` issue and nwbfile version
keyaloding Jul 26, 2024
e579ebf
updated load_nwb and video writing
keyaloding Jul 26, 2024
90f0ec4
updated processing module handling
keyaloding Jul 26, 2024
24634a1
update
keyaloding Jul 26, 2024
4819536
fixed save issues
keyaloding Jul 26, 2024
432c343
updated saving
keyaloding Jul 27, 2024
7cb04c4
updated code quality and image write function
keyaloding Jul 29, 2024
a66cf8f
implemented metadata indexing
keyaloding Jul 29, 2024
8f2271b
updated loading nwb
keyaloding Jul 29, 2024
f510765
black
keyaloding Jul 29, 2024
183cf55
updated video handling
keyaloding Jul 29, 2024
7e2d138
added `__future__` import
keyaloding Jul 31, 2024
846856b
updated future import
keyaloding Jul 31, 2024
f88ca17
updated test and documentation
keyaloding Aug 1, 2024
0a8fc45
updated saving nwb
keyaloding Aug 1, 2024
73b41b0
Revert "updated video handling"
keyaloding Aug 1, 2024
a9be0eb
Delete save_test.ipynb
keyaloding Aug 2, 2024
1031247
added test fixtures
keyaloding Aug 2, 2024
68c7cfb
fixed recursion error
keyaloding Aug 2, 2024
3bf7c8a
updated error handling
keyaloding Aug 3, 2024
6d12f39
updated error handling
keyaloding Aug 3, 2024
e94c14d
code quality
keyaloding Aug 5, 2024
dac1eb5
code quality
keyaloding Aug 5, 2024
593c139
code quality
keyaloding Aug 5, 2024
68133e1
code quality
keyaloding Aug 5, 2024
d66b858
updated video saving
keyaloding Aug 5, 2024
0abaca4
deleted large test file
keyaloding Aug 7, 2024
4ba67ea
updated video loading and pose_estimation creation
keyaloding Aug 7, 2024
3bac601
reverted PoseEstimation handling
keyaloding Aug 8, 2024
9699be2
updated fixtures
keyaloding Aug 8, 2024
f01e03a
updated fixtures
keyaloding Aug 8, 2024
9a4422d
Delete load_test.ipynb
keyaloding Aug 8, 2024
55ca394
Delete presentation.ipynb
keyaloding Aug 8, 2024
c91e74c
code quality
keyaloding Aug 8, 2024
63faf8b
code quality
keyaloding Aug 8, 2024
56911d6
fixed pydocstyle errors
keyaloding Aug 8, 2024
ac6bb23
updated tests
keyaloding Aug 8, 2024
0be5813
a
keyaloding Aug 8, 2024
46f63c6
fixed test not passing
keyaloding Aug 9, 2024
1cd6180
fixed test not passing
keyaloding Aug 9, 2024
a2f96ab
update
keyaloding Aug 9, 2024
30fbe6f
added cameras
keyaloding Aug 9, 2024
6a0cf27
fixed test fixture
keyaloding Aug 11, 2024
52d45b8
added fixture
keyaloding Aug 11, 2024
bab0917
updated tests
keyaloding Aug 11, 2024
a268e1f
update
keyaloding Aug 12, 2024
c57e572
updated toml
keyaloding Aug 12, 2024
e7b9fd3
z
keyaloding Aug 12, 2024
e932340
camera update
keyaloding Aug 13, 2024
6f3aabe
fixed OrphanBuildContainerError
keyaloding Aug 13, 2024
7a83046
one test left
keyaloding Aug 14, 2024
1a7e58b
passed all tests
keyaloding Aug 14, 2024
90fd397
removed unused function
keyaloding Aug 14, 2024
d8294b7
removed unused function
keyaloding Aug 20, 2024
c3b286e
Merge branch 'talmolab:main' into kloding/nwb_data_structures
keyaloding Aug 24, 2024
dedc06d
code quality update, removed `PoseEstimation` handling
keyaloding Sep 5, 2024
141d1dd
fixed black format issue
keyaloding Sep 5, 2024
67a62c2
added `SkeletonInstance` counter
keyaloding Sep 8, 2024
bf7fadf
Docs and nits
talmo Sep 25, 2024
62dc540
Add multi-video support
talmo Sep 25, 2024
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
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ labels = sio.load_file("predictions.slp")
sio.save_file(labels, "predictions.nwb")
# Or:
# labels.save("predictions.nwb")

# Save to an NWB file and convert SLEAP training data to NWB training data:
frame_inds = [i for i in range(20)]
sio.save_file(labels, "predictions.nwb", as_training=True, frame_inds=frame_inds)
# This will save the first 20 frames of the video as individual images
```

### Convert labels to raw arrays
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- pydocstyle
- toml
- twine
- build
- python-build
- pip
- pip:
- "--editable=.[dev]"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
"attrs",
"h5py>=3.8.0",
"pynwb",
"ndx-pose",
"ndx-pose @ git+https://github.com/rly/ndx-pose@a847ad4be75e60ef9e413b8cbfc99c616fc9fd05",
"pandas",
"simplejson",
"imageio",
Expand Down
42 changes: 36 additions & 6 deletions sleap_io/io/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
from typing import Optional, Union
from pathlib import Path

from pynwb import NWBHDF5IO
talmo marked this conversation as resolved.
Show resolved Hide resolved


def load_slp(filename: str) -> Labels:
"""Load a SLEAP dataset.
Expand Down Expand Up @@ -59,21 +61,45 @@
return nwb.read_nwb(filename)


def save_nwb(labels: Labels, filename: str, append: bool = True):
def save_nwb(
labels: Labels,
filename: str,
as_training: bool = False,
append: bool = True,
frame_inds: Optional[list[int]] = None,
frame_path: Optional[str] = None,
):
"""Save a SLEAP dataset to NWB format.

Args:
labels: A SLEAP `Labels` object (see `load_slp`).
filename: Path to NWB file to save to. Must end in `.nwb`.
as_training: If `True`, save the dataset as a training dataset.
append: If `True` (the default), append to existing NWB file. File will be
created if it does not exist.
frame_inds: Optional list of frame indices to save. If None, all frames
will be saved.
frame_path: The path to save the frames. If None, the path is the video
filename without the extension.

See also: nwb.write_nwb, nwb.append_nwb
See also: nwb.write_nwb, nwb.append_nwb, nwb.append_nwb_training
"""
if append and Path(filename).exists():
nwb.append_nwb(labels, filename)
nwb.append_nwb(

Check warning on line 88 in sleap_io/io/main.py

View check run for this annotation

Codecov / codecov/patch

sleap_io/io/main.py#L88

Added line #L88 was not covered by tests
labels,
filename,
as_training=as_training,
frame_inds=frame_inds,
frame_path=frame_path,
)
else:
nwb.write_nwb(labels, filename)
nwb.write_nwb(
labels,
filename,
as_training=as_training,
frame_inds=frame_inds,
frame_path=frame_path,
)


def load_labelstudio(
Expand Down Expand Up @@ -190,6 +216,8 @@
return load_jabs(filename, **kwargs)
elif format == "video":
return load_video(filename, **kwargs)
else:
raise ValueError(f"Unknown format '{format}' for filename: '{filename}'.")

Check warning on line 220 in sleap_io/io/main.py

View check run for this annotation

Codecov / codecov/patch

sleap_io/io/main.py#L220

Added line #L220 was not covered by tests


def save_file(
Expand Down Expand Up @@ -219,8 +247,10 @@

if format == "slp":
save_slp(labels, filename, **kwargs)
elif format == "nwb":
save_nwb(labels, filename, **kwargs)
elif format in ("nwb", "nwb_predictions"):
save_nwb(labels, filename, False)
elif format == "nwb_training":
save_nwb(labels, filename, True, frame_inds=kwargs.pop("frame_inds", None))

Check warning on line 253 in sleap_io/io/main.py

View check run for this annotation

Codecov / codecov/patch

sleap_io/io/main.py#L253

Added line #L253 was not covered by tests
talmo marked this conversation as resolved.
Show resolved Hide resolved
elif format == "labelstudio":
save_labelstudio(labels, filename, **kwargs)
elif format == "jabs":
Expand Down
Loading
Loading