odxtools 10.0.0__py3-none-any.whl → 10.1.1__py3-none-any.whl

odxtools/odxcategory.py

@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: MIT
-from dataclasses import dataclass
+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,37 +17,25 @@ 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: AdminData | None
-    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)
 

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

@@ -8,6 +8,7 @@ from xml.etree import ElementTree
 
 from .exceptions import OdxWarning, odxassert, odxraise, odxrequire
 from .nameditemlist import OdxNamed, TNamed
+from .odxdoccontext import OdxDocContext
 
 
 class DocType(Enum):
@@ -45,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
@@ -68,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.
@@ -79,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
@@ -95,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
@@ -103,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: ElementTree.Element | None,
-                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.
@@ -144,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)
 

odxtools/odxtypes.py

@@ -109,8 +109,8 @@ def compare_odx_values(a: AtomicOdxType, b: AtomicOdxType) -> int:
     # specification. (cf section 7.3.6.5)
 
     # numeric values are compared numerically (duh!)
-    if isinstance(a, int | float):
-        if not isinstance(b, int | float):
+    if isinstance(a, (int, float)):
+        if not isinstance(b, (int, float)):
             odxraise()
 
         tmp = a - b
@@ -239,7 +239,7 @@ class DataType(Enum):
         expected_type = self.python_type
         if isinstance(value, expected_type):
             return True
-        elif expected_type is float and isinstance(value, int | float):
+        elif expected_type is float and isinstance(value, (int, float)):
             return True
         elif self == DataType.A_BYTEFIELD and isinstance(value, BytesTypes):
             return True

odxtools/outputparam.py

@@ -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: str | None
+    semantic: str | None = None
 
     @property
     def dop(self) -> DopBase:
@@ -27,11 +28,11 @@ 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)

odxtools/parameters/codedconstparameter.py

@@ -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)

odxtools/parameters/createanyparameter.py

@@ -3,7 +3,7 @@ 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
@@ -20,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

@@ -6,13 +6,13 @@ 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
@@ -32,10 +32,9 @@ 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)
 

odxtools/parameters/lengthkeyparameter.py

@@ -8,14 +8,15 @@ from typing_extensions import final, override
 from ..decodestate import DecodeState
 from ..encodestate import EncodeState
 from ..exceptions import EncodeError, odxraise, odxrequire
-from ..odxlink import OdxDocFragment, OdxLinkId
+from ..odxdoccontext import OdxDocContext
+from ..odxlink import OdxLinkId
 from ..odxtypes import ParameterValue
 from ..utils import dataclass_fields_asdict
 from .parameter import ParameterType
 from .parameterwithdop import ParameterWithDOP
 
 
-@dataclass
+@dataclass(kw_only=True)
 class LengthKeyParameter(ParameterWithDOP):
     """Length Keys specify the bit (!) length of another parameter.
 
@@ -48,12 +49,11 @@ class LengthKeyParameter(ParameterWithDOP):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: list[OdxDocFragment]) -> "LengthKeyParameter":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "LengthKeyParameter":
 
-        kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, context))
 
-        odx_id = odxrequire(OdxLinkId.from_et(et_element, doc_frags))
+        odx_id = odxrequire(OdxLinkId.from_et(et_element, context))
 
         return LengthKeyParameter(odx_id=odx_id, **kwargs)
 

odxtools/parameters/matchingrequestparameter.py

@@ -7,13 +7,13 @@ from typing_extensions import override
 from ..decodestate import DecodeState
 from ..encodestate import EncodeState
 from ..exceptions import EncodeError, odxraise, odxrequire
-from ..odxlink import OdxDocFragment
+from ..odxdoccontext import OdxDocContext
 from ..odxtypes import DataType, ParameterValue
 from ..utils import dataclass_fields_asdict
 from .parameter import Parameter, ParameterType
 
 
-@dataclass
+@dataclass(kw_only=True)
 class MatchingRequestParameter(Parameter):
     request_byte_position: int
     byte_length: int
@@ -36,9 +36,9 @@ class MatchingRequestParameter(Parameter):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: list[OdxDocFragment]) -> "MatchingRequestParameter":
+                context: OdxDocContext) -> "MatchingRequestParameter":
 
-        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, context))
 
         request_byte_position = int(odxrequire(et_element.findtext("REQUEST-BYTE-POS")))
         byte_length = int(odxrequire(et_element.findtext("BYTE-LENGTH")))

odxtools/parameters/nrcconstparameter.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any
 from xml.etree import ElementTree
 
@@ -10,13 +10,14 @@ from ..decodestate import DecodeState
 from ..diagcodedtype import DiagCodedType
 from ..encodestate import EncodeState
 from ..exceptions import DecodeMismatch, 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 NrcConstParameter(Parameter):
     """A parameter of type NRC-CONST defines a set of values to be
     matched for a negative response object to apply
@@ -34,7 +35,7 @@ class NrcConstParameter(Parameter):
 
     """
 
-    coded_values_raw: list[str]
+    coded_values_raw: list[str] = field(default_factory=list)
     diag_coded_type: DiagCodedType
 
     @property
@@ -62,16 +63,15 @@ class NrcConstParameter(Parameter):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: list[OdxDocFragment]) -> "NrcConstParameter":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "NrcConstParameter":
 
-        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, context))
 
         coded_values_raw = [
             odxrequire(x.text) for x in et_element.iterfind("CODED-VALUES/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 NrcConstParameter(
             coded_values_raw=coded_values_raw, diag_coded_type=diag_coded_type, **kwargs)

odxtools/parameters/parameter.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any, Literal
 from xml.etree import ElementTree
 
@@ -8,7 +8,8 @@ from typing_extensions import final, override
 from ..decodestate import DecodeState
 from ..element import NamedElement
 from ..encodestate import EncodeState
-from ..odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
+from ..odxdoccontext import OdxDocContext
+from ..odxlink import OdxLinkDatabase, OdxLinkId
 from ..odxtypes import ParameterValue
 from ..snrefcontext import SnRefContext
 from ..specialdatagroup import SpecialDataGroup
@@ -30,7 +31,7 @@ ParameterType = Literal[
 ]
 
 
-@dataclass
+@dataclass(kw_only=True)
 class Parameter(NamedElement):
     """This class corresponds to POSITIONABLE-PARAM in the ODX
     specification
@@ -42,11 +43,11 @@ class Parameter(NamedElement):
     non-positionable parameter types.
 
     """
-    sdgs: list[SpecialDataGroup]
-    semantic: str | None
-    oid: str | None
-    byte_position: int | None
-    bit_position: int | None
+    sdgs: list[SpecialDataGroup] = field(default_factory=list)
+    semantic: str | None = None
+    oid: str | None = None
+    byte_position: int | None = None
+    bit_position: int | None = None
 
     @property
     def parameter_type(self) -> ParameterType:
@@ -78,13 +79,11 @@ class Parameter(NamedElement):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "Parameter":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "Parameter":
 
-        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, context))
 
-        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")]
         semantic = et_element.attrib.get("SEMANTIC")
         oid = et_element.attrib.get("OID")
         byte_position_str = et_element.findtext("BYTE-POSITION")

odxtools/parameters/parameterwithdop.py

@@ -11,7 +11,8 @@ from ..dopbase import DopBase
 from ..dtcdop import DtcDop
 from ..encodestate import EncodeState
 from ..exceptions import odxassert, odxrequire
-from ..odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef, resolve_snref
+from ..odxdoccontext import OdxDocContext
+from ..odxlink import OdxLinkDatabase, OdxLinkId, OdxLinkRef, resolve_snref
 from ..odxtypes import AtomicOdxType, ParameterValue
 from ..physicaltype import PhysicalType
 from ..snrefcontext import SnRefContext
@@ -19,10 +20,10 @@ from ..utils import dataclass_fields_asdict
 from .parameter import Parameter
 
 
-@dataclass
+@dataclass(kw_only=True)
 class ParameterWithDOP(Parameter):
-    dop_ref: OdxLinkRef | None
-    dop_snref: str | None
+    dop_ref: OdxLinkRef | None = None
+    dop_snref: str | None = None
 
     @property
     def dop(self) -> DopBase:
@@ -32,12 +33,11 @@ class ParameterWithDOP(Parameter):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: list[OdxDocFragment]) -> "ParameterWithDOP":
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "ParameterWithDOP":
 
-        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, context))
 
-        dop_ref = OdxLinkRef.from_et(et_element.find("DOP-REF"), doc_frags)
+        dop_ref = OdxLinkRef.from_et(et_element.find("DOP-REF"), context)
         dop_snref = None
         if (dop_snref_elem := et_element.find("DOP-SNREF")) is not None:
             dop_snref = odxrequire(dop_snref_elem.get("SHORT-NAME"))
@@ -78,7 +78,7 @@ class ParameterWithDOP(Parameter):
 
     @property
     def physical_type(self) -> PhysicalType | None:
-        if isinstance(self.dop, DataObjectProperty | DtcDop):
+        if isinstance(self.dop, (DataObjectProperty, DtcDop)):
             return self.dop.physical_type
         else:
             return None

odxtools/parameters/physicalconstantparameter.py

@@ -9,7 +9,8 @@ from ..dataobjectproperty import DataObjectProperty
 from ..decodestate import DecodeState
 from ..encodestate import EncodeState
 from ..exceptions import DecodeError, EncodeError, odxraise, odxrequire
-from ..odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
+from ..odxdoccontext import OdxDocContext
+from ..odxlink import OdxLinkDatabase, OdxLinkId
 from ..odxtypes import ParameterValue
 from ..snrefcontext import SnRefContext
 from ..utils import dataclass_fields_asdict
@@ -17,7 +18,7 @@ from .parameter import ParameterType
 from .parameterwithdop import ParameterWithDOP
 
 
-@dataclass
+@dataclass(kw_only=True)
 class PhysicalConstantParameter(ParameterWithDOP):
     physical_constant_value_raw: str
 
@@ -43,9 +44,9 @@ class PhysicalConstantParameter(ParameterWithDOP):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: list[OdxDocFragment]) -> "PhysicalConstantParameter":
+                context: OdxDocContext) -> "PhysicalConstantParameter":
 
-        kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, doc_frags))
+        kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, context))
 
         physical_constant_value_raw = odxrequire(et_element.findtext("PHYS-CONSTANT-VALUE"))
 

odxtools/parameters/reservedparameter.py

@@ -7,13 +7,13 @@ from typing_extensions import override
 from ..decodestate import DecodeState
 from ..encodestate import EncodeState
 from ..exceptions import odxrequire
-from ..odxlink import OdxDocFragment
+from ..odxdoccontext import OdxDocContext
 from ..odxtypes import DataType, ParameterValue
 from ..utils import dataclass_fields_asdict
 from .parameter import Parameter, ParameterType
 
 
-@dataclass
+@dataclass(kw_only=True)
 class ReservedParameter(Parameter):
     bit_length: int
 
@@ -34,9 +34,8 @@ class ReservedParameter(Parameter):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: list[OdxDocFragment]) -> "ReservedParameter":
-        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "ReservedParameter":
+        kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, context))
 
         bit_length = int(odxrequire(et_element.findtext("BIT-LENGTH")))
 

odxtools/parameters/systemparameter.py

@@ -8,7 +8,7 @@ from typing_extensions import override
 
 from ..encodestate import EncodeState
 from ..exceptions import odxraise, odxrequire
-from ..odxlink import OdxDocFragment
+from ..odxdoccontext import OdxDocContext
 from ..odxtypes import ParameterValue
 from ..utils import dataclass_fields_asdict
 from .parameter import ParameterType
@@ -24,7 +24,7 @@ PREDEFINED_SYSPARAM_VALUES = [
 ]
 
 
-@dataclass
+@dataclass(kw_only=True)
 class SystemParameter(ParameterWithDOP):
     sysparam: str
 
@@ -48,9 +48,8 @@ class SystemParameter(ParameterWithDOP):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element,
-                doc_frags: list[OdxDocFragment]) -> "SystemParameter":
-        kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, doc_frags))
+    def from_et(et_element: ElementTree.Element, context: OdxDocContext) -> "SystemParameter":
+        kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, context))
 
         sysparam = odxrequire(et_element.get("SYSPARAM"))