nxswriter 3.17.2__tar.gz → 3.18.1__tar.gz

{nxswriter-3.17.2 → nxswriter-3.18.1}/.ci/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # restart mysqldb
-if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian12tg10" ] || [ "$1" = "debian13" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu24.04" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian12tg10" ] || [ "$1" = "debian13" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu24.04" ]; then
     docker exec --user root ndts service mariadb restart
 else
     # workaround for a bug in debian9, i.e. starting mysql hangs
@@ -17,7 +17,7 @@ fi
 
 echo "install tango-common"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-common; sleep 10'
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ]; then
     # docker exec  --user tango ndts /bin/bash -c '/usr/lib/tango/DataBaseds 2 -ORBendPoint giop:tcp::10000  &'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=root\npassword=rootpw" > /root/.my.cnf'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=tango\nhost=localhost\npassword=rootpw" > /var/lib/tango/.my.cnf'
@@ -33,7 +33,7 @@ fi
 echo "install tango-db"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-db; sleep 10'
 if [ "$?" -ne "0" ]; then exit 255; fi
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ]; then
     docker exec  --user tango ndts /usr/bin/mysql -e 'create database tango'
     docker exec  --user tango ndts /bin/bash -c '/usr/bin/mysql tango < /usr/share/dbconfig-common/data/tango-db/install/mysql'
 fi
@@ -54,7 +54,7 @@ if [ "$2" = "2" ]; then
     docker exec  --user root ndts /bin/sh -c 'apt-get -qq update; apt-get -qq install -y   python-pytango nxsconfigserver-db python-nxstools'
 else
     echo "install python3-pytango"
-    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu23.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian12tg10" ] || [ "$1" = "debian13" ] ; then
+    if [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "ubuntu21.04" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu23.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "debian12tg10" ] || [ "$1" = "debian13" ] ; then
 	docker exec  --user root ndts /bin/sh -c 'apt-get -qq update; apt-get -qq install -y   python3-tango nxsconfigserver-db python3-nxstools'
     else
 	docker exec  --user root ndts /bin/sh -c 'apt-get -qq update; apt-get -qq install -y   python3-pytango nxsconfigserver-db python3-nxstools'

{nxswriter-3.17.2 → nxswriter-3.18.1}/.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [debian13, debian12tg10, debian12, debian11, ubuntu25.04, ubuntu24.04, ubuntu22.04]
+        os: [debian13, debian12tg10, debian12, debian11, ubuntu25.10, ubuntu24.04, ubuntu22.04]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

{nxswriter-3.17.2 → nxswriter-3.18.1}/ChangeLog

@@ -1,3 +1,11 @@
+2026-01-13 Jan Kotanski <jankotan@gmail.com>
+	* check openEntry total runtime (#204)
+	* tagged as 3.18.1
+
+2025-12-22 Jan Kotanski <jankotan@gmail.com>
+	* add support sardana tango client (#201)
+	* tagged as 3.18.0
+
 2025-10-23 Jan Kotanski <jankotan@gmail.com>
 	* create virtual field layout with the parent object (#195)
 	* recommends nxstools 4.29.0

{nxswriter-3.17.2 → nxswriter-3.18.1}/NXSDataWriter.xmi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
-  <classes name="NXSDataWriter" pogoRevision="9.7">
-    <description description="NXSDataWriter is a Tango server which allows to store NeXuS Data in H5 files.&#xA;&#xA;The server provides storing data from other Tango devices,&#xA;various databases as well as passed by a user client via JSON strings.&#xA;&#xA;Source code: https://github.com/nexdatas/nxsdatawriter&#xA;Project Web page: https://nexdatas.github.io/nxsdatawriter&#xA;NexDaTaS Web page: https://nexdatas.github.io" title="NeXus Data Writer" sourcePath="/home/jkotan/ndts/nexdatas.writer" language="Python" filestogenerate="XMI   file,Code files,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
+<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://tango.org/pogo/PogoDsl">
+  <classes name="NXSDataWriter" pogoRevision="9.9">
+    <description description="NXSDataWriter is a Tango server which allows to store NeXuS Data in H5 files.&#xA;&#xA;The server provides storing data from other Tango devices,&#xA;various databases as well as passed by a user client via JSON strings.&#xA;&#xA;Source code: https://github.com/nexdatas/nxsdatawriter&#xA;Project Web page: https://nexdatas.github.io/nxsdatawriter&#xA;NexDaTaS Web page: https://nexdatas.github.io" title="NeXus Data Writer" sourcePath="/home/jkotan/ndts/nexdatas.writer" language="Python" filestogenerate="XMI   file,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <identification contact="at desy.de - jan.kotanski" author="jan.kotanski" emailDomain="desy.de" classFamily="Acquisition" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="DESY" reference=""/>
     </description>
@@ -10,7 +10,7 @@
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
       <DefaultPropValue>100</DefaultPropValue>
     </deviceProperties>
-    <deviceProperties name="Writer" description="writer module: `pni` or `h5py` or `h5cpp`">
+    <deviceProperties name="Writer" description="writer module: `h5cpp` or `h5py` or `h5redis`">
       <type xsi:type="pogoDsl:StringType"/>
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </deviceProperties>

{nxswriter-3.17.2/nxswriter.egg-info → nxswriter-3.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.17.2
+Version: 3.18.1
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -91,7 +91,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `questing`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -106,7 +106,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 To install tango server
 

{nxswriter-3.17.2 → nxswriter-3.18.1}/README.rst

@@ -64,7 +64,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `questing`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -79,7 +79,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 To install tango server
 

{nxswriter-3.17.2 → nxswriter-3.18.1}/doc_html/FullDocument.html

@@ -126,7 +126,7 @@
 	</tr>
 	<tr>
 		<td> Writer </td>
-		<td> writer module: `pni` or `h5py` or `h5cpp` </td>
+		<td> writer module: `h5cpp` or `h5py` or `h5redis` </td>
 		<td> String </td>
 		<td> none </td>
 	</tr>

{nxswriter-3.17.2 → nxswriter-3.18.1}/doc_html/Properties.html

@@ -26,7 +26,7 @@
 	</tr>
 	<tr>
 		<td> Writer </td>
-		<td> writer module: `pni` or `h5py` or `h5cpp` </td>
+		<td> writer module: `h5cpp` or `h5py` or `h5redis` </td>
 		<td> String </td>
 		<td> none </td>
 	</tr>

{nxswriter-3.17.2 → nxswriter-3.18.1}/man/nxswriter.1

@@ -79,7 +79,7 @@ $ python3 setup.py install
 .UNINDENT
 .SS Debian packages
 .sp
-Debian \fIbookworm\fP, \fIbullseye\fP, \fIbuster\fP  or Ubuntu \fIplucky\fP,  \fInoble\fP, \fIjammy\fP  packages can be found in the HDRI repository.
+Debian \fIbookworm\fP, \fIbullseye\fP, \fIbuster\fP  or Ubuntu \fIquesting\fP,  \fInoble\fP, \fIjammy\fP  packages can be found in the HDRI repository.
 .sp
 To install the debian packages, add the PGP repository key
 .INDENT 0.0

{nxswriter-3.17.2 → nxswriter-3.18.1}/nxswriter/ClientSource.py

@@ -25,6 +25,18 @@ from lxml.etree import XMLParser
 from .DataSources import DataSource
 from .Errors import DataSourceSetupError
 
+try:
+    try:
+        import tango
+    except Exception:
+        import PyTango as tango
+    #: (:obj:`str`) global variable if tango module installed
+    PYTANGO_AVAILABLE = True
+except ImportError as e:
+    PYTANGO_AVAILABLE = False
+    sys.stdout.write("PYTANGO not available: %s" % e)
+    sys.stdout.flush()
+
 
 class ClientSource(DataSource):
 
@@ -106,4 +118,13 @@ class ClientSource(DataSource):
         names = [self.name]
         if self.name:
             names.append(self.name.lower())
+            if PYTANGO_AVAILABLE and "/" in self.name and \
+               not self.name.startswith("tango://"):
+                if ":" in self.name:
+                    names.append("tango://%s" % (self.name.lower()))
+                else:
+                    db = tango.Database()
+                    names.append("tango://%s:%s/%s" %
+                                 (db.get_db_host().split(".")[0],
+                                  db.get_db_port(), self.name.lower()))
         return self._getJSONData(names, self.__globalJSON, self.__localJSON)

{nxswriter-3.17.2 → nxswriter-3.18.1}/nxswriter/Release.py

@@ -21,4 +21,4 @@
 
 
 #: package version
-__version__ = "3.17.2"
+__version__ = "3.18.1"

{nxswriter-3.17.2 → nxswriter-3.18.1}/nxswriter/TangoDataWriter.py

@@ -491,12 +491,17 @@ class TangoDataWriter(object):
         :brief: It parse the XML settings, creates thread pools
                 and runs the INIT pool.
         """
+        tt0 = time.time()
+        if self._streams:
+            self._streams.debug("openEntry: INIT")
         if self.xmlsettings:
             # flag for INIT mode
             self.__datasources.counter = -1
             self.__datasources.nxroot = self.__nxRoot
             errorHandler = sax.ErrorHandler()
             parser = sax.make_parser()
+            if self._streams:
+                self._streams.debug("openEntry: Create NexusXMLHnadler")
             handler = NexusXMLHandler(
                 self.__nxPath[-1] if self.__nxPath else self.__eFile,
                 self.__datasources,
@@ -517,6 +522,8 @@ class TangoDataWriter(object):
                 else:
                     inpsrc.setByteStream(StringIO(self.xmlsettings))
 
+            if self._streams:
+                self._streams.debug("openEntry: Parse NexusXMLHnadler")
             parser.parse(inpsrc)
 
             self.__initPool = handler.initPool
@@ -540,10 +547,18 @@ class TangoDataWriter(object):
                 self.__triggerPools[pool].maxRuntime = \
                     self.maxElementRuntime
 
+            if self._streams:
+                self._streams.debug("openEntry: SET JSON")
             self.__initPool.setJSON(json.loads(self.jsonrecord))
+            if self._streams:
+                self._streams.debug("openEntry: RUN INIT")
+            tt1 = time.time()
             if not self.skipacquisition:
                 self.__initPool.runAndWait()
                 self.__initPool.checkErrors()
+            tt2 = time.time()
+            if self._streams:
+                self._streams.debug("openEntry: ADD LOGS")
             self.skipacquisition = False
             if self.addingLogs:
                 self.__entryCounter += 1
@@ -554,6 +569,9 @@ class TangoDataWriter(object):
                     "string")
                 lfield.write(self.xmlsettings)
                 lfield.close()
+            tt3 = time.time()
+            if self._streams:
+                self._streams.debug("openEntry: FLUSH")
             if self.__nxFile and hasattr(self.__nxFile, "flush"):
                 self.__nxFile.flush()
             if self.stepsperfile > 0:
@@ -562,9 +580,34 @@ class TangoDataWriter(object):
                 self.__nextfile()
             elif "swmr" in self.__pars.keys() and self.__pars["swmr"]:
                 self.__nxFile.reopen(readonly=False, **self.__pars)
+            tt4 = time.time()
+        else:
+            tt4 = time.time()
+            tt1 = tt4
+            tt2 = tt4
+            tt3 = tt4
+        if self._streams:
+            self._streams.debug("openEntry: PREPARE")
         if self.__nxFile and hasattr(self.__nxFile, "prepare"):
             # print("START")
             self.__nxFile.prepare()
+        tt5 = time.time()
+        if self._streams:
+            dt = tt5 - tt0
+            dt1 = tt1 - tt0
+            dt2 = tt2 - tt1
+            dt3 = tt3 - tt2
+            dt4 = tt4 - tt3
+            dt5 = tt5 - tt4
+            message = "openEntry: END TotalTime = %ss, " \
+                "ParseXMLTime=%ss, INITRunTime=%ss, " \
+                "AddLogsTime=%ss, FlushTime=%ss, " \
+                "PrepateTime=%ss" % (dt, dt1, dt2, dt3, dt4, dt5)
+            if dt and self.maxRecordRuntime and \
+                    dt > self.maxRecordRuntime:
+                self._streams.warn(message)
+            else:
+                self._streams.debug(message)
 
     def __nextfile(self):
         self.__nxFile.close()

{nxswriter-3.17.2 → nxswriter-3.18.1/nxswriter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxswriter
-Version: 3.17.2
+Version: 3.18.1
 Summary: Nexus Data writer implemented as a Tango Server
 Home-page: https://github.com/nexdatas/nxsdatawriter
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -91,7 +91,7 @@ Extract sources and run
 Debian packages
 """""""""""""""
 
-Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `plucky`,  `noble`, `jammy`  packages can be found in the HDRI repository.
+Debian `trixie`, `bookworm`, `bullseye`  or Ubuntu `questing`,  `noble`, `jammy`  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -106,7 +106,7 @@ and then download the corresponding source list
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 To install tango server