lima2.client 2.1.2__tar.gz → 2.2.0__tar.gz

{lima2_client-2.1.2/src/lima2.client.egg-info → lima2_client-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lima2.client
-Version: 2.1.2
+Version: 2.2.0
 Summary: Python client library for Lima2 detector
 Home-page: https://gitlab.esrf.fr/limagroup/lima2-client
 Author: BCU (ESRF)

{lima2_client-2.1.2 → lima2_client-2.2.0}/src/lima2/client/client.py

@@ -47,6 +47,7 @@ class Client:
         self,
         ctl_dev: tg.DeviceProxy,
         rcv_devs: list[tg.DeviceProxy],
+        tango_timeout_s: int = 10,
     ):
         """Construct a Client given tango device proxies.
 
@@ -54,7 +55,8 @@ class Client:
         The topology is queried from the control device properties.
         """
 
-        self._detector = Detector(ctl_dev, *rcv_devs)
+        self._detector = Detector(ctl_dev, *rcv_devs, timeout=tango_timeout_s)
+        self._tango_timeout = tango_timeout_s
 
         try:
             # Get the topology property from control
@@ -245,7 +247,9 @@ class Client:
         proc_devs = [tg.DeviceProxy(url) for url in sorted(list(instances))]
 
         # Instantiate pipeline
-        self.__pipelines[uuid] = pipeline_class(uuid, proc_devs, self.topology_kind)
+        self.__pipelines[uuid] = pipeline_class(
+            uuid, proc_devs, self.topology_kind, timeout=self._tango_timeout
+        )
 
         return self.__pipelines[uuid]
 

{lima2_client-2.1.2 → lima2_client-2.2.0}/src/lima2/client/detector.py

@@ -47,13 +47,11 @@ class CommError(RuntimeError):
 class Detector:
     """The main Detector interface."""
 
-    DEFAULT_TANGO_TIMEOUT = 5
-
     def __init__(
         self,
         ctrl_dev: tango.DeviceProxy,
         *recv_devs: tango.DeviceProxy,
-        timeout: int = DEFAULT_TANGO_TIMEOUT,
+        timeout: int,
     ):
         """Construct a Detector object.
 

{lima2_client-2.1.2 → lima2_client-2.2.0}/src/lima2/client/pipeline.py

@@ -91,8 +91,6 @@ class Pipeline:
     Definition in child classes is enforced by __init_subclass__().
     """
 
-    DEFAULT_TANGO_TIMEOUT = 20 * 60  #
-
     BYPRODUCT_CACHE_LIMIT = 500
     """Maximum number of cached entries for each processing by-product.
 
@@ -167,7 +165,7 @@ class Pipeline:
         uuid: UUID,
         proc_devs: list[tango.DeviceProxy],
         topology_kind: TopologyKind,
-        timeout: int = DEFAULT_TANGO_TIMEOUT,
+        timeout: int,
     ):
         """Construct a Pipeline object.
 

{lima2_client-2.1.2 → lima2_client-2.2.0}/src/lima2/client/pipelines/legacy.py

@@ -43,7 +43,7 @@ class Legacy(Pipeline):
         uuid: UUID,
         proc_devs: list[tango.DeviceProxy],
         topology_kind: TopologyKind,
-        timeout: int = Pipeline.DEFAULT_TANGO_TIMEOUT,
+        timeout: int,
     ):
         super().__init__(
             uuid=uuid, proc_devs=proc_devs, topology_kind=topology_kind, timeout=timeout

{lima2_client-2.1.2 → lima2_client-2.2.0}/src/lima2/client/pipelines/smx.py

@@ -57,7 +57,7 @@ class Smx(Pipeline):
         uuid: UUID,
         proc_devs: list[tango.DeviceProxy],
         topology_kind: TopologyKind,
-        timeout: int = Pipeline.DEFAULT_TANGO_TIMEOUT,
+        timeout: int,
     ):
         super().__init__(
             uuid=uuid, proc_devs=proc_devs, topology_kind=topology_kind, timeout=timeout

{lima2_client-2.1.2 → lima2_client-2.2.0}/src/lima2/client/pipelines/xpcs.py

@@ -49,7 +49,7 @@ class Xpcs(Pipeline):
         uuid: UUID,
         proc_devs: list[tango.DeviceProxy],
         topology_kind: TopologyKind,
-        timeout: int = Pipeline.DEFAULT_TANGO_TIMEOUT,
+        timeout: int,
     ):
         super().__init__(
             uuid=uuid, proc_devs=proc_devs, topology_kind=topology_kind, timeout=timeout

{lima2_client-2.1.2 → lima2_client-2.2.0}/src/lima2/client/state_machine.py

@@ -86,7 +86,7 @@ class StateMachine(fsm.StateMachine):
                 _logger.error(
                     f"Device {evt.device.dev_name()} in FAULT state. Stopping all devices."
                 )
-                self.abort()
+                gevent.spawn(self.abort).join()
 
             if self.state == State.DISCONNECTED:
                 _logger.info(
@@ -158,7 +158,7 @@ class StateMachine(fsm.StateMachine):
             self.on_state_change(value)
 
     @transition(
-        source=[State.IDLE, State.PREPARED, State.FAULT],
+        source=[State.IDLE, State.PREPARED],
         target=State.PREPARING,
         on_error=State.IDLE,
     )

{lima2_client-2.1.2 → lima2_client-2.2.0/src/lima2.client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lima2.client
-Version: 2.1.2
+Version: 2.2.0
 Summary: Python client library for Lima2 detector
 Home-page: https://gitlab.esrf.fr/limagroup/lima2-client
 Author: BCU (ESRF)

{lima2_client-2.1.2 → lima2_client-2.2.0}/tests/test_pipeline.py

@@ -69,7 +69,12 @@ def processing_devices():
 def test_constructor_no_devices():
     """Construct a Pipeline object with no processing devices."""
     with pytest.raises(ValueError):
-        _ = Pipeline(uuid=uuid1(), proc_devs=[], topology_kind=TopologyKind.ROUND_ROBIN)
+        _ = Pipeline(
+            uuid=uuid1(),
+            proc_devs=[],
+            topology_kind=TopologyKind.ROUND_ROBIN,
+            timeout=10,
+        )
 
 
 def test_constructor_single(processing_devices):
@@ -78,6 +83,7 @@ def test_constructor_single(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices[:1],
         topology_kind=TopologyKind.SINGLE,
+        timeout=10,
     )
 
 
@@ -87,6 +93,7 @@ def test_constructor_uneven(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices[:1],
         topology_kind=TopologyKind.UNEVEN,
+        timeout=10,
     )
 
 
@@ -125,6 +132,7 @@ def test_progress_counters(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices[:1],
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     pc = proc.progress_counters
@@ -143,6 +151,7 @@ def test_cache_byproduct_limit(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     # Force the pipeline to cache too many entries
@@ -178,6 +187,7 @@ def test_nb_roi_statistics(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     assert proc.nb_roi_statistics.counters == [
@@ -199,6 +209,7 @@ def test_nb_roi_profiles(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     assert proc.nb_roi_profiles.counters == [
@@ -224,6 +235,7 @@ def test_pop_roi_statistics_empty(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     assert proc.pop_roi_statistics() == []
@@ -270,6 +282,7 @@ def test_pop_roi_statistics(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     # First pop -> receiver 0 is ahead by 2 frames
@@ -330,6 +343,7 @@ def test_pop_roi_profiles_empty(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     assert proc.pop_roi_profiles(roi_lengths=roi_lengths) == []
@@ -371,6 +385,7 @@ def test_pop_roi_profiles(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     # First pop -> 3 frames available
@@ -406,6 +421,7 @@ def test_get_frame(processing_devices, monkeypatch):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     @dataclass
@@ -498,6 +514,7 @@ def test_smx_peak_counters(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     # Receiver 0 yields 3 frames, versus 1 frame for receiver 1.
@@ -524,6 +541,7 @@ def test_xpcs_fill_factors(processing_devices):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     # Receiver 1 yields 3 frames, versus 1 frame for receiver 0.
@@ -595,6 +613,7 @@ def test_register_on_finished(processing_devices, event_man):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     # Flag for pipelines on all receivers finished
@@ -641,6 +660,7 @@ def test_register_on_error(processing_devices, event_man):
         uuid=uuid1(),
         proc_devs=processing_devices,
         topology_kind=TopologyKind.ROUND_ROBIN,
+        timeout=10,
     )
 
     errored_devices = set()