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

odxtools/templates/macros/printParam.xml.jinja2

@@ -11,8 +11,8 @@
 {%- set semattrib = make_xml_attrib("SEMANTIC", param.semantic) -%}
 {%- if param.parameter_type == "TABLE-KEY"  %}
 <PARAM {{ semattrib }}
-  {{- make_xml_attrib("ID", param.odx_id and param.odx_id.local_id) }}
-  xsi:type="{{param.parameter_type}}">
+       {{-peid.printElementIdAttribs(param)}}
+       xsi:type="{{param.parameter_type}}">
 {%- elif param.parameter_type == "SYSTEM" %}
 <PARAM {{ semattrib }}
   {{- make_xml_attrib("SYSPARAM", param.sysparam) }}
@@ -35,8 +35,6 @@
 {%- endif %}
 {%- if param.coded_value is defined %}
  <CODED-VALUE>{{param.coded_value}}</CODED-VALUE>
-{%- elif param.physical_constant_value_raw is defined %}
- <PHYS-CONSTANT-VALUE>{{param.physical_constant_value_raw}}</PHYS-CONSTANT-VALUE>
 {%- elif param.coded_values is defined %}
  <CODED-VALUES>
  {%- for coded_value in param.coded_values %}
@@ -44,19 +42,20 @@
  {%- endfor %}
  </CODED-VALUES>
 {%- endif %}
-{%- if param.physical_default_value_raw %}
- <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value_raw}}</PHYSICAL-DEFAULT-VALUE>
+{%- if param.physical_constant_value_raw is defined %}
+ <PHYS-CONSTANT-VALUE>{{param.physical_constant_value_raw}}</PHYS-CONSTANT-VALUE>
+{%- endif %}
+{%- if param.physical_default_value_raw is defined and param.physical_default_value_raw is not none %}
+ <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value_raw | e}}</PHYSICAL-DEFAULT-VALUE>
 {%- endif %}
 {%- if param.dop_ref %}
  <DOP-REF ID-REF="{{param.dop_ref.ref_id}}"/>
 {%- elif param.dop_snref %}
- <DOP-SNREF SN="{{param.dop_snref}}"/>
+ <DOP-SNREF SHORT-NAME="{{param.dop_snref}}"/>
 {%- elif param.diag_coded_type is defined %}
  {{pdop.printDiagCodedType(param.diag_coded_type)|indent(2)}}
-{%- elif param.parameter_type != "MATCHING-REQUEST-PARAM" %}
- {%- if param.bit_length is defined and param.bit_length is not none %}
-  <BIT-LENGTH>{{param.bit_length}}</BIT-LENGTH>
- {%- endif %}
+{%- elif param.bit_length is defined and param.bit_length is not none %}
+ <BIT-LENGTH>{{param.bit_length}}</BIT-LENGTH>
 {%- endif %}
 {%- if param.parameter_type == "TABLE-KEY" %}
  {%- if param.table_ref %}
@@ -77,7 +76,7 @@
  <TABLE-KEY-REF ID-REF="{{param.table_key_ref.ref_id}}"/>
  {%- endif %}
  {%- if param.table_key_snref %}
- <TABLE-KEY-SNREF SHORT-NAME="{{param.table_ref}}"/>
+ <TABLE-KEY-SNREF SHORT-NAME="{{param.table_key_snref}}"/>
  {%- endif %}
 {%- endif %}
 </PARAM>

odxtools/templates/macros/printProtStack.xml.jinja2

@@ -7,7 +7,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printProtStack(ps) %}
-<PROT-STACK ID="{{ps.odx_id.local_id}}">
+<PROT-STACK {{-peid.printElementIdAttribs(ps)}}>
  {{ peid.printElementIdSubtags(ps) | indent(1) }}
  <PDU-PROTOCOL-TYPE>{{ ps.pdu_protocol_type }}</PDU-PROTOCOL-TYPE>
  <PHYSICAL-LINK-TYPE>{{ ps.physical_link_type }}</PHYSICAL-LINK-TYPE>

odxtools/templates/macros/printProtocol.xml.jinja2

@@ -0,0 +1,30 @@
+{#- -*- mode: sgml; tab-width: 2; indent-tabs-mode: nil -*-
+ #
+ # SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printHierarchyElement.xml.jinja2') as phe %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
+{%- import('macros/printParentRef.xml.jinja2') as pparref %}
+
+{%- macro printProtocol(protocol) -%}
+<PROTOCOL {{- phe.printHierarchyElementAttribs(protocol) -}}>
+  {{ phe.printHierarchyElementSubtags(protocol) | indent(2) }}
+  {%- set dlr = protocol.protocol_raw %}
+
+  {%- set cps_docfrag = dlr.comparam_spec_ref.ref_docs[-1] %}
+  <COMPARAM-SPEC-REF ID-REF="{{dlr.comparam_spec_ref.ref_id}}" DOCREF="{{cps_docfrag.doc_name}}" DOCTYPE="{{cps_docfrag.doc_type}}" />
+
+  {%- if dlr.prot_stack_snref is not none %}
+  <PROT-STACK-SNREF SHORT-NAME="{{ dlr.prot_stack_snref }}" />
+  {%- endif %}
+
+  {%- if dlr.parent_refs %}
+  <PARENT-REFS>
+    {%- for parent in dlr.parent_refs -%}
+    {{ pparref.printParentRef(parent)|indent(4) }}
+    {%- endfor %}
+  </PARENT-REFS>
+  {%- endif %}
+</PROTOCOL>
+{%- endmacro %}

odxtools/templates/macros/printRequest.xml.jinja2

@@ -9,7 +9,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printRequest(request) -%}
-<REQUEST ID="{{request.odx_id.local_id}}">
+<REQUEST {{-peid.printElementIdAttribs(request)}}>
  {{ peid.printElementIdSubtags(request)|indent(1) }}
 {%- if request.parameters %}
  <PARAMS>

odxtools/templates/macros/printResponse.xml.jinja2

@@ -8,7 +8,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printResponse(resp, tag_name="POS-RESPONSE") -%}
-<{{tag_name}} ID="{{resp.odx_id.local_id}}">
+<{{tag_name}} {{-peid.printElementIdAttribs(resp)}}>
  {{ peid.printElementIdSubtags(resp)|indent(1) }}
 {%- if resp.parameters %}
  <PARAMS>

odxtools/templates/macros/printService.xml.jinja2

@@ -4,6 +4,7 @@
 -#}
 
 {%- import('macros/printDiagComm.xml.jinja2') as pdc %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
 
 {%- macro printService(service) -%}
 <DIAG-SERVICE {{pdc.printDiagCommAttribs(service) | indent(1) }}
@@ -18,8 +19,8 @@
   {{pdc.printDiagCommSubtags(service) | indent(1, first=True) }}
   {%- if service.comparam_refs %}
   <COMPARAM-REFS>
-    {%- for ref in service.comparam_refs %}
-    <COMPARAM-REF ID-REF="{{ref.ref_id}}" />
+    {%- for cpref in service.comparam_refs %}
+    {{ pcom.printComparamRef(cpref)|indent(4) }}
     {%- endfor %}
   </COMPARAM-REFS>
   {%- endif%}

odxtools/templates/macros/printSingleEcuJob.xml.jinja2

@@ -5,13 +5,14 @@
 
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 {%- import('macros/printDiagComm.xml.jinja2') as pdc %}
+{%- import('macros/printCompuMethod.xml.jinja2') as pcm %}
 
 {%- macro printSingleEcuJob(job) -%}
 <SINGLE-ECU-JOB {{pdc.printDiagCommAttribs(job)|indent(1) }}>
   {{pdc.printDiagCommSubtags(job) | indent(2, first=True) }}
   <PROG-CODES>
     {%- for prog in job.prog_codes %}
-    {{ printProgCode(prog)|indent(4) }}
+    {{ pcm.printProgCode(prog)|indent(4) }}
     {%- endfor %}
   </PROG-CODES>
   {%- if job.input_params %}
@@ -39,41 +40,19 @@
 {%- endmacro -%}
 
 
-{%- macro printProgCode(prog) -%}
-<PROG-CODE>
- <CODE-FILE>{{prog.code_file}}</CODE-FILE>
-{%- if prog.encryption %}
- <ENCRYPTION>{{prog.encryption}}</ENCRYPTION>
-{%- endif %}
- <SYNTAX>{{prog.syntax}}</SYNTAX>
- <REVISION>{{prog.revision}}</REVISION>
-{%- if prog.entrypoint %}
- <ENTRYPOINT>{{prog.entrypoint}}</ENTRYPOINT>
-{%- endif %}
-{%- if prog.library_refs %}
- <LIBRARY-REFS>
- {%- for ref in prog.library_refs %}
-   <LIBRARY-REF ID-REF="{{ref.ref_id}}" />
- {%- endfor %}
- </LIBRARY-REFS>
-{%- endif %}
-</PROG-CODE>
-{%- endmacro -%}
-
-
 {%- macro printInputParam(param) -%}
 <INPUT-PARAM {{-make_xml_attrib("OID", param.oid)}}
              {{-make_xml_attrib("SEMANTIC", param.semantic)}}>
  {{ peid.printElementIdSubtags(param)|indent(1) }}
-{%- if param.physical_default_value %}
- <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value}}</PHYSICAL-DEFAULT-VALUE>
+{%- if param.physical_default_value is not none %}
+ <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value | e}}</PHYSICAL-DEFAULT-VALUE>
 {%- endif %}
  <DOP-BASE-REF ID-REF="{{param.dop_base_ref.ref_id}}" />
 </INPUT-PARAM>
 {%- endmacro -%}
 
 {%- macro printOutputParam(param) -%}
-<OUTPUT-PARAM ID="{{param.odx_id.local_id}}"
+<OUTPUT-PARAM {{-peid.printElementIdAttribs(param)}}
               {{-make_xml_attrib("OID", param.oid)}}
               {{-make_xml_attrib("SEMANTIC", param.semantic)}}>
  {{ peid.printElementIdSubtags(param)|indent(1) }}

odxtools/templates/macros/printSpecialData.xml.jinja2

@@ -17,7 +17,7 @@
 {%- endmacro %}
 
 {%- macro printSdgCaption(sdg_caption) %}
-<SDG-CAPTION ID="{{sdg_caption.odx_id.local_id}}">
+<SDG-CAPTION {{-peid.printElementIdAttribs(sdg_caption)}}>
  {{ peid.printElementIdSubtags(sdg_caption)|indent(1) }}
 </SDG-CAPTION>
 {%- endmacro %}

odxtools/templates/macros/printState.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printState(state) -%}
-<STATE ID="{{state.odx_id.local_id}}">
+<STATE {{-peid.printElementIdAttribs(state)}}>
  {{ peid.printElementIdSubtags(state)|indent(1) }}
 </STATE>
 {%- endmacro -%}

odxtools/templates/macros/printStateChart.xml.jinja2

@@ -8,7 +8,7 @@
 {%- import('macros/printStateTransition.xml.jinja2') as pst %}
 
 {%- macro printStateChart(state_chart) -%}
-<STATE-CHART ID="{{state_chart.odx_id.local_id}}">
+<STATE-CHART {{-peid.printElementIdAttribs(state_chart)}}>
  {{ peid.printElementIdSubtags(state_chart)|indent(1) }}
  <SEMANTIC>{{state_chart.semantic}}</SEMANTIC>
  {%- if state_chart.state_transitions %}

odxtools/templates/macros/printStateTransition.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printStateTransition(state_transition) -%}
-<STATE-TRANSITION ID="{{state_transition.odx_id.local_id}}">
+<STATE-TRANSITION {{-peid.printElementIdAttribs(state_transition)}}>
  {{ peid.printElementIdSubtags(state_transition)|indent(1) }}
  <SOURCE-SNREF SHORT-NAME="{{state_transition.source_snref}}" />
  <TARGET-SNREF SHORT-NAME="{{state_transition.target_snref}}" />

odxtools/templates/macros/printStaticField.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printStaticField(sf) -%}
-<STATIC-FIELD ID="{{sf.odx_id.local_id}}">
+<STATIC-FIELD {{-peid.printElementIdAttribs(sf)}}>
  {{ peid.printElementIdSubtags(sf)|indent(1) }}
  <BASIC-STRUCTURE-REF ID-REF="{{sf.structure_ref.ref_id}}" />
  <FIXED-NUMBER-OF-ITEMS>{{sf.fixed_number_of_items}}</FIXED-NUMBER-OF-ITEMS>

odxtools/templates/macros/printStructure.xml.jinja2

@@ -7,7 +7,7 @@
 {%- import('macros/printParam.xml.jinja2') as pp %}
 
 {%- macro printStructure(st) -%}
-<STRUCTURE ID="{{st.odx_id.local_id}}">
+<STRUCTURE {{-peid.printElementIdAttribs(st)}}>
  {{ peid.printElementIdSubtags(st)|indent(1) }}
 {%- if st.byte_size is not none %}
  <BYTE-SIZE>{{st.byte_size}}</BYTE-SIZE>

odxtools/templates/macros/printSubComponent.xml.jinja2

@@ -0,0 +1,104 @@
+{#- -*- mode: sgml; tab-width: 1; indent-tabs-mode: nil -*-
+#
+# SPDX-License-Identifier: MIT
+-#}
+
+{%- import('macros/printElementId.xml.jinja2') as peid %}
+{%- import('macros/printEcuVariantPattern.xml.jinja2') as pevp %}
+
+{%- macro printSubComponentPattern(pat) %}
+<SUB-COMPONENT-PATTERN>
+  <MATCHING-PARAMETERS>
+    {%- for mp in pat.matching_parameters %}
+    {{ pvp.printMatchingParameter(mp)|indent(4) }}
+    {%- endfor %}
+  </MATCHING-PARAMETERS>
+</SUB-COMPONENT-PATTERN>
+{%- endmacro %}
+
+{%- macro printSubComponentParamConnector(conn) %}
+<SUB-COMPONENT-PARAM-CONNECTOR{#- #} {{-peid.printElementIdAttribs(conn)}}>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <DIAG-COMM-SNREF {{- make_xml_attrib("SHORT-NAME", conn.diag_comm_snref ) }} />
+  {%- if conn.out_param_if_refs %}
+  <OUT-PARAM-IF-REFS>
+    {%- for snref in conn.out_param_if_refs %}
+    <OUT-PARAM-IF-SNREF SHORT-NAME="{{snref}}" />
+    {%- endfor %}
+  </OUT-PARAM-IF-REFS>
+  {%- endif %}
+  {%- if conn.in_param_if_refs %}
+  <IN-PARAM-IF-REFS>
+    {%- for snref in conn.in_param_if_refs %}
+    <IN-PARAM-IF-SNREF SHORT-NAME="{{snref}}" />
+    {%- endfor %}
+  </IN-PARAM-IF-REFS>
+  {%- endif %}
+</SUB-COMPONENT-PARAM-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printTableRowConnector(conn) %}
+<TABLE-ROW-CONNECTOR>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <TABLE-REF ID-REF="{{ conn.table_ref.ref_id }}" />
+  <TABLE-ROW-SNREF {{- make_xml_attrib("SHORT-NAME", conn.table_row_snref ) }} />
+</TABLE-ROW-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printEnvDataConnector(conn) %}
+<ENV-DATA-CONNECTOR>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <ENV-DATA-DESC-REF ID-REF="{{ conn.env_data_desc_ref.ref_id }}" />
+  <ENV-DATA-SNREF {{- make_xml_attrib("SHORT-NAME", conn.env_data_snref ) }} />
+</ENV-DATA-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printDtcConnector(conn) %}
+<DTC-CONNECTOR>
+  {{ peid.printElementIdSubtags(conn)|indent(2) }}
+  <DTC-DOP-REF ID-REF="{{ conn.dtc_dop_ref.ref_id }}" />
+  <DOP-SNREF {{- make_xml_attrib("SHORT-NAME", conn.dtc_snref ) }} />
+</DTC-CONNECTOR>
+{%- endmacro %}
+
+{%- macro printSubComponent(sc) %}
+<SUB-COMPONENT{#- #} {{-peid.printElementIdAttribs(sc)}}
+              {{- make_xml_attrib("SEMANTIC", sc.semantic) }}>
+  {{ peid.printElementIdSubtags(sc)|indent(2) }}
+  {%- if sc.sub_component_patterns %}
+  <SUB-COMPONENT-PATTERNS>
+    {%- for scp in sc.sub_component_patterns %}
+    {{ printSubComponentPattern(scp)|indent(4) }}
+    {%- endfor %}
+  </SUB-COMPONENT-PATTERNS>
+  {%- endif %}
+  {%- if sc.sub_component_param_connectors %}
+  <SUB-COMPONENT-PARAM-CONNECTORS>
+    {%- for conn in sc.sub_component_param_connectors %}
+    {{ printSubComponentParamConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </SUB-COMPONENT-PARAM-CONNECTORS>
+  {%- endif %}
+  {%- if sc.table_row_connectors %}
+  <TABLE-ROW-CONNECTORS>
+    {%- for conn in sc.table_row_connectors %}
+    {{ printTableRowConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </TABLE-ROW-CONNECTORS>
+  {%- endif %}
+  {%- if sc.env_data_connectors %}
+  <ENV-DATA-CONNECTORS>
+    {%- for conn in sc.env_data_connectors %}
+    {{ printEnvDataConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </ENV-DATA-CONNECTORS>
+  {%- endif %}
+  {%- if sc.dtc_connectors %}
+  <DTC-CONNECTORS>
+    {%- for conn in sc.dtc_connectors %}
+    {{ printDtcConnector(conn)|indent(4) }}
+    {%- endfor %}
+  </DTC-CONNECTORS>
+  {%- endif %}
+</SUB-COMPONENT>
+{%- endmacro %}

odxtools/templates/macros/printTable.xml.jinja2

@@ -5,9 +5,10 @@
 
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
+{%- import('macros/printDescription.xml.jinja2') as pd %}
 
 {%- macro printTable(table) %}
-<TABLE ID="{{table.odx_id.local_id}}"
+<TABLE {{-peid.printElementIdAttribs(table)}}
        {{-make_xml_attrib("SEMANTIC", table.semantic)}}>
  {{ peid.printElementIdSubtags(table)|indent(1) }}
 {%- if table.key_dop_ref %}
@@ -15,15 +16,13 @@
 {%- endif %}
  {%- for table_row in table.table_rows_raw %}
  {%- if hasattr(table_row, "key") %}
- <TABLE-ROW ID="{{table_row.odx_id.local_id}}"
+ <TABLE-ROW {{-peid.printElementIdAttribs(table_row)}}
             {{-make_xml_attrib("SEMANTIC", table_row.semantic)}}>
   <SHORT-NAME>{{table_row.short_name}}</SHORT-NAME>
   {%- if table_row.long_name %}
   <LONG-NAME>{{table_row.long_name|e}}</LONG-NAME>
   {%- endif %}
-  {%- if table_row.description %}
-  <DESC>{{table_row.description}}</DESC>
-  {%- endif %}
+  {{ pd.printDescription(table_row.description) }}
   <KEY>{{table_row.key|e}}</KEY>
   {%- if table_row.dop_ref %}
   <DATA-OBJECT-PROP-REF ID-REF="{{ table_row.dop_ref.ref_id }}" />

odxtools/templates/macros/printUnitSpec.xml.jinja2

@@ -35,8 +35,7 @@
 
 
 {%- macro printUnit(unit) -%}
-<UNIT ID="{{unit.odx_id.local_id}}"
-      {{-make_xml_attrib("OID", unit.oid)}}>
+<UNIT {{-peid.printElementIdAttribs(unit)}}>
  {{ peid.printElementIdSubtags(unit)|indent(1) }}
  <DISPLAY-NAME>{{ unit.display_name }}</DISPLAY-NAME>
  {%- if unit.factor_si_to_unit is not none %}
@@ -52,7 +51,7 @@
 {%- endmacro -%}
 
 {%- macro printUnitGroup(group) -%}
-<UNIT-GROUP {%- if group.oid %} OID="{{group.oid}}" {%- endif %}>
+<UNIT-GROUP {{-make_xml_attrib("OID", group.oid)}}>
  {{ peid.printElementIdSubtags(group)|indent(1) }}
  <CATEGORY>{{ group.category.value }}</CATEGORY>
  {%- if group.unit_refs %}
@@ -66,8 +65,7 @@
 {%- endmacro -%}
 
 {%- macro printPhysicalDimesion(dim) -%}
-<PHYSICAL-DIMENSION ID="{{dim.odx_id.local_id}}"
-                    {{-make_xml_attrib("OID",dim.oid)}}>
+<PHYSICAL-DIMENSION {{-peid.printElementIdAttribs(dim)}}>
  {{ peid.printElementIdSubtags(dim)|indent(1) }}
  {%- if dim.length_exp %}
  <LENGTH-EXP>{{ dim.length_exp }}</LENGTH-EXP>

odxtools/uds.py

@@ -3,8 +3,6 @@ from enum import IntEnum
 from itertools import chain
 from typing import Optional
 
-from deprecation import deprecated
-
 import odxtools.obd as obd
 
 
@@ -62,13 +60,13 @@ _sid_to_name = {
     0x85: "Control DTC Settings",
     0x86: "Response on Event",
     0x87: "Link Control",
-    0x22: "Read Data by Identifier ",
+    0x22: "Read Data by Identifier",
     0x23: "Read Memory by Address",
     0x24: "Read Scaling Data by Identifier",
     0x2a: "Read Data by Periodic Identifier",
     0x2c: "Dynamically Define Data Identifier",
     0x2e: "Write Data by Identifier",
-    0x3d: "Write Memory by Address ",
+    0x3d: "Write Memory by Address",
     0x14: "Clear Diagnostic Information",
     0x19: "Read DTC Information",
     0x2f: "Input Output Control by Identifier",
@@ -170,9 +168,3 @@ def is_response_pending(telegram_payload: bytes, request_sid: Optional[int] = No
 
     # if all of the above applies, we received a "stay tuned" response
     return True
-
-
-# previous versions of odxtools had a typo here. hit happens!
-@deprecated(details="use is_response_pending()")  # type: ignore[misc]
-def is_reponse_pending(telegram_payload: bytes, request_sid: Optional[int] = None) -> bool:
-    return is_response_pending(telegram_payload, request_sid)

odxtools/unit.py

@@ -1,17 +1,15 @@
 # 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 .element import IdentifiableElement
 from .exceptions import odxassert, odxrequire
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
 from .physicaldimension import PhysicalDimension
+from .snrefcontext import SnRefContext
 from .utils import dataclass_fields_asdict
 
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
-
 
 @dataclass
 class Unit(IdentifiableElement):
@@ -55,7 +53,6 @@ class Unit(IdentifiableElement):
     ```
     """
     display_name: str
-    oid: Optional[str]
     factor_si_to_unit: Optional[float]
     offset_si_to_unit: Optional[float]
     physical_dimension_ref: Optional[OdxLinkRef]
@@ -66,7 +63,7 @@ class Unit(IdentifiableElement):
     @staticmethod
     def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "Unit":
         kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
-        oid = et_element.get("OID")
+
         display_name = odxrequire(et_element.findtext("DISPLAY-NAME"))
 
         def read_optional_float(element: ElementTree.Element, name: str) -> Optional[float]:
@@ -82,7 +79,6 @@ class Unit(IdentifiableElement):
 
         return Unit(
             display_name=display_name,
-            oid=oid,
             factor_si_to_unit=factor_si_to_unit,
             offset_si_to_unit=offset_si_to_unit,
             physical_dimension_ref=physical_dimension_ref,
@@ -104,5 +100,5 @@ class Unit(IdentifiableElement):
                 f"The physical_dimension_ref must be resolved to a PhysicalDimension."
                 f" {self.physical_dimension_ref} referenced {self._physical_dimension}")
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
         pass

odxtools/unitgroup.py

@@ -1,19 +1,17 @@
 # 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 NamedElement
 from .exceptions import odxraise, odxrequire
 from .nameditemlist import NamedItemList
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
+from .snrefcontext import SnRefContext
 from .unit import Unit
 from .utils import dataclass_fields_asdict
 
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
-
 
 class UnitGroupCategory(Enum):
     COUNTRY = "COUNTRY"
@@ -57,7 +55,7 @@ class UnitGroup(NamedElement):
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
         self._units = NamedItemList[Unit]([odxlinks.resolve(ref) for ref in self.unit_refs])
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
         pass
 
     @property

odxtools/unitspec.py

@@ -1,19 +1,16 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Union
+from typing import Any, Dict, List
 from xml.etree import ElementTree
 
-from .createsdgs import create_sdgs_from_et
 from .nameditemlist import NamedItemList
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
 from .physicaldimension import PhysicalDimension
+from .snrefcontext import SnRefContext
 from .specialdatagroup import SpecialDataGroup
 from .unit import Unit
 from .unitgroup import UnitGroup
 
-if TYPE_CHECKING:
-    from .diaglayer import DiagLayer
-
 
 @dataclass
 class UnitSpec:
@@ -28,9 +25,9 @@ class UnitSpec:
     """
 
     # TODO (?): Why are there type errors...
-    unit_groups: Union[NamedItemList[UnitGroup], List[UnitGroup]]
-    units: Union[NamedItemList[Unit], List[Unit]]
-    physical_dimensions: Union[NamedItemList[PhysicalDimension], List[PhysicalDimension]]
+    unit_groups: NamedItemList[UnitGroup]
+    units: NamedItemList[Unit]
+    physical_dimensions: NamedItemList[PhysicalDimension]
     sdgs: List[SpecialDataGroup]
 
     def __post_init__(self) -> None:
@@ -41,15 +38,18 @@ class UnitSpec:
     @staticmethod
     def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "UnitSpec":
 
-        unit_groups = [
+        unit_groups = NamedItemList([
             UnitGroup.from_et(el, doc_frags) for el in et_element.iterfind("UNIT-GROUPS/UNIT-GROUP")
-        ]
-        units = [Unit.from_et(el, doc_frags) for el in et_element.iterfind("UNITS/UNIT")]
-        physical_dimensions = [
+        ])
+        units = NamedItemList(
+            [Unit.from_et(el, doc_frags) for el in et_element.iterfind("UNITS/UNIT")])
+        physical_dimensions = NamedItemList([
             PhysicalDimension.from_et(el, doc_frags)
             for el in et_element.iterfind("PHYSICAL-DIMENSIONS/PHYSICAL-DIMENSION")
+        ])
+        sdgs = [
+            SpecialDataGroup.from_et(sdge, doc_frags) for sdge in et_element.iterfind("SDGS/SDG")
         ]
-        sdgs = create_sdgs_from_et(et_element.find("SDGS"), doc_frags)
 
         return UnitSpec(
             unit_groups=unit_groups,
@@ -76,10 +76,10 @@ class UnitSpec:
         for sdg in self.sdgs:
             sdg._resolve_odxlinks(odxlinks)
 
-    def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
+    def _resolve_snrefs(self, context: SnRefContext) -> None:
         for unit in self.units:
-            unit._resolve_snrefs(diag_layer)
+            unit._resolve_snrefs(context)
         for group in self.unit_groups:
-            group._resolve_snrefs(diag_layer)
+            group._resolve_snrefs(context)
         for sdg in self.sdgs:
-            sdg._resolve_snrefs(diag_layer)
+            sdg._resolve_snrefs(context)