armodel 1.8.6__py3-none-any.whl → 1.8.7__py3-none-any.whl

armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py

@@ -18,7 +18,10 @@ from ...M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwCompon
 from ...M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import VariableDataPrototype
 from ...M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
 from ...M2.AUTOSARTemplates.SystemTemplate import RootSwCompositionPrototype, System
+from ...M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity
 from ...M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import SystemSignal, SystemSignalGroup
+from ...M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswSchedulableEntity, BswCalledEntity
+from ...M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
 
 
 class FileInfoComment(ARObject):
@@ -152,7 +155,26 @@ class AbstractAUTOSAR(CollectableElement):
     def getDestType(self, type) -> str:
         if isinstance(type, ImplementationDataType):
             return "IMPLEMENTATION-DATA-TYPE"
-        return ""
+        elif isinstance(type, ApplicationDataType):
+            return "APPLICATION-DATA-TYPE"
+        elif isinstance(type, AtomicSwComponentType):
+            return "ATOMIC-SW-COMPONENT-TYPE"
+        elif isinstance(type, CompositionSwComponentType):
+            return "COMPOSITION-SW-COMPONENT-TYPE"
+        elif isinstance(type, SystemSignal):
+            return "SYSTEM-SIGNAL"
+        elif isinstance(type, SystemSignalGroup):
+            return "SYSTEM-SIGNAL-GROUP"
+        elif isinstance(type, RunnableEntity):
+            return "RUNNABLE-ENTITY"
+        elif isinstance(type, BswSchedulableEntity):
+            return "BSW-SCHEDULABLE-ENTITY"
+        elif isinstance(type, BswModuleEntry):
+            return "BSW-MODULE-ENTRY"
+        elif isinstance(type, BswCalledEntity):
+            return "BSW-CALLED-ENTITY"
+
+        raise NotImplementedError("The type <%s> is not implemented for getDestType method" % type.__class__.__name__)
     
     def findAtomicSwComponentType(self, referred) -> AtomicSwComponentType:
         return self.find(referred)

armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py

@@ -2,8 +2,7 @@ from abc import ABCMeta
 from typing import List
 
 from ....M2.MSR.DataDictionary.DataDefProperties import SwImplPolicyEnum
-from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
-from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
+from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import AbstractEvent, ExecutableEntity, InternalBehavior
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, AREnum, ARFloat, ARNumerical, Boolean
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import PositiveInteger, String, TimeValue
@@ -266,7 +265,7 @@ class BswInterruptEntity(BswModuleEntity):
         return self
 
 
-class BswEvent(Identifiable, metaclass=ABCMeta):
+class BswEvent(AbstractEvent, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) is BswEvent:
             raise NotImplementedError("BswEvent is an abstract class.")

armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__init__.py

@@ -1,4 +0,0 @@
-from .BswBehavior import *
-from .BswImplementation import *
-from .BswInterfaces import *
-from .BswOverview import *

armodel/models/__init__.py

@@ -47,6 +47,7 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.Composition import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.RPTScenario import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import *

{armodel-1.8.6.dist-info → armodel-1.8.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.8.6
+Version: 1.8.7
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -654,3 +654,9 @@ Fix the attribute intervalType of **Limit** is empty issue.
 2. To improve the following AR Element:
    * ParameterAccess
 
+**Version 1.8.7**
+
+1. Correct the base class of the BswEvent.
+2. Export the RunnableEntity class.
+3. Add the more class support for getDestType
+

{armodel-1.8.6.dist-info → armodel-1.8.7.dist-info}/RECORD

@@ -17,17 +17,17 @@ armodel/lib/__init__.py,sha256=5629DkORqTomt16J6VL40o5hFv86-9SRB1240OJWTts,142
 armodel/lib/cli_args_parser.py,sha256=WiTC3wy_fZYloA1AjPqCvvOA_26V_y5toun0qfV51cw,1207
 armodel/lib/sw_component.py,sha256=spUeVR8ftzqf9h-pilh17qQg8amYqcqh39XKYql3HO4,1367
 armodel/lib/system_signal.py,sha256=E3FNiUGRUZovTCclCkabkVPpScMIACOXERUpbAuBTv8,1397
-armodel/models/__init__.py,sha256=Oj9ea8HUVNZ9I_BUiH72LT23rGSJAwx5lcdmW_8O9fM,6017
+armodel/models/__init__.py,sha256=OEOaZKoAq3wQ5DoV5dz0esCGWd08W0MkdMKqhfkvXJ4,6093
 armodel/models/M2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py,sha256=chlS6CGFWpxIa5qLfJXNY_CjFGBBGp1aJcKotsa4Nxs,12137
+armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py,sha256=FyH882AiycQHQYPkuzakL5EFY0QdIHdhaoVue1_ZHZ0,13365
 armodel/models/M2/AUTOSARTemplates/ECUCDescriptionTemplate.py,sha256=m9EMGnfdOeRbSFYcGabrCtOpZvb6uy2o03GoQ_MFpLQ,12261
 armodel/models/M2/AUTOSARTemplates/ECUCParameterDefTemplate.py,sha256=umY2aFmJepGOsmOTtfWTYeqY5KPb7bw4E0oazAUA7Wk,51238
 armodel/models/M2/AUTOSARTemplates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py,sha256=iFPCTPAs4ypcXg_TGt_ZBZv2QfCbxyVK-WJtN1wxcxQ,30018
+armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py,sha256=58Pz1K726hTbMw3rJcxr4zQ8sV0iuGp1D3C-y_ZLQO8,29965
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswImplementation.py,sha256=el7uFWztAqqYaCX_BOiSI6n7zeXsdD7acwpK52ZO5cM,2209
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswInterfaces.py,sha256=R5xu-KRd4utc7fWigQAS_Pw50_aW7koEZbeztR1ONWk,7168
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswOverview.py,sha256=zb8tcqYPbVy72nKA9w2heZzJrEPdA5Fgz_MWnxiEqvA,7899
-armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__init__.py,sha256=IY7GCwskITrwr1Rv76zzNUupbMsPAiG4ZMf5ZqtQuBg,118
+armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__pycache__/BswBehavior.cpython-312.pyc,sha256=S4bA8g-RIAVL66lO-kpkV9vD5byvxPrP5gec-k92aYA,47832
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__pycache__/BswImplementation.cpython-312.pyc,sha256=EE8mTv7iczeIOJFPS4MrpX2L17c3bwysqfzIrfjoF_I,3832
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__pycache__/BswInterfaces.cpython-312.pyc,sha256=gBywIioKRDtv9RqYEAPZslW_V3PrwSXxMtuNViUHYqE,10983
@@ -352,9 +352,9 @@ armodel/writer/arxml_writer.py,sha256=to2ZeWWlAq9b3KJAlPlZmprzs-HwqZCgSGtX_q--Jn
 armodel/writer/__pycache__/__init__.cpython-312.pyc,sha256=lMmx45hn8xKTLZYEBwjBlj-01DZs-WjTGBeRTjRV6f8,206
 armodel/writer/__pycache__/abstract_arxml_writer.cpython-312.pyc,sha256=mg34GvKggVd2TRVGcG15LzOtrrMOwNcf-EMlTCedJEc,8954
 armodel/writer/__pycache__/arxml_writer.cpython-312.pyc,sha256=cO1by_IjcUQfbHLp_0hxqNiX6jH6NXegbN3Ubl5sIGY,525054
-armodel-1.8.6.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
-armodel-1.8.6.dist-info/METADATA,sha256=8rgMj61P9kJmp6IiBarVY8j175iZNxajPTWB29ydgQY,18558
-armodel-1.8.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-armodel-1.8.6.dist-info/entry_points.txt,sha256=24xz9yK6gjxZ2IlHB23zY3_8M8rwrqAkWgElNBquUdA,550
-armodel-1.8.6.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
-armodel-1.8.6.dist-info/RECORD,,
+armodel-1.8.7.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
+armodel-1.8.7.dist-info/METADATA,sha256=S5j8x06NEeRCF0gQTj61HBAKiHxr6omUWNi6xDIoeA8,18709
+armodel-1.8.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+armodel-1.8.7.dist-info/entry_points.txt,sha256=24xz9yK6gjxZ2IlHB23zY3_8M8rwrqAkWgElNBquUdA,550
+armodel-1.8.7.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
+armodel-1.8.7.dist-info/RECORD,,