nxstools 4.35.1__tar.gz → 4.37.0__tar.gz

{nxstools-4.35.1 → nxstools-4.37.0}/ChangeLog

@@ -1,3 +1,11 @@
+2026-01-22 Jan Kotanski <jankotan@gmail.com>
+	* ensure filestartnum is int (#850)
+	* tagged as v4.37.0
+
+2025-12-11 Jan Kotanski <jankotan@gmail.com>
+	* add caching of attribute values for h5redis writer (#848)
+	* tagged as v4.36.0
+
 2025-12-11 Jan Kotanski <jankotan@gmail.com>
 	* add prodigyremote  component (#845)
 	* tagged as v4.35.1

{nxstools-4.35.1/nxstools.egg-info → nxstools-4.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxstools
-Version: 4.35.1
+Version: 4.37.0
 Summary: Configuration tools for NeXDaTaS Tango Servers
 Home-page: http://github.com/nexdatas/nxstools
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/h5cppwriter.py

@@ -1196,7 +1196,7 @@ class H5CppField(filewriter.FTField):
                 v = v[0, :, :]
                 shape = v.shape
             if len(shape) == 2 and shape[1] == 1:
-                # v.reshape([shape[0]])
+                # v.reshape([shape[0]]]
                 v = v[0, :]
                 shape = v.shape
             if len(shape) == 2 and shape[0] == 1:
@@ -1941,12 +1941,12 @@ class H5CppAttribute(filewriter.FTAttribute):
            (hasattr(o, "__len__") and t == slice(0, len(o), None)):
             if self.dtype in ['string', b'string']:
                 if isinstance(o, str):
-                    self._h5object.write(unicode(o))
+                    self.write(unicode(o))
                 else:
                     dtype = npunicode
-                    self._h5object.write(np.array(o, dtype=dtype))
+                    self.write(np.array(o, dtype=dtype))
             else:
-                self._h5object.write(np.array(o, dtype=self.dtype))
+                self.write(np.array(o, dtype=self.dtype))
         elif isinstance(t, slice):
             var = self._h5object.read()
             if self.dtype not in ['string', b'string']:
@@ -1956,11 +1956,11 @@ class H5CppAttribute(filewriter.FTAttribute):
                 var[t] = np.array(o, dtype=dtype)
                 var = var.astype(dtype)
             try:
-                self._h5object.write(var)
+                self.write(var)
             except Exception:
                 dtype = npunicode
                 tvar = np.array(var, dtype=dtype)
-                self._h5object[0][self.name] = tvar
+                self.write(tvar)
 
         elif isinstance(t, tuple):
             var = self._h5object.read()
@@ -1980,12 +1980,12 @@ class H5CppAttribute(filewriter.FTAttribute):
                 else:
                     var[t] = np.array(o, dtype=self.dtype).tolist()
                 var = var.astype(dtype)
-            self._h5object.write(var)
+            self.write(var)
         else:
             if isinstance(o, str) or isinstance(o, unicode):
-                self._h5object.write(unicode(o))
+                self.write(unicode(o))
             else:
-                self._h5object.write(np.array(o, dtype=self.dtype))
+                self.write(np.array(o, dtype=self.dtype))
 
     def __getitem__(self, t):
         """ read attribute value

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/h5rediswriter.py

@@ -1010,6 +1010,32 @@ class H5RedisGroup(H5Group):
                 raise Exception("Undefined constructor parameters")
             H5Group.__init__(self, h5object, tparent)
         self.__nxclass = nxclass
+        self.__avcache_lock = threading.Lock()
+        self.__avcache = {}
+
+    def set_attr_value(self, name, value):
+        """ set device parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :param value: attribute value
+        :type value: :obj:`any`
+        """
+        with self.__avcache_lock:
+            self.__avcache[name] = value
+
+    def get_attr_value(self, name):
+        """ get scan info parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :returns value: attribute value
+        :rtype value: :obj:`any`
+        """
+        with self.__avcache_lock:
+            # print(self.__avcache)
+            vl = self.__avcache.get(name, None)
+        return vl
 
     def open(self, name):
         """ open a file tree element
@@ -1235,10 +1261,14 @@ class H5RedisGroup(H5Group):
             self.set_insname(n)
         if REDIS and nxclass in ["NXentry", u'NXentry']:
             self.reset_scaninfo(n)
-        return H5RedisGroup(
+        gr = H5RedisGroup(
             h5imp=H5Group.create_group(self, n, nxclass),
             nxclass=nxclass)
 
+        # print("CREATE", "NX_class", nxclass)
+        self.set_attr_value("NX_class", nxclass)
+        return gr
+
     def create_virtual_field(self, name, layout, fillvalue=0):
         """ creates a virtual filed tres element
 
@@ -1354,6 +1384,43 @@ class H5RedisField(H5Field):
         self.__jstream = None
         self.__rstream = None
         self.__rcounter = 0
+        self.__avcache_lock = threading.Lock()
+        self.__avcache = {}
+
+    def set_attr_value(self, name, value):
+        """ set device parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :param value: attribute value
+        :type value: :obj:`any`
+        """
+        with self.__avcache_lock:
+            self.__avcache[name] = value
+
+    def get_attr_value(self, name):
+        """ get scan info parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :returns value: attribute value
+        :rtype value: :obj:`any`
+        """
+        with self.__avcache_lock:
+            vl = self.__avcache.get(name, None)
+        return vl
+
+    def get_attrs(self):
+        """ get scan info parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :returns value: attribute value
+        :rtype value: :obj:`any`
+        """
+        with self.__avcache_lock:
+            vl = dict(self.__avcache)
+        return vl
 
     def append_stream(self, name, stream):
         """ scan object
@@ -1511,7 +1578,7 @@ class H5RedisField(H5Field):
             h5imp=super(H5RedisField, self).attributes)
 
     def __set_step_channel_info(self, dsname, units, shape, strategy="STEP",
-                                o=None):
+                                o=None, av=None):
         """ set step channel info
 
         :param dsname: datasource name
@@ -1525,6 +1592,7 @@ class H5RedisField(H5Field):
         :param o: object value to write
         :type o: :obj:`any`
         """
+        av = av or {}
         attrs = self.attributes
         sds = {
             "name": dsname,
@@ -1541,8 +1609,8 @@ class H5RedisField(H5Field):
         anames = [at.name for at in attrs]
         for key, vl in attrdesc.items():
             if vl[0] in anames:
-                sds[key] = vl[1](
-                    filewriter.first(attrs[vl[0]].read()))
+                avl = av[vl[0]] if vl[0] in av.keys() else attrs[vl[0]].read()
+                sds[key] = vl[1](filewriter.first(avl))
         sds["nexus_path"] = self.path
         self.append_scaninfo(sds, ["datadesc", dsname])
         try:
@@ -1665,7 +1733,7 @@ class H5RedisField(H5Field):
             else:
                 raise
 
-    def __set_init_channel_info(self, dsname, units, shape, strategy, o):
+    def __set_init_channel_info(self, dsname, units, shape, strategy, o, av):
         """ set init channel info
 
         :param dsname: datasource name
@@ -1691,8 +1759,8 @@ class H5RedisField(H5Field):
         anames = [at.name for at in attrs]
         for key, vl in attrdesc.items():
             if vl[0] in anames:
-                ids[key] = vl[1](
-                    filewriter.first(attrs[vl[0]].read()))
+                avl = av[vl[0]] if vl[0] in av.keys() else attrs[vl[0]].read()
+                ids[key] = vl[1](filewriter.first(avl))
         ids["nexus_path"] = self.path
         pars = (self.get_scaninfo(["snapshot"]) or {}).keys()
         dsn = dsname
@@ -1710,11 +1778,12 @@ class H5RedisField(H5Field):
                             np = str(filewriter.first(attrs[vl[0]].read()))
                         if vl[2] or np:
                             self.set_scaninfo(np, [key])
-                            if isinstance(np, str):
+                            # print(key, np)
+                            if key == "title" and isinstance(np, str):
                                 macro_name = np.split(" ")[0]
-                            for mn, plot in titleplots.items():
-                                if mn in macro_name:
-                                    self.append_scaninfo(plot, ["plots"])
+                                for mn, plot in titleplots.items():
+                                    if mn in macro_name:
+                                        self.append_scaninfo(plot, ["plots"])
 
                     except Exception as e:
                         print(str(e))
@@ -1726,18 +1795,31 @@ class H5RedisField(H5Field):
         :param o: object value to write
         :type o: :obj:`any`
         """
-
         attrs = self.attributes
-        strategy = filewriter.first(attrs["nexdatas_strategy"].read())
+        av = self.get_attrs()
+        strategy = av.get("nexdatas_strategy", None)
+        if strategy is None:
+            strategy = attrs["nexdatas_strategy"].read()
+        strategy = filewriter.first(strategy)
         dsname = "%s_%s" % (self._tparent.name, self.name)
         dsnm = ""
-        if "nexdatas_source" in attrs.names():
-            dsnm = getdsname(
-                filewriter.first(attrs["nexdatas_source"].read()))
+        dsnm = av.get("nexdatas_source", None)
+        if dsnm is None and "nexdatas_source" in attrs.names():
+            #     dsnm = self.get_attr_value("nexdatas_source")
+            #     if dsnm is None:
+            dsnm = attrs["nexdatas_source"].read()
+        if dsnm is not None:
+            dsnm = getdsname(filewriter.first(dsnm))
             dsname = dsnm
-        units = ""
-        if "units" in attrs.names():
-            units = filewriter.first(attrs["units"].read())
+        units = av.get("units", None)
+        if units is None:
+            if "units" in attrs.names():
+                units = attrs["units"].read()
+                print("READ UNIT", units)
+        if units is not None:
+            units = filewriter.first(units)
+        else:
+            units = ""
         self.__dsname = dsname
         shape = []
         if hasattr(o, "shape"):
@@ -1749,9 +1831,10 @@ class H5RedisField(H5Field):
         if strategy in ["STEP"] and dsnm:
             # skip 2D images
             if not shape or len(shape) < 2 or FileStream is not None:
-                self.__set_step_channel_info(dsname, units, shape, strategy, o)
+                self.__set_step_channel_info(
+                    dsname, units, shape, strategy, o, av)
         else:
-            self.__set_init_channel_info(dsname, units, shape, strategy, o)
+            self.__set_init_channel_info(dsname, units, shape, strategy, o, av)
 
     def __setitem__(self, t, o):
         """ set value
@@ -1799,6 +1882,31 @@ class H5RedisLink(H5Link):
             if h5object is None:
                 raise Exception("Undefined constructor parameters")
             H5Link.__init__(self, h5object, tparent)
+        self.__avcache_lock = threading.Lock()
+        self.__avcache = {}
+
+    def set_attr_value(self, name, value):
+        """ set device parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :param value: attribute value
+        :type value: :obj:`any`
+        """
+        with self.__avcache_lock:
+            self.__avcache[name] = value
+
+    def get_attr_value(self, name):
+        """ get scan info parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :returns value: attribute value
+        :rtype value: :obj:`any`
+        """
+        with self.__avcache_lock:
+            vl = self.__avcache.get(name, None)
+        return vl
 
 
 class H5RedisDataFilter(H5DataFilter):
@@ -2096,6 +2204,8 @@ class H5RedisAttributeManager(H5AttributeManager):
         :returns: attribute object
         :rtype: :class:`H5RedisAttribute`
         """
+        if overwrite:
+            self.set_attr_value(name, None)
         return H5RedisAttribute(
             h5imp=H5AttributeManager.create(
                 self, name, dtype, shape, overwrite))
@@ -2111,6 +2221,28 @@ class H5RedisAttributeManager(H5AttributeManager):
         return H5RedisAttribute(
             h5imp=H5AttributeManager.__getitem__(self, name))
 
+    def set_attr_value(self, name, value):
+        """ set device parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :param value: attribute value
+        :type value: :obj:`any`
+        """
+        if hasattr(self._tparent, "set_attr_value"):
+            return self._tparent.set_attr_value(name, value)
+
+    def get_attr_value(self, name):
+        """ get scan info parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :returns value: attribute value
+        :rtype value: :obj:`any`
+        """
+        if hasattr(self._tparent, "get_attr_value"):
+            return self._tparent.get_attr_value(name)
+
 
 class H5RedisAttribute(H5Attribute):
 
@@ -2133,3 +2265,65 @@ class H5RedisAttribute(H5Attribute):
             if h5object is None:
                 raise Exception("Undefined constructor parameters")
             H5Attribute.__init__(self, h5object, tparent)
+
+    def read(self):
+        """ read attribute value
+
+        :returns: python object
+        :rtype: :obj:`any`
+        """
+        vl = None
+        if H5CPP:
+            vl = self.get_attr_value(self.name)
+            # print("READ", self.name, vl)
+        if vl is None:
+            # print("READ", self.name, vl)
+            vl = self._h5object.read()
+            # print("READ2", self.name, vl)
+            if vl is not None:
+                self.set_attr_value(self.name, vl)
+        if self.dtype in ['string', b'string']:
+            try:
+                vl = vl.decode('UTF-8')
+            except Exception:
+                pass
+        return vl
+
+    def write(self, o):
+        """ write attribute value
+
+        :param o: python object
+        :type o: :obj:`any`
+        """
+        self._h5object.write(o)
+        vl = o
+        if vl is not None and H5CPP:
+            if self.dtype in ['string', b'string']:
+                try:
+                    vl = vl.decode('UTF-8')
+                except Exception:
+                    pass
+            # print("WRITE", self.name, vl)
+            self.set_attr_value(self.name, vl)
+
+    def set_attr_value(self, name, value):
+        """ set device parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :param value: attribute value
+        :type value: :obj:`any`
+        """
+        if hasattr(self._tparent, "set_attr_value"):
+            return self._tparent.set_attr_value(name, value)
+
+    def get_attr_value(self, name):
+        """ get scan info parameters
+
+        :param name: attribute name
+        :type name: :obj:`str`
+        :returns value: attribute value
+        :rtype value: :obj:`any`
+        """
+        if hasattr(self._tparent, "get_attr_value"):
+            return self._tparent.get_attr_value(name)

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/release.py

@@ -19,4 +19,4 @@
 """  NXS tools release version"""
 
 #: (:obj:`str`) package version
-__version__ = "4.35.1"
+__version__ = "4.37.0"

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/limaccd.xml

@@ -46,7 +46,7 @@
           <field type="NX_CHAR" name="last_image_saved">
             <strategy mode="FINAL"/>$datasources.$(name)_last_image_saved</field>
           <field type="NX_UINT" name="signal">1</field>
-          <field type="NX_CHAR" name="file_index_num">
+          <field type="NX_INT64" name="file_index_num">
             <strategy mode="STEP"/>$datasources.$(name)_filestartnum_cb</field>
           <field type="NX_CHAR" name="image_type">
             <strategy mode="FINAL"/>$datasources.$(name)_image_type</field>

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/limaccd_filestartnum_cb.ds.xml

@@ -3,7 +3,7 @@
   <datasource type="PYEVAL" name="$(name)_filestartnum_cb">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.filestartnum_cb(commonblock, ds.$(name)_saving_next_number, ds.$(name)_acq_nb_frames, "$(name)_saving_next_number")
+ds.result = common.filestartnum_cb(commonblock, int(ds.$(name)_saving_next_number or 0), ds.$(name)_acq_nb_frames, "$(name)_saving_next_number")
     </result>
   $datasources.$(name)_saving_next_number
   $datasources.$(name)_acq_nb_frames</datasource>

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/limaccdvds.xml

@@ -46,7 +46,7 @@
           <field type="NX_CHAR" name="last_image_saved">
             <strategy mode="FINAL"/>$datasources.$(name)_last_image_saved</field>
           <field type="NX_UINT" name="signal">1</field>
-          <field type="NX_CHAR" name="next_file_index_num">
+          <field type="NX_INT64" name="next_file_index_num">
             <strategy mode="STEP"/>$datasources.$(name)_filestartnum_cb</field>
           <field type="NX_CHAR" name="image_type">
             <strategy mode="FINAL"/>$datasources.$(name)_image_type</field>

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/limaccdvds_filestartnum_cb.ds.xml

@@ -3,7 +3,7 @@
   <datasource type="PYEVAL" name="$(name)_filestartnum_cb">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.filestartnum_cb(commonblock, ds.$(name)_saving_next_number, 0, "$(name)_saving_next_number")
+ds.result = common.filestartnum_cb(commonblock, int(ds.$(name)_saving_next_number or 0), 0, "$(name)_saving_next_number")
     </result>
   $datasources.$(name)_saving_next_number</datasource>
 </definition>

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/pco.xml

@@ -50,7 +50,7 @@
             <strategy mode="FINAL"/>$datasources.$(name)_filepostfix</field>
           <field type="NX_CHAR" name="file_prefix">
             <strategy mode="FINAL"/>$datasources.$(name)_fileprefix</field>
-          <field type="NX_CHAR" name="file_last_num">
+          <field type="NX_INT64" name="file_last_num">
             <strategy mode="STEP"/>$datasources.$(name)_filestartnum_cb</field>
           <field units="Celsius" type="NX_INT16" name="cooling_temp_set">
             <strategy mode="FINAL"/>$datasources.$(name)_coolingtempset</field>

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/pco_filestartnum_cb.ds.xml

@@ -3,7 +3,7 @@
   <datasource type="PYEVAL" name="$(name)_filestartnum_cb">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.filestartnum_cb(commonblock, ds.$(name)_filestartnum, ds.$(name)_nbframes, "$(name)_filestartnum")
+ds.result = common.filestartnum_cb(commonblock, int(ds.$(name)_filestartnum or 0), ds.$(name)_nbframes, "$(name)_filestartnum")
     </result>
  $datasources.$(name)_filestartnum
  $datasources.$(name)_nbframes</datasource>

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/pilatus.xml

@@ -30,7 +30,7 @@
           <field type="NX_CHAR" name="last_image_taken">
             <strategy mode="FINAL"/>$datasources.$(name)_lastimagetaken</field>
           <field type="NX_UINT" name="signal">1</field>
-          <field type="NX_CHAR" name="file_start_index_num">
+          <field type="NX_INT64" name="file_start_index_num">
             <strategy mode="STEP"/>$datasources.$(name)_filestartnum_cb</field>
           <field type="NX_CHAR" name="mx_parameters">
             <strategy mode="FINAL"/>$datasources.$(name)_mxparameters_cb</field>

{nxstools-4.35.1 → nxstools-4.37.0}/nxstools/xmltemplates/pilatus_filestartnum_cb.ds.xml

@@ -3,7 +3,7 @@
   <datasource type="PYEVAL" name="$(name)_filestartnum_cb">
     <result name="result">
 from nxstools.pyeval import common
-ds.result = common.filestartnum_cb(commonblock, ds.$(name)_filestartnum, ds.$(name)_nbframes, "$(name)_filestartnum")
+ds.result = common.filestartnum_cb(commonblock, int(ds.$(name)_filestartnum or 0), ds.$(name)_nbframes, "$(name)_filestartnum")
     </result>
     $datasources.$(name)_filestartnum
     $datasources.$(name)_nbframes

{nxstools-4.35.1 → nxstools-4.37.0/nxstools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxstools
-Version: 4.35.1
+Version: 4.37.0
 Summary: Configuration tools for NeXDaTaS Tango Servers
 Home-page: http://github.com/nexdatas/nxstools
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic

{nxstools-4.35.1 → nxstools-4.37.0}/test/NXSCreateDeviceDSDB_test.py

@@ -178,6 +178,7 @@ class NXSCreateDeviceDSDBTest(
                 ['testcs_jsonsettings',
                  'testcs_selection',
                  'testcs_xmlstring',
+                 'testcs_xmlcache',
                  'testcs_variables',
                  'testcs_linkdatasources',
                  'testcs_extralinkdatasources',
@@ -215,6 +216,15 @@ class NXSCreateDeviceDSDBTest(
                     '</definition>\n',
                     '<?xml version=\'1.0\' encoding=\'utf8\'?>\n'
                     '<definition>\n'
+                    '  <datasource type="TANGO" name="testcs_xmlcache">\n'
+                    '    <device name="%s" '
+                    'member="attribute" hostname="%s" port="%s"'
+                    ' group="testcs_"/>\n'
+                    '    <record name="XMLCache"/>\n'
+                    '  </datasource>\n'
+                    '</definition>\n',
+                    '<?xml version=\'1.0\' encoding=\'utf8\'?>\n'
+                    '<definition>\n'
                     '  <datasource type="TANGO" name="testcs_variables">\n'
                     '    <device name="%s" '
                     'member="attribute" hostname="%s" port="%s"'

{nxstools-4.35.1 → nxstools-4.37.0}/test/NXSCreateOnlineCPFS_test.py

@@ -652,7 +652,7 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
                      '$datasources.mypilatus_lastimagetaken</field>\n'
                      '          <field type="NX_UINT" '
                      'name="signal">1</field>\n'
-                     '          <field type="NX_CHAR" '
+                     '          <field type="NX_INT64" '
                      'name="file_start_index_num">\n'
                      '            <strategy mode="STEP"/>'
                      '$datasources.mypilatus_filestartnum_cb</field>\n'
@@ -755,7 +755,8 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
                      '    <result name="result">\n'
                      'from nxstools.pyeval import common\n'
                      'ds.result = common.filestartnum_cb('
-                     'commonblock, ds.mypilatus_filestartnum,'
+                     'commonblock,'
+                     ' int(ds.mypilatus_filestartnum or 0),'
                      ' ds.mypilatus_nbframes,'
                      ' "mypilatus_filestartnum")\n'
                      '    </result>\n'
@@ -970,7 +971,7 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
                      '$datasources.mypilatus_lastimagetaken</field>\n'
                      '          <field type="NX_UINT" '
                      'name="signal">1</field>\n'
-                     '          <field type="NX_CHAR" '
+                     '          <field type="NX_INT64" '
                      'name="file_start_index_num">\n'
                      '            <strategy mode="STEP"/>'
                      '$datasources.mypilatus_filestartnum_cb</field>\n'
@@ -1073,7 +1074,8 @@ class NXSCreateOnlineCPFSTest(unittest.TestCase):
                      '    <result name="result">\n'
                      'from nxstools.pyeval import common\n'
                      'ds.result = common.filestartnum_cb('
-                     'commonblock, ds.mypilatus_filestartnum,'
+                     'commonblock, '
+                     'int(ds.mypilatus_filestartnum or 0),'
                      ' ds.mypilatus_nbframes,'
                      ' "mypilatus_filestartnum")\n'
                      '    </result>\n'