blissdata 2.1.0__tar.gz → 2.1.1__tar.gz

{blissdata-2.1.0/src/blissdata.egg-info → blissdata-2.1.1}/PKG-INFO

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

{blissdata-2.1.0 → blissdata-2.1.1}/pyproject.toml

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

{blissdata-2.1.0 → blissdata-2.1.1}/src/blissdata/streams/lima2/stream.py

@@ -8,9 +8,18 @@
 import logging
 from collections.abc import Sequence
 
-import lima2.client.services as l2s
+try:
+    from lima2.client.services import ConductorServices, init as service_init
+    from lima2.common.devencoded.sparse_frame import SparseFrame
+except ImportError:
+
+    def service_init(*args, **kwargs):
+        return None
+
+    ConductorServices = None
+    SparseFrame = None
+
 import numpy as np
-from lima2.common.devencoded.sparse_frame import SparseFrame
 from numpy.typing import DTypeLike
 
 from blissdata.lima.image_utils import ImageData
@@ -33,11 +42,15 @@ _logger = logging.getLogger(__name__)
 
 
 def get_frame(
-    services: l2s.ConductorServices,
+    services: ConductorServices,
     acq_uuid: str,
     source: str,
     frame_idx: int,
 ) -> ImageData:
+    if services is None:
+        raise RuntimeError(
+            "Missing package lima2-client, cannot read Lima2Stream without optional dependencies"
+        )
     frm = services.pipeline.get_frame(frame_idx=frame_idx, source=source, uuid=acq_uuid)
 
     if isinstance(frm, SparseFrame):
@@ -49,7 +62,7 @@ def get_frame(
 class Lima2View(BaseView):
     def __init__(
         self,
-        services: l2s.ConductorServices,
+        services: ConductorServices,
         acq_uuid: str,
         source: str,
         start: int,
@@ -132,7 +145,7 @@ class Lima2Stream(BaseStream):
         self._acq_uuid = str(event_stream.info["acq_uuid"])
         self._source = str(event_stream.info["source_name"])
 
-        self._services = l2s.init(
+        self._services = service_init(
             hostname=str(event_stream.info["conductor_hostname"]),
             port=int(event_stream.info["conductor_port"]),
         )

{blissdata-2.1.0 → blissdata-2.1.1/src/blissdata.egg-info}/PKG-INFO

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