nxstools 4.31.4__py3-none-any.whl → 4.33.0__py3-none-any.whl

nxstools/h5rediswriter.py

@@ -34,7 +34,6 @@ from .nxsfileparser import (getdsname, getdssource,
                             # getdstype
                             )
 
-
 H5CPP = False
 try:
     from . import h5cppwriter as h5writer
@@ -130,6 +129,10 @@ progattrdesc = {
     "beamtime_id": ["beamtime_id", str, False],
 }
 
+titleplots = {
+    "mesh": {"kind": "scatter-plot", "items": [{"kind": "scatter"}]},
+}
+
 
 def nptype(dtype):
     """ converts to numpy types
@@ -406,6 +409,12 @@ class H5RedisFile(H5File):
     """ file tree file
     """
 
+    #: (:obj:`dict`) global data stores
+    global_data_stores = {}
+
+    #: (:class:`threading.Lock`) global data store lock
+    global_data_store_lock = threading.Lock()
+
     def __init__(self, h5object=None, filename=None, h5imp=None,
                  redisurl=None, session=None, h5fileplugin=None):
         """ constructor
@@ -444,8 +453,13 @@ class H5RedisFile(H5File):
         self.__entryname = ''
         self.__insname = ''
         if REDIS and self.__redisurl:
-            # print("FILENAME", self.name)
-            self.__datastore = getDataStore(self.__redisurl)
+            with self.global_data_store_lock:
+                # print("FILENAME", self.name)
+                if self.__redisurl in self.global_data_stores:
+                    self.__datastore = self.global_data_stores[self.__redisurl]
+                else:
+                    self.__datastore = getDataStore(self.__redisurl)
+                    self.global_data_stores[self.__redisurl] = self.__datastore
             # global FileStream
             # if h5fileplugin:
             #     try:
@@ -1696,6 +1710,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):
+                                macro_name = np.split(" ")[0]
+                            for mn, plot in titleplots.items():
+                                if mn in macro_name:
+                                    self.append_scaninfo(plot, ["plots"])
+
                     except Exception as e:
                         print(str(e))
                         pass

nxstools/release.py

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

{nxstools-4.31.4.dist-info → nxstools-4.33.0.dist-info}/METADATA

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

{nxstools-4.31.4.dist-info → nxstools-4.33.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ nxstools/filenamegenerator.py,sha256=82Zbrxk54OiDFi6MuXtKgSgPNti4CVciBCe9NgPY8HE
 nxstools/filewriter.py,sha256=feSjyvCkUvoiD949-PB6bP6F30-MSuRPtboZehYbaVk,31899
 nxstools/h5cppwriter.py,sha256=OOdXQR2ptKAaTNIOFVd6hETqStM_Jb38jTR65rdBxlU,69060
 nxstools/h5pywriter.py,sha256=PxV0ou_WBpKE2NTnmIfsw0xKwjOO6WIjkMmxvtYXbsk,57830
-nxstools/h5rediswriter.py,sha256=QrMgLxyquy0G7f4xoQkHjqCsfNtPTQO5LNvrWrSxwaw,70066
+nxstools/h5rediswriter.py,sha256=UHCUx7uIlVlzkmAAXTjmnkgohZ1EJl-AteH5FGf8ozg,70934
 nxstools/nxsargparser.py,sha256=j2ZEhBbs1TelCTEVSWMnVTvujusjKhFNSY6kQR3nIbQ,3241
 nxstools/nxscollect.py,sha256=1kYhO6Vpk5Hb-cF14EMFkljF_nr2UUcXvzuk46-uVcM,64898
 nxstools/nxsconfig.py,sha256=hyuLqLFC9nVHPaARut74_Oy-5_SBkuADGV6ilPM6dqI,61686
@@ -17,7 +17,7 @@ nxstools/nxsfileparser.py,sha256=hoNDweS_o9RjM7p89dVQdP13VRf-1SytCUwuVNMOWag,283
 nxstools/nxsparser.py,sha256=Z6xOHCd7W20ICIurOM6H3I0FbFLF4xa29iwkotk9b40,35902
 nxstools/nxsxml.py,sha256=EMh9ZctS6TsEA9cpJc5BRabd-a8CQClTm0_H4QqaLAk,25209
 nxstools/redisutils.py,sha256=3QSILdasxql4geSHxrWAfOQ5v0-KZ6lv-e8uhlbhNPk,2586
-nxstools/release.py,sha256=6nqQTtWSA3nIQRPP-QDhzF__HsW_uGoB8fLNoUqmHLs,890
+nxstools/release.py,sha256=QqJtpI0EqOlnrr15pw5uqFTdQ1qvrRU0ZzrX5edY4pM,890
 nxstools/ontology/__init__.py,sha256=QoAaEawW9gN3-Oan4Nh4RcnIQ5xTUy_cyTTt_qH7MH0,5583
 nxstools/ontology/ontology.json,sha256=skBZzmbhLGtQ9ahizOKlolG5agHf0lfaK4Bao2e43Lk,191838
 nxstools/pyeval/__init__.py,sha256=PtASTU6yoxWfn8GWA17Y9jcLRQjkqCKy9bpCxhaeMSo,848
@@ -265,13 +265,13 @@ nxstools/xmltemplates/title.ds.xml,sha256=cBN_WigqtvGK2vS3dCotwH7NNDAb2Z_z7CLw-t
 nxstools/xmltemplates/undulator.xml,sha256=Tnfkgftm6KOQyifc-BVyqUuEB9alHUru7z3_Qv9tJrY,2369
 nxstools/xmltemplates/xspress3.xml,sha256=uOsLW21SyXcsilZAZdIyQ37npTkzuIEqjat3QlNyndY,1873
 nxstools/xmltemplates/xspress3_triggermode_cb.ds.xml,sha256=xrXNLT6uuDofgXRqVhdIo25J7nUPPdSPJs4kE_u8_rw,871
-nxstools-4.31.4.data/scripts/nxscollect,sha256=ckAVuZnNdjepU9S6EKDACb-Zcojpt_UhiTKnHoMVEhk,60
-nxstools-4.31.4.data/scripts/nxsconfig,sha256=va2RtUWqZN_Nb4dSs_0d63XjzqYkbSLSnvkCB0dbwYw,58
-nxstools-4.31.4.data/scripts/nxscreate,sha256=kpc2eEoCpWNg3inzgm2if6bpT9i-9-GJJQ-8mSs6a7M,59
-nxstools-4.31.4.data/scripts/nxsdata,sha256=XvalTwXtrS2DOb8nKLp-7Mjom-L_WBLBqY5xtl-CPH4,54
-nxstools-4.31.4.data/scripts/nxsetup,sha256=pYXgv6vHpblrmURXikAZBAOOaPxDnqu3n6OSYuLXkWE,54
-nxstools-4.31.4.data/scripts/nxsfileinfo,sha256=Hhus49bHtva79IwY_7nxDhQF-ianVKMYo1uvNqeOqJ0,62
-nxstools-4.31.4.dist-info/METADATA,sha256=Fo5RhDGQ6t7x8OKBtzUaxZbr4eMX4jEHpcaf6ZNcnG0,5051
-nxstools-4.31.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-nxstools-4.31.4.dist-info/top_level.txt,sha256=puE4GNPuhMbwc3ViVq7sru72pVPcvxWlx9lPezA-5RQ,9
-nxstools-4.31.4.dist-info/RECORD,,
+nxstools-4.33.0.data/scripts/nxscollect,sha256=ckAVuZnNdjepU9S6EKDACb-Zcojpt_UhiTKnHoMVEhk,60
+nxstools-4.33.0.data/scripts/nxsconfig,sha256=va2RtUWqZN_Nb4dSs_0d63XjzqYkbSLSnvkCB0dbwYw,58
+nxstools-4.33.0.data/scripts/nxscreate,sha256=kpc2eEoCpWNg3inzgm2if6bpT9i-9-GJJQ-8mSs6a7M,59
+nxstools-4.33.0.data/scripts/nxsdata,sha256=XvalTwXtrS2DOb8nKLp-7Mjom-L_WBLBqY5xtl-CPH4,54
+nxstools-4.33.0.data/scripts/nxsetup,sha256=pYXgv6vHpblrmURXikAZBAOOaPxDnqu3n6OSYuLXkWE,54
+nxstools-4.33.0.data/scripts/nxsfileinfo,sha256=Hhus49bHtva79IwY_7nxDhQF-ianVKMYo1uvNqeOqJ0,62
+nxstools-4.33.0.dist-info/METADATA,sha256=9WV46bYnWOCS3a_ucPAgRoUgUPLF-sZrBtCRQ41TLXo,5051
+nxstools-4.33.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+nxstools-4.33.0.dist-info/top_level.txt,sha256=puE4GNPuhMbwc3ViVq7sru72pVPcvxWlx9lPezA-5RQ,9
+nxstools-4.33.0.dist-info/RECORD,,