blissdata 2.4.1__tar.gz → 2.4.3__tar.gz

{blissdata-2.4.1/src/blissdata.egg-info → blissdata-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.4.1
+Version: 2.4.3
 Summary: Bliss data streaming client
 Maintainer: BCU (ESRF)
 License-Expression: LGPL-3.0-or-later

{blissdata-2.4.1 → blissdata-2.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blissdata"
-version = "2.4.1"
+version = "2.4.3"
 description = "Bliss data streaming client"
 readme = "README.md"
 license = "LGPL-3.0-or-later"

{blissdata-2.4.1 → blissdata-2.4.3}/src/blissdata/h5api/redis_hdf5.py

@@ -15,21 +15,31 @@ from blissdata.h5api.h5_scan_map import H5ScanMap
 
 
 class Attributes(abstract.Attributes):
-    def __init__(self, dct):
-        self.dct = dct
+    def __init__(self, attrs: dict[str : h5m.DataItemType]):
+        self._attrs: dict[str : h5m.DataItemType] = attrs
         super().__init__()
 
     def __repr__(self):
-        return f"<Attributes of Redis-HDF5 object at {hex(id(self))}>"
+        return f"<Attributes of Live-HDF5 object at {hex(id(self))}>"
 
     def __getitem__(self, key: str):
-        return self.dct[key]
+        value = self._attrs[key].decode()
+        # h5map decoded values are always numpy arrays, "O" type is used for
+        # strings. In h5py the same value will be returned as 'bytes' when in a
+        # dataset, but as 'str' when in an attribute.
+        if value.dtype == np.dtype("O"):
+            # Decode 'bytes' into 'str' to reproduce h5py attribute's behavior
+            value = np.vectorize(lambda x: x.decode(), otypes=[np.dtype("O")])(value)
+        if value.shape == ():
+            # extract value when array is a scalar
+            value = value[()]
+        return value
 
     def __iter__(self):
-        yield from self.dct
+        yield from self._attrs
 
     def __len__(self):
-        return len(self.dct)
+        return len(self._attrs)
 
 
 class File(abstract.File):
@@ -68,7 +78,7 @@ class File(abstract.File):
 
     @property
     def attrs(self) -> abstract.Attributes:
-        return Attributes({"NX_class": "NXroot"})
+        return Attributes({"NX_class": h5m.InlineRaw("NXroot")})
 
     @property
     def file(self) -> "File":
@@ -541,4 +551,4 @@ def dataset_factory(parent: File, path: str, item: h5m.HDF5ItemType, scan) -> Da
         # TODO
         raise NotImplementedError
 
-    return Dataset(parent, path, item, array, virtual, external)
+    return Dataset(parent, path, item.attributes, array, virtual, external)

{blissdata-2.4.1 → blissdata-2.4.3}/src/blissdata/redis_engine/store.py

@@ -350,7 +350,7 @@ redis.register_function('seal_stream', seal_stream)"""
         for stream_key in stream_keys:
             pipe.xrevrange(stream_key, count=1)
         raw = pipe.execute()
-        scan_states = [ScanState(val[0][1][b"state"].decode()) for val in raw]
+        scan_states = [ScanState(int(val[0][1][b"state"].decode())) for val in raw]
 
         return {key: state for key, state in zip(scan_keys, scan_states)}
 

{blissdata-2.4.1 → blissdata-2.4.3}/src/blissdata/streams/__init__.py

@@ -92,7 +92,7 @@ class BaseStream(ABC):
             except EndOfStream:
                 return
             else:
-                yield from view.get_data()
+                yield from view
 
     @abstractmethod
     def _need_last_only(self, last_only):

{blissdata-2.4.1 → blissdata-2.4.3}/src/blissdata/streams/lima/stream.py

@@ -151,7 +151,7 @@ class LimaStream(BaseStream, LimaDirectAccess):
         return tuple(self.info["shape"])
 
     def __len__(self):
-        self._update_client()
+        self._update_client_if_needed(-1)
         return len(self._client)
 
     def _update_client_if_needed(self, key: int | slice):

{blissdata-2.4.1 → blissdata-2.4.3}/src/blissdata/tests/streams/plugins/test_lima_stream.py

@@ -91,11 +91,13 @@ def test_get_image_no_file(monkeypatch, data_store):
         monkeypatch.setattr(LimaClient, "_get_from_file", data_simu.get_from_file_mock)
 
         # not image at all
+        assert len(ro_stream) == 0
         with pytest.raises(IndexNotYetThereError):
             ro_stream[0]
 
         # 0 to 4
         data_simu.publish_images(last_index=4)
+        assert len(ro_stream) == 5
         assert ro_stream[0] == "memo-0"
         assert ro_stream[4] == "memo-4"
         with pytest.raises(IndexNotYetThereError):
@@ -103,6 +105,7 @@ def test_get_image_no_file(monkeypatch, data_store):
 
         # 5 to 14 (buffer wrapped around)
         data_simu.publish_images(last_index=14)
+        assert len(ro_stream) == 15
         assert ro_stream[5] == "memo-5"
         assert ro_stream[14] == "memo-14"
         with pytest.raises(IndexNoMoreThereError):
@@ -128,6 +131,7 @@ def test_get_image_file(monkeypatch, data_store):
 
         # buffer [0, 9], file [None]
         data_simu.publish_images(last_index=9, last_index_saved=9)
+        assert len(ro_stream) == 10
         assert ro_stream[0] == "memo-0"
         assert ro_stream[9] == "memo-9"
         with pytest.raises(IndexNotYetThereError):
@@ -135,6 +139,7 @@ def test_get_image_file(monkeypatch, data_store):
 
         # buffer [15, 24], file [0-19]
         data_simu.publish_images(last_index=24, last_index_saved=20)
+        assert len(ro_stream) == 25
         assert ro_stream[0] == "file-0"
         assert ro_stream[9] == "file-9"
         assert ro_stream[19] == "file-19"

{blissdata-2.4.1 → blissdata-2.4.3}/src/blissdata/tests/streams/plugins/test_plugin_base.py

@@ -1,5 +1,6 @@
 import pytest
 import numpy as np
+import gc
 from contextlib import contextmanager
 import blissdata.redis_engine.scan
 from blissdata.exceptions import MissingPluginException
@@ -12,11 +13,11 @@ from blissdata.streams.default import (
 )
 
 
-class FakePluginView(View):
+class MockPluginView(View):
     pass
 
 
-class FakePluginStream(Stream):
+class MockPluginStream(Stream):
     def __init__(self, event_stream):
         if event_stream.info.get("fail", False):
             raise Exception("Oops, broken plugin...")
@@ -25,56 +26,67 @@ class FakePluginStream(Stream):
     @staticmethod
     def make_definition(name, info={}) -> StreamDefinition:
         return Stream.make_definition(
-            name, dtype=np.int64, info=info | {"plugin": "fake"}
+            name, dtype=np.int64, info=info | {"plugin": "mock"}
         )
 
     @property
     def kind(self):
-        return "fake"
+        return "mock"
 
     @property
     def plugin(self):
-        return "fake"
+        return "mock"
 
     def _build_view_from_events(self, index, events: EventRange, last_only):
-        return FakePluginView(events)
+        return MockPluginView(events)
 
 
-@contextmanager
-def fake_plugin_available():
-    """Emulate installation of 'fake' plugin module"""
+@pytest.fixture
+def mock_plugin(monkeypatch):
+    @contextmanager
+    def mock_plugin_ctx():
+        """Emulate installation of 'mock' plugin module"""
 
-    class FakePluginModule:
-        stream_cls = FakePluginStream
-        view_cls = FakePluginView
+        class MockPluginModule:
+            stream_cls = MockPluginStream
+            view_cls = MockPluginView
 
-    plugin_modules = blissdata.redis_engine.scan.loaded_plugins
-    try:
-        plugin_modules["fake"] = FakePluginModule
-        yield
-    finally:
-        del plugin_modules["fake"]
+        try:
+            monkeypatch.setitem(
+                blissdata.redis_engine.scan.loaded_plugins, "mock", MockPluginModule
+            )
+            yield
+        finally:
+            monkeypatch.delitem(blissdata.redis_engine.scan.loaded_plugins, "mock")
 
+    return mock_plugin_ctx
 
-def test_plugin_load(dummy_scan):
-    with fake_plugin_available():
-        stream_definition = FakePluginStream.make_definition("mystream")
+
+def test_plugin_load(dummy_scan, mock_plugin):
+    with mock_plugin():
+        stream_definition = MockPluginStream.make_definition("mystream")
         _ = dummy_scan.create_stream(stream_definition)
         dummy_scan.prepare()
 
         stream = dummy_scan.streams["mystream"]
-        assert isinstance(stream, FakePluginStream)
+        assert isinstance(stream, MockPluginStream)
 
 
 def test_missing_plugin_create(dummy_scan):
-    stream_definition = FakePluginStream.make_definition("mystream")
+    stream_definition = MockPluginStream.make_definition("mystream")
     with pytest.raises(MissingPluginException):
         _ = dummy_scan.create_stream(stream_definition)
 
+    # In this test an event stream was created and then abandoned. It owns a
+    # sink with a redis connection that will be returned to the pool at garbage
+    # collection. With gevent, this leads to frequent race conditions blocking
+    # tests. Forcing gc.collect here prevent this issue.
+    gc.collect()
+
 
-def test_missing_plugin_load(dummy_scan):
-    with fake_plugin_available():
-        stream_definition = FakePluginStream.make_definition("mystream")
+def test_missing_plugin_load(dummy_scan, mock_plugin):
+    with mock_plugin():
+        stream_definition = MockPluginStream.make_definition("mystream")
         _ = dummy_scan.create_stream(stream_definition)
     dummy_scan.prepare()
     stream = dummy_scan.streams["mystream"]
@@ -83,9 +95,9 @@ def test_missing_plugin_load(dummy_scan):
         len(stream)
 
 
-def test_broken_plugin_create(data_store, dummy_scan):
-    with fake_plugin_available():
-        stream_definition = FakePluginStream.make_definition(
+def test_broken_plugin_create(data_store, dummy_scan, mock_plugin):
+    with mock_plugin():
+        stream_definition = MockPluginStream.make_definition(
             "mystream", info={"fail": True}
         )
         with pytest.raises(Exception) as exc_info:
@@ -93,9 +105,9 @@ def test_broken_plugin_create(data_store, dummy_scan):
         assert "Oops, broken plugin..." in str(exc_info)
 
 
-def test_broken_plugin_load(data_store, dummy_scan):
-    with fake_plugin_available():
-        stream_definition = FakePluginStream.make_definition(
+def test_broken_plugin_load(data_store, dummy_scan, mock_plugin):
+    with mock_plugin():
+        stream_definition = MockPluginStream.make_definition(
             "mystream", info={"fail": False}
         )
         rw_stream = dummy_scan.create_stream(stream_definition)

{blissdata-2.4.1 → blissdata-2.4.3/src/blissdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.4.1
+Version: 2.4.3
 Summary: Bliss data streaming client
 Maintainer: BCU (ESRF)
 License-Expression: LGPL-3.0-or-later