odxtools 10.2.0__py3-none-any.whl → 10.2.1__py3-none-any.whl

odxtools/diaglayers/diaglayer.py

@@ -7,6 +7,7 @@ from itertools import chain
 from typing import Any, Union, cast
 from xml.etree import ElementTree
 
+from ..additionalaudience import AdditionalAudience
 from ..admindata import AdminData
 from ..companydata import CompanyData
 from ..description import Description
@@ -14,6 +15,7 @@ from ..diagcomm import DiagComm
 from ..diagdatadictionaryspec import DiagDataDictionarySpec
 from ..diagservice import DiagService
 from ..exceptions import DecodeError, odxassert, odxraise
+from ..functionalclass import FunctionalClass
 from ..library import Library
 from ..message import Message
 from ..nameditemlist import NamedItemList, TNamed
@@ -26,6 +28,7 @@ from ..servicebinner import ServiceBinner
 from ..singleecujob import SingleEcuJob
 from ..snrefcontext import SnRefContext
 from ..specialdatagroup import SpecialDataGroup
+from ..statechart import StateChart
 from ..subcomponent import SubComponent
 from ..unitgroup import UnitGroup
 from .diaglayerraw import DiagLayerRaw
@@ -223,12 +226,30 @@ class DiagLayer:
     def admin_data(self) -> AdminData | None:
         return self.diag_layer_raw.admin_data
 
+    @property
+    def company_datas(self) -> NamedItemList[CompanyData]:
+        return self.diag_layer_raw.company_datas
+
+    @property
+    def functional_classes(self) -> NamedItemList[FunctionalClass]:
+        return self.diag_layer_raw.functional_classes
+
+    @property
+    def diag_data_dictionary_spec(self) -> DiagDataDictionarySpec:
+        """The DiagDataDictionarySpec applicable to this DiagLayer"""
+        return self._diag_data_dictionary_spec
+
+    @property
+    def diag_comms_raw(self) -> list[OdxLinkRef | DiagComm]:
+        return self.diag_layer_raw.diag_comms_raw
+
     @property
     def diag_comms(self) -> NamedItemList[DiagComm]:
         return self.diag_layer_raw.diag_comms
 
     @property
     def services(self) -> NamedItemList[DiagService]:
+        """This is an alias for `.diag_services`"""
         return self.diag_layer_raw.services
 
     @property
@@ -239,10 +260,6 @@ class DiagLayer:
     def single_ecu_jobs(self) -> NamedItemList[SingleEcuJob]:
         return self.diag_layer_raw.single_ecu_jobs
 
-    @property
-    def company_datas(self) -> NamedItemList[CompanyData]:
-        return self.diag_layer_raw.company_datas
-
     @property
     def requests(self) -> NamedItemList[Request]:
         return self.diag_layer_raw.requests
@@ -264,21 +281,24 @@ class DiagLayer:
         return self.diag_layer_raw.import_refs
 
     @property
-    def libraries(self) -> NamedItemList[Library]:
-        return self.diag_layer_raw.libraries
+    def state_charts(self) -> NamedItemList[StateChart]:
+        return self.diag_layer_raw.state_charts
+
+    @property
+    def additional_audiences(self) -> NamedItemList[AdditionalAudience]:
+        return self.diag_layer_raw.additional_audiences
 
     @property
     def sub_components(self) -> NamedItemList[SubComponent]:
         return self.diag_layer_raw.sub_components
 
     @property
-    def sdgs(self) -> list[SpecialDataGroup]:
-        return self.diag_layer_raw.sdgs
+    def libraries(self) -> NamedItemList[Library]:
+        return self.diag_layer_raw.libraries
 
     @property
-    def diag_data_dictionary_spec(self) -> DiagDataDictionarySpec:
-        """The DiagDataDictionarySpec applicable to this DiagLayer"""
-        return self._diag_data_dictionary_spec
+    def sdgs(self) -> list[SpecialDataGroup]:
+        return self.diag_layer_raw.sdgs
 
     #####
     # </properties forwarded to the "raw" diag layer>

odxtools/diaglayers/ecuvariant.py

@@ -33,6 +33,18 @@ class EcuVariant(HierarchyElement):
     def diag_variables_raw(self) -> list[DiagVariable | OdxLinkRef]:
         return self.ecu_variant_raw.diag_variables_raw
 
+    @property
+    def diag_variables(self) -> NamedItemList[DiagVariable]:
+        return self._diag_variables
+
+    @property
+    def variable_groups(self) -> NamedItemList[VariableGroup]:
+        return self._variable_groups
+
+    @property
+    def ecu_variant_patterns(self) -> list[EcuVariantPattern]:
+        return self.ecu_variant_raw.ecu_variant_patterns
+
     @property
     def dyn_defined_spec(self) -> DynDefinedSpec | None:
         return self.ecu_variant_raw.dyn_defined_spec
@@ -56,25 +68,6 @@ class EcuVariant(HierarchyElement):
 
         return None
 
-    @property
-    def ecu_variant_patterns(self) -> list[EcuVariantPattern]:
-        return self.ecu_variant_raw.ecu_variant_patterns
-
-    #######
-    # <properties subject to value inheritance>
-    #######
-    @property
-    def diag_variables(self) -> NamedItemList[DiagVariable]:
-        return self._diag_variables
-
-    @property
-    def variable_groups(self) -> NamedItemList[VariableGroup]:
-        return self._variable_groups
-
-    #######
-    # </properties subject to value inheritance>
-    #######
-
     @staticmethod
     def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "EcuVariant":
         ecu_variant_raw = EcuVariantRaw.from_et(et_element, context)

odxtools/diaglayers/hierarchyelement.py

@@ -438,6 +438,11 @@ class HierarchyElement(DiagLayer):
     #######
     # <properties subject to value inheritance>
     #######
+    @property
+    def functional_classes(self) -> NamedItemList[FunctionalClass]:
+        """All functional classes applicable to this DiagLayer"""
+        return self._functional_classes
+
     @property
     def diag_data_dictionary_spec(self) -> DiagDataDictionarySpec:
         return self._diag_data_dictionary_spec
@@ -480,11 +485,6 @@ class HierarchyElement(DiagLayer):
         """All global negative responses applicable to this DiagLayer"""
         return self._global_negative_responses
 
-    @property
-    def functional_classes(self) -> NamedItemList[FunctionalClass]:
-        """All functional classes applicable to this DiagLayer"""
-        return self._functional_classes
-
     @property
     def state_charts(self) -> NamedItemList[StateChart]:
         """All state charts applicable to this DiagLayer"""

odxtools/diaglayers/protocol.py

@@ -7,6 +7,8 @@ from xml.etree import ElementTree
 from ..comparamspec import ComparamSpec
 from ..exceptions import odxassert
 from ..odxdoccontext import OdxDocContext
+from ..odxlink import OdxLinkRef
+from ..parentref import ParentRef
 from ..protstack import ProtStack
 from .hierarchyelement import HierarchyElement
 from .protocolraw import ProtocolRaw
@@ -24,14 +26,26 @@ class Protocol(HierarchyElement):
     def protocol_raw(self) -> ProtocolRaw:
         return cast(ProtocolRaw, self.diag_layer_raw)
 
+    @property
+    def comparam_spec_ref(self) -> OdxLinkRef:
+        return self.protocol_raw.comparam_spec_ref
+
     @property
     def comparam_spec(self) -> ComparamSpec:
         return self.protocol_raw.comparam_spec
 
+    @property
+    def prot_stack_snref(self) -> str | None:
+        return self.protocol_raw.prot_stack_snref
+
     @property
     def prot_stack(self) -> ProtStack | None:
         return self.protocol_raw.prot_stack
 
+    @property
+    def parent_refs(self) -> list[ParentRef]:
+        return self.protocol_raw.parent_refs
+
     @staticmethod
     def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "Protocol":
         protocol_raw = ProtocolRaw.from_et(et_element, context)

odxtools/odxlink.py

@@ -204,8 +204,10 @@ class OdxLinkDatabase:
             # locate an object exhibiting with the referenced local ID
             # in the ID database for the document fragment
             if (obj := doc_frag_db.get(ref.ref_id)) is not None:
-                if expected_type is not None:
-                    odxassert(isinstance(obj, expected_type))
+                if expected_type is not None and not isinstance(obj, expected_type):
+                    odxraise(f"Referenced object for link {ref.ref_id} is of type "
+                             f"{type(obj).__name__} which is not a subclass of expected "
+                             f"type {expected_type.__name__}")
 
                 return obj
 

odxtools/subcomponentparamconnector.py

@@ -77,7 +77,7 @@ class SubComponentParamConnector(IdentifiableElement):
                                 odxrequire(context.diag_layer).diag_comms, DiagService)
         self._service = service
 
-        if self._service.request is not None:
+        if self._service.request is None:
             odxraise()
             return
         if not self._service.positive_responses:

odxtools/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '10.2.0'
-__version_tuple__ = version_tuple = (10, 2, 0)
+__version__ = version = '10.2.1'
+__version_tuple__ = version_tuple = (10, 2, 1)

{odxtools-10.2.0.dist-info → odxtools-10.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odxtools
-Version: 10.2.0
+Version: 10.2.1
 Summary: Utilities to work with the ODX standard for automotive diagnostics
 Author-email: Katrin Bauer <katrin.bauer@mbition.io>, Andreas Lauser <andreas.lauser@mbition.io>, Ayoub Kaanich <kayoub5@live.com>
 Maintainer-email: Andreas Lauser <andreas.lauser@mbition.io>, Ayoub Kaanich <kayoub5@live.com>

{odxtools-10.2.0.dist-info → odxtools-10.2.1.dist-info}/RECORD

@@ -107,7 +107,7 @@ odxtools/negoutputparam.py,sha256=-uP34wmnBYz_wwxJDRWYsqMIVqRdrBpjhw15Ctyvs0E,12
 odxtools/obd.py,sha256=hjTvs7DD6_JngNOH_b362L7X6zcpNsmoY6d8DDxQoZI,1829
 odxtools/odxcategory.py,sha256=hZ3_BBJFA5cNVZ8Rd2vlsbEV_qU6zECXtUJ8H-mg6Fk,2664
 odxtools/odxdoccontext.py,sha256=QjdOp7jwtJVgyGwzPBH_a35xqdS24WJmlF6uNqLrp9U,460
-odxtools/odxlink.py,sha256=dg72A5i104f79dbStJb19zfQUMNODkQsC-JNMn7v7zM,10593
+odxtools/odxlink.py,sha256=me0Y5yoXv6HsFGPQjo99hSt1GxpzllJlwIy0nhgpcdQ,10807
 odxtools/odxtypes.py,sha256=uhlKergX9Mutax_gf-bsyf_LJwF-t18HoYt2OXcimf0,8208
 odxtools/outputparam.py,sha256=oijoIXChUY7Jwds4x7OeIiyp5VTEivi61Sj5oVPjQMY,1477
 odxtools/ownident.py,sha256=beX1glfBfG-s9hMD6qT_cGMZLln7LYt2X8uY4R_-_Zo,1146
@@ -154,7 +154,7 @@ odxtools/statetransitionref.py,sha256=j5vmWpTF4RsgS75GTLkAIgGcbkG3wtgPvIthIQOBjM
 odxtools/staticfield.py,sha256=pVJNbdtO9-Vnf4atzpmLWzcHAII6sXnQmwBsVZ36Y3E,4477
 odxtools/structure.py,sha256=LsGejNUEyXOe1tI69lAPzxpLnX_GKDd4pwGcLvV40Yw,844
 odxtools/subcomponent.py,sha256=PO-Fi2qUS3IX7nPJyCciCiPUo-Vk4g3eznETTb_FrkE,4752
-odxtools/subcomponentparamconnector.py,sha256=TY8bfwlwYDi2mD2qqgNMN6PXShUZPzO-ep0gxgnLesQ,3964
+odxtools/subcomponentparamconnector.py,sha256=Oqt5jFXbjOtAfZFcYskiARyxW6-mLk58PAOb0WvOzsE,3960
 odxtools/subcomponentpattern.py,sha256=G7dAAJD_cN1QrKRgl6UTIj_o9trbkounJ-IHZGtau2k,1404
 odxtools/swvariable.py,sha256=3OsXxWhKFomNPd6ASvgMr67CB7G0Sm3tBQg1fMTc7C4,679
 odxtools/table.py,sha256=7JCxtclipAbbwvsJ9Gy1jYMU9OdYoAYkvjm2VpqeVWk,4978
@@ -178,7 +178,7 @@ odxtools/validtype.py,sha256=exe5OIqoIWgsgEm1t54pyk-U2m61DgBWI0Gew8rNYFc,194
 odxtools/variablegroup.py,sha256=o2hHupTvYSAJgOK8YOG9-VjXZpOMQ9vp9Sssu6RvN6E,834
 odxtools/variantmatcher.py,sha256=5Dad4WHHkQT6US8tnFoXxqO4wo2yGhCez_EpmnljfX4,8289
 odxtools/variantpattern.py,sha256=Mt2iXrlHvdo2EZtWq_tTqOqD-MxsaMUumQLcOpTkFR8,1406
-odxtools/version.py,sha256=SZPRsJtjzCo-uujoU7-r_xkH3WFdZZh3Z80jCyCOJVg,513
+odxtools/version.py,sha256=n-m0uzfNiaOnNZiQObPm6Fv9pffKHdK3pGoS5Y0ivH8,513
 odxtools/writepdxfile.py,sha256=I1FHKYUrUSir8XQB6Q-a0pA3Xfzem7GkM9pPnwUi7ME,9141
 odxtools/xdoc.py,sha256=Ymir_UH5dz8h-T4_kVCm2M_zyip7lDSnQ_wJvu-BCAA,1463
 odxtools/cli/__init__.py,sha256=T7ano_FIyzBASxYpmcA5VJXU5bQLIy_Qk0HE_SDKelY,106
@@ -216,18 +216,18 @@ odxtools/compumethods/tabintpcompumethod.py,sha256=Jb57a3xKtFreZmwDdvKbmPQ4Dg0fR
 odxtools/compumethods/texttablecompumethod.py,sha256=0aLSPsOsb3XgP1aj13CkpDfSi4PIZID6ErnAXiQgtZo,5957
 odxtools/diaglayers/basevariant.py,sha256=urQiHezdLQ2TM6X8LfPTQHIMELxAP_CKFiHxZI3JKzQ,4660
 odxtools/diaglayers/basevariantraw.py,sha256=y7yujzGooVuPuX0bAtCNcvSCSrKQObgmyNABI5Pypyc,4994
-odxtools/diaglayers/diaglayer.py,sha256=iGeEm59oHMe5FTxo1yhakKLILe9HmfRNMAwDv4UBV9c,16279
+odxtools/diaglayers/diaglayer.py,sha256=KXF9R6ZmtYOn52VEHt-Yvl72D8eODqV0LVl49TsQKyw,16992
 odxtools/diaglayers/diaglayerraw.py,sha256=cS3w4FcjuTPZ06wyfXPRrI99X_zsx9vjbaDwFCyGzn4,13059
 odxtools/diaglayers/diaglayertype.py,sha256=o1Vz6ycSqkDGNxNErcqpXUs0SAk9c4NSmxPDGWlufOE,1316
 odxtools/diaglayers/ecushareddata.py,sha256=2mg6bS50oSJlpqYDgRfXqPbkZHSvY4fFF3b_VwBhPwE,3336
 odxtools/diaglayers/ecushareddataraw.py,sha256=APSi5JRkzA7kcpz5ihKva4Gskh0NNxwnS3RK4G3H6I0,3376
-odxtools/diaglayers/ecuvariant.py,sha256=4OMGAN3u9QEcfnpluKPMJLImOnY_QWzq685CrTCVDgw,4878
+odxtools/diaglayers/ecuvariant.py,sha256=bZsG2QEwwZsThb2jylYE52zS6PEep2SQwP6xx-V_N_g,4732
 odxtools/diaglayers/ecuvariantraw.py,sha256=wlyLX50zYx3Ai7AADU6G4MCnH0kIkj9CzPTagT7TSUA,4993
 odxtools/diaglayers/functionalgroup.py,sha256=unQkoHGdRHCQi-ENJYxCbhGtuWLWD0UpDHAe1hNLKQA,4108
 odxtools/diaglayers/functionalgroupraw.py,sha256=QNtJfMXWwHXxNRCnszbAjN8Y615Vw4neRA1RrfIzv3M,3992
-odxtools/diaglayers/hierarchyelement.py,sha256=m-m7IT6rovNDjm3K-SqKiFK1q1680KUs6rQsvOYf17s,36420
+odxtools/diaglayers/hierarchyelement.py,sha256=mfjfj0X3mnDCx550YkJu8OEtq4FcP1HbpRDEbxnpktY,36420
 odxtools/diaglayers/hierarchyelementraw.py,sha256=WKA6YlH11Wrc1KUQXrJYBeDIe-DrKvEFWyjEtkjaj_c,2049
-odxtools/diaglayers/protocol.py,sha256=Cfu3LNy259R-IP9n_hFVOX6lWbX3B_-UkAg7RYjKcjs,2066
+odxtools/diaglayers/protocol.py,sha256=1Bc5ICvihzjjitwZ3x2N9-4-N_gyuvJwQTiWUm6O7V0,2463
 odxtools/diaglayers/protocolraw.py,sha256=qWlpec5NfjFuBOb-5phStJXelRbwl8yFGpnI1L68moI,3199
 odxtools/parameters/codedconstparameter.py,sha256=v7f_4FNx8eRWeOD8Y4Hx3LBhNCP_4e5AqOfoy3hyB7o,3907
 odxtools/parameters/createanyparameter.py,sha256=fMkf0HJ6RHzOvu6Ib6vQIMBkdCblKtZ4K-PG0lthwWU,2512
@@ -314,9 +314,9 @@ odxtools/templates/macros/printStructure.xml.jinja2,sha256=M8p82SlgKaDk6nJA-0wr6
 odxtools/templates/macros/printSubComponent.xml.jinja2,sha256=R3DxnK6NysUQL84uf2kGYMoF_VVym2l7H-J0JZ1uLKc,3416
 odxtools/templates/macros/printTable.xml.jinja2,sha256=iMmq4tSFl_nc44HNdFqzk4XLYjrbQ73cKm7kMVdRLmc,3336
 odxtools/templates/macros/printUnitSpec.xml.jinja2,sha256=pgZdrPdWi3OGtDIFNpEDz_TQs103uuRQoDdmGkNffOM,2878
-odxtools-10.2.0.dist-info/licenses/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
-odxtools-10.2.0.dist-info/METADATA,sha256=NqMX_3pAHCVaO9ZR66tv5_eABeOKBXaN1lrHfFdFHCY,44025
-odxtools-10.2.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-odxtools-10.2.0.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
-odxtools-10.2.0.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
-odxtools-10.2.0.dist-info/RECORD,,
+odxtools-10.2.1.dist-info/licenses/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
+odxtools-10.2.1.dist-info/METADATA,sha256=NMsvH9So436uodI5M5POSIQNee3Y1Y9pxw0WUbVuvoA,44025
+odxtools-10.2.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+odxtools-10.2.1.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
+odxtools-10.2.1.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
+odxtools-10.2.1.dist-info/RECORD,,

{odxtools-10.2.0.dist-info → odxtools-10.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any