nxswriter 3.15.0__py3-none-any.whl → 3.17.0__py3-none-any.whl

nxswriter/DecoderPool.py

@@ -175,8 +175,10 @@ class DATAARRAYdecoder(object):
         self.__value = None
         #: ([:obj:`str`, :obj:`str`]) header and image data
         self.__data = None
-        #: (:obj:`str`) struct header format
-        self.__headerFormat = '<IHHIIHHHHHHHHIIIIIIII'
+        #: (:obj:`str`) struct header format ver < 4
+        self.__headerFormat123 = '<IHHIIHHHHHHHHIIIIIIII'
+        #: (:obj:`str`) struct header format ver >=4
+        self.__headerFormat = '<IHHIIHHHHHHHHIIIIIIQQII'
         #: (:obj:`dict` <:obj:`str`, :obj:`any` > ) header data
         self.__header = {}
         #: (:obj:`dict` <:obj:`int`, :obj:`str` > ) format modes
@@ -200,7 +202,7 @@ class DATAARRAYdecoder(object):
         """
         self.__data = data
         self.format = data[0]
-        self._loadHeader(data[1][:struct.calcsize(self.__headerFormat)])
+        self._loadHeader(data[1])
         self.__value = None
 
     def _loadHeader(self, headerData):
@@ -209,7 +211,15 @@ class DATAARRAYdecoder(object):
         :param headerData: buffer with header data
         :type headerData: :obj:`str`
         """
-        hdr = struct.unpack(self.__headerFormat, headerData)
+        try:
+            hData = headerData[:struct.calcsize(self.__headerFormat)]
+            hdr = struct.unpack(self.__headerFormat, hData)
+            if hdr[1] < 4:
+                hData = headerData[:struct.calcsize(self.__headerFormat123)]
+                hdr = struct.unpack(self.__headerFormat123, hData)
+        except Exception:
+            hData = headerData[:struct.calcsize(self.__headerFormat123)]
+            hdr = struct.unpack(self.__headerFormat123, hData)
         self.__header = {}
         self.__header['magic'] = hdr[0]
         self.__header['headerVersion'] = hdr[1]
@@ -261,7 +271,12 @@ class DATAARRAYdecoder(object):
         if not self.__header or not self.__data:
             return
         if self.__value is None:
-            image = self.__data[1][struct.calcsize(self.__headerFormat):]
+            if 'headerVersion' in self.__header and \
+               self.__header['headerVersion'] >= 4:
+                image = self.__data[1][struct.calcsize(self.__headerFormat):]
+            else:
+                image = self.__data[1][
+                    struct.calcsize(self.__headerFormat123):]
             dformat = self.__formatID[self.__header['imageMode']]
             fSize = struct.calcsize(dformat)
             self.__value = numpy.array(

nxswriter/EVirtualField.py

@@ -343,14 +343,15 @@ class EVirtualDataMap(Element):
                 if dt and isinstance(dt, dict):
                     dh = DataHolder(streams=self._streams, **dt)
                     val = dh.cast("string")
-                    self.last.appendVmap(val, self.__vmap)
+                    self.last.appendVmap(val, self.__vmap,
+                                         self.strategy)
 
         except Exception:
             info = sys.exc_info()
             import traceback
-            message = self.setMessage(
-                str(info[1].__str__()) + "\n " + (" ").join(
-                    traceback.format_tb(sys.exc_info()[2])))
+            message = ("Datasource not found: " +
+                       str(info[1].__str__()) + "\n " + (" ").join(
+                           traceback.format_tb(sys.exc_info()[2])))
             # message = self.setMessage(  sys.exc_info()[1].__str__()  )
             del info
             #: notification of error in the run method (defined in base class)
@@ -404,6 +405,9 @@ class EVirtualField(FElementWithAttr):
         self.__shape = []
         #: (:obj:`list` <:obj:`dict` >) vmap list
         self.__vmaps = []
+        #: (:class:`H5CppVirtualFieldLayout`) or
+        #:   (:class:`H5PYVirtualFieldLayout`) virtual field layout
+        self.__vfl = None
 
     def setRank(self, rank):
         """ sets dimension rank
@@ -498,7 +502,10 @@ class EVirtualField(FElementWithAttr):
             lval = val.split("\n")
             for el in lval:
                 if el.strip():
-                    self.__vmaps.append({"target": el.strip()})
+                    if self.__vfl is not None:
+                        self.__vfl.append_vmap({"target": el.strip()})
+                    else:
+                        self.__vmaps.append({"target": el.strip()})
         return self.strategy, self.trigger
 
     def store(self, xml=None, globalJSON=None):
@@ -517,39 +524,14 @@ class EVirtualField(FElementWithAttr):
         self.__dtype, self.__name = self.__typeAndName()
         # shape
         self.__shape = self.__getShape()
+        self.__vfl = FileWriter.virtual_field_layout(
+            self.__shape, self.__dtype)
+        for vmap in self.__vmaps:
+            self.__vfl.append_vmap(vmap)
+        self.__vmaps = []
         return self.__setStrategy(self.__name)
 
-    def __cureKeys(self, key):
-        tkey = []
-        if isinstance(key, list):
-            try:
-                sk = list(set([len(ky) for ky in key]))
-            except Exception:
-                sk = []
-            if len(sk) == 1 and sk[0] == 4:
-                offset = []
-                block = []
-                count = []
-                stride = []
-                for ky in key:
-                    off, bl, cnt, std = ky
-                    offset.append(off)
-                    block.append(bl)
-                    count.append(cnt)
-                    stride.append(std)
-                return FileWriter.FTHyperslab(offset, block, count, stride)
-            for ky in key:
-                if isinstance(ky, list) and len(ky) > 0 and len(ky) < 4:
-                    tkey.append(slice(*ky))
-                else:
-                    if ky is None:
-                        ky = slice(None)
-                    tkey.append(ky)
-
-            return tuple(tkey)
-        return key
-
-    def appendVmap(self, values, base=None):
+    def appendVmap(self, values, base=None, strategy=None):
         """ append virtual map items
 
         :param values: a list of map items to append
@@ -588,94 +570,20 @@ class EVirtualField(FElementWithAttr):
                 fval.update(vl)
             else:
                 fval.update({"target": vl.strip()})
-            self.__vmaps.append(fval)
-        return len(self.__vmaps)
-
-    def __findShape(self, key, eshape=None, unlimited=True):
-        if isinstance(key, FileWriter.FTHyperslab):
-            if not unlimited:
-                count = [(ct if ct != FileWriter.writer.unlimited() else 1)
-                         for ct in key.count]
-
-                block = [(ct if ct != FileWriter.writer.unlimited() else 1)
-                         for ct in key.block]
+            if self.__vfl is not None:
+                self.__vfl.append_vmap(fval, strategy)
             else:
-                count = key.count
-                block = key.block
-            eshape = [bl * count[hi] for hi, bl in enumerate(block)]
-        if isinstance(key, tuple):
-            eshape = []
-            for ky in key:
-                if not unlimited and ky.stop == FileWriter.writer.unlimited():
-                    eshape.append(1)
-                elif isinstance(ky, slice) and ky.stop > 0:
-                    start = ky.start if ky.start is not None else 0
-                    step = ky.step if ky.step is not None else 1
-                    eshape.append((ky.stop - start) // step)
-                else:
-                    eshape.append(1)
-        return eshape
+                self.__vmaps.append(fval)
+        if self.__vfl is not None:
+            return len(self.__vfl)
+        return len(self.__vmaps)
 
     def __createVDS(self):
         """ create the virtual field object
         """
-        vlf = FileWriter.virtual_field_layout(
-            self.__shape, self.__dtype)
-        counter = 0
-        for vmap in self.__vmaps:
-            fieldpath = ""
-            filename = ""
-            edtype = vmap["dtype"] \
-                if "dtype" in vmap else self.__dtype
-            key = vmap["key"] if "key" in vmap else counter
-            key = self.__cureKeys(key)
-            if "shape" in vmap:
-                eshape = vmap["shape"]
-            elif isinstance(key, int):
-                eshape = list(self.__shape)
-                eshape[0] = 1
-            else:
-                eshape = [0] * len(self.__shape)
-            fieldpath = vmap["fieldpath"] \
-                if "fieldpath" in vmap else "/data"
-            filename = vmap["filename"] if "filename" in vmap else None
-            if "target" in vmap:
-                target = vmap["target"]
-                if target.startswith("h5file:/"):
-                    target = target[8:]
-                if "::" in target:
-                    filename, fieldpath = target.split("::")
-                elif ":/" in target:
-                    filename, fieldpath = target.split(":/")
-                else:
-                    fieldpath = target
-            obj = self._lastObject()
-            while filename is None:
-                par = obj.parent
-                if par is None:
-                    break
-                if hasattr(par, "root") and hasattr(par, "name"):
-                    filename = par.name
-                    break
-                else:
-                    obj = par
-            sourceshape = vmap["sourceshape"] \
-                if "sourceshape" in vmap else None
-            sourcekey = vmap["sourcekey"] \
-                if "sourcekey" in vmap else None
-            sourcekey = self.__cureKeys(sourcekey)
-            if not any(eshape):
-                eshape = self.__findShape(key, eshape, unlimited=False)
-            ef = FileWriter.target_field_view(
-                filename, fieldpath, eshape, edtype)
-            if eshape:
-                counter += eshape[0]
-            else:
-                counter += 1
-            # print("KEY", key, sourcekey, sourceshape, eshape)
-            vlf.add(key, ef, sourcekey, sourceshape)
+        self.__vfl.process_target_field_views(self._lastObject())
         self.h5Object = self._lastObject().create_virtual_field(
-            self.__name, vlf)
+            self.__name, self.__vfl)
 
     def run(self):
         """ runner
@@ -693,15 +601,16 @@ class EVirtualField(FElementWithAttr):
             # print("SHaPE", self.__shape)
             # print("TYPE", self.__dtype)
             # print("NAME", self.__name)
-            if self.__vmaps and self.__shape and self.__dtype and self.__name:
+            if self.__vfl is not None and len(self.__vfl) and self.__shape \
+                    and self.__dtype and self.__name:
                 self.__createVDS()
                 self.__setAttributes()
         except Exception:
             info = sys.exc_info()
             import traceback
-            message = self.setMessage(
-                str(info[1].__str__()) + "\n " + (" ").join(
-                    traceback.format_tb(sys.exc_info()[2])))
+            message = ("Datasource not found: " +
+                       str(info[1].__str__()) + "\n " + (" ").join(
+                           traceback.format_tb(sys.exc_info()[2])))
             # message = self.setMessage(  sys.exc_info()[1].__str__()  )
             del info
             #: notification of error in the run method (defined in base class)

nxswriter/Release.py

@@ -21,4 +21,4 @@
 
 
 #: package version
-__version__ = "3.15.0"
+__version__ = "3.17.0"

{nxswriter-3.15.0.dist-info → nxswriter-3.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.15.0
+Version: 3.17.0
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -26,7 +26,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: lxml
 Requires-Dist: numpy (>1.6.0)
-Requires-Dist: nxstools (>=3.50.0)
+Requires-Dist: nxstools (>=4.28.1)
 Requires-Dist: pytz
 
 Welcome to NXSDataWriter's documentation!
@@ -95,7 +95,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `bookworm`, `bullseye`, `buster`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -110,7 +110,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
 
 To install tango server
 

{nxswriter-3.15.0.dist-info → nxswriter-3.17.0.dist-info}/RECORD

@@ -4,13 +4,13 @@ nxswriter/DataHolder.py,sha256=DL08NyY0FG6snsmW0-nQ7JmWJwDc5-Hy2bC4E3Uz1fk,6164
 nxswriter/DataSourceFactory.py,sha256=W0IirDjsu38KKvBxFbkvv-ghvqil2JJStQ3WMxo8Kh4,4687
 nxswriter/DataSourcePool.py,sha256=1bDOrHhYpG_ZFz8ut2IzkNSMeGxrCBcSCneM4h1AgDc,4574
 nxswriter/DataSources.py,sha256=l40n4WTfgRjLpFsJs7JoWjsER_dCVviRI_iolQ2fENM,5303
-nxswriter/DecoderPool.py,sha256=8nsKtzwyls-YLZUJAfxdGrqb2278Er1Y20NVq1XexvY,15052
+nxswriter/DecoderPool.py,sha256=-eBLujQhuAV81yaFoWirHNULuGSDp4L0ElyFfK-Yj2c,15779
 nxswriter/EAttribute.py,sha256=hADI-LeuQMZwVoTFM4qevoz173Ma_atrk0edqvsFXS0,8878
 nxswriter/EField.py,sha256=YLbdaykGccZ4cjqheS9te50FG6HQq5kfp7gg_OBkJ9k,28034
 nxswriter/EGroup.py,sha256=Y_PuTERckQXfUXGISbnpzHj7I4y2iFxM5CGByjVD6KA,4900
 nxswriter/ELink.py,sha256=FO7SRF1bpJhqRzK2FBSkRHhFwH1Mw5BRCgt8X8qJbr0,8820
 nxswriter/EStrategy.py,sha256=3RX8E6Ee-Klv9DGlMPvXJacdNDmuKWLQrcnuerR0IQI,3992
-nxswriter/EVirtualField.py,sha256=ZECzyGb4wZoBohHlwkcilpOtDHuA907VoruLDe9RN9k,24971
+nxswriter/EVirtualField.py,sha256=XE9Hup5oX_OLskRv5G6JG0np65M23q0rHEa2vdYY1x0,21572
 nxswriter/Element.py,sha256=dnIUS_U0fqJK3FxV_raQBx6qTGPT7sUFkWVzxI5YuEY,3019
 nxswriter/ElementThread.py,sha256=gCZRpzjji8TRfWLkwFRXG_K55d0yUkv9Gzi2DZ22EyQ,2099
 nxswriter/Errors.py,sha256=dYXtJ7rVWv59kAalNMMZO4X3SxSplhoWICeCb3_rFGc,1660
@@ -23,16 +23,16 @@ nxswriter/NXSFromXML.py,sha256=932BivWZnf-3tnIkbpSRFwfGV0PTwcT9pYb2FMmVd_4,9077
 nxswriter/NXSWriter.py,sha256=raHykC9mpUXU8pPtsqePuz3CI-24qYjIUSoyux2zCgo,31345
 nxswriter/NexusXMLHandler.py,sha256=IrZ2mWLuovdBIHcWTqKmr4HZxpMEWLun8A94O6pavr8,14131
 nxswriter/PyEvalSource.py,sha256=7-7Gc2_3CGd3XMHD3LBPCBOZx4Q6b1guzt1xgrSLxMs,11234
-nxswriter/Release.py,sha256=wnY92t-42OYEn6TDj_sULeraAF84pcdjcjLMAtFU3TU,900
+nxswriter/Release.py,sha256=gKfSjs4hgXUKTnclGeQ9cQo3G_uoCeLcLJVEbf6wFSU,900
 nxswriter/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
 nxswriter/TangoDataWriter.py,sha256=yP6B3TVUhpHp8OBHKYQRNNtFer9xARoakNXuro4eVv8,28725
 nxswriter/TangoSource.py,sha256=jiFGUsoX2N5-i2gpBqkHi2KjmTBd46TI22Cjkt_2btw,29410
 nxswriter/ThreadPool.py,sha256=TKvOStVUUyuyHowk0MRaBM4GmRKtl0VPVVPdFHu332M,6039
 nxswriter/Types.py,sha256=haH578_GqBwWWUhPC6x9KQOubhhEOsxHdI63j0_AkdE,7906
 nxswriter/__init__.py,sha256=M0w3HGjZgfdqjMdQNaLcq5jazqQeRekx84YSbQCA8-0,1760
-nxswriter-3.15.0.data/scripts/NXSDataWriter,sha256=wO3opCCjYttfrY7CITNXHvirXv5W6rIQTY7vX5PmioI,905
-nxswriter-3.15.0.data/scripts/nxsfromxml,sha256=qxnJUtV_ueA3lGnne8ltaOF6yF5YtmzeFLIl3NWkAq8,61
-nxswriter-3.15.0.dist-info/METADATA,sha256=iuTW0TPySfQdDF6zyFliD6mOGPW58TYnB2CtmNRJY1E,9013
-nxswriter-3.15.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-nxswriter-3.15.0.dist-info/top_level.txt,sha256=29dYcOYN2MVz1NKpwobc4Zl4yjhd4VB62LDSuSy7x0Y,10
-nxswriter-3.15.0.dist-info/RECORD,,
+nxswriter-3.17.0.data/scripts/NXSDataWriter,sha256=wO3opCCjYttfrY7CITNXHvirXv5W6rIQTY7vX5PmioI,905
+nxswriter-3.17.0.data/scripts/nxsfromxml,sha256=qxnJUtV_ueA3lGnne8ltaOF6yF5YtmzeFLIl3NWkAq8,61
+nxswriter-3.17.0.dist-info/METADATA,sha256=qI2THU4twGd7hFY5IEWQfvZAnpN6mjXHbfvs_6h8CQ8,9011
+nxswriter-3.17.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+nxswriter-3.17.0.dist-info/top_level.txt,sha256=29dYcOYN2MVz1NKpwobc4Zl4yjhd4VB62LDSuSy7x0Y,10
+nxswriter-3.17.0.dist-info/RECORD,,