mxcubecore 1.356.0__tar.gz → 1.357.0__tar.gz

{mxcubecore-1.356.0 → mxcubecore-1.357.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.356.0
+Version: 1.357.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.356.0 → mxcubecore-1.357.0}/mxcubecore/HardwareObjects/ISARAMaint.py

@@ -6,6 +6,7 @@ from tango import (
 )
 
 from mxcubecore.BaseHardwareObjects import HardwareObject
+from mxcubecore.utils.tango import TangoAttributeReadError, add_attribute_channel
 
 """
 The sample changer maintenance hardware object for ISARA2 robot.
@@ -93,14 +94,7 @@ class ISARAMaint(HardwareObject):
     def init(self):
         tangoname = self.get_property("tangoname")
         self.isara_dev = DeviceProxy(tangoname)
-
-        polling = self._get_polling()
-
-        self._poll_attribute(tangoname, "Powered", polling, self._powered_updated)
-        self._poll_attribute(
-            tangoname, "PositionName", polling, self._position_name_updated
-        )
-        self._poll_attribute(tangoname, "Message", polling, self._message_updated)
+        self._setup_attribute_polling(tangoname)
 
     def _get_polling(self):
         """
@@ -113,18 +107,36 @@ class ISARAMaint(HardwareObject):
             # no polling is specified in the XML, use default polling value
             return DEFAULT_POLLING
 
-    def _poll_attribute(self, tangoname: str, attr_name: str, polling: int, callback):
-        channel = self.add_channel(
-            {
-                "type": "tango",
-                "name": f"_chn{attr_name}",
-                "tangoname": tangoname,
-                "polling": polling,
-            },
-            attr_name,
-        )
+    def _setup_attribute_polling(self, tangoname: str):
+        polling = self._get_polling()
 
-        channel.connect_signal("update", callback)
+        try:
+            add_attribute_channel(
+                self,
+                tangoname,
+                "Powered",
+                polling,
+                self._powered_updated,
+            )
+            add_attribute_channel(
+                self,
+                tangoname,
+                "PositionName",
+                polling,
+                self._position_name_updated,
+            )
+            add_attribute_channel(
+                self,
+                tangoname,
+                "Message",
+                polling,
+                self._message_updated,
+            )
+        except TangoAttributeReadError as ex:
+            self.log.warning(
+                "ISARA: could not connect to '%s' tango attribute",
+                ex.attribute_name,
+            )
 
     def _update_state(self):
         for attr in [self._powered, self._position_name, self._message]:

mxcubecore-1.357.0/mxcubecore/utils/tango.py

@@ -0,0 +1,71 @@
+from tango import DevFailed
+
+from mxcubecore.BaseHardwareObjects import HardwareObject
+from mxcubecore.Command.Tango import TangoChannel
+
+
+class TangoAttributeReadError(Exception):
+    def __init__(self, attribute_name: str):
+        super().__init__()
+        self.attribute_name = attribute_name
+
+
+def add_attribute_channel(
+    hwo: HardwareObject,
+    tango_device: str,
+    attribute_name: str,
+    polling: int,
+    update_callback=None,
+) -> TangoChannel:
+    """Utility function to add Tango attribute Channel to a hardware object.
+
+    This function adds a Channel object to specified hardware object and checks
+    that it's possible to read the specified tango attribute.
+
+    If there is errors reading the attribute, the TangoAttributeReadError
+    exception is raised.
+
+    Parameters:
+        hwo: The hardware object where to add the Channel object.
+        tango_device: Tango device name.
+        attribute_name: The tango attribute name.
+        polling: Attribute polling periodicity.
+        update_callback: Optional callback, if provided it is connected to
+           "update" signal of Channel object
+    """
+
+    channel = hwo.add_channel(
+        {
+            "type": "tango",
+            "tangoname": tango_device,
+            "name": attribute_name,
+            "polling": polling,
+        },
+        attribute_name,
+    )
+
+    if not channel.is_connected():
+        raise TangoAttributeReadError(attribute_name)
+
+    #
+    # check if it's possible to read the Attribute
+    #
+    try:
+        val = channel.get_value()
+    except DevFailed:
+        raise TangoAttributeReadError(attribute_name) from None
+
+    #
+    # add "update" callback
+    #
+    if update_callback is not None:
+        channel.connect_signal("update", update_callback)
+        #
+        # We have 'consumed' the initial value of this channel above,
+        # when we were testing if it's readable. The standard polling
+        # will not invoke the callback with that value now.
+        # Make sure initial value is passed to the callback.
+        #
+        update_callback(val)
+
+    return channel

{mxcubecore-1.356.0 → mxcubecore-1.357.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mxcubecore"
-version = "1.356.0"
+version = "1.357.0"
 license = "LGPL-3.0-or-later"
 description = "Core libraries for the MXCuBE application"
 authors = [