ewoksdata 2.1.1__tar.gz → 2.2.1__tar.gz

{ewoksdata-2.1.1/src/ewoksdata.egg-info → ewoksdata-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ewoksdata
-Version: 2.1.1
+Version: 2.2.1
 Summary: Ewoks tasks for data access
 Author-email: ESRF <dau-pydev@esrf.fr>
 License: # MIT License
@@ -45,7 +45,7 @@ Requires-Dist: redis!=5.3.0b1,!=5.3.0b3
 Requires-Dist: redis-om!=1.0.0b0; python_version < "3.9"
 Requires-Dist: redis-om!=1.0.3b0; python_version < "3.9"
 Provides-Extra: online
-Requires-Dist: blissdata[tango]; extra == "online"
+Requires-Dist: blissdata[lima2,tango]; extra == "online"
 Provides-Extra: test
 Requires-Dist: ewoksdata[online]; extra == "test"
 Requires-Dist: pytest>=7; extra == "test"

{ewoksdata-2.1.1 → ewoksdata-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ewoksdata"
-version = "2.1.1"
+version = "2.2.1"
 authors = [{ name = "ESRF", email = "dau-pydev@esrf.fr" }]
 description = "Ewoks tasks for data access"
 readme = { file = "README.md", content-type = "text/markdown" }
@@ -36,7 +36,7 @@ Changelog = "https://gitlab.esrf.fr/workflow/ewoksapps/ewoksdata/-/blob/main/CHA
 
 [project.optional-dependencies]
 online = [
-    "blissdata[tango]"
+    "blissdata[tango,lima2]"
 ]
 test = [
     "ewoksdata[online]",

{ewoksdata-2.1.1 → ewoksdata-2.2.1}/src/ewoksdata/data/blissdata/blissdatav2.py

@@ -26,12 +26,14 @@ if _BLISSDATA_VERSION >= Version("2.3.0"):
     from blissdata.exceptions import IndexNoMoreThereError
     from blissdata.exceptions import IndexNotYetThereError
     from blissdata.exceptions import IndexWontBeThereError
+    from blissdata.streams import BaseStream
     from blissdata.streams import CursorGroup
 else:
     from blissdata.redis_engine.exceptions import EndOfStream
     from blissdata.redis_engine.exceptions import IndexNoMoreThereError
     from blissdata.redis_engine.exceptions import IndexNotYetThereError
     from blissdata.redis_engine.exceptions import IndexWontBeThereError
+    from blissdata.streams.base import BaseStream
     from blissdata.streams.base import CursorGroup
 
 logger = logging.getLogger(__name__)
@@ -178,10 +180,8 @@ def last_lima_image(scan_key: str, lima_name: str) -> ArrayLike:
 
 
 def _get_streams(
-    scan_key: str,
-    lima_names: List[str],
-    counter_names: List[str],
-):
+    scan_key: str, lima_names: List[str], counter_names: List[str]
+) -> Dict[str, BaseStream]:
     data_store = _get_data_store()
     scan = data_store.load_scan(scan_key)
 
@@ -191,15 +191,17 @@ def _get_streams(
     streams = dict()
 
     for name, stream in scan.streams.items():
-        if (
-            stream.event_stream.encoding["type"] == "json"
-            and "lima" in stream.info["format"]
-        ):
-            if name.split(":")[-2] in lima_names:
-                streams[name.split(":")[-2]] = stream
-
-        elif name.split(":")[-1] in counter_names:
-            streams[name.split(":")[-1]] = stream
+        name_parts = name.split(":")
+        if _is_lima_image_stream(stream, name_parts):
+            input_name = name_parts[0]
+            if input_name not in lima_names:
+                continue
+        elif name_parts[-1] in counter_names:
+            input_name = name_parts[-1]
+        else:
+            continue
+
+        streams[input_name] = stream
 
     nnames = len(lima_names) + len(counter_names)
     nstreams = len(streams)
@@ -210,6 +212,22 @@ def _get_streams(
     return streams
 
 
+def _is_lima_image_stream(stream: BaseStream, name_parts: Tuple[str]) -> bool:
+    if "plugin" in stream.info:
+        if stream.info["plugin"] == "lima2":
+            return (
+                name_parts[-1] == "frame" and stream.info.get("master_file") is not None
+            )
+        else:
+            return stream.info["plugin"] == "lima"
+
+    if stream.event_stream.encoding["type"] == "json":
+        # lima_v1, lima_v2
+        return "lima" in stream.info.get("format", "")
+
+    return False
+
+
 def iter_bliss_scan_data_from_memory_slice(
     scan_key: str,
     lima_names: List[str],

{ewoksdata-2.1.1 → ewoksdata-2.2.1/src/ewoksdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ewoksdata
-Version: 2.1.1
+Version: 2.2.1
 Summary: Ewoks tasks for data access
 Author-email: ESRF <dau-pydev@esrf.fr>
 License: # MIT License
@@ -45,7 +45,7 @@ Requires-Dist: redis!=5.3.0b1,!=5.3.0b3
 Requires-Dist: redis-om!=1.0.0b0; python_version < "3.9"
 Requires-Dist: redis-om!=1.0.3b0; python_version < "3.9"
 Provides-Extra: online
-Requires-Dist: blissdata[tango]; extra == "online"
+Requires-Dist: blissdata[lima2,tango]; extra == "online"
 Provides-Extra: test
 Requires-Dist: ewoksdata[online]; extra == "test"
 Requires-Dist: pytest>=7; extra == "test"

{ewoksdata-2.1.1 → ewoksdata-2.2.1}/src/ewoksdata.egg-info/requires.txt

@@ -23,7 +23,7 @@ sphinx-autodoc-typehints>=1.16
 pydata-sphinx-theme<0.15
 
 [online]
-blissdata[tango]
+blissdata[lima2,tango]
 
 [test]
 ewoksdata[online]