blissdata 2.4.3__tar.gz → 2.4.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.4.3
+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.3 → blissdata-2.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blissdata"
-version = "2.4.3"
+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.3 → 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.3 → 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.3 → 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.3 → 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

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

@@ -1,6 +1,5 @@
 import pytest
 import numpy as np
-import gc
 from contextlib import contextmanager
 import blissdata.redis_engine.scan
 from blissdata.exceptions import MissingPluginException
@@ -77,12 +76,6 @@ def test_missing_plugin_create(dummy_scan):
     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, mock_plugin):
     with mock_plugin():

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.4.3
+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.3 → 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