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

pyon: Add xarray object encoding and decoding. #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
32 changes: 30 additions & 2 deletions sipyco/pyon.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import tempfile

import numpy
import xarray
import pybase64 as base64


Expand All @@ -42,7 +43,9 @@
slice: "slice",
Fraction: "fraction",
OrderedDict: "ordereddict",
numpy.ndarray: "nparray"
numpy.ndarray: "nparray",
xarray.DataArray: "xrarray",
xarray.Dataset: "xrdataset"
}

_numpy_scalar = {
Expand Down Expand Up @@ -164,6 +167,21 @@ def encode_npscalar(self, x):
r += base64.b64encode(x.data).decode()
r += "\")"
return r

def encode_xrarray(self, x):
d = x.to_dict(data=False)
d["data"] = x.values
for k in d["coords"]:
d["coords"][k]["data"] = x.coords[k].values
return "xrarray(" + self.encode_dict(d) + ")"

def encode_xrdataset(self, x):
d = x.to_dict(data=False)
for k in d["data_vars"]:
d["data_vars"][k]["data"] = x.data_vars[k].values
for k in d["coords"]:
d["coords"][k]["data"] = x.coords[k].values
return "xrdataset(" + self.encode_dict(d) + ")"

def encode(self, x):
ty = _encode_map.get(type(x), None)
Expand All @@ -189,6 +207,14 @@ def _npscalar(ty, data):
return numpy.frombuffer(base64.b64decode(data), dtype=ty)[0]


def _xrarray(d):
return xarray.DataArray.from_dict(d)


def _xrdataset(d):
return xarray.Dataset.from_dict(d)


_eval_dict = {
"__builtins__": {},

Expand All @@ -202,7 +228,9 @@ def _npscalar(ty, data):
"Fraction": Fraction,
"OrderedDict": OrderedDict,
"nparray": _nparray,
"npscalar": _npscalar
"npscalar": _npscalar,
"xrarray": _xrarray,
"xrdataset": _xrdataset,
}


Expand Down
19 changes: 19 additions & 0 deletions sipyco/test/test_pyon.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from collections import OrderedDict

import numpy as np
import xarray as xr

from sipyco import pyon

Expand All @@ -21,6 +22,11 @@
"od": OrderedDict(zip("abc", range(3))),
}

_pyon_test_xarray_object = xr.DataArray(
data=np.random.randn(5),
coords=[("x", np.arange(0, 5))],
attrs={"foo": "bar"},
)

class PYON(unittest.TestCase):
def test_encdec(self):
Expand All @@ -46,6 +52,18 @@ def test_encdec_array_order(self):
array = np.reshape(np.arange(6), (2, 3), order='F')
np.testing.assert_array_equal(
array, pyon.decode(pyon.encode(array)))

def test_encdec_xarray(self):
"""Test encoding & decoding of xarray objects:"""
for enc in pyon.encode, lambda x: pyon.encode(x, True):
xr.testing.assert_equal(
pyon.decode(enc(_pyon_test_xarray_object)),
_pyon_test_xarray_object
)
xr.testing.assert_equal(
pyon.decode(enc(_pyon_test_xarray_object.to_dataset(name="a"))),
_pyon_test_xarray_object.to_dataset(name="a")
)


_json_test_object = {
Expand All @@ -62,3 +80,4 @@ def test_encdec(self):
for dec in pyon.decode, json.loads:
self.assertEqual(dec(enc(_json_test_object)),
_json_test_object)