odxtools 6.7.0__py3-none-any.whl → 9.3.0__py3-none-any.whl

odxtools/__init__.py

@@ -62,11 +62,13 @@ References
 - _`[ISO22901]` The ISO 22901 Standard: https://www.iso.org/standard/41207.html
 
 """
-from .load_file import load_file as load_file  # noqa: F401
-from .load_odx_d_file import load_odx_d_file as load_odx_d_file  # noqa: F401
-from .load_pdx_file import load_pdx_file as load_pdx_file  # noqa: F401
+from .loadfile import load_directory as load_directory  # noqa: F401
+from .loadfile import load_file as load_file  # noqa: F401
+from .loadfile import load_files  # noqa: F401
+from .loadfile import load_odx_d_file as load_odx_d_file  # noqa: F401
+from .loadfile import load_pdx_file as load_pdx_file  # noqa: F401
 from .version import __version__ as __version__  # noqa: F401
-from .write_pdx_file import write_pdx_file as write_pdx_file  # noqa: F401
+from .writepdxfile import write_pdx_file as write_pdx_file  # noqa: F401
 
 __author__ = "Katrin Bauer"
 

odxtools/additionalaudience.py

@@ -1,15 +1,13 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List
+from typing import Any, Dict, List
 from xml.etree import ElementTree
 
 from .element import IdentifiableElement
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
+from .snrefcontext import SnRefContext
 from .utils import dataclass_fields_asdict
 
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
-
 
 @dataclass
 class AdditionalAudience(IdentifiableElement):
@@ -30,5 +28,5 @@ class AdditionalAudience(IdentifiableElement):
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
         pass
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
         pass

odxtools/admindata.py

@@ -1,14 +1,12 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional
 from xml.etree import ElementTree
 
 from .companydocinfo import CompanyDocInfo
 from .docrevision import DocRevision
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
-
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
+from .snrefcontext import SnRefContext
 
 
 @dataclass
@@ -54,9 +52,9 @@ class AdminData:
         for dr in self.doc_revisions:
             dr._resolve_odxlinks(odxlinks)
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
         for cdi in self.company_doc_infos:
-            cdi._resolve_snrefs(diag_layer)
+            cdi._resolve_snrefs(context)
 
         for dr in self.doc_revisions:
-            dr._resolve_snrefs(diag_layer)
+            dr._resolve_snrefs(context)

odxtools/audience.py

@@ -1,14 +1,13 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional
 from xml.etree import ElementTree
 
 from .additionalaudience import AdditionalAudience
+from .nameditemlist import NamedItemList
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
 from .odxtypes import odxstr_to_bool
-
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
+from .snrefcontext import SnRefContext
 
 
 @dataclass
@@ -47,11 +46,11 @@ class Audience:
         return self.is_aftermarket_raw in [None, True]
 
     @property
-    def enabled_audiences(self) -> List[AdditionalAudience]:
+    def enabled_audiences(self) -> NamedItemList[AdditionalAudience]:
         return self._enabled_audiences
 
     @property
-    def disabled_audiences(self) -> List[AdditionalAudience]:
+    def disabled_audiences(self) -> NamedItemList[AdditionalAudience]:
         return self._disabled_audiences
 
     @staticmethod
@@ -87,12 +86,10 @@ class Audience:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
-        self._enabled_audiences = [
-            odxlinks.resolve(ref, AdditionalAudience) for ref in self.enabled_audience_refs
-        ]
-        self._disabled_audiences = [
-            odxlinks.resolve(ref, AdditionalAudience) for ref in self.disabled_audience_refs
-        ]
+        self._enabled_audiences = NamedItemList(
+            [odxlinks.resolve(ref, AdditionalAudience) for ref in self.enabled_audience_refs])
+        self._disabled_audiences = NamedItemList(
+            [odxlinks.resolve(ref, AdditionalAudience) for ref in self.disabled_audience_refs])
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
         pass

odxtools/basecomparam.py

@@ -1,17 +1,15 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, cast
+from typing import Any, Dict, List, Optional, cast
 from xml.etree import ElementTree
 
 from .element import IdentifiableElement
 from .exceptions import odxraise, odxrequire
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
+from .snrefcontext import SnRefContext
 from .utils import dataclass_fields_asdict
 
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
-
 
 class StandardizationLevel(Enum):
     STANDARD = "STANDARD"
@@ -74,5 +72,5 @@ class BaseComparam(IdentifiableElement):
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
         pass
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
         pass

odxtools/basicstructure.py

@@ -1,34 +1,34 @@
 # SPDX-License-Identifier: MIT
-import warnings
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, cast
+from typing import Any, Dict, List, Optional
 from xml.etree import ElementTree
 
+from typing_extensions import override
+
+from .codec import (composite_codec_decode_from_pdu, composite_codec_encode_into_pdu,
+                    composite_codec_get_free_parameters, composite_codec_get_required_parameters,
+                    composite_codec_get_static_bit_length)
 from .complexdop import ComplexDop
-from .dataobjectproperty import DataObjectProperty
 from .decodestate import DecodeState
 from .encodestate import EncodeState
-from .exceptions import DecodeError, EncodeError, OdxWarning, odxassert, odxraise, strict_mode
+from .exceptions import DecodeError, odxraise
 from .nameditemlist import NamedItemList
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
-from .odxtypes import ParameterDict, ParameterValue, ParameterValueDict
-from .parameters.codedconstparameter import CodedConstParameter
+from .odxtypes import ParameterValue
 from .parameters.createanyparameter import create_any_parameter_from_et
-from .parameters.lengthkeyparameter import LengthKeyParameter
-from .parameters.matchingrequestparameter import MatchingRequestParameter
-from .parameters.nrcconstparameter import NrcConstParameter
 from .parameters.parameter import Parameter
-from .parameters.parameterwithdop import ParameterWithDOP
-from .parameters.physicalconstantparameter import PhysicalConstantParameter
-from .parameters.tablekeyparameter import TableKeyParameter
+from .snrefcontext import SnRefContext
 from .utils import dataclass_fields_asdict
 
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
-
 
 @dataclass
 class BasicStructure(ComplexDop):
+    """Base class for structure-like objects
+
+    "Structure-like" objects are structures as well as environment
+    data objects. All structure-like objects adhere to the
+    `CompositeCodec` type protocol.
+    """
     parameters: NamedItemList[Parameter]
     byte_size: Optional[int]
 
@@ -49,64 +49,20 @@ class BasicStructure(ComplexDop):
         return BasicStructure(parameters=parameters, byte_size=byte_size, **kwargs)
 
     def get_static_bit_length(self) -> Optional[int]:
-        # Explicit size was specified
-        if self.byte_size:
+        # Explicit size was specified, so we do not need to look at
+        # the list of parameters
+        if self.byte_size is not None:
             return 8 * self.byte_size
 
-        cursor = 0
-        length = 0
-        for param in self.parameters:
-            param_bit_length = param.get_static_bit_length()
-            if param_bit_length is None:
-                # We were not able to calculate a static bit length
-                return None
-            elif param.byte_position is not None:
-                bit_pos = param.bit_position or 0
-                byte_pos = param.byte_position or 0
-                cursor = byte_pos * 8 + bit_pos
-
-            cursor += param_bit_length
-            length = max(length, cursor)
-
-        # Round up to account for padding bits (all structures are
-        # byte aligned)
-        return ((length + 7) // 8) * 8
-
-    def coded_const_prefix(self, request_prefix: bytes = b'') -> bytes:
-        prefix = b''
-        encode_state = EncodeState(
-            bytearray(prefix), parameter_values={}, triggering_request=request_prefix)
-        for param in self.parameters:
-            if isinstance(param, (CodedConstParameter, NrcConstParameter, MatchingRequestParameter,
-                                  PhysicalConstantParameter)):
-                encode_state.coded_message = bytearray(param.encode_into_pdu(encode_state))
-            else:
-                break
-        return encode_state.coded_message
+        return composite_codec_get_static_bit_length(self)
 
     @property
     def required_parameters(self) -> List[Parameter]:
-        """Return the list of parameters which are required for
-        encoding the structure."""
-        return [p for p in self.parameters if p.is_required]
+        return composite_codec_get_required_parameters(self)
 
     @property
     def free_parameters(self) -> List[Parameter]:
-        """Return the list of parameters which can be freely specified by
-        the user when encoding the structure.
-
-        This means all required parameters plus the parameters that
-        can be omitted minus those which are implicitly specified by
-        the corresponding request (in the case of responses).
-
-        """
-        result: List[Parameter] = []
-        for param in self.parameters:
-            if not param.is_settable:
-                continue
-            result.append(param)
-
-        return result
+        return composite_codec_get_free_parameters(self)
 
     def print_free_parameters_info(self) -> None:
         """Return a human readable description of the structure's
@@ -116,186 +72,44 @@ class BasicStructure(ComplexDop):
 
         print(parameter_info(self.free_parameters), end="")
 
-    def convert_physical_to_internal(self,
-                                     param_value: ParameterValue,
-                                     triggering_coded_request: Optional[bytes],
-                                     is_end_of_pdu: bool = True) -> bytes:
-
-        if not isinstance(param_value, dict):
-            raise EncodeError(
-                f"Expected a dictionary for the values of structure {self.short_name}, "
-                f"got {type(param_value)}")
-
-        # in strict mode, ensure that no values for unknown parameters are specified.
-        if strict_mode:
-            param_names = [param.short_name for param in self.parameters]
-            for param_key in param_value:
-                if param_key not in param_names:
-                    odxraise(f"Value for unknown parameter '{param_key}' specified")
-
-        encode_state = EncodeState(
-            bytearray(),
-            dict(param_value),
-            triggering_request=triggering_coded_request,
-            is_end_of_pdu=False,
-        )
-
-        for param in self.parameters:
-            if param == self.parameters[-1]:
-                # The last parameter is at the end of the PDU if the
-                # structure itself is at the end of the PDU. TODO:
-                # This assumes that the last parameter specified in
-                # the ODX is located last in the PDU...
-                encode_state.is_end_of_pdu = is_end_of_pdu
-
-            if isinstance(
-                    param,
-                (LengthKeyParameter, TableKeyParameter)) and param.short_name in param_value:
-                # This is a hack to always encode a dummy value for
-                # length- and table keys. since these can be specified
-                # implicitly (i.e., by means of parameters that use
-                # these keys), to avoid getting an "overlapping
-                # parameter" warning, we must encode a value of zero
-                # into the PDU here and add the real value of the
-                # parameter in a post processing step.
-                tmp = encode_state.parameter_values.pop(param.short_name)
-                encode_state.coded_message = bytearray(param.encode_into_pdu(encode_state))
-                encode_state.parameter_values[param.short_name] = tmp
-                continue
-
-            encode_state.coded_message = bytearray(param.encode_into_pdu(encode_state))
-
-        if self.byte_size is not None and len(encode_state.coded_message) < self.byte_size:
-            # Padding bytes needed
-            encode_state.coded_message = encode_state.coded_message.ljust(self.byte_size, b"\0")
-
-        # encode the length- and table keys. This cannot be done above
-        # because we allow these to be defined implicitly (i.e. they
-        # are defined by their respective users)
-        for param in self.parameters:
-            if not isinstance(param, (LengthKeyParameter, TableKeyParameter)):
-                # the current parameter is neither a length- nor a table key
-                continue
-
-            # Encode the key parameter into the message
-            encode_state.coded_message = bytearray(param.encode_into_pdu(encode_state))
-
-        # Assert that length is as expected
-        self._validate_coded_message(encode_state.coded_message)
+    @override
+    def encode_into_pdu(self, physical_value: Optional[ParameterValue],
+                        encode_state: EncodeState) -> None:
+        orig_pos = encode_state.cursor_byte_position
 
-        return bytearray(encode_state.coded_message)
-
-    def _validate_coded_message(self, coded_message: bytes) -> None:
+        composite_codec_encode_into_pdu(self, physical_value, encode_state)
 
         if self.byte_size is not None:
-            # We definitely broke something if we didn't respect the explicit byte_size
-            odxassert(
-                len(coded_message) == self.byte_size,
-                "Verification of coded message {coded_message.hex()} failed: Incorrect size.")
-            # No need to check further
-            return
-
-        bit_length = self.get_static_bit_length()
-
-        if bit_length is None:
-            # Nothing to check
-            return
-
-        if len(coded_message) * 8 != bit_length:
-            # We may have broke something
-            # but it could be that bit_length was mis calculated and not the actual bytes are wrong
-            # Could happen with overlapping parameters and parameters with gaps
-            warnings.warn(
-                f"Verification of coded message '{coded_message.hex()}' possibly failed: Size may be incorrect.",
-                OdxWarning,
-                stacklevel=1)
-
-    def convert_physical_to_bytes(self,
-                                  physical_value: ParameterValue,
-                                  encode_state: EncodeState,
-                                  bit_position: int = 0) -> bytes:
-        if not isinstance(physical_value, dict):
-            raise EncodeError(
-                f"Expected a dictionary for the values of structure {self.short_name}, "
-                f"got {type(physical_value)}")
-        if bit_position != 0:
-            raise EncodeError("Structures must be aligned, i.e. bit_position=0, but "
-                              f"{self.short_name} was passed the bit position {bit_position}")
-        return self.convert_physical_to_internal(
-            physical_value,
-            triggering_coded_request=encode_state.triggering_request,
-            is_end_of_pdu=encode_state.is_end_of_pdu,
-        )
-
+            actual_len = encode_state.cursor_byte_position - orig_pos
+
+            if actual_len < self.byte_size:
+                # Padding bytes are needed. We add an empty object at
+                # the position directly after the structure and let
+                # EncodeState add the padding as needed.
+                encode_state.cursor_byte_position = encode_state.origin_byte_position + self.byte_size
+                # Padding bytes needed. these count as "used".
+                encode_state.coded_message += b"\x00" * (self.byte_size - actual_len)
+                encode_state.used_mask += b"\xff" * (self.byte_size - actual_len)
+
+    @override
     def decode_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
-        # move the origin since positions specified by sub-parameters of
-        # structures are relative to the beginning of the structure object.
-        orig_origin = decode_state.origin_byte_position
-        decode_state.origin_byte_position = decode_state.cursor_byte_position
+        orig_pos = decode_state.cursor_byte_position
 
-        result = {}
-        for param in self.parameters:
-            value = param.decode_from_pdu(decode_state)
+        result = composite_codec_decode_from_pdu(self, decode_state)
 
-            result[param.short_name] = value
+        if self.byte_size is not None:
+            n = decode_state.cursor_byte_position - orig_pos
+            if n > self.byte_size:
+                odxraise(
+                    f"Attempted to decode too large instance of structure "
+                    f"{self.short_name} ({n} instead at most "
+                    f"{self.byte_size} bytes)", DecodeError)
+                return result
 
-        # decoding of the structure finished. go back the original origin.
-        decode_state.origin_byte_position = orig_origin
+            decode_state.cursor_byte_position = orig_pos + self.byte_size
 
         return result
 
-    def encode(self, coded_request: Optional[bytes] = None, **params: ParameterValue) -> bytes:
-        """
-        Composes an UDS message as bytes for this service.
-        Parameters:
-        ----------
-        coded_request: bytes
-            coded request (only needed when encoding a response)
-        params: dict
-            Parameters of the RPC as mapping from SHORT-NAME of the parameter to the value
-        """
-        return self.convert_physical_to_internal(
-            params, triggering_coded_request=coded_request, is_end_of_pdu=True)
-
-    def decode(self, message: bytes) -> ParameterValueDict:
-        decode_state = DecodeState(coded_message=message)
-        param_values = self.decode_from_pdu(decode_state)
-
-        if len(message) != decode_state.cursor_byte_position:
-            odxraise(
-                f"The message {message.hex()} probably could not be completely parsed:"
-                f" Expected length of {decode_state.cursor_byte_position} but got {len(message)}.",
-                DecodeError)
-            return {}
-
-        if not isinstance(param_values, dict):
-            odxraise("Decoding structures must result in a dictionary")
-
-        return cast(ParameterValueDict, param_values)
-
-    def parameter_dict(self) -> ParameterDict:
-        """
-        Returns a dictionary with all parameter short names as keys.
-
-        The values are parameters for simple types or a nested dict for structures.
-        """
-        from .structure import Structure
-        odxassert(
-            all(not isinstance(p, ParameterWithDOP) or isinstance(p.dop, DataObjectProperty) or
-                isinstance(p.dop, Structure) for p in self.parameters))
-        param_dict: ParameterDict = {
-            p.short_name: p
-            for p in self.parameters
-            if not isinstance(p, ParameterWithDOP) or not isinstance(p.dop, Structure)
-        }
-        param_dict.update({
-            struct_param.short_name: struct_param.dop.parameter_dict()
-            for struct_param in self.parameters
-            if isinstance(struct_param, ParameterWithDOP) and
-            isinstance(struct_param.dop, BasicStructure)
-        })
-        return param_dict
-
     def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
         result = super()._build_odxlinks()
 
@@ -305,15 +119,16 @@ class BasicStructure(ComplexDop):
         return result
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
-        """Recursively resolve any references (odxlinks or sn-refs)"""
         super()._resolve_odxlinks(odxlinks)
 
         for param in self.parameters:
             param._resolve_odxlinks(odxlinks)
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
-        """Recursively resolve any references (odxlinks or sn-refs)"""
-        super()._resolve_snrefs(diag_layer)
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
+        context.parameters = self.parameters
 
+        super()._resolve_snrefs(context)
         for param in self.parameters:
-            param._resolve_snrefs(diag_layer)
+            param._resolve_snrefs(context)
+
+        context.parameters = None

odxtools/cli/_parser_utils.py

@@ -5,7 +5,7 @@ import argparse
 from typing import Any, Protocol, runtime_checkable
 
 from ..database import Database
-from ..load_file import load_file as _load_file
+from ..loadfile import load_file as _load_file
 
 
 @runtime_checkable