Skip to content

Allow various bytelike to mapper setitem(s) #480

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

Merged
merged 1 commit into from
Nov 19, 2020
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
14 changes: 9 additions & 5 deletions fsspec/mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def setitems(self, values_dict):
----------
values_dict: dict(str, bytes)
"""
values = {self._key_to_str(k): v for k, v in values_dict.items()}
values = {self._key_to_str(k): maybe_convert(v) for k, v in values_dict.items()}
self.fs.pipe(values)

def delitems(self, keys):
Expand Down Expand Up @@ -147,11 +147,8 @@ def pop(self, key, default=None):
def __setitem__(self, key, value):
"""Store value in key"""
key = self._key_to_str(key)
if isinstance(value, array.array): # pragma: no cover
# back compat, array.array used to work
value = bytearray(value)
self.fs.mkdirs(self.fs._parent(key), exist_ok=True)
self.fs.pipe_file(key, value)
self.fs.pipe_file(key, maybe_convert(value))

def __iter__(self):
return (self._str_to_key(x) for x in self.fs.find(self.root))
Expand All @@ -175,6 +172,13 @@ def __reduce__(self):
return FSMap, (self.root, self.fs, False, False, self.missing_exceptions)


def maybe_convert(value):
if isinstance(value, array.array) or hasattr(value, "__array__"):
# bytes-like things
value = bytearray(memoryview(value))
return value


def get_mapper(url, check=False, create=False, missing_exceptions=None, **kwargs):
"""Create key-value interface for given URL and options

Expand Down
22 changes: 22 additions & 0 deletions fsspec/tests/test_mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,25 @@ def test_multi():
assert m.getitems(list(data)) == data
m.delitems(list(data))
assert not list(m)


def test_setitem_types():
import array

m = fsspec.get_mapper("memory://")
m["a"] = array.array("i", [1])
assert m["a"] == b"\x01\x00\x00\x00"
m["b"] = bytearray(b"123")
assert m["b"] == b"123"
m.setitems({"c": array.array("i", [1]), "d": bytearray(b"123")})
assert m["c"] == b"\x01\x00\x00\x00"
assert m["d"] == b"123"


def test_setitem_numpy():
m = fsspec.get_mapper("memory://")
np = pytest.importorskip("numpy")
m["c"] = np.array(1, dtype="int32") # scalar
assert m["c"] == b"\x01\x00\x00\x00"
m["c"] = np.array([1, 2], dtype="int32") # array
assert m["c"] == b"\x01\x00\x00\x00\x02\x00\x00\x00"