blissdata 2.3.0__tar.gz → 2.4.0__tar.gz

{blissdata-2.3.0/src/blissdata.egg-info → blissdata-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.3.0
+Version: 2.4.0
 Summary: Bliss data streaming client
 Maintainer: BCU (ESRF)
 License-Expression: LGPL-3.0-or-later
@@ -19,9 +19,9 @@ Requires-Dist: h5py>=2.9
 Requires-Dist: msgpack
 Requires-Dist: numpy>=1.20
 Requires-Dist: numpydantic<1.6.10
-Requires-Dist: pydantic>=2.3.0
+Requires-Dist: pydantic>=2.9
 Requires-Dist: redis>=4.6.0
-Requires-Dist: redis-om<1.0,>=0.3.1
+Requires-Dist: redis-om~=1.0
 Requires-Dist: silx>=1.1.0
 Provides-Extra: tango
 Requires-Dist: pytango>=9.3.1; extra == "tango"
@@ -36,7 +36,7 @@ Requires-Dist: pytest-timeout; extra == "test"
 Requires-Dist: packaging; extra == "test"
 Provides-Extra: dev
 Requires-Dist: blissdata[test]; extra == "dev"
-Requires-Dist: black==22.3; extra == "dev"
+Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8>=4; extra == "dev"
 Requires-Dist: flake8-pep585; extra == "dev"
 Requires-Dist: mkdocs; extra == "dev"

{blissdata-2.3.0 → blissdata-2.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blissdata"
-version = "2.3.0"
+version = "2.4.0"
 description = "Bliss data streaming client"
 readme = "README.md"
 license = "LGPL-3.0-or-later"
@@ -19,9 +19,9 @@ dependencies = [
     "msgpack",
     "numpy>=1.20",
     "numpydantic<1.6.10",
-    "pydantic>=2.3.0", # (not a direct dep) redis-om 0.3.2 doesn't support lower versions
+    "pydantic>=2.9",
     "redis>=4.6.0",
-    "redis-om>=0.3.1,<1.0",
+    "redis-om~=1.0",
     "silx>=1.1.0",
 ]
 
@@ -43,7 +43,7 @@ test = [
 ]
 dev = [
     "blissdata[test]",
-    "black==22.3",
+    "black",
     "flake8>=4",
     "flake8-pep585",
     "mkdocs",

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/h5api/utils/hdf5.py

@@ -251,7 +251,7 @@ class DynamicHDF5Handler:
             try:
                 return item.attrs[key]  # try one more time
             except KeyError as e:
-                if not _key_does_not_exist(e):
+                if not _attribute_does_not_exist(e):
                     raise
                 # attribute will never be created
                 raise RetryTimeoutError(str(e)) from e
@@ -366,3 +366,14 @@ def _key_does_not_exist(exc: KeyError) -> bool:
 
     """
     return "doesn't exist" in str(exc)
+
+
+def _attribute_does_not_exist(exc: KeyError) -> bool:
+    """
+    A real KeyError (meaning that the attribute does not exist) gives the following error message:
+
+    .. code
+
+        KeyError: "Unable to synchronously open attribute (can't locate attribute: 'myattr')"
+    """
+    return "can't locate attribute" in str(exc)

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/h5map/__init__.py

@@ -4,6 +4,7 @@ from .data_items import (  # noqa: F401
     InlineRaw,
     Inline,
     InlineBase64,
+    Compound,
     Stream,
 )
 from .hdf5_items import (  # noqa: F401

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/h5map/data_items.py

@@ -6,6 +6,7 @@ from pydantic import (
     Base64Bytes,
     Field,
     field_validator,
+    model_validator,
     model_serializer,
     Discriminator,
     Tag,
@@ -64,7 +65,13 @@ class InlineRaw(RootModel):
     def decode(self):
         value = self.model_dump()
         if value.dtype.kind in "UT":
-            return np.vectorize(lambda x: x.encode(), otypes="O")(value)
+            # Make strings similar to those read back from h5py:
+            #   - Convert to "object" dtype
+            #   - Tell h5py that "object" is variable length string using
+            #     metadata, so writing doesn't fail even in a compound dataset.
+            return np.vectorize(
+                lambda x: x.encode(), otypes=[np.dtype("O", metadata={"vlen": str})]
+            )(value)
         else:
             return value
 
@@ -155,14 +162,6 @@ class InlineBase64(BaseModel):
             return value
 
 
-class Stream(BaseModel):
-    type: Literal["stream"] = "stream"
-    stream: str
-
-    def decode(self):
-        raise TypeError("Stream model is just a reference, can't use decode()")
-
-
 def get_discriminator_value(v: Any) -> str:
     if isinstance(v, dict):
         return v.get("type")
@@ -171,12 +170,78 @@ def get_discriminator_value(v: Any) -> str:
     return "raw"
 
 
+class Compound(BaseModel):
+    """Composite model to combine multiple DataItems as a structured array.
+    Unlike numpy structured arrays where data is a list of heterogeneous tuples,
+    here all elements of one dtype are stored together. This way existing
+    DataItem models can be reused as columns.
+
+    Validation ensures:
+    - Column names uniqueness
+    - Shape consistency between columns
+    """
+
+    type: Literal["compound"] = "compound"
+    columns: list[
+        tuple[
+            str,
+            Annotated[
+                (
+                    Annotated[Inline, Tag("inline")]
+                    | Annotated[InlineBase64, Tag("inline_b64")]
+                    | Annotated[InlineRaw, Tag("raw")]
+                    | Annotated["Compound", Tag("compound")]
+                    # Note: Stream can't be part of a compound object
+                ),
+                Discriminator(get_discriminator_value),
+            ],
+        ]
+    ] = Field(min_length=1)
+    # Reusing DataItemType simplifies this model as it does not redefine
+    # handling of dtype, shape or base64 version of the values.
+    # Therefore the representation is the transposed of numpy one, which can be
+    # harder to read.
+
+    def decode(self):
+        decoded_columns = [(name, value.decode()) for name, value in self.columns]
+        rec = np.rec.fromarrays(
+            [value for _, value in decoded_columns],
+            names=[name for name, _ in decoded_columns],
+        )
+        return rec.view(np.ndarray)
+
+    @model_validator(mode="after")
+    @classmethod
+    def verify_names_and_shapes(cls, value):
+        """Ensure uniqueness of names and shape equality between columns"""
+        if len(value.columns) != len({name for name, _ in value.columns}):
+            raise ValueError("found columns with same name")
+
+        shape_iterator = iter((col.decode().shape for _, col in value.columns))
+        try:
+            first_shape = next(shape_iterator)
+        except StopIteration:
+            return value
+        if not all(first_shape == shape for shape in shape_iterator):
+            raise ValueError("columns have different shapes")
+        return value
+
+
+class Stream(BaseModel):
+    type: Literal["stream"] = "stream"
+    stream: str
+
+    def decode(self):
+        raise TypeError("Stream model is just a reference, can't use decode()")
+
+
 DataItemType = Annotated[
     (
         Annotated[Inline, Tag("inline")]
         | Annotated[InlineBase64, Tag("inline_b64")]
         | Annotated[Stream, Tag("stream")]
         | Annotated[InlineRaw, Tag("raw")]
+        | Annotated[Compound, Tag("compound")]
     ),
     Discriminator(get_discriminator_value),
 ]

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/lima/image_utils.py

@@ -5,8 +5,8 @@
 # Copyright (c) Beamline Control Unit, ESRF
 # Distributed under the GNU LGPLv3. See LICENSE for more info.
 
-"""Utility functions to read Lima images from file or device server.
-"""
+"""Utility functions to read Lima images from file or device server."""
+
 import struct
 import numpy
 import typing

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/redis_engine/memory_tracker.py

@@ -16,7 +16,6 @@ from dataclasses import dataclass
 from blissdata import DataStore, Scan, ScanState
 from blissdata.exceptions import NoScanAvailable, ScanNotFoundError, ScanLoadError
 
-
 memory_tracking_stream = "_MEMORY_TRACKING_"
 SEAL_ID = ("-".join([str(2**64 - 1)] * 2)).encode()
 
@@ -35,6 +34,7 @@ class NoFreeableMemoryError(Exception):
 class TrackedScan:
     scan: Scan
     last_activity: int
+    last_streams_ids: dict[str, int]
 
     def __eq__(self, other):
         return self.scan.key == other.scan.key
@@ -93,7 +93,7 @@ class MemoryTracker:
                     scan._model.state_stream.key(), count=1
                 )
                 last_activity = int(raw[0][0].split(b"-")[0]) / 1000
-                self._tracked_scans.add(TrackedScan(scan, last_activity))
+                self._tracked_scans.add(TrackedScan(scan, last_activity, {}))
             except ScanNotFoundError:
                 # scan already deleted from Redis by user, skip it
                 pass
@@ -113,7 +113,7 @@ class MemoryTracker:
                 try:
                     scan = self._data_store.load_scan(scan_key)
                     last_activity = int(since.split("-")[0]) / 1000
-                    self._tracked_scans.add(TrackedScan(scan, last_activity))
+                    self._tracked_scans.add(TrackedScan(scan, last_activity, {}))
                     self._since = since
                     logging.info(f"Start tracking {scan.key}")
                 except ScanNotFoundError:
@@ -135,7 +135,14 @@ class MemoryTracker:
 
             if track.scan.state >= ScanState.PREPARED:
                 streams_ids = self._data_streams_ids(track.scan)
-                if streams_ids:
+                stream_activity = {
+                    key: idx
+                    for key, idx in streams_ids.items()
+                    if key not in track.last_streams_ids
+                    or track.last_streams_ids[key] != idx
+                }
+                if stream_activity:
+                    track.last_streams_ids = streams_ids
                     track.last_activity, _ = self._data_store._redis.time()
                 all_data_streams_ids.update(streams_ids)
 

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/redis_engine/store.py

@@ -43,7 +43,7 @@ class DataStore:
         close_func = type(redis_pool).disconnect
         weakref.finalize(self, close_func, redis_pool)
 
-        class StreamModel(HashModel):
+        class StreamModel(HashModel, index=True):
             """Actual stream model to be embedded into ScanModel, but not exposed to user directly.
             They are wrapped into Stream objects instead."""
 
@@ -60,7 +60,7 @@ class DataStore:
             encoding: dict | str | None = None
             info: dict | str | None = None
 
-        class ScanModel(JsonModel):
+        class ScanModel(JsonModel, index=True):
             class Meta:
                 global_key_prefix = identity_model_cls._meta.global_key_prefix
                 model_key_prefix = "scan"

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/schemas/scan_info_display.py

@@ -7,7 +7,6 @@
 import typing
 import typing_extensions
 
-
 ChannelRef = str
 """Identify a channel from the `scan_info["channels"]` field"""
 

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/tests/beacon/test_files.py

@@ -23,7 +23,7 @@ def test_param_constructor(mocker):
 
 
 def test_get_file(mocker):
-    RESPONSE1 = b"\x34\x00\x00\x00\x0E\x00\x00\x001|MY FILE DATA"
+    RESPONSE1 = b"\x34\x00\x00\x00\x0e\x00\x00\x001|MY FILE DATA"
     mock_socket = mocker.patch("socket.socket")
     mock_socket.return_value.recv.side_effect = [RESPONSE1]
     service = BeaconFiles("foo", 200)
@@ -35,7 +35,7 @@ def test_get_file(mocker):
 
 
 def test_get_tree(mocker):
-    RESPONSE1 = b"""\x58\x00\x00\x00\x2C\x00\x00\x001|{"afile":null,"adir":{"anotherfile":null}}"""
+    RESPONSE1 = b"""\x58\x00\x00\x00\x2c\x00\x00\x001|{"afile":null,"adir":{"anotherfile":null}}"""
     mock_socket = mocker.patch("socket.socket")
     mock_socket.return_value.recv.side_effect = [RESPONSE1]
     service = BeaconFiles("foo", 200)

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/tests/conftest.py

@@ -5,7 +5,6 @@ from pytest_redis.factories.proc import redis_proc
 
 from blissdata import DataStore
 
-
 redis_db = redis_proc(
     modules=[
         os.path.join(os.getenv("CONDA_PREFIX", "/usr"), "lib", "librejson.so"),

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/tests/h5api/test_dynamic_files.py

@@ -1,6 +1,10 @@
 import os
+import time
+
+import h5py
 import numpy
 import pytest
+
 from blissdata.h5api import dynamic_hdf5
 from . import scanner
 
@@ -325,3 +329,88 @@ def read_scan_data(nxroot, scan_number, counters, queue):
             numpy.testing.assert_array_equal(data, expected)
         scanner.log_point(scan_number, scan_index, queue, write=False)
     print(f"Finished reading scan {scan_number}")
+
+
+@pytest.fixture
+def h5file_finished_scan(tmp_path):
+    path = tmp_path / "test.h5"
+    with h5py.File(path, "w") as fh:
+        fh["/1.1/start_time"] = "2026-01-09T14:49:39.364371+01:00"
+        fh["/1.1/end_time"] = "2026-01-09T14:49:39.364371+01:00"
+    return str(path)
+
+
+@pytest.fixture
+def h5file_running_scan(tmp_path):
+    path = tmp_path / "test.h5"
+    with h5py.File(path, "w") as fh:
+        fh["/1.1/start_time"] = "2026-01-09T14:49:39.364371+01:00"
+    return str(path)
+
+
+def test_non_existing_h5item_in_finished_scan(h5file_finished_scan):
+    _assert_non_existing_h5item(h5file_finished_scan, finished=True)
+
+
+def test_non_existing_h5item_in_running_scan(h5file_running_scan):
+    _assert_non_existing_h5item(h5file_running_scan, finished=False)
+
+
+def test_non_existing_h5attr_in_finished_scan(h5file_finished_scan):
+    _assert_non_existing_h5attr(h5file_finished_scan, finished=True)
+
+
+def test_non_existing_h5attr_in_running_scan(h5file_running_scan):
+    _assert_non_existing_h5attr(h5file_running_scan, finished=False)
+
+
+def _assert_non_existing_h5item(h5file, finished):
+    retry_timeout = 2
+    max_immediate_time = 0.5
+
+    with dynamic_hdf5.File(h5file, retry_timeout=retry_timeout) as fh:
+        scan = fh["/1.1"]
+
+        t0 = time.time()
+        with pytest.raises(KeyError):
+            scan["instrument"]
+        elapsed = time.time() - t0
+        if finished:
+            assert elapsed < max_immediate_time
+        else:
+            assert elapsed >= retry_timeout
+
+        t0 = time.time()
+        value = scan.get("instrument")
+        elapsed = time.time() - t0
+        assert value is None
+        if finished:
+            assert elapsed < max_immediate_time
+        else:
+            assert elapsed >= retry_timeout
+
+
+def _assert_non_existing_h5attr(h5file, finished):
+    retry_timeout = 2
+    max_immediate_time = 0.5
+
+    with dynamic_hdf5.File(h5file, retry_timeout=retry_timeout) as fh:
+        scan = fh["/1.1"]
+
+        t0 = time.time()
+        with pytest.raises(KeyError):
+            scan.attrs["myattr"]
+        elapsed = time.time() - t0
+        if finished:
+            assert elapsed < max_immediate_time
+        else:
+            assert elapsed >= retry_timeout
+
+        t0 = time.time()
+        value = scan.attrs.get("myattr")
+        elapsed = time.time() - t0
+        assert value is None
+        if finished:
+            assert elapsed < max_immediate_time
+        else:
+            assert elapsed >= retry_timeout

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/tests/h5api/test_redis_files.py

@@ -307,6 +307,12 @@ def test_external_link(data_store, tmpdir):
         h5m.InlineRaw(["a", "b", "c"]),
         h5m.Inline(value=1.23, dtype="float16"),
         h5m.Inline(value=[1.23, "4.56"], dtype="float32"),
+        h5m.Compound(
+            columns=[
+                ("name", ["chan1", "chan2"]),
+                ("current", h5m.Inline(value=[1.23, "4.56"], dtype="float32")),
+            ]
+        ),
     ],
 )
 def test_static_dataset(data_store, tmpdir, value):

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/tests/h5map/test_data_items.py

@@ -2,7 +2,7 @@ import pytest
 import pydantic
 import base64
 import numpy as np
-from blissdata.h5map import InlineRaw, Inline, InlineBase64
+from blissdata.h5map import InlineRaw, Inline, InlineBase64, Compound, Stream
 
 
 @pytest.mark.parametrize(
@@ -211,6 +211,96 @@ def test_inline_load(json_input, expected_value):
     assert output.dtype == expected_value.dtype
 
 
+@pytest.mark.parametrize(
+    "input_value, expected_json",
+    [
+        pytest.param(
+            [("a", 123)],
+            '{"type":"compound","columns":[["a",123]]}',
+            id="single column",
+        ),
+        pytest.param(
+            [("a", 1), ("b", 2)],
+            '{"type":"compound","columns":[["a",1],["b",2]]}',
+            id="scalars",
+        ),
+        pytest.param(
+            [("a", [1, 2]), ("b", [3.0, 4.0])],
+            '{"type":"compound","columns":[["a",[1,2]],["b",[3.0,4.0]]]}',
+            id="arrays",
+        ),
+        pytest.param(
+            [("a", [[1, 2], [3, 4]]), ("b", [[5.0, 6.0], [7.0, 8.0]])],
+            '{"type":"compound","columns":[["a",[[1,2],[3,4]]],["b",[[5.0,6.0],[7.0,8.0]]]]}',
+            id="ndarrays",
+        ),
+        pytest.param(
+            [("name", ["alice", "bob"]), ("id", [123, 456])],
+            '{"type":"compound","columns":[["name",["alice","bob"]],["id",[123,456]]]}',
+            id="strings",
+        ),
+        pytest.param(
+            [
+                ("a", Inline(value=[1.2, 2.3], dtype="float16")),
+                ("b", Inline(value=[12, 23], dtype="uint32")),
+            ],
+            '{"type":"compound","columns":[["a",{"type":"inline","dtype":"float16","value":[1.2,2.3]}],["b",{"type":"inline","dtype":"uint32","value":[12,23]}]]}',
+            id="explicit types",
+        ),
+        pytest.param(
+            [
+                ["id", [1, 2, 3]],
+                [
+                    "person",
+                    Compound(
+                        columns=[
+                            ["name", ["Alice", "Bob", "Charlie"]],
+                            [
+                                "email",
+                                [
+                                    "alice@example.com",
+                                    "bob@example.com",
+                                    "charlie@example.com",
+                                ],
+                            ],
+                        ]
+                    ),
+                ],
+            ],
+            '{"type":"compound","columns":[["id",[1,2,3]],["person",{"type":"compound","columns":[["name",["Alice","Bob","Charlie"]],["email",["alice@example.com","bob@example.com","charlie@example.com"]]]}]]}',
+            id="nested",
+        ),
+    ],
+)
+def test_compound(input_value, expected_json):
+    model = Compound(columns=input_value)
+    assert model.model_dump_json() == expected_json
+    _ = model.decode()
+
+
+@pytest.mark.parametrize(
+    "input_value",
+    [
+        pytest.param([], id="empty"),
+        pytest.param(
+            [("aaa", [1, 2]), ("bbb", ["hello", "bye"]), ("ccc", [1.23])],
+            id="misaligned",
+        ),
+        pytest.param(
+            [("stream", Stream(stream="stream_name")), ("integer", 42)],
+            id="stream",
+        ),
+        pytest.param(
+            [("twin", 1), ("twin", 2)],
+            id="duplicate name",
+        ),
+    ],
+)
+def test_compound_forbidden_value(input_value):
+    with pytest.raises(pydantic.ValidationError):
+        _ = Compound(columns=input_value)
+
+
 @pytest.mark.parametrize(
     "json_input, expected_value",
     [

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/tests/lima/test_image_utils.py

@@ -63,13 +63,13 @@ RAW_YUV422PACKED_VIDEO = (
 RAW_RGB24_VIDEO = (
     b"VDEO\x00\x01\x00\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x02\x00\x00\x00\x02\x00\x00\x00 \x00\x00\x00\x00"
-    + b"\xFF\x00\x00\x00\xFF\x00\x00\x00\xFF\x00\x00\x00"
+    + b"\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00"
 )
 
 RAW_RGB32_VIDEO = (
     b"VDEO\x00\x01\x00\x07\x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00 \x00\x00\x00\x00"
-    + b"\xFF\x00\x00\x00\x00\xFF\x00\x00\x00\x00\xFF\x00\x00\x00\x00\xFF"
+    + b"\xff\x00\x00\x00\x00\xff\x00\x00\x00\x00\xff\x00\x00\x00\x00\xff"
 )
 
 RAW_BAYER_RG16 = (

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata/tests/redis_engine/test_memory_tracker.py

@@ -224,29 +224,35 @@ def test_delete_inactive_scan(redis_url, data_store, dummy_id):
         active_scan = data_store.create_scan(dummy_id)
 
         stream_definition = Stream.make_definition("mystream", "int")
-        stream = active_scan.create_stream(stream_definition)
+        stream_ina = inactive_scan.create_stream(stream_definition)
 
+        stream_definition = Stream.make_definition("mystream", "int")
+        stream_act = active_scan.create_stream(stream_definition)
+
+        inactive_scan.prepare()
+        inactive_scan.start()
         active_scan.prepare()
         active_scan.start()
 
-        # wait for tracker to find the scan
+        # wait for tracker to find the scans
         nb_scans_to_track = 2
         while nb_scans_to_track:
-            stream.send(1)
+            stream_ina.send(1)
+            stream_act.send(1)
             line = proc.stdout.readline()
             print(line, end="")
             if "Start tracking" in line:
                 nb_scans_to_track -= 1
 
         while True:
-            stream.send(2)
+            stream_act.send(2)
             line = proc.stdout.readline()
             print(line, end="")
             if f"{inactive_scan.key} was inactive" in line:
                 break
 
         for _ in range(4):
-            stream.send(3)
+            stream_act.send(3)
             line = proc.stdout.readline()
             print(line, end="")
             assert f"{active_scan.key} was inactive" not in line

{blissdata-2.3.0 → blissdata-2.4.0/src/blissdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blissdata
-Version: 2.3.0
+Version: 2.4.0
 Summary: Bliss data streaming client
 Maintainer: BCU (ESRF)
 License-Expression: LGPL-3.0-or-later
@@ -19,9 +19,9 @@ Requires-Dist: h5py>=2.9
 Requires-Dist: msgpack
 Requires-Dist: numpy>=1.20
 Requires-Dist: numpydantic<1.6.10
-Requires-Dist: pydantic>=2.3.0
+Requires-Dist: pydantic>=2.9
 Requires-Dist: redis>=4.6.0
-Requires-Dist: redis-om<1.0,>=0.3.1
+Requires-Dist: redis-om~=1.0
 Requires-Dist: silx>=1.1.0
 Provides-Extra: tango
 Requires-Dist: pytango>=9.3.1; extra == "tango"
@@ -36,7 +36,7 @@ Requires-Dist: pytest-timeout; extra == "test"
 Requires-Dist: packaging; extra == "test"
 Provides-Extra: dev
 Requires-Dist: blissdata[test]; extra == "dev"
-Requires-Dist: black==22.3; extra == "dev"
+Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8>=4; extra == "dev"
 Requires-Dist: flake8-pep585; extra == "dev"
 Requires-Dist: mkdocs; extra == "dev"

{blissdata-2.3.0 → blissdata-2.4.0}/src/blissdata.egg-info/requires.txt

@@ -4,9 +4,9 @@ h5py>=2.9
 msgpack
 numpy>=1.20
 numpydantic<1.6.10
-pydantic>=2.3.0
+pydantic>=2.9
 redis>=4.6.0
-redis-om<1.0,>=0.3.1
+redis-om~=1.0
 silx>=1.1.0
 
 [beacon]
@@ -14,7 +14,7 @@ ruamel.yaml
 
 [dev]
 blissdata[test]
-black==22.3
+black
 flake8>=4
 flake8-pep585
 mkdocs