nxsconfigserver 2.19.0__py3-none-any.whl → 2.21.1__py3-none-any.whl

nxsconfigserver/Merger.py

@@ -77,6 +77,8 @@ class Merger(object):
 
         #: (:obj:`xml.etree.ElementTree.Element`) DOM root node
         self.__root = None
+        #: (:obj:`bool`) do not merge node on false
+        self.skip = False
         #: (:obj:`list` <:obj:`str`> ) tags which cannot have the same siblings
         self.singles = ['strategy', 'dimensions', 'definition',
                         'record', 'device', 'query', 'database',
@@ -182,7 +184,7 @@ class Merger(object):
             res += ":" + name
         return res
 
-    def __areMergeable(self, elem1, elem2, ancestors):
+    def __areMergeable(self, elem1, elem2, ancestors, node):
         """ checks if two elements are mergeable
 
         :param elem1: first element
@@ -214,20 +216,32 @@ class Merger(object):
         if tags:
             status = False
             if tagName in self.singles or (name1 and name1 == name2):
-                raise IncompatibleNodeError(
-                    "Incompatible element attributes  %s: %s"
-                    % (str(self.__getAncestors(elem1, ancestors)), str(tags)),
-                    [elem1, elem2])
+                if not self.skip:
+                    if tags and tags[0] == ('TANGO', 'CLIENT'):
+                        node.remove(elem2)
+                    elif tags and tags[0] == ('CLIENT', 'TANGO'):
+                        node.remove(elem1)
+                    else:
+                        raise IncompatibleNodeError(
+                            "Incompatible element attributes  %s: %s %s"
+                            % (str(self.__getAncestors(elem1, ancestors)),
+                               str(node.get("name")),  str(tags)),
+                            [elem1, elem2])
+                else:
+                    status = False
 
         if tagName in self.uniqueText:
             text1 = unicode(self.__getText(elem1)).strip()
             text2 = unicode(self.__getText(elem2)).strip()
             if text1 != text2 and text1 and text2:
-                raise IncompatibleNodeError(
-                    "Incompatible \n%s element value\n%s \n%s "
-                    % (str(self.__getAncestors(elem1, ancestors)),
-                       text1, text2),
-                    [elem1, elem2])
+                if not self.skip:
+                    raise IncompatibleNodeError(
+                        "Incompatible \n%s element value\n%s \n%s "
+                        % (str(self.__getAncestors(elem1, ancestors)),
+                           text1, text2),
+                        [elem1, elem2])
+                else:
+                    status = False
         return status
 
     def __checkAttributes(self, elem1, elem2):
@@ -325,6 +339,9 @@ class Merger(object):
 
             children = list(node)
             c1 = 0
+            if unicode(node.tag) in self.switchable and self.switchdatasources:
+                # print("NODE", node.tag, node.get("name"))
+                self.__switch(node)
             while c1 < len(children):
                 child1 = children[c1]
                 c2 = c1 + 1
@@ -333,7 +350,7 @@ class Merger(object):
                     if child1 != child2:
                         if self.__areMergeable(
                                 child1, child2,
-                                ancestors):
+                                ancestors, node):
                             self.__mergeNodes(child1, child2, node)
                             children.pop(c2)
                             c2 -= 1
@@ -354,8 +371,9 @@ class Merger(object):
 
                 self.__mergeChildren(child, newancestors, entrynode,
                                      datanode, linknode)
-                if cName in self.switchable and self.switchdatasources:
-                    self.__switch(child)
+                # if cName in self.switchable and self.switchdatasources:
+                #     print("CHILD", child.tag, child.get("name"))
+                #     self.__switch(child)
                 if cName in self.linkable and self.linkdatasources:
                     datanode = self.__addlink(
                         child, newancestors, entrynode, datanode,
@@ -426,7 +444,8 @@ class Merger(object):
         :type node: :obj:`xml.etree.ElementTree.Element`
         """
         if node is not None:
-            stnode = None
+            stnodes = []
+            modes = []
             mode = None
             dsname = None
             dsnode = None
@@ -451,13 +470,18 @@ class Merger(object):
                 elif cName == 'strategy':
                     mode = child.get("mode")
                     if mode in self.modesToSwitch.keys():
-                        stnode = child
-                    else:
-                        break
-                if stnode is not None and dsnode is not None:
-                    break
-            if stnode is not None and dsnode is not None:
-                stnode.attrib["mode"] = self.modesToSwitch[mode]
+                        stnodes.append(child)
+                        modes.append(mode)
+                    # else:
+                    #     break
+                # if stnode not None and dsnode is not None:
+                #     break
+            if stnodes and dsnode is not None:
+                for si, stn in enumerate(stnodes):
+                    mode = modes[si]
+                    if mode in self.modesToSwitch.keys():
+                        stn.attrib["mode"] = self.modesToSwitch[mode]
+                        # print("SWITCH", node.get("name"), dsname, dsnode)
 
     def __canfail(self, node):
         """ switch the given node to canfail mode

nxsconfigserver/NXSConfigServer.py

@@ -135,6 +135,26 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
+    def read_XMLCache(self, attr):
+        """ Read XMLCache attribute
+
+        :param attr: xml string attribute
+        :type attr: :class:`tango.Attribute`
+        """
+        self.debug_stream("In read_XMLCache()")
+        attr.set_value(self.xmlc.xmlcache)
+
+    def is_XMLCache_allowed(self, _):
+        """ XMLCache attribute State Machine
+
+        :returns: True if the operation allowed
+        :rtype: :obj:`bool`
+        """
+        if self.get_state() in [tango.DevState.ON,
+                                tango.DevState.RUNNING]:
+            return False
+        return True
+
     def read_Selection(self, attr):
         """ Read Selection attribute
 
@@ -765,6 +785,7 @@ class NXSConfigServer(tango.LatestDeviceImpl):
 
         :brief: Creates the NDTS configuration script from the
                 given components. The result is strored in XMLString
+                and XMLCache
 
         :param argin:  DevVarStringArray    list of component names
         :type argin: :obj:`list` <:obj:`str`>
@@ -789,6 +810,36 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
+    def CreateCache(self, argin):
+        """ CreateCache command
+
+        :brief: Creates the NDTS cache script from the
+                given components. The result is strored in XMLString
+                and XMLCache
+
+        :param argin:  DevVarStringArray    list of component names
+        :type argin: :obj:`list` <:obj:`str`>
+        """
+        self.debug_stream("In CreateCache()")
+        try:
+            self.set_state(tango.DevState.RUNNING)
+            self.xmlc.createCache(argin)
+            self.set_state(tango.DevState.OPEN)
+        finally:
+            if self.get_state() == tango.DevState.RUNNING:
+                self.set_state(tango.DevState.OPEN)
+
+    def is_CreateCache_allowed(self):
+        """ CreateCache command State Machine
+
+        :returns: True if the operation allowed
+        :rtype: :obj:`bool`
+        """
+        if self.get_state() in [tango.DevState.ON,
+                                tango.DevState.RUNNING]:
+            return False
+        return True
+
     def DeleteComponent(self, argin):
         """ DeleteComponent command
 
@@ -1255,6 +1306,9 @@ class NXSConfigServerClass(tango.DeviceClass):
         'CreateConfiguration':
             [[tango.DevVarStringArray, "list of component names"],
              [tango.DevVoid, ""]],
+        'CreateCache':
+            [[tango.DevVarStringArray, "list of component names"],
+             [tango.DevVoid, ""]],
         'DeleteComponent':
             [[tango.DevString, "component name"],
              [tango.DevVoid, ""]],
@@ -1316,6 +1370,16 @@ class NXSConfigServerClass(tango.DeviceClass):
              "it contains the resulting XML configuration.",
              'Display level': tango.DispLevel.EXPERT,
         }],
+        'XMLCache':
+        [[tango.DevString,
+          tango.SCALAR,
+          tango.READ],
+         {
+             'label': "XML for merged components",
+             'description':
+             "XML for merged components without applied variables ",
+             'Display level': tango.DispLevel.EXPERT,
+         }],
         'Selection':
         [[tango.DevString,
           tango.SCALAR,

nxsconfigserver/Release.py

@@ -20,4 +20,4 @@
 """ release version module """
 
 #: version number
-__version__ = "2.19.0"
+__version__ = "2.21.1"

nxsconfigserver/XMLConfigurator.py

@@ -86,6 +86,8 @@ class XMLConfigurator(object):
         self._streams = StreamSet(weakref.ref(server) if server else None)
         #: (:obj:`str`) XML config string
         self.xmlstring = ""
+        #: (:obj:`str`) Merged coponents in XML string without variables
+        self.xmlcache = ""
         #: (:obj:`str`) component selection
         self.selection = "{}"
         #: (:obj:`str`) JSON string with arguments to connect to database
@@ -829,9 +831,12 @@ class XMLConfigurator(object):
             name = subc.strip() if subc else ""
             if name:
                 if tag and name not in keys:
-                    raise NonregisteredDBRecordError(
-                        "The %s %s of %s not registered in the DataBase" % (
-                            tag if tag else "variable", name, component))
+                    if not onlyexisting:
+                        raise NonregisteredDBRecordError(
+                            "The %s %s of %s not registered in the "
+                            "DataBase" % (
+                                tag if tag else "variable",
+                                name, component))
                 try:
                     xmlds = funValue([name], defsubc)
                 except Exception:
@@ -840,7 +845,7 @@ class XMLConfigurator(object):
                     raise NonregisteredDBRecordError(
                         "The %s %s of %s not registered" % (
                             tag if tag else "variable", name, component))
-                if tag:
+                if tag and xmlds:
                     if sys.version_info > (3,):
                         root = et.fromstring(
                             bytes(xmlds[0], "UTF-8"),
@@ -906,10 +911,12 @@ class XMLConfigurator(object):
             component, self.__varLabel,
             list(self.__parameters.keys()), self.__getVariable)
 
-    def __attachComponents(self, component):
+    def __attachComponents(self, component, onlyexisting=False):
         """ attaches variables to component
 
         :param component: given component
+        :param onlyexisting: attachElement only if exists
+        :type onlyexisting: :obj:`bool`
         :type component: :obj:`str`
         :returns: component with attached variables
         :rtype: :obj:`str`
@@ -917,13 +924,16 @@ class XMLConfigurator(object):
         if not component:
             return
         return self.__attachElements(
-            component, self.__cpLabel, [], lambda x, y: [""])
+            component, self.__cpLabel, [], lambda x, y: [""],
+            onlyexisting=onlyexisting)
 
-    def __attachDataSources(self, component):
+    def __attachDataSources(self, component, onlyexisting=False):
         """ attaches datasources to component
 
         :param component: given component
         :type component: :obj:`str`
+        :param onlyexisting: attachElement only if exists
+        :type onlyexisting: :obj:`bool`
         :returns: component with attached datasources
         :rtype: :obj:`str`
         """
@@ -932,7 +942,7 @@ class XMLConfigurator(object):
         return self.__attachElements(
             component, self.__dsLabel,
             self.availableDataSources(), self.dataSources,
-            "datasource")
+            "datasource", onlyexisting=onlyexisting)
 
     def merge(self, names):
         """ merges the give components
@@ -961,13 +971,15 @@ class XMLConfigurator(object):
                 cpvars[str(key)] = str(value)
         return cpvars
 
-    def __mergeVars(self, names, withVariables=False):
+    def __mergeVars(self, names, withVariables=False, onlyCache=False):
         """ merges the give components
 
         :param names: list of component names
         :type names: :obj:`list` <:obj:`str`>
         :param withVariables: if true variables will be substituted
         :param withVariables: :obj:`bool`
+        :param onlyCache: if true create only cache
+        :param onlyCache: :obj:`bool`
         :returns: merged components
         :rtype: :obj:`str`
         """
@@ -976,13 +988,23 @@ class XMLConfigurator(object):
             allnames = self.dependentComponents(
                 list(set(self.__mydb.mandatory() + names)))
             comps = self.__mydb.components(list(set(allnames)))
+            xml = self.__merge(comps, skip=withVariables)
             if withVariables:
-                cpvars = self.__variableComponentValues(comps)
-                comps = [self.__attachVariables(cp, cpvars) for cp in comps]
-            xml = self.__merge(comps)
+                xml = self.__attachDataSources(
+                   self.__attachComponents(
+                       xml, onlyexisting=True), onlyexisting=True)
+                self.xmlcache = xml or ""
+                if onlyCache:
+                    return self.xmlcache
+                if xml is not None:
+                    comps = [xml]
+                    cpvars = self.__variableComponentValues(comps)
+                    comps = [self.__attachVariables(cp, cpvars)
+                             for cp in comps]
+                    xml = self.__merge(comps)
         return xml if xml is not None else ""
 
-    def __merge(self, xmls):
+    def __merge(self, xmls, skip=False):
         """ merges the give component xmls
 
         :param xmls: list of component xmls
@@ -991,11 +1013,13 @@ class XMLConfigurator(object):
         :rtype: :obj:`str`
         """
         mgr = Merger()
-        mgr.switchdatasources = json.loads(self.stepdatasources)
-        mgr.linkdatasources = json.loads(self.linkdatasources)
-        mgr.extralinkdatasources = json.loads(self.extralinkdatasources)
-        mgr.canfaildatasources = json.loads(self.canfaildatasources)
-        mgr.extralinkpath = self.__splitExtraPath(self.extraLinkPath)
+        if not skip:
+            mgr.switchdatasources = json.loads(self.stepdatasources)
+            mgr.linkdatasources = json.loads(self.linkdatasources)
+            mgr.extralinkdatasources = json.loads(self.extralinkdatasources)
+            mgr.canfaildatasources = json.loads(self.canfaildatasources)
+            mgr.extralinkpath = self.__splitExtraPath(self.extraLinkPath)
+        mgr.skip = skip
         mgr.collect(xmls)
         mgr.merge()
         return mgr.toString()
@@ -1027,6 +1051,16 @@ class XMLConfigurator(object):
                     epath.append([nd[0], "NX" + nd[0]])
         return epath
 
+    def createCache(self, names):
+        """ creates the final configuration string in the xmlstring attribute
+
+        :param names: list of component names
+        :type names: :obj:`list` <:obj:`str`>
+        """
+        self.__mergeVars(names, withVariables=True, onlyCache=True)
+        self._streams.info("XMLConfigurator::createConfiguration() "
+                           "- Create configuration")
+
     def createConfiguration(self, names):
         """ creates the final configuration string in the xmlstring attribute
 

{nxsconfigserver-2.19.0.dist-info → nxsconfigserver-2.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.19.0
+Version: 2.21.1
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -99,21 +99,22 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and as well as Ubuntu Questing, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
-and then download the corresponding source list, e.g. for bookworm
+and then download the corresponding source list, e.g. for trixie
 
 .. 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.sources
 
 Finally, for python2 packages
 

nxsconfigserver-2.21.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+nxsconfigserver/ComponentParser.py,sha256=oUEy3_0Q77992pAxR3k8CxzF5UP4hwc2beHYh9v-mJU,7745
+nxsconfigserver/Errors.py,sha256=zFZlQNbZV6UlbGGBV149j1DQbPXAkTmYVgaR1QRIXP8,1956
+nxsconfigserver/MYSQLDataBase.py,sha256=54bFG4KFLMkVYMme3bcybve24qgsxKTvCo7vP6RDjTI,22755
+nxsconfigserver/Merger.py,sha256=pNMvdSvx6sEBdg0qfsPKVOi5jkmAsihk-ZnSlkhtk0Q,26709
+nxsconfigserver/NXSConfigServer.py,sha256=FlM3a1-kR7GE7tqtXv8HPNrAK0Nyjhpb4SXgUEkq5ok,49178
+nxsconfigserver/Release.py,sha256=2qnNjn98r87uukmyURh0Is97f_sXSr5U6M81cqVSsTw,895
+nxsconfigserver/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
+nxsconfigserver/XMLConfigurator.py,sha256=OVQiDrWuCX2Ta8MtycTvoc3yKankfsVbZTQd6gQ6ktM,38785
+nxsconfigserver/__init__.py,sha256=dAvNwdxRsIARsH--JgJBAxzyaX3KPzZNStQ6B7SLbjI,1718
+nxsconfigserver-2.21.1.data/scripts/NXSConfigServer,sha256=VEAkby0R6UyckF-OofkVDPx3Mkn6rjPrl2xMbbBXqwo,986
+nxsconfigserver-2.21.1.dist-info/METADATA,sha256=kNl7pYZ4HRXl4ONHIDi6Icto6MnyL-s6W3NvrZR5hbk,14580
+nxsconfigserver-2.21.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+nxsconfigserver-2.21.1.dist-info/top_level.txt,sha256=TFz-xXdq3yV2iwY44R0uY1F-zqwYDnOmcJlN9kdo1S8,16
+nxsconfigserver-2.21.1.dist-info/RECORD,,

nxsconfigserver-2.19.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-nxsconfigserver/ComponentParser.py,sha256=oUEy3_0Q77992pAxR3k8CxzF5UP4hwc2beHYh9v-mJU,7745
-nxsconfigserver/Errors.py,sha256=zFZlQNbZV6UlbGGBV149j1DQbPXAkTmYVgaR1QRIXP8,1956
-nxsconfigserver/MYSQLDataBase.py,sha256=54bFG4KFLMkVYMme3bcybve24qgsxKTvCo7vP6RDjTI,22755
-nxsconfigserver/Merger.py,sha256=r7SS4JRdFWgGgRuI1sDl-H-zsYVcUjIbF3mSlTG_CHk,25545
-nxsconfigserver/NXSConfigServer.py,sha256=kxHx0vugHEin9j5c0iizvIbbi0Z5S6E8MoMDY7csN6k,47113
-nxsconfigserver/Release.py,sha256=2KgnY_sm1tpwteaOQR6sXxvJM1opn5jyjKBMrQO7erQ,895
-nxsconfigserver/StreamSet.py,sha256=sSvXJxoDufmt9_Xu5rFaQsp_4x9gww_zMv0NTiiyLlg,5799
-nxsconfigserver/XMLConfigurator.py,sha256=xdifnewlTNIQ3PgHTBvBh83xJUf2qCnqC3Rkq24urzk,37220
-nxsconfigserver/__init__.py,sha256=dAvNwdxRsIARsH--JgJBAxzyaX3KPzZNStQ6B7SLbjI,1718
-nxsconfigserver-2.19.0.data/scripts/NXSConfigServer,sha256=VEAkby0R6UyckF-OofkVDPx3Mkn6rjPrl2xMbbBXqwo,986
-nxsconfigserver-2.19.0.dist-info/METADATA,sha256=9C9T_WGxRBExhkI-YFFnZkhvJceog6scmyOJYRu57DA,14440
-nxsconfigserver-2.19.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-nxsconfigserver-2.19.0.dist-info/top_level.txt,sha256=TFz-xXdq3yV2iwY44R0uY1F-zqwYDnOmcJlN9kdo1S8,16
-nxsconfigserver-2.19.0.dist-info/RECORD,,