odxtools 9.7.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

odxtools/negoutputparam.py

@@ -1,17 +1,18 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List
+from typing import Any
 from xml.etree import ElementTree
 
 from .dopbase import DopBase
 from .element import NamedElement
 from .exceptions import odxrequire
-from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId, OdxLinkRef
 from .snrefcontext import SnRefContext
 from .utils import dataclass_fields_asdict
 
 
-@dataclass
+@dataclass(kw_only=True)
 class NegOutputParam(NamedElement):
     dop_base_ref: OdxLinkRef
 
@@ -21,15 +22,14 @@ class NegOutputParam(NamedElement):
         return self._dop
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "NegOutputParam":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "NegOutputParam":
 
-        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
-        dop_base_ref = odxrequire(OdxLinkRef.from_et(et_element.find("DOP-BASE-REF"), doc_frags))
+        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, context))
+        dop_base_ref = odxrequire(OdxLinkRef.from_et(et_element.find("DOP-BASE-REF"), context))
 
         return NegOutputParam(dop_base_ref=dop_base_ref, **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:

odxtools/obd.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: MIT
 from enum import IntEnum
-from typing import Optional
 
 
 class SID(IntEnum):
@@ -47,7 +46,7 @@ _sid_to_name = {
 }
 
 
-def sid_to_name(sid: int) -> Optional[str]:
+def sid_to_name(sid: int) -> str | None:
     if sid in _sid_to_name:
         return _sid_to_name[sid]
 

odxtools/odxcategory.py

@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: MIT
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING, Any
 from xml.etree import ElementTree
 
 from .admindata import AdminData
 from .companydata import CompanyData
 from .element import IdentifiableElement
-from .exceptions import odxrequire
 from .nameditemlist import NamedItemList
-from .odxlink import DocType, OdxDocFragment, OdxLinkDatabase, OdxLinkId
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId
 from .snrefcontext import SnRefContext
 from .specialdatagroup import SpecialDataGroup
 from .utils import dataclass_fields_asdict
@@ -17,41 +17,29 @@ if TYPE_CHECKING:
     from .database import Database
 
 
-@dataclass
+@dataclass(kw_only=True)
 class OdxCategory(IdentifiableElement):
     """This is the base class for all top-level container classes in ODX"""
 
-    admin_data: Optional[AdminData]
-    company_datas: NamedItemList[CompanyData]
-    sdgs: List[SpecialDataGroup]
+    admin_data: AdminData | None = None
+    company_datas: NamedItemList[CompanyData] = field(default_factory=NamedItemList)
+    sdgs: list[SpecialDataGroup] = field(default_factory=list)
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "OdxCategory":
-        raise Exception("Calling `._from_et()` is not allowed for OdxCategory. "
-                        "Use `OdxCategory.category_from_et()`!")
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "OdxCategory":
 
-    @staticmethod
-    def category_from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment], *,
-                         doc_type: DocType) -> "OdxCategory":
-
-        short_name = odxrequire(et_element.findtext("SHORT-NAME"))
-        # create the current ODX "document fragment" (description of the
-        # current document for references and IDs)
-        doc_frags = [OdxDocFragment(short_name, doc_type)]
-        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, context))
 
-        admin_data = AdminData.from_et(et_element.find("ADMIN-DATA"), doc_frags)
+        admin_data = AdminData.from_et(et_element.find("ADMIN-DATA"), context)
         company_datas = NamedItemList([
-            CompanyData.from_et(cde, doc_frags)
+            CompanyData.from_et(cde, context)
             for cde in et_element.iterfind("COMPANY-DATAS/COMPANY-DATA")
         ])
-        sdgs = [
-            SpecialDataGroup.from_et(sdge, doc_frags) for sdge in et_element.iterfind("SDGS/SDG")
-        ]
+        sdgs = [SpecialDataGroup.from_et(sdge, context) for sdge in et_element.iterfind("SDGS/SDG")]
 
         return OdxCategory(admin_data=admin_data, company_datas=company_datas, sdgs=sdgs, **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = {self.odx_id: self}
 
         if self.admin_data is not None:

odxtools/odxdoccontext.py

@@ -0,0 +1,16 @@
+from dataclasses import dataclass
+from typing import TYPE_CHECKING
+
+from packaging.version import Version
+
+if TYPE_CHECKING:
+    from odxtools.odxlink import OdxDocFragment
+
+
+@dataclass(slots=True, frozen=True)
+class OdxDocContext:
+    version: Version
+
+    # the doc_fragments are either tuple(doc_frag(category),)
+    # or tuple(doc_frag(category), doc_frag(diag_layer))
+    doc_fragments: tuple["OdxDocFragment"] | tuple["OdxDocFragment", "OdxDocFragment"]

odxtools/odxlink.py

@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: MIT
 import warnings
+from collections.abc import Iterable
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Dict, Iterable, List, Optional, Type, TypeVar, overload
+from typing import Any, Optional, TypeVar, overload
 from xml.etree import ElementTree
 
 from .exceptions import OdxWarning, odxassert, odxraise, odxrequire
 from .nameditemlist import OdxNamed, TNamed
+from .odxdoccontext import OdxDocContext
 
 
 class DocType(Enum):
@@ -44,7 +46,7 @@ class OdxLinkId:
 
     #: The name and type of the document fragment to which the
     #: `local_id` is relative to
-    doc_fragments: List[OdxDocFragment]
+    doc_fragments: tuple[OdxDocFragment] | tuple[OdxDocFragment, OdxDocFragment]
 
     def __hash__(self) -> int:
         # we do not hash about the document fragment here, because
@@ -67,8 +69,7 @@ class OdxLinkId:
         return f"OdxLinkId('{self.local_id}')"
 
     @staticmethod
-    def from_et(et: ElementTree.Element,
-                doc_fragments: List[OdxDocFragment]) -> Optional["OdxLinkId"]:
+    def from_et(et: ElementTree.Element, context: OdxDocContext) -> Optional["OdxLinkId"]:
         """Construct an OdxLinkId for a given XML node (ElementTree object).
 
         Returns None if the given XML node does not exhibit an ID.
@@ -78,7 +79,7 @@ class OdxLinkId:
         if local_id is None:
             return None
 
-        return OdxLinkId(local_id, doc_fragments)
+        return OdxLinkId(local_id, context.doc_fragments)
 
 
 @dataclass
@@ -94,7 +95,7 @@ class OdxLinkRef:
     ref_id: str
 
     #: The document fragments to which the `ref_id` refers to (in reverse order)
-    ref_docs: List[OdxDocFragment]
+    ref_docs: tuple[OdxDocFragment, ...]
 
     # TODO: this is difficult because OdxLinkRef is derived from and
     # we do not want having to specify it mandatorily
@@ -102,17 +103,16 @@ class OdxLinkRef:
 
     @overload
     @staticmethod
-    def from_et(et: None, source_doc_frags: List[OdxDocFragment]) -> None:
+    def from_et(et: None, context: OdxDocContext) -> None:
         ...
 
     @overload
     @staticmethod
-    def from_et(et: ElementTree.Element, source_doc_frags: List[OdxDocFragment]) -> "OdxLinkRef":
+    def from_et(et: ElementTree.Element, context: OdxDocContext) -> "OdxLinkRef":
         ...
 
     @staticmethod
-    def from_et(et: Optional[ElementTree.Element],
-                source_doc_frags: List[OdxDocFragment]) -> Optional["OdxLinkRef"]:
+    def from_et(et: ElementTree.Element | None, context: OdxDocContext) -> Optional["OdxLinkRef"]:
         """Construct an OdxLinkRef for a given XML node (ElementTree object).
 
         Returns None if the given XML node does not represent a reference.
@@ -143,10 +143,10 @@ class OdxLinkRef:
         # if the target document fragment is specified by the
         # reference, use it, else use the document fragment containing
         # the reference.
-        if docref is not None:
-            doc_frags = [OdxDocFragment(docref, odxrequire(doctype))]
+        if docref is None:
+            doc_frags = context.doc_fragments
         else:
-            doc_frags = source_doc_frags
+            doc_frags = (OdxDocFragment(docref, odxrequire(doctype)),)
 
         return OdxLinkRef(id_ref, doc_frags)
 
@@ -170,17 +170,17 @@ class OdxLinkDatabase:
     """
 
     def __init__(self) -> None:
-        self._db: Dict[OdxDocFragment, Dict[str, Any]] = {}
+        self._db: dict[OdxDocFragment, dict[str, Any]] = {}
 
     @overload
     def resolve(self, ref: OdxLinkRef, expected_type: None = None) -> Any:
         ...
 
     @overload
-    def resolve(self, ref: OdxLinkRef, expected_type: Type[T]) -> T:
+    def resolve(self, ref: OdxLinkRef, expected_type: type[T]) -> T:
         ...
 
-    def resolve(self, ref: OdxLinkRef, expected_type: Optional[Any] = None) -> Any:
+    def resolve(self, ref: OdxLinkRef, expected_type: Any | None = None) -> Any:
         """
         Resolve a reference to an object
 
@@ -219,12 +219,10 @@ class OdxLinkDatabase:
         ...
 
     @overload
-    def resolve_lenient(self, ref: OdxLinkRef, expected_type: Type[T]) -> Optional[T]:
+    def resolve_lenient(self, ref: OdxLinkRef, expected_type: type[T]) -> T | None:
         ...
 
-    def resolve_lenient(self,
-                        ref: OdxLinkRef,
-                        expected_type: Optional[Any] = None) -> Optional[Any]:
+    def resolve_lenient(self, ref: OdxLinkRef, expected_type: Any | None = None) -> Any | None:
         """
         Resolve a reference to an object
 
@@ -254,7 +252,7 @@ class OdxLinkDatabase:
 
         return None
 
-    def update(self, new_entries: Dict[OdxLinkId, Any], *, overwrite: bool = True) -> None:
+    def update(self, new_entries: dict[OdxLinkId, Any], *, overwrite: bool = True) -> None:
         """
         Add a bunch of new objects to the ODXLINK database.
 
@@ -287,7 +285,7 @@ def resolve_snref(target_short_name: str,
 @overload
 def resolve_snref(target_short_name: str,
                   items: Iterable[OdxNamed],
-                  expected_type: Type[TNamed],
+                  expected_type: type[TNamed],
                   *,
                   lenient: None = None) -> TNamed:
     ...
@@ -296,16 +294,16 @@ def resolve_snref(target_short_name: str,
 @overload
 def resolve_snref(target_short_name: str,
                   items: Iterable[OdxNamed],
-                  expected_type: Type[TNamed],
+                  expected_type: type[TNamed],
                   *,
-                  lenient: bool = True) -> Optional[TNamed]:
+                  lenient: bool = True) -> TNamed | None:
     ...
 
 
 def resolve_snref(target_short_name: str,
                   items: Iterable[OdxNamed],
                   expected_type: Any = None,
-                  lenient: Optional[bool] = None) -> Any:
+                  lenient: bool | None = None) -> Any:
     candidates = [x for x in items if x.short_name == target_short_name]
 
     if not candidates:

odxtools/odxtypes.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
+from collections.abc import Callable, Iterable
 from enum import Enum
-from typing import (TYPE_CHECKING, Any, Callable, Dict, Iterable, Optional, SupportsBytes, Tuple,
-                    Type, Union, overload)
+from typing import TYPE_CHECKING, Any, SupportsBytes, Union, overload
 from xml.etree import ElementTree
 
 from .exceptions import odxassert, odxraise, odxrequire
@@ -16,22 +16,22 @@ def bytefield_to_bytearray(bytefield: str) -> bytearray:
     return bytearray([int(x, 16) for x in bytes_string])
 
 
-BytesTypes = (bytearray, bytes, SupportsBytes)
-AtomicOdxType = Union[str, int, float, bytearray, bytes]
+BytesTypes = bytearray | bytes | SupportsBytes
+AtomicOdxType = str | int | float | BytesTypes
 
 # dictionary mapping short names to a Parameter that needs to be
 # specified. Complex parameters (structures) may contain
 # sub-parameters, so this is a recursive type...
-ParameterDict = Dict[str, Union["Parameter", "ParameterDict"]]
+ParameterDict = dict[str, Union["Parameter", "ParameterDict"]]
 
 # Dictionary mapping short names of parameters to the value it
 # exhibits. Complex parameters (structures) may contain
 # sub-parameters, so this is a recursive type, and fields encompass
 # multiple items, so this can be a list of objects.
-TableStructParameterValue = Tuple[str, "ParameterValue"]
+TableStructParameterValue = tuple[str, "ParameterValue"]
 ParameterValue = Union[AtomicOdxType, "ParameterValueDict", TableStructParameterValue,
                        Iterable["ParameterValue"], "DiagnosticTroubleCode"]
-ParameterValueDict = Dict[str, ParameterValue]
+ParameterValueDict = dict[str, ParameterValue]
 
 
 @overload
@@ -44,7 +44,7 @@ def odxstr_to_bool(str_val: str) -> bool:
     ...
 
 
-def odxstr_to_bool(str_val: Optional[str]) -> Optional[bool]:
+def odxstr_to_bool(str_val: str | None) -> bool | None:
     if str_val is None:
         return None
 
@@ -79,7 +79,7 @@ def parse_int(value: str) -> int:
 
 #: conversion functions for strings from the XML to the types stored
 #: by the internalized database
-_PARSE_ODX_TYPE: Dict[str, Callable[[str], AtomicOdxType]] = {
+_PARSE_ODX_TYPE: dict[str, Callable[[str], AtomicOdxType]] = {
     "A_INT32": parse_int,
     "A_UINT32": parse_int,
     "A_FLOAT32": float,
@@ -92,7 +92,7 @@ _PARSE_ODX_TYPE: Dict[str, Callable[[str], AtomicOdxType]] = {
 
 #: mapping from type name strings specified by the XML to the types
 #: used by the internalized database
-_ODX_TYPE_TO_PYTHON_TYPE: Dict[str, Type[AtomicOdxType]] = {
+_ODX_TYPE_TO_PYTHON_TYPE: dict[str, type[int | float | str | bytearray]] = {
     "A_INT32": int,
     "A_UINT32": int,
     "A_FLOAT32": float,
@@ -140,10 +140,13 @@ def compare_odx_values(a: AtomicOdxType, b: AtomicOdxType) -> int:
         if not isinstance(b, BytesTypes):
             odxraise()
 
-        obj_len = max(len(a), len(b))
+        a_bytes = bytes(a)
+        b_bytes = bytes(b)
 
-        tmp_a = a.ljust(obj_len, b'\x00')
-        tmp_b = b.ljust(obj_len, b'\x00')
+        obj_len = max(len(a_bytes), len(b_bytes))
+
+        tmp_a = a_bytes.ljust(obj_len, b'\x00')
+        tmp_b = b_bytes.ljust(obj_len, b'\x00')
 
         if tmp_a > tmp_b:
             return 1
@@ -193,7 +196,7 @@ class DataType(Enum):
     A_UTF8STRING = "A_UTF8STRING"
 
     @property
-    def python_type(self) -> Type[AtomicOdxType]:
+    def python_type(self) -> type[int | float | str | bytearray]:
         return _ODX_TYPE_TO_PYTHON_TYPE[self.value]
 
     @property
@@ -211,7 +214,7 @@ class DataType(Enum):
     def create_from_et(self, et_element: ElementTree.Element) -> AtomicOdxType:
         ...
 
-    def create_from_et(self, et_element: Optional[ElementTree.Element]) -> Optional[AtomicOdxType]:
+    def create_from_et(self, et_element: ElementTree.Element | None) -> AtomicOdxType | None:
         """
             Parse a V/VT value union and return an AtomicOdxType from them that match current datatype
             this includes, but not limited to COMPU-CONST, COMPU-DEFAULT-VALUE, COMPU-INVERSE-VALUE

odxtools/outputparam.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional
+from typing import Any
 from xml.etree import ElementTree
 
 from deprecation import deprecated
@@ -8,15 +8,16 @@ from deprecation import deprecated
 from .dopbase import DopBase
 from .element import IdentifiableElement
 from .exceptions import odxrequire
-from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
+from .odxdoccontext import OdxDocContext
+from .odxlink import OdxLinkDatabase, OdxLinkId, OdxLinkRef
 from .snrefcontext import SnRefContext
 from .utils import dataclass_fields_asdict
 
 
-@dataclass
+@dataclass(kw_only=True)
 class OutputParam(IdentifiableElement):
     dop_base_ref: OdxLinkRef
-    semantic: Optional[str]
+    semantic: str | None = None
 
     @property
     def dop(self) -> DopBase:
@@ -27,16 +28,16 @@ class OutputParam(IdentifiableElement):
         return self._dop
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "OutputParam":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "OutputParam":
 
-        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, context))
 
-        dop_base_ref = odxrequire(OdxLinkRef.from_et(et_element.find("DOP-BASE-REF"), doc_frags))
+        dop_base_ref = odxrequire(OdxLinkRef.from_et(et_element.find("DOP-BASE-REF"), context))
         semantic = et_element.get("SEMANTIC")
 
         return OutputParam(dop_base_ref=dop_base_ref, semantic=semantic, **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:

odxtools/parameterinfo.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 import textwrap
+from collections.abc import Iterable
 from io import StringIO
-from typing import Iterable
 
 from .compumethods.compucodecompumethod import CompuCodeCompuMethod
 from .compumethods.identicalcompumethod import IdenticalCompuMethod

odxtools/parameters/codedconstparameter.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 import warnings
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -11,13 +11,14 @@ from ..decodestate import DecodeState
 from ..diagcodedtype import DiagCodedType
 from ..encodestate import EncodeState
 from ..exceptions import DecodeError, EncodeError, odxraise, odxrequire
-from ..odxlink import OdxDocFragment, OdxLinkId
+from ..odxdoccontext import OdxDocContext
+from ..odxlink import OdxLinkId
 from ..odxtypes import AtomicOdxType, DataType, ParameterValue
 from ..utils import dataclass_fields_asdict
 from .parameter import Parameter, ParameterType
 
 
-@dataclass
+@dataclass(kw_only=True)
 class CodedConstParameter(Parameter):
 
     coded_value_raw: str
@@ -44,14 +45,13 @@ class CodedConstParameter(Parameter):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "CodedConstParameter":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "CodedConstParameter":
 
-        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, context))
 
         coded_value_raw = odxrequire(et_element.findtext("CODED-VALUE"))
         dct_elem = odxrequire(et_element.find("DIAG-CODED-TYPE"))
-        diag_coded_type = create_any_diag_coded_type_from_et(dct_elem, doc_frags)
+        diag_coded_type = create_any_diag_coded_type_from_et(dct_elem, context)
 
         return CodedConstParameter(
             coded_value_raw=coded_value_raw, diag_coded_type=diag_coded_type, **kwargs)
@@ -61,7 +61,7 @@ class CodedConstParameter(Parameter):
             AtomicOdxType, self.diag_coded_type.base_data_type.from_string(self.coded_value_raw))
 
     @override
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = super()._build_odxlinks()
 
         result.update(self.diag_coded_type._build_odxlinks())
@@ -69,7 +69,7 @@ class CodedConstParameter(Parameter):
         return result
 
     @override
-    def get_static_bit_length(self) -> Optional[int]:
+    def get_static_bit_length(self) -> int | None:
         return self.diag_coded_type.get_static_bit_length()
 
     @property
@@ -77,7 +77,7 @@ class CodedConstParameter(Parameter):
         return self.diag_coded_type.base_data_type
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         if physical_value is not None and physical_value != self.coded_value:
             odxraise(

odxtools/parameters/createanyparameter.py

@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: MIT
-from typing import List
 from xml.etree import ElementTree
 
 from ..exceptions import odxraise
 from ..globals import xsi
-from ..odxlink import OdxDocFragment
+from ..odxdoccontext import OdxDocContext
 from .codedconstparameter import CodedConstParameter
 from .dynamicparameter import DynamicParameter
 from .lengthkeyparameter import LengthKeyParameter
@@ -21,35 +20,35 @@ from .valueparameter import ValueParameter
 
 
 def create_any_parameter_from_et(et_element: ElementTree.Element,
-                                 doc_frags: List[OdxDocFragment]) \
+                                 context: OdxDocContext) \
                                  -> Parameter:
     parameter_type = et_element.get(f"{xsi}type")
 
     # Which attributes are set depends on the type of the parameter.
     if parameter_type == "VALUE":
-        return ValueParameter.from_et(et_element, doc_frags)
+        return ValueParameter.from_et(et_element, context)
     elif parameter_type == "CODED-CONST":
-        return CodedConstParameter.from_et(et_element, doc_frags)
+        return CodedConstParameter.from_et(et_element, context)
     elif parameter_type == "PHYS-CONST":
-        return PhysicalConstantParameter.from_et(et_element, doc_frags)
+        return PhysicalConstantParameter.from_et(et_element, context)
     elif parameter_type == "SYSTEM":
-        return SystemParameter.from_et(et_element, doc_frags)
+        return SystemParameter.from_et(et_element, context)
     elif parameter_type == "LENGTH-KEY":
-        return LengthKeyParameter.from_et(et_element, doc_frags)
+        return LengthKeyParameter.from_et(et_element, context)
     elif parameter_type == "NRC-CONST":
-        return NrcConstParameter.from_et(et_element, doc_frags)
+        return NrcConstParameter.from_et(et_element, context)
     elif parameter_type == "RESERVED":
-        return ReservedParameter.from_et(et_element, doc_frags)
+        return ReservedParameter.from_et(et_element, context)
     elif parameter_type == "MATCHING-REQUEST-PARAM":
-        return MatchingRequestParameter.from_et(et_element, doc_frags)
+        return MatchingRequestParameter.from_et(et_element, context)
     elif parameter_type == "DYNAMIC":
-        return DynamicParameter.from_et(et_element, doc_frags)
+        return DynamicParameter.from_et(et_element, context)
     elif parameter_type == "TABLE-STRUCT":
-        return TableStructParameter.from_et(et_element, doc_frags)
+        return TableStructParameter.from_et(et_element, context)
     elif parameter_type == "TABLE-KEY":
-        return TableKeyParameter.from_et(et_element, doc_frags)
+        return TableKeyParameter.from_et(et_element, context)
     elif parameter_type == "TABLE-ENTRY":
-        return TableEntryParameter.from_et(et_element, doc_frags)
+        return TableEntryParameter.from_et(et_element, context)
 
     odxraise(f"I don't know about parameters of type {parameter_type}", NotImplementedError)
-    return Parameter.from_et(et_element, doc_frags)
+    return Parameter.from_et(et_element, context)

odxtools/parameters/dynamicparameter.py

@@ -1,19 +1,18 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import List, Optional
 from xml.etree import ElementTree
 
 from typing_extensions import override
 
 from ..decodestate import DecodeState
 from ..encodestate import EncodeState
-from ..odxlink import OdxDocFragment
+from ..odxdoccontext import OdxDocContext
 from ..odxtypes import ParameterValue
 from ..utils import dataclass_fields_asdict
 from .parameter import Parameter, ParameterType
 
 
-@dataclass
+@dataclass(kw_only=True)
 class DynamicParameter(Parameter):
 
     @property
@@ -33,15 +32,14 @@ class DynamicParameter(Parameter):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "DynamicParameter":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "DynamicParameter":
 
-        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, context))
 
         return DynamicParameter(**kwargs)
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         raise NotImplementedError("Encoding DynamicParameter is not implemented yet.")