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
13 changes: 11 additions & 2 deletions eccodes/highlevel/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,21 @@ class MemoryReader(ReaderBase):
def __init__(self, buf, kind=eccodes.CODES_PRODUCT_GRIB):
super().__init__(kind=kind)
self.buf = buf
self._index = 0

def _next_handle(self):
if self.buf is None:
return None
handle = eccodes.codes_new_from_message(self.buf)
self.buf = None
handle = eccodes.codes_new_from_message(self.buf[self._index :])

try:
handle_length = eccodes.codes_get(handle, "totalLength")
except eccodes.GribInternalError:
return None

self._index += handle_length
if self._index >= len(self.buf):
self.buf = None
return handle


Expand Down
61 changes: 61 additions & 0 deletions tests/test_highlevel.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import collections
import io
import itertools
import pathlib

Expand Down Expand Up @@ -179,3 +180,63 @@ def test_grib_message_from_samples():
def test_bufr_message_from_samples():
message = eccodes.BUFRMessage.from_samples("BUFR4")
assert message["edition"] == 4


def test_read_memory():
buffer = io.BytesIO()
with eccodes.FileReader(TEST_GRIB_DATA2) as reader1:
written = []
for message in itertools.islice(reader1, 15):
message.write_to(buffer)
written.append(message)

with eccodes.MemoryReader(buffer.getvalue()) as reader2:
for message1, message2 in itertools.zip_longest(written, reader2):
assert message1 is not None
assert message2 is not None
for key in [
"edition",
"centre",
"typeOfLevel",
"level",
"dataDate",
"stepRange",
"dataType",
"shortName",
"packingType",
"gridType",
"number",
]:
assert message1[key] == message2[key]
assert np.all(message1.data == message2.data)


def test_read_stream():
buffer = io.BytesIO()
with eccodes.FileReader(TEST_GRIB_DATA2) as reader1:
written = []
for message in itertools.islice(reader1, 15):
message.write_to(buffer)
written.append(message)

buffer.seek(0, 0)

with eccodes.StreamReader(buffer) as reader2:
for message1, message2 in itertools.zip_longest(written, reader2):
assert message1 is not None
assert message2 is not None
for key in [
"edition",
"centre",
"typeOfLevel",
"level",
"dataDate",
"stepRange",
"dataType",
"shortName",
"packingType",
"gridType",
"number",
]:
assert message1[key] == message2[key]
assert np.all(message1.data == message2.data)
Loading