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

ENH: Add NiftiJSONExtension class, use for NIfTI-MRS #1327

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repos:
rev: v0.3.4
hooks:
- id: ruff
args: [--fix, --show-fix, --exit-non-zero-on-fix]
args: [--fix, --show-fixes, --exit-non-zero-on-fix]
exclude: = ["doc", "tools"]
- id: ruff-format
exclude: = ["doc", "tools"]
Expand Down
32 changes: 31 additions & 1 deletion nibabel/nifti1.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

from __future__ import annotations

import json
import warnings
from io import BytesIO

Expand Down Expand Up @@ -377,7 +378,7 @@
# deal with unknown codes
code = self._code

s = f"Nifti1Extension('{code}', '{self._content}')"
s = f"{self.__class__.__name__}('{code}', '{self._content}')"

Check warning on line 381 in nibabel/nifti1.py

View check run for this annotation

Codecov / codecov/patch

nibabel/nifti1.py#L381

Added line #L381 was not covered by tests
return s

def __eq__(self, other):
Expand Down Expand Up @@ -505,6 +506,20 @@
return dio.read(ds_len)


class NiftiJSONExtension(Nifti1Extension):
"""Generic JSON-based NIfTI header extension

This class handles serialization and deserialization of JSON contents
without any further validation or processing.
"""

def _unmangle(self, value: bytes) -> dict:
return json.loads(value.decode('utf-8'))

def _mangle(self, value: dict) -> bytes:
return json.dumps(value).encode('utf-8')


# NIfTI header extension type codes (ECODE)
# see nifti1_io.h for a complete list of all known extensions and
# references to their description or contacts of the respective
Expand All @@ -520,6 +535,21 @@
(12, 'workflow_fwds', Nifti1Extension),
(14, 'freesurfer', Nifti1Extension),
(16, 'pypickle', Nifti1Extension),
(18, 'mind_ident', Nifti1Extension),
(20, 'b_value', Nifti1Extension),
(22, 'spherical_direction', Nifti1Extension),
(24, 'dt_component', Nifti1Extension),
(26, 'shc_degreeorder', Nifti1Extension),
(28, 'voxbo', Nifti1Extension),
(30, 'caret', Nifti1Extension),
## Defined in nibabel.cifti2.parse_cifti2
# (32, 'cifti', Cifti2Extension),
(34, 'variable_frame_timing', Nifti1Extension),
(36, 'unassigned', Nifti1Extension),
(38, 'eval', Nifti1Extension),
(40, 'matlab', Nifti1Extension),
(42, 'quantiphyse', Nifti1Extension),
(44, 'mrs', NiftiJSONExtension),
),
fields=('code', 'label', 'handler'),
)
Expand Down
51 changes: 51 additions & 0 deletions nibabel/tests/test_nifti1.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
Nifti1Image,
Nifti1Pair,
Nifti1PairHeader,
NiftiJSONExtension,
data_type_codes,
extension_codes,
load,
Expand Down Expand Up @@ -1388,6 +1389,56 @@ def test_nifti_dicom_extension():
Nifti1DicomExtension(2, 0)


def test_json_extension(tmp_path):
nim = load(image_file)
hdr = nim.header
exts_container = hdr.extensions

# Test basic functionality
json_ext = NiftiJSONExtension('ignore', b'{"key": "value"}')
assert json_ext.get_content() == {'key': 'value'}
byte_content = json_ext._mangle(json_ext.get_content())
assert byte_content == b'{"key": "value"}'
json_obj = json_ext._unmangle(byte_content)
assert json_obj == {'key': 'value'}
size = 16 * ((len(byte_content) + 7) // 16 + 1)
assert json_ext.get_sizeondisk() == size

def ext_to_bytes(ext, byteswap=False):
bio = BytesIO()
ext.write_to(bio, byteswap)
return bio.getvalue()

# Check serialization
bytestring = ext_to_bytes(json_ext)
assert bytestring[:8] == struct.pack('<2I', size, extension_codes['ignore'])
assert bytestring[8:].startswith(byte_content)
assert len(bytestring) == size

# Save to file and read back
exts_container.append(json_ext)
nim.to_filename(tmp_path / 'test.nii')

# We used ignore, so it comes back as a Nifti1Extension
rt_img = Nifti1Image.from_filename(tmp_path / 'test.nii')
assert len(rt_img.header.extensions) == 3
rt_ext = rt_img.header.extensions[-1]
assert rt_ext.get_code() == extension_codes['ignore']
assert rt_ext.get_content() == byte_content

# MRS is currently the only JSON extension
json_ext._code = extension_codes['mrs']
nim.to_filename(tmp_path / 'test.nii')

# Check that the extension is read back as a NiftiJSONExtension
rt_img = Nifti1Image.from_filename(tmp_path / 'test.nii')
assert len(rt_img.header.extensions) == 3
rt_ext = rt_img.header.extensions[-1]
assert rt_ext.get_code() == extension_codes['mrs']
assert isinstance(rt_ext, NiftiJSONExtension)
assert rt_ext.get_content() == json_obj


class TestNifti1General:
"""Test class to test nifti1 in general

Expand Down
Loading