Skip to content
Merged
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
4 changes: 4 additions & 0 deletions python/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
[X.X.X] - XXXX-XX-XX
--------------------

**Features**

- :issue:`832` - Add ``metadata_bytes`` method to allow access to raw
TableCollection metadata (:user:`benjeffery`, :pr:`842`)

--------------------
[0.3.1] - 2020-09-04
Expand Down
9 changes: 9 additions & 0 deletions python/tests/test_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -2512,22 +2512,30 @@ def test_set_metadata(self):
tc = tskit.TableCollection(1)
# Default is empty bytes
self.assertEqual(tc.metadata, b"")
self.assertEqual(tc.metadata_bytes, b"")

tc.metadata_schema = self.metadata_schema
md1 = self.metadata_example_data()
md2 = self.metadata_example_data(val=2)
# Set
tc.metadata = md1
self.assertEqual(tc.metadata, md1)
self.assertEqual(tc.metadata_bytes, tskit.canonical_json(md1).encode())
# Overwrite
tc.metadata = md2
self.assertEqual(tc.metadata, md2)
self.assertEqual(tc.metadata_bytes, tskit.canonical_json(md2).encode())
# Del should fail
with self.assertRaises(AttributeError):
del tc.metadata
with self.assertRaises(AttributeError):
del tc.metadata_bytes
# None should fail
with self.assertRaises(exceptions.MetadataValidationError):
tc.metadata = None
# Setting bytes should fail
with self.assertRaises(AttributeError):
tc.metadata_bytes = b"123"

def test_default_metadata_schema(self):
# Default should allow bytes
Expand All @@ -2544,6 +2552,7 @@ def test_round_trip_metadata(self):
tc.metadata_schema = self.metadata_schema
tc.metadata = data
self.assertDictEqual(tc.metadata, data)
self.assertEqual(tc.metadata_bytes, tskit.canonical_json(data).encode())

def test_bad_metadata(self):
metadata = self.metadata_example_data()
Expand Down
7 changes: 7 additions & 0 deletions python/tskit/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -2074,6 +2074,13 @@ def metadata(self, metadata: Any) -> None:
metadata
)

@property
def metadata_bytes(self) -> Any:
"""
The raw bytes of metadata for this TableCollection
"""
return self._ll_tables.metadata

def asdict(self):
"""
Returns a dictionary representation of this TableCollection.
Expand Down