blissdata 2.4.2__tar.gz → 2.4.4__tar.gz

{blissdata-2.4.2/src/blissdata.egg-info → blissdata-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.4.2
+Version: 2.4.4
 Summary: Bliss data streaming client
 Maintainer: BCU (ESRF)
 License-Expression: LGPL-3.0-or-later
@@ -39,9 +39,8 @@ Requires-Dist: blissdata[test]; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8>=4; extra == "dev"
 Requires-Dist: flake8-pep585; extra == "dev"
-Requires-Dist: mkdocs; extra == "dev"
+Requires-Dist: mkdocs<2; extra == "dev"
 Requires-Dist: mkdocs-material; extra == "dev"
-Requires-Dist: mkdocstrings[python]>=0.18; extra == "dev"
 Provides-Extra: beacon
 Requires-Dist: ruamel.yaml; extra == "beacon"
 Dynamic: license-file

{blissdata-2.4.2 → blissdata-2.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blissdata"
-version = "2.4.2"
+version = "2.4.4"
 description = "Bliss data streaming client"
 readme = "README.md"
 license = "LGPL-3.0-or-later"
@@ -46,9 +46,8 @@ dev = [
     "black",
     "flake8>=4",
     "flake8-pep585",
-    "mkdocs",
+    "mkdocs<2",
     "mkdocs-material",
-    "mkdocstrings[python]>=0.18",
 ]
 beacon = ["ruamel.yaml"]
 

{blissdata-2.4.2 → blissdata-2.4.4}/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.2 → blissdata-2.4.4}/src/blissdata/h5map/data_items.py

@@ -211,20 +211,19 @@ class Compound(BaseModel):
         return rec.view(np.ndarray)
 
     @model_validator(mode="after")
-    @classmethod
-    def verify_names_and_shapes(cls, value):
+    def verify_names_and_shapes(self):
         """Ensure uniqueness of names and shape equality between columns"""
-        if len(value.columns) != len({name for name, _ in value.columns}):
+        if len(self.columns) != len({name for name, _ in self.columns}):
             raise ValueError("found columns with same name")
 
-        shape_iterator = iter((col.decode().shape for _, col in value.columns))
+        shape_iterator = iter((col.decode().shape for _, col in self.columns))
         try:
             first_shape = next(shape_iterator)
         except StopIteration:
-            return value
+            return self
         if not all(first_shape == shape for shape in shape_iterator):
             raise ValueError("columns have different shapes")
-        return value
+        return self
 
 
 class Stream(BaseModel):

{blissdata-2.4.2 → blissdata-2.4.4}/src/blissdata/lima/image_utils.py

@@ -273,8 +273,9 @@ def decode_devencoded_video(raw_data: bytes | tuple[str, bytes]) -> ImageData |
 
     if mode in MODE_TO_NUMPY:
         dtype = MODE_TO_NUMPY[mode]
-        data = numpy.frombuffer(raw_data, offset=header_size, dtype=dtype).copy()
-        data.shape = image_height, image_width
+        data = numpy.frombuffer(raw_data, offset=header_size, dtype=dtype).reshape(
+            (image_height, image_width), copy=True
+        )
     elif mode in _RGB_CODECS:
         data = decode_rgb_data(
             raw_data, image_width, image_height, mode, offset=header_size
@@ -411,8 +412,9 @@ def decode_devencoded_image(raw_data: bytes | tuple[str, bytes]) -> ImageData:
     except Exception:
         raise ImageFormatNotSupported("Data format %s is not supported" % mode)
 
-    data = numpy.frombuffer(raw_data, offset=header_size, dtype=dtype)
-    data.shape = dim2, dim1
+    data = numpy.frombuffer(raw_data, offset=header_size, dtype=dtype).reshape(
+        (dim2, dim1)
+    )
 
     # Create a memory copy only if it is needed
     if not data.flags.writeable:

{blissdata-2.4.2 → blissdata-2.4.4}/src/blissdata/redis_engine/scan.py

@@ -357,6 +357,7 @@ class Scan:
 
         stream = self._wrap_event_stream(event_stream)
         if isinstance(stream, BrokenStream):
+            event_stream._sink.stop()
             raise stream._exception
         self._model.data_streams[name] = model
         self._writer_streams[name] = stream
@@ -374,7 +375,11 @@ class Scan:
         multiple places."""
         model = self._model.data_streams[name]
         rw_event_stream = EventStream.create(self._data_store, name, model)
-        return self._wrap_event_stream(rw_event_stream)
+        stream = self._wrap_event_stream(rw_event_stream)
+        if isinstance(stream, BrokenStream):
+            rw_event_stream._sink.stop()
+            raise stream._exception
+        return stream
 
     @needs_write_permission
     def _close_writer_streams(self):

{blissdata-2.4.2 → blissdata-2.4.4}/src/blissdata/redis_engine/store.py

@@ -109,6 +109,16 @@ class DataStore:
                 f"Cannot re-index a non-empty Redis database, {nb_keys} keys are already present"
             )
 
+        # Ensure ReJSON and RediSearch modules are installed on server side
+        installed_modules = {
+            module[b"name"].decode() for module in self._redis.module_list()
+        }
+        for module in ["ReJSON", "search"]:
+            if module not in installed_modules:
+                raise RuntimeError(
+                    f"Redis server is missing '{module}' module for blissdata to function"
+                )
+
         # Configure RediSearch indexing with redis-om, but block redis-om mechanism which auto-discover any
         # model class for indexing. Instead we set model_registry by hand to only enable self._scan_model indexing
         # and not to interfer with existing DataStores.
@@ -122,7 +132,12 @@ class DataStore:
 
         # TODO how to ensure this is always greater than the number of scan in redis ?
         # otherwise search results may be truncated without warning
-        self._redis.ft().config_set("MAXPREFIXEXPANSIONS", 2000)
+        try:
+            # redis-server 8+ API
+            self._redis.config_set("search-max-prefix-expansions", 2000)
+        except redis.exceptions.ResponseError:
+            # fallback to legacy API
+            self._redis.ft().config_set("MAXPREFIXEXPANSIONS", 2000)
 
         # Server side sealing function:
         # For the seal to contain the complete length of the stream, we
@@ -350,7 +365,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.2 → blissdata-2.4.4}/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.2 → blissdata-2.4.4}/src/blissdata/tests/streams/plugins/test_plugin_base.py

@@ -12,11 +12,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 +25,61 @@ 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)
 
 
-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 +88,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 +98,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.2 → blissdata-2.4.4/src/blissdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.4.2
+Version: 2.4.4
 Summary: Bliss data streaming client
 Maintainer: BCU (ESRF)
 License-Expression: LGPL-3.0-or-later
@@ -39,9 +39,8 @@ Requires-Dist: blissdata[test]; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8>=4; extra == "dev"
 Requires-Dist: flake8-pep585; extra == "dev"
-Requires-Dist: mkdocs; extra == "dev"
+Requires-Dist: mkdocs<2; extra == "dev"
 Requires-Dist: mkdocs-material; extra == "dev"
-Requires-Dist: mkdocstrings[python]>=0.18; extra == "dev"
 Provides-Extra: beacon
 Requires-Dist: ruamel.yaml; extra == "beacon"
 Dynamic: license-file

{blissdata-2.4.2 → blissdata-2.4.4}/src/blissdata.egg-info/requires.txt

@@ -17,9 +17,8 @@ blissdata[test]
 black
 flake8>=4
 flake8-pep585
-mkdocs
+mkdocs<2
 mkdocs-material
-mkdocstrings[python]>=0.18
 
 [lima2]
 blissdata-lima2>=2.0