odxtools 8.0.6__py3-none-any.whl → 8.1.0__py3-none-any.whl

odxtools/element.py

@@ -15,10 +15,7 @@ class NamedElement:
     description: Optional[Description]
 
     @staticmethod
-    def from_et(
-        et_element: ElementTree.Element,
-        doc_frags: List[OdxDocFragment],
-    ) -> "NamedElement":
+    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "NamedElement":
 
         return NamedElement(
             short_name=odxrequire(et_element.findtext("SHORT-NAME")),
@@ -30,15 +27,15 @@ class NamedElement:
 @dataclass
 class IdentifiableElement(NamedElement):
     odx_id: OdxLinkId
+    oid: Optional[str]
 
     @staticmethod
-    def from_et(
-        et_element: ElementTree.Element,
-        doc_frags: List[OdxDocFragment],
-    ) -> "IdentifiableElement":
+    def from_et(et_element: ElementTree.Element,
+                doc_frags: List[OdxDocFragment]) -> "IdentifiableElement":
 
         kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
-        return IdentifiableElement(
-            **kwargs,
-            odx_id=odxrequire(OdxLinkId.from_et(et_element, doc_frags)),
-        )
+
+        odx_id = odxrequire(OdxLinkId.from_et(et_element, doc_frags))
+        oid = et_element.get("OID")
+
+        return IdentifiableElement(**kwargs, odx_id=odx_id, oid=oid)

odxtools/outputparam.py

@@ -16,7 +16,6 @@ from .utils import dataclass_fields_asdict
 @dataclass
 class OutputParam(IdentifiableElement):
     dop_base_ref: OdxLinkRef
-    oid: Optional[str]
     semantic: Optional[str]
 
     @staticmethod
@@ -25,9 +24,8 @@ class OutputParam(IdentifiableElement):
         kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
         dop_base_ref = odxrequire(OdxLinkRef.from_et(et_element.find("DOP-BASE-REF"), doc_frags))
         semantic = et_element.get("SEMANTIC")
-        oid = et_element.get("OID")
 
-        return OutputParam(dop_base_ref=dop_base_ref, semantic=semantic, oid=oid, **kwargs)
+        return OutputParam(dop_base_ref=dop_base_ref, semantic=semantic, **kwargs)
 
     def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
         return {}

odxtools/parameters/parameter.py

@@ -40,6 +40,7 @@ class Parameter(NamedElement):
     define any non-positionable parameter types.
 
     """
+    oid: Optional[str]
     byte_position: Optional[int]
     bit_position: Optional[int]
     semantic: Optional[str]
@@ -51,6 +52,7 @@ class Parameter(NamedElement):
 
         kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
 
+        oid = et_element.get("OID")
         semantic = et_element.get("SEMANTIC")
         sdgs = [
             SpecialDataGroup.from_et(sdge, doc_frags) for sdge in et_element.iterfind("SDGS/SDG")
@@ -63,6 +65,7 @@ class Parameter(NamedElement):
         bit_position = int(bit_position_str) if bit_position_str is not None else None
 
         return Parameter(
+            oid=oid,
             byte_position=byte_position,
             bit_position=bit_position,
             semantic=semantic,

odxtools/physicaldimension.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List
 from xml.etree import ElementTree
 
 from .element import IdentifiableElement
@@ -41,7 +41,6 @@ class PhysicalDimension(IdentifiableElement):
     )
     ```
     """
-    oid: Optional[str]
     length_exp: int
     mass_exp: int
     time_exp: int
@@ -54,7 +53,6 @@ class PhysicalDimension(IdentifiableElement):
     def from_et(et_element: ElementTree.Element,
                 doc_frags: List[OdxDocFragment]) -> "PhysicalDimension":
         kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
-        oid = et_element.get("OID")
 
         def read_optional_int(element: ElementTree.Element, name: str) -> int:
             if val_str := element.findtext(name):
@@ -71,7 +69,6 @@ class PhysicalDimension(IdentifiableElement):
         luminous_intensity_exp = read_optional_int(et_element, "LUMINOUS-INTENSITY-EXP")
 
         return PhysicalDimension(
-            oid=oid,
             length_exp=length_exp,
             mass_exp=mass_exp,
             time_exp=time_exp,

odxtools/templates/macros/printAudience.xml.jinja2

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

odxtools/templates/macros/printCompanyData.xml.jinja2

@@ -8,7 +8,7 @@
 {%- import('macros/printDescription.xml.jinja2') as pd %}
 
 {%- macro printCompanyData(company_data) %}
-<COMPANY-DATA ID="{{company_data.odx_id.local_id}}">
+<COMPANY-DATA {{-peid.printElementIdAttribs(company_data)}}>
  {{ peid.printElementIdSubtags(company_data)|indent(1) }}
  {%- if company_data.roles is not none %}
  <ROLES>
@@ -20,7 +20,7 @@
  {%- if company_data.team_members is not none %}
  <TEAM-MEMBERS>
   {%- for team_member in company_data.team_members %}
-  <TEAM-MEMBER ID="{{team_member.odx_id.local_id}}">
+  <TEAM-MEMBER {{-peid.printElementIdAttribs(team_member)}}>
    {{ peid.printElementIdSubtags(team_member)|indent(3) }}
    {%- if team_member.roles is not none %}
    <ROLES>

odxtools/templates/macros/printComparam.xml.jinja2

@@ -38,7 +38,7 @@
 {%- endmacro %}
 
 {%- macro printSimpleComparam(cp) %}
-<COMPARAM ID="{{cp.odx_id.local_id}}"
+<COMPARAM {{-peid.printElementIdAttribs(cp)}}
           PARAM-CLASS="{{cp.param_class}}"
           CPTYPE="{{cp.cptype.value}}"
          {{make_xml_attrib("DISPLAY-LEVEL", cp.display_level)}}{#- #}
@@ -52,7 +52,7 @@
 {%- endmacro %}
 
 {%- macro printComplexComparam(cp) %}
-<COMPLEX-COMPARAM ID="{{cp.odx_id.local_id}}"
+<COMPLEX-COMPARAM {{-peid.printElementIdAttribs(cp)}}
                   PARAM-CLASS="{{cp.param_class}}"
                   CPTYPE="{{cp.cptype.value}}"
                  {{make_xml_attrib("DISPLAY-LEVEL", cp.display_level)}}{#- #}

odxtools/templates/macros/printDOP.xml.jinja2

@@ -130,7 +130,7 @@
  {%- if hasattr(dtc, "ref_id") %}
   <DTC-REF ID-REF="{{dtc.ref_id}}" />
  {%- else %}
-  <DTC ID="{{dtc.odx_id.local_id}}">
+  <DTC {{-peid.printElementIdAttribs(dtc)}}>
    <SHORT-NAME>{{dtc.short_name}}</SHORT-NAME>
    <TROUBLE-CODE>{{dtc.trouble_code}}</TROUBLE-CODE>
   {%- if dtc.display_trouble_code is not none   %}

odxtools/templates/macros/printDiagComm.xml.jinja2

@@ -9,7 +9,7 @@
 {%- import('macros/printSpecialData.xml.jinja2') as psd %}
 
 {%- macro printDiagCommAttribs(dc) -%}
-ID="{{dc.odx_id.local_id}}"
+{{-peid.printElementIdAttribs(dc)}}
 {{-make_xml_attrib("SEMANTIC", dc.semantic)}}
 {{-make_xml_attrib("DIAGNOSTIC-CLASS", dc.diagnostic_class and dc.diagnostic_class.value)}}
 {{-make_bool_xml_attrib("IS-MANDATORY", dc.is_mandatory_raw)}}

odxtools/templates/macros/printDiagLayer.xml.jinja2

@@ -27,7 +27,7 @@
 {%- import('macros/printAdminData.xml.jinja2') as pad %}
 
 {%- macro printDiagLayerAttribs(dl) -%}
-{#- #} ID="{{dl.diag_layer_raw.odx_id.local_id}}"{# -#}
+{#- #} {{-peid.printElementIdAttribs(dl)}}{# -#}
 {%- endmacro -%}
 
 {%- macro printDiagLayerSubtags(dl) -%}

odxtools/templates/macros/printDiagVariable.xml.jinja2

@@ -7,7 +7,7 @@
 {%- import('macros/printDescription.xml.jinja2') as pd %}
 
 {%- macro printDiagVariable(diag_var) -%}
-<DIAG-VARIABLE>
+<DIAG-VARIABLE {{-peid.printElementIdAttribs(diag_var)}}>
   {{ peid.printElementIdSubtags(diag_variable)|indent(2) }}
   {%- if diag_variable.admin_data is not none %}
   {{ pad.printAdminData(diag_variable.admin_data)|indent(2) }}
@@ -16,7 +16,7 @@
   {%- if diag_variable.sw_variables %}
   <SW-VARIABLES>
     {%- for sw_var in diag_variable.sw_variables %}
-    <SW-VARIABLE>
+    <SW-VARIABLE {{-peid.printElementIdAttribs(sw_var)}}>
       {{ peid.printElementIdSubtags(sw_var)|indent(6) }}
       {%- if sw_var.origin is not none %}
       <ORIGIN>{{ sw_var.origin }}</ORIGIN>
@@ -60,7 +60,7 @@
 {%- endmacro -%}
 
 {%- macro printVariableGroup(var_group) -%}
-<VARIABLE-GROUP>
+<VARIABLE-GROUP {{-peid.printElementIdAttribs(var_group)}}>
   {{ peid.printElementIdSubtags(diag_variable)|indent(2) }}
 </VARIABLE-GROUP>
 {%- endmacro -%}

odxtools/templates/macros/printDynamicEndmarkerField.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printStaticField(demf) -%}
-<DYNAMIC-ENDMARKER-FIELD ID="{{demf.odx_id.local_id}}">
+<DYNAMIC-ENDMARKER-FIELD {{-peid.printElementIdAttribs(demf)}}>
  {{ peid.printElementIdSubtags(demf)|indent(1) }}
  <BASIC-STRUCTURE-REF ID-REF="{{demf.structure_ref.ref_id}}" />
  <DYN-END-DOP-REF ID-REF="{{demf.dyn_end_dop_ref.ref_id}}">

odxtools/templates/macros/printDynamicLengthField.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printDynamicLengthField(dlf) -%}
-<DYNAMIC-LENGTH-FIELD ID="{{dlf.odx_id.local_id}}">
+<DYNAMIC-LENGTH-FIELD {{-peid.printElementIdAttribs(dlf)}}>
  {{ peid.printElementIdSubtags(dlf)|indent(1) }}
  <BASIC-STRUCTURE-REF ID-REF="{{dlf.structure_ref.ref_id}}" />
  <OFFSET>{{dlf.offset}}</OFFSET>

odxtools/templates/macros/printElementId.xml.jinja2

@@ -5,6 +5,11 @@
 
 {%- import('macros/printDescription.xml.jinja2') as pd %}
 
+{%- macro printElementIdAttribs(obj) -%}
+{#- #} {{- make_xml_attrib("ID", obj.odx_id.local_id) }}
+{#- #} {{- make_xml_attrib("OID", getattr(obj, "oid", none)) -}}
+{%- endmacro -%}
+
 {%- macro printElementIdSubtags(obj) -%}
 <SHORT-NAME>{{ obj.short_name }}</SHORT-NAME>
 {%- if obj.long_name %}

odxtools/templates/macros/printEndOfPdu.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printEndOfPdu(eopdu) -%}
-<END-OF-PDU-FIELD ID="{{eopdu.odx_id.local_id}}">
+<END-OF-PDU-FIELD {{-peid.printElementIdAttribs(eopdu)}}>
  {{ peid.printElementIdSubtags(eopdu)|indent(1) }}
  <BASIC-STRUCTURE-REF ID-REF="{{eopdu.structure_ref.ref_id}}" />
  {%- if eopdu.max_number_of_items is not none %}

odxtools/templates/macros/printEnvDataDesc.xml.jinja2

@@ -6,7 +6,7 @@
 {%- import('macros/printElementId.xml.jinja2') as peid %}
 
 {%- macro printEnvDataDesc(env_data_desc) %}
-<ENV-DATA-DESC ID="{{env_data_desc.odx_id.local_id}}">
+<ENV-DATA-DESC {{-peid.printElementIdAttribs(env_data_desc)}}>
   {{ peid.printElementIdSubtags(env_data_desc)|indent(1) }}
   <PARAM-SNREF SHORT-NAME="{{env_data_desc.param_snref}}"/>
   <ENV-DATA-REFS>

odxtools/templates/macros/printFunctionalClass.xml.jinja2

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

odxtools/templates/macros/printMux.xml.jinja2

@@ -8,7 +8,7 @@
 {%- import('macros/printDOP.xml.jinja2') as pdop %}
 
 {%- macro printMux(mux) %}
-<MUX ID="{{mux.odx_id.local_id}}"
+<MUX {{-peid.printElementIdAttribs(mux)}}
      {{-make_bool_xml_attrib("IS-VISIBLE", mux.is_visible_raw)}}
      {#- #}>
   {{ peid.printElementIdSubtags(mux)|indent(1) }}

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

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/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/printSingleEcuJob.xml.jinja2

@@ -73,7 +73,7 @@
 {%- 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/printTable.xml.jinja2

@@ -8,7 +8,7 @@
 {%- 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 %}
@@ -16,7 +16,7 @@
 {%- 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 %}

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/unit.py

@@ -53,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]
@@ -64,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]:
@@ -80,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,

odxtools/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '8.0.6'
-__version_tuple__ = version_tuple = (8, 0, 6)
+__version__ = version = '8.1.0'
+__version_tuple__ = version_tuple = (8, 1, 0)

odxtools/writepdxfile.py

@@ -140,6 +140,7 @@ def write_pdx_file(
                 out_file.write(data_file.read())
 
         jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(templates_dir))
+        jinja_env.globals["getattr"] = getattr
         jinja_env.globals["hasattr"] = hasattr
         jinja_env.globals["odxraise"] = jinja2_odxraise_helper
         jinja_env.globals["make_xml_attrib"] = make_xml_attrib

{odxtools-8.0.6.dist-info → odxtools-8.1.0.dist-info}/METADATA

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

{odxtools-8.0.6.dist-info → odxtools-8.1.0.dist-info}/RECORD

@@ -40,7 +40,7 @@ odxtools/dyndefinedspec.py,sha256=ErtMIFVAB-E-ujTUwLXxsheGOOFkhNy6zCXs4cp7biE,76
 odxtools/dynenddopref.py,sha256=SYXrmRUQoLWD4UI3WV92oA5rNhxbDuRv6H1MeXeuWhM,1199
 odxtools/ecuvariantmatcher.py,sha256=muZfBcHVUQFXn3mBRwLtQ2asGV1oDYkDrBwZ9WYuLKU,6848
 odxtools/ecuvariantpattern.py,sha256=Xp2NpS13sVvyOjy2PgxLvXPptAfmYSH_KDIjqYByZHs,863
-odxtools/element.py,sha256=7JlWYW_KERDpYPfofdfRwT8UQBI94B_iEmhNCM7jUi8,1230
+odxtools/element.py,sha256=nCJkQMIPC26XfD4w1VrTH3l7Cd_BemMM_5lALh5gC7E,1259
 odxtools/encodestate.py,sha256=yxeql949uvlB2WnsF0jVcMJ6PvaoYcGB7M0OuB4Afj0,10008
 odxtools/endofpdufield.py,sha256=mGkhTj-YGdJ4EHMsK3AlWV6G_KLWI4ymiFKbY8U2W50,3359
 odxtools/environmentdata.py,sha256=_wSKhV_NuMG6UPMnpOxz6mVjvrXsd2mtqqT7VKSSxHU,1414
@@ -67,11 +67,11 @@ odxtools/negoutputparam.py,sha256=u2IhJvy6n19t3nyADGG0H0XTm7JNdQ0-95FawGAdtiE,13
 odxtools/obd.py,sha256=WsUbhdonqQJtxf972CUdYL78AMMTVjMQhoCJbaZhRIo,1860
 odxtools/odxlink.py,sha256=YoEovTx5T8c5YFJPa2CSxk_gwRfP8miGCwicHbpqQNg,9259
 odxtools/odxtypes.py,sha256=Cg1BxXAoOW-cqbbmePw3x-rZ2CW6qZGlFX2xdAanlKc,7541
-odxtools/outputparam.py,sha256=e9YvdJvKlX-GOdmu2vCPO6BZEyOLuOsYEdvtC5ISLHM,1636
+odxtools/outputparam.py,sha256=_NVZj4YfU_RdPpGUnz659-70DaYwBxYxwktxZ5lSMsY,1568
 odxtools/parameterinfo.py,sha256=hsUqlTnMJ-s6QbA6-X7rN6b6NfdnagJ1u_1JLLuYRqo,8564
 odxtools/paramlengthinfotype.py,sha256=vhgvCPIRnyCF9t8yhkYf5MsHXQhWWeEgz_kS8AbiONQ,4700
 odxtools/parentref.py,sha256=kcY3VMyVaIUWD0iVNX8sD9qeI4peU8gijboquu0zD7E,3751
-odxtools/physicaldimension.py,sha256=iaf7LIJEiEoV3WniybEpDvGgL4Z_iWCjo1HlQy663GU,3359
+odxtools/physicaldimension.py,sha256=CEH7Ura4gqsqlBUxBW08ea9Pxh_Od8JruYQ8o9qOGME,3269
 odxtools/physicaltype.py,sha256=oYjOhdrTVCJcLLBYgy6pxKsZHpuwm1vZ8svwSjsUB6E,2699
 odxtools/progcode.py,sha256=ZoGf6X7qH3TT8zSr3bQAYwPb0Il4V6vSLWgdTnlj88Y,2169
 odxtools/protstack.py,sha256=nb2RR4OEaGX6lJ6drHejJU-tkB1p0Ok0KLZhNMTdsEc,2012
@@ -97,13 +97,13 @@ odxtools/table.py,sha256=zgpVveH8neSNhdcsPp0jG4f6H00M0NKCuAME8MSrf-Q,4024
 odxtools/tablerow.py,sha256=hOi7FCX7TiCRxErCD1hKU6h2hT5_8V3ghtt8dJXOiQY,6307
 odxtools/teammember.py,sha256=xn1y6k42zQoyM2SlEkZ8UFyiqBvVI5FNZAm_xt2Vt_Y,1772
 odxtools/uds.py,sha256=69SyVnQDcyspzSf6QVfm_Uk9iCxczD6UcrO1PxhNo7E,5894
-odxtools/unit.py,sha256=zzQlQGAct6G0dARTlqBlhqnkg2iixkViI4VScLWrnP4,3667
+odxtools/unit.py,sha256=PLMErZ6N9oA4z3fuwYsmqMajeVHFNtKhC-w7IzaTfvw,3588
 odxtools/unitgroup.py,sha256=_WNpnYFmkiHQnOY8XhIviiQLXziY3kplH--7ufAWXyI,2067
 odxtools/unitspec.py,sha256=bc3B6ysTXSxpNWyQ6cQVJgIGyxmeqRTeshc3bdym1iA,2948
 odxtools/utils.py,sha256=PJFXkG74BzoheurrDYOwHZ6EuIcr1sdxf1tQGk6zSgs,1122
 odxtools/variablegroup.py,sha256=--5sMDOMUg4I3hFyoVOFcGCTOrctrrMADdmH3Mn4wHk,848
-odxtools/version.py,sha256=ezZqCbstAPwDi9fM4OrkFMyujfwJlfH0tBmH0LsrRww,411
-odxtools/writepdxfile.py,sha256=x3W2xiPVjzNZjfpJssY6ngkx74sZtb95OFmBHql1VY4,7766
+odxtools/version.py,sha256=eiWyn2_6w1-A0TRBYVKm6NOjpOjm1AVjrofuhC156co,411
+odxtools/writepdxfile.py,sha256=ZEoNkSxheqnXm836-HOpd04O6ipMXYKFzXZy6PM0YLc,7813
 odxtools/xdoc.py,sha256=gDq-8l8x-Tj1ZJOttPxZchcO5_jEPwcXxMgT29VgTS0,1433
 odxtools/cli/__init__.py,sha256=T7ano_FIyzBASxYpmcA5VJXU5bQLIy_Qk0HE_SDKelY,106
 odxtools/cli/_parser_utils.py,sha256=p0L9NYYnml5ydfD22oC04EMhz8PKHgU40GPOPkybZwg,1116
@@ -153,7 +153,7 @@ odxtools/parameters/dynamicparameter.py,sha256=mdZx12XbhTSYVVuXEsPYRll3zaHjbHIYI
 odxtools/parameters/lengthkeyparameter.py,sha256=WSpSIbxFmEwBov6Jj5Ubj9gMr46OgrdNi5-UaahCjAo,5270
 odxtools/parameters/matchingrequestparameter.py,sha256=VNYIpmP_Yt_pzMHPgGWZk1XYH5liIdyawNIwIR1Cbvw,2897
 odxtools/parameters/nrcconstparameter.py,sha256=SjTHQlaBzvyUATyOzSFFWCcdkTeHcaoKO54kTomzb6Y,4823
-odxtools/parameters/parameter.py,sha256=K6UU0vQV010n-7oov9uibN7u5-cIp-r68Vfaz7jJqR0,5945
+odxtools/parameters/parameter.py,sha256=vb74YXUKEffF6ISshYtlIACf8TV-AOlIzlSthBIkxXc,6025
 odxtools/parameters/parameterwithdop.py,sha256=k7yJABRmHQTZNTEEPjyq3tBXJD4Aey365HpP7SGsEgk,3283
 odxtools/parameters/physicalconstantparameter.py,sha256=2iC6EKVJZVHwVVmd4h8KJ6OLc7B5QOUawivQMqWPCRA,3593
 odxtools/parameters/reservedparameter.py,sha256=8XQocU3_ExRZzXYEkITj535TTEUCNK87wIkrUTizgvI,1989
@@ -167,51 +167,51 @@ odxtools/templates/comparam-subset.odx-cs.xml.jinja2,sha256=9desdk8puFzysHAeLSoZ
 odxtools/templates/diag_layer_container.odx-d.xml.jinja2,sha256=YC4-jWVRoFqD_zd2Sd5FKnAlYsGYGVm9n2uXQ6kXqW8,2388
 odxtools/templates/index.xml.jinja2,sha256=Z1bcntvvky7NoH0Q0CRJgUORwf3g96PFPGeOpi7VATw,647
 odxtools/templates/macros/printAdminData.xml.jinja2,sha256=YTB_CbhnALF6RIbE0XKQHRbC6c0PSZ_DxdrRHgqMD_s,2590
-odxtools/templates/macros/printAudience.xml.jinja2,sha256=IiAogxtEIo6qg7iZm1plQtrM4nkl6jj9GhIv5QI5ETM,1278
+odxtools/templates/macros/printAudience.xml.jinja2,sha256=vaYL_-GPVdlLc7WAQTbkVZZbFuQptnCbOhXJb3tsHv8,1286
 odxtools/templates/macros/printBaseVariant.xml.jinja2,sha256=l4Jp8v9ZfPXvIisqVLgTpzc5UdYGeIocY4vAcgCiiaE,1480
 odxtools/templates/macros/printBasicStructure.xml.jinja2,sha256=V5oWGZesU_U5pvPO3Rtlodc7sxe5mFWY-uURLnQ8OfQ,614
-odxtools/templates/macros/printCompanyData.xml.jinja2,sha256=-F5xfUbjFAee7E__lgLCXC8a9xn15t_MDfxv6BzbKGA,2965
-odxtools/templates/macros/printComparam.xml.jinja2,sha256=rhoJO78urhjO07kuX0p_PRwfRHPIp2BPRu-eQ-USe6I,2392
+odxtools/templates/macros/printCompanyData.xml.jinja2,sha256=jcNmQBOGDw7wcKdam72NIJSOTxthfkPJvrmw24MBiYQ,2981
+odxtools/templates/macros/printComparam.xml.jinja2,sha256=e3hPCswAymJteQIUNoc7FOwsK_FrbJOvJooWdEx_vuQ,2408
 odxtools/templates/macros/printComparamRef.xml.jinja2,sha256=rBhrdUnp605fsUN9SaljpyaAojzaLBvTbkOuduKod18,1274
 odxtools/templates/macros/printCompuMethod.xml.jinja2,sha256=6eW1IgjPDwtW9qvA24Tx1wFtGFfJ0k10Gne5HoQpy4U,4394
-odxtools/templates/macros/printDOP.xml.jinja2,sha256=1i8s6Z9zR6C5WRngxXPMGaHhoaZsJSEfWsggjfxnRqY,5138
+odxtools/templates/macros/printDOP.xml.jinja2,sha256=t-6U0gZLdV2n6-YW5pkVFnHNVTAOnfqMch-mk_fGyjo,5146
 odxtools/templates/macros/printDescription.xml.jinja2,sha256=7jcYEIXr7hbbKqSvIUIgXaQSXV4dKAR9UhY352BZct8,452
-odxtools/templates/macros/printDiagComm.xml.jinja2,sha256=eIKtu3xEmoQllyNYOWQx5Iv2oljKSg3lR6V4As-SFE0,2231
-odxtools/templates/macros/printDiagLayer.xml.jinja2,sha256=V4CYnhnRLUPBhjE-l4kWpG3Hzym-9ddO0q9Kp2ypflU,6456
-odxtools/templates/macros/printDiagVariable.xml.jinja2,sha256=7Fa0DFyeEUDUxgM0IUsj_BXC2-csLSv1xjiUT1yauis,2531
+odxtools/templates/macros/printDiagComm.xml.jinja2,sha256=_SByYBYzPG9t7VNnAohFAXsgng9VrQcSacXH923wRzY,2239
+odxtools/templates/macros/printDiagLayer.xml.jinja2,sha256=NKrQ9JTxxhdHTHYFo_ZzyoClJJkZC3ISObhWCJOXUq4,6449
+odxtools/templates/macros/printDiagVariable.xml.jinja2,sha256=sQEU42Onf0WkRJZJyNUgeeGICc3MZaQJPQ0YKY6lRrU,2656
 odxtools/templates/macros/printDynDefinedSpec.xml.jinja2,sha256=uX3C40VmlbH7sndlJNyTvq8upzaoq8vCk6S93gtpFIY,1742
-odxtools/templates/macros/printDynamicEndmarkerField.xml.jinja2,sha256=EvUOkfVsNAT61B5OApyE7Yh45C_A_iBg9gCTiq_td7w,579
-odxtools/templates/macros/printDynamicLengthField.xml.jinja2,sha256=YCwgKV2na49mlHQQmI8L85ZYqUktaYuNil-K6rp4BR8,776
+odxtools/templates/macros/printDynamicEndmarkerField.xml.jinja2,sha256=6BmxPKesQvfy46iTiPSFu_iJffC6umZ_YRsTEd-0y5Q,587
+odxtools/templates/macros/printDynamicLengthField.xml.jinja2,sha256=bNvNh_4xyp4L6v7cxJ5cO1yOHYPnSFiaK9oY4l63fDU,784
 odxtools/templates/macros/printEcuSharedData.xml.jinja2,sha256=WK08eoDFEjj9o3eOuy__H0r9ioo688rTuQp6uXE6Tdo,820
 odxtools/templates/macros/printEcuVariant.xml.jinja2,sha256=Nsgj2VUWZvSDFPQsn6wv75M9TaryOB-tlQYCVq9hDEM,1594
 odxtools/templates/macros/printEcuVariantPattern.xml.jinja2,sha256=uSUrX1n2YVw6tt1-A0Lmlgy_W3dxW4r8bVErdrf_6vk,846
-odxtools/templates/macros/printElementId.xml.jinja2,sha256=wuCXYyXlg50zgUvukxScHN_SCH8YEATjkcqvwsC9aNw,389
-odxtools/templates/macros/printEndOfPdu.xml.jinja2,sha256=_BwCjD0iBya3JFRi_XcUrq8nwR96O7Tw6TeRu3t6Tgs,671
+odxtools/templates/macros/printElementId.xml.jinja2,sha256=Oe4sgtBB_VhTz6uJzaiTCpQki2ulKKfpBq56FVgBC-I,570
+odxtools/templates/macros/printEndOfPdu.xml.jinja2,sha256=ptjwOxyNTABATOajiitcvlJRKVGP_osh2wSJTCbaa38,679
 odxtools/templates/macros/printEnvData.xml.jinja2,sha256=2Goatqb66d-pCf9wqJDXn1EZWNhkQ8FJANKQMOnxuJs,609
-odxtools/templates/macros/printEnvDataDesc.xml.jinja2,sha256=23d4XOrHD6O-JHGVYbwnLVJWwaw3al1kneSsP2EIW0Q,580
-odxtools/templates/macros/printFunctionalClass.xml.jinja2,sha256=7Jtf_xB3bBcvjK_fXXHYTDXqcxMU4eBnJeZgLPKjFmg,321
+odxtools/templates/macros/printEnvDataDesc.xml.jinja2,sha256=rBpPf51LFx5oNx_XjeTABast9hmru5hYbeJQ2axHntw,588
+odxtools/templates/macros/printFunctionalClass.xml.jinja2,sha256=TpOQTj-hlNLtIfcSTVzU-gRrfaWrgsTrIFMqm_1M6Qs,329
 odxtools/templates/macros/printFunctionalGroup.xml.jinja2,sha256=zIeZbhf8haXhgJJUPiOnMe3lvqvfye4-zmwWDQJxFtQ,1159
 odxtools/templates/macros/printHierarchyElement.xml.jinja2,sha256=GD6iNIE0Wu0QsJ8uLtwEV8N9t6mIhI00_KpCVzOVQBM,651
-odxtools/templates/macros/printMux.xml.jinja2,sha256=EL9sCWzqC3iaBPsrTINUo03zGGMrU-bWbJ3f0U5CBIQ,1861
-odxtools/templates/macros/printParam.xml.jinja2,sha256=BKvKvswnelCynXmz_rAsejMdtce6Fji2CkSteX5x0jI,3203
+odxtools/templates/macros/printMux.xml.jinja2,sha256=68IiPY_mIJQqQiqce3jUphqp3-xLfmEBL7CSb3Cz7eI,1869
+odxtools/templates/macros/printParam.xml.jinja2,sha256=bdp-r1arWod-vV9ODUZn_QThtAAqkm31SqdJeGItJ1M,3183
 odxtools/templates/macros/printParentRef.xml.jinja2,sha256=RllVKt2RgrMnWfsujGnBUiABwV2y4_ZfINYy7LXenPM,896
-odxtools/templates/macros/printProtStack.xml.jinja2,sha256=abss3fNe-e5CbFBI0WcRopP7omIV2POzT0qJ6Az7dUE,765
+odxtools/templates/macros/printProtStack.xml.jinja2,sha256=0FHHvuduiMPhAE19vpTHu3cQeM9kSybWj5FbybcXnGk,773
 odxtools/templates/macros/printProtocol.xml.jinja2,sha256=1DXoRSq6z4dhpZnXWH3x9JPKCWmAmghjVgVFfizo41s,1028
-odxtools/templates/macros/printRequest.xml.jinja2,sha256=GazGOinjHp72ZhIZ8LVKpRxYcyYyNlBmEUNuN0cgntg,709
-odxtools/templates/macros/printResponse.xml.jinja2,sha256=QVU8dVCJm_Tv_Cy6SEun-fJBs2w9ASEfJeRs0LynZdA,675
+odxtools/templates/macros/printRequest.xml.jinja2,sha256=yq4xGSlQCioT7FRivyx40Cjs2CYr9EK6NLZf0W4wGW0,717
+odxtools/templates/macros/printResponse.xml.jinja2,sha256=GsOYmnoh4ewhWg3FUdcovHuJxvuIjsSrXNtbcnnAQcM,683
 odxtools/templates/macros/printService.xml.jinja2,sha256=zvjOCELEx4yim2FtdNKiExTsDPkAfQAP4Gf_QsondfQ,1546
-odxtools/templates/macros/printSingleEcuJob.xml.jinja2,sha256=KQqp5TeKPEC3Z_kasE35n9SRw7KhjPulQ4ijyReKF-U,2637
-odxtools/templates/macros/printSpecialData.xml.jinja2,sha256=SrgPPQkZF5C4wdveJSiHk8QJVYZ2zbd6XFvkyt7NEBE,1378
-odxtools/templates/macros/printState.xml.jinja2,sha256=B-rhB7HgfZCoC_mGljgDaX9hU4X1tZ9DbS39WpffBu4,307
-odxtools/templates/macros/printStateChart.xml.jinja2,sha256=bOj9FWl-kZmlhoMskG71zS9NxtTimGwQvgDpKNaPw6s,943
-odxtools/templates/macros/printStateTransition.xml.jinja2,sha256=iO4fSCwFMLdX_VDdNnn8udiGE3vYU7tXPfbEBvoTFa4,502
-odxtools/templates/macros/printStaticField.xml.jinja2,sha256=JIXFhyNrnQ-2_vWy6RxikrYpp5ZMAITgWCVCnt7bOxQ,513
-odxtools/templates/macros/printStructure.xml.jinja2,sha256=uswYs2xse0B9hZut_FN1GvvR0xsZa_3pZRnlF0ElEEc,559
-odxtools/templates/macros/printTable.xml.jinja2,sha256=VsP01jqyQllLP-brQ6J1E8ubVntiToEb8Uk7HQEYqtY,1485
-odxtools/templates/macros/printUnitSpec.xml.jinja2,sha256=AJ5jWYKRmoIZkrd25R1KmjjgU6pfOqRiOQHtUAuS6GI,2813
-odxtools-8.0.6.dist-info/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
-odxtools-8.0.6.dist-info/METADATA,sha256=I6_6YdNbHTRJXLyvjh-KMskjqe5-CvSc0tQCRYU0qXI,44084
-odxtools-8.0.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-odxtools-8.0.6.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
-odxtools-8.0.6.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
-odxtools-8.0.6.dist-info/RECORD,,
+odxtools/templates/macros/printSingleEcuJob.xml.jinja2,sha256=SXUgO57KQFahI3fv9tRWlEyWeSr0sYXwQ8vq8lqo0eI,2645
+odxtools/templates/macros/printSpecialData.xml.jinja2,sha256=0eIFh9cWXfFrQN_f8G_lz3fUqmtysxY6tSN4DbuFY40,1386
+odxtools/templates/macros/printState.xml.jinja2,sha256=BNnTEyczp43iP9Bn_plMLRsJsasra4sRyvmgODuZQYg,315
+odxtools/templates/macros/printStateChart.xml.jinja2,sha256=XW1EhF1k8ogbEDt-QMjSOojKl4vjxXkq6BwJWR9GJsI,951
+odxtools/templates/macros/printStateTransition.xml.jinja2,sha256=J2t0yU82UBegUSH9sAbnkdgEYPTUU0A7I-CokuPQxDo,510
+odxtools/templates/macros/printStaticField.xml.jinja2,sha256=fkV07zrL2pTo6b5ZPD14V0uC1aEk2P4roXyDhp-ah38,521
+odxtools/templates/macros/printStructure.xml.jinja2,sha256=CJUPZv_9lko63C5fNpOn5LlQqLCuS--qyhtx4NyD5Rk,567
+odxtools/templates/macros/printTable.xml.jinja2,sha256=5DQjjJ-UxQ75ntov0S0LGnm_V7YWtKadBpNbmV1aBb8,1501
+odxtools/templates/macros/printUnitSpec.xml.jinja2,sha256=opS6_Gr94WlAtREEyX4sLo-D-17Gni9Wvr3y1nfVgSA,2715
+odxtools-8.1.0.dist-info/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
+odxtools-8.1.0.dist-info/METADATA,sha256=dkjShZNAIkPd9u579phjMKQr1gGFWNyuMpng0dcqLrI,44084
+odxtools-8.1.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+odxtools-8.1.0.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
+odxtools-8.1.0.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
+odxtools-8.1.0.dist-info/RECORD,,