armodel 1.7.7__py3-none-any.whl → 1.7.8__py3-none-any.whl

armodel/parser/abstract_arxml_parser.py

@@ -6,18 +6,19 @@ import re
 import logging
 import xml.etree.ElementTree as ET
 
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, ARFloat, ARLiteral, ARNumerical, Boolean, Integer, PositiveInteger, TimeValue
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, PositiveInteger, TimeValue
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, Limit
+
 
 class AbstractARXMLParser:
     __metaclass__ = ABCMeta
      
-    def __init__(self, options = None) -> None:
-        if type(self) == AbstractARXMLParser:
+    def __init__(self, options=None) -> None:
+        if type(self) is AbstractARXMLParser:
             raise NotImplementedError("AbstractArxmlParser is an abstract class.")
         
         self.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
@@ -40,13 +41,13 @@ class AbstractARXMLParser:
                 self.options['warning'] = options['warning']
 
     def raiseError(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise ValueError(error_msg)
         
     def notImplemented(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise NotImplementedError(error_msg)
@@ -96,11 +97,11 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         literal = None
         if (child_element is not None):
-            self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
+            # self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
             literal = ARLiteral()
             self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
-            if child_element.text is None:      
+            if child_element.text is None:
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
@@ -110,14 +111,14 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         literal = None
         if (child_element is not None) and (child_element.text is not None):
-            self.logger.debug("getChildElementOptionalRevisionLabelString : %s" % child_element.text)
+            # self.logger.debug("getChildElementOptionalRevisionLabelString : %s" % child_element.text)
             m = re.match(r'[0-9]+\.[0-9]+\.[0-9]+([\._;].*)?', child_element.text)
             if not m:
                 raise ValueError("Invalid RevisionLabelString <%s>" % child_element.text)
             literal = ARLiteral()
             self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
-            if child_element.text is None:      
+            if child_element.text is None:
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
@@ -165,7 +166,7 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
-        if literal == None:
+        if literal is None:
             return None
         if literal.getText() == "":
             return None
@@ -182,7 +183,7 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = ARNumerical()
         self.readARObjectAttributes(child_element, numerical)
@@ -191,7 +192,7 @@ class AbstractARXMLParser:
     
     def getChildElementOptionalIntegerValue(self, element: ET.Element, key: str) -> Integer:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = Integer()
         self.readARObjectAttributes(child_element, numerical)
@@ -200,7 +201,7 @@ class AbstractARXMLParser:
     
     def getChildElementOptionalPositiveInteger(self, element: ET.Element, key: str) -> PositiveInteger:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = PositiveInteger()
         self.readARObjectAttributes(child_element, numerical)
@@ -231,7 +232,7 @@ class AbstractARXMLParser:
             return limit
         return None
     
-    def _getChildElementRefTypeDestAndValue(self, element) -> RefType:
+    def _getChildElementRefTypeDestAndValue(self, element: ET.Element) -> RefType:
         ref = RefType()
         if 'BASE' in element.attrib:
             ref.setBase(element.attrib['BASE'])
@@ -246,7 +247,7 @@ class AbstractARXMLParser:
             return self._getChildElementRefTypeDestAndValue(child_element)
         self.raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
 
-    def getChildElementOptionalRefType(self, element:ET.Element, key: str) -> RefType:
+    def getChildElementOptionalRefType(self, element: ET.Element, key: str) -> RefType:
         child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
@@ -268,13 +269,19 @@ class AbstractARXMLParser:
         return None
     
     def readARObjectAttributes(self, element: ET.Element, ar_object: ARObject):
-        ar_object.timestamp = self.readElementOptionalAttrib(element, "T")             # read the timestamp
-        ar_object.uuid      = self.readElementOptionalAttrib(element, "UUID")          # read the uuid
+        ar_object.timestamp = self.readElementOptionalAttrib(element, "T")              # read the timestamp
+        ar_object.uuid = self.readElementOptionalAttrib(element, "UUID")                # read the uuid
 
-        if ar_object.timestamp is not None:
-            self.logger.debug("Timestamp: %s" % ar_object.timestamp)
+        # if ar_object.timestamp is not None:
+        #    self.logger.debug("Timestamp: %s" % ar_object.timestamp)
         if ar_object.uuid is not None:
-            self.logger.debug("UUID: %s" % ar_object.uuid)
+            instance = AUTOSAR.getInstance()
+            old_ar_object = instance.getARObjectByUUID(ar_object.uuid)
+            if old_ar_object is not None:
+                self.logger.warning(Fore.YELLOW + "Duplicate UUID <%s> / type <%s>" % (ar_object.uuid, type(old_ar_object)) + Fore.WHITE)
+            else:
+                instance.addARObject(ar_object)
+            # self.logger.debug("UUID: %s" % ar_object.uuid)
     
     def getAUTOSARInfo(self, element: ET.Element, document: AUTOSAR):
         key = "{http://www.w3.org/2001/XMLSchema-instance}schemaLocation"
@@ -295,12 +302,9 @@ class AbstractARXMLParser:
             if item != "*" and item != ".":
                 keys[idx] = "xmlns:%s" % item
         return "/".join(keys)
-    
-    def findChild(self, parent:ET.Element, key: str) -> ET.Element:
-        return parent.find("xmlns:./child::%s" % key, self.nsmap)
-    
-    def find(self, parent:ET.Element, key: str) -> ET.Element:
+       
+    def find(self, parent: ET.Element, key: str) -> ET.Element:
         return parent.find(self.convert_find_key(key), self.nsmap)
     
     def findall(self, parent: ET.Element, key: str) -> List[ET.Element]:
-        return parent.findall(self.convert_find_key(key), self.nsmap)
+        return parent.findall(self.convert_find_key(key), self.nsmap)