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

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

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List
 from xml.etree import ElementTree
 
 from .nameditemlist import NamedItemList
@@ -25,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:
@@ -38,14 +38,15 @@ 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")
         ]

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.2.0'
+__version_tuple__ = version_tuple = (8, 2, 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.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odxtools
-Version: 8.0.6
+Version: 8.2.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>