DLMS-SPODES 0.86.15__tar.gz → 0.86.17__tar.gz

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.15
+Version: 0.86.17
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project
@@ -14,7 +14,7 @@ Requires-Dist: pydantic>=2.11
 Requires-Dist: cryptography>=45.0
 Requires-Dist: semver>=3.0
 Requires-Dist: typing-extensions>=4.12.2
-Requires-Dist: StructResult>=0.8.2
+Requires-Dist: StructResult>=0.8.3
 Requires-Dist: numpy>=2.3.2
 Provides-Extra: dev
 Requires-Dist: mypy>=1.5.0; extra == "dev"

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/pyproject.toml

@@ -14,7 +14,7 @@ exclude = ["test","KPZ"]
 
 [project]
 name = "DLMS_SPODES"
-version = "0.86.15"
+version = "0.86.17"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
 ]
@@ -23,7 +23,7 @@ dependencies = [
     "cryptography>=45.0",
     "semver>=3.0",
     "typing-extensions>=4.12.2",  # remove for 3.13(use for @deprecated)
-    "StructResult>=0.8.2",
+    "StructResult>=0.8.3",
     "numpy>=2.3.2"
 ]
 description="dlms-spodes"

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/__class_init__.py

@@ -1,3 +1,3 @@
 from ..cosem_interface_classes import cosem_interface_class as ic, attr_indexes as ai
-from ..cosem_interface_classes.overview import ClassID, Version
+from ..cosem_interface_classes.overview import ClassID
 from ..types import common_data_types as cdt, cosem_service_types as cst, useful_types as ut

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/activity_calendar.py

@@ -1,5 +1,6 @@
 from typing_extensions import deprecated
 from typing import Self
+from .overview import VERSION_0
 from .__class_init__ import *
 from ..types.implementations import integers, octet_string
 
@@ -135,7 +136,7 @@ class DayProfileTable(cdt.Array):
 class ActivityCalendar(ic.COSEMInterfaceClasses):
     """DLMS UA 1000-1 Ed. 14 4.5.5 Activity calendar"""
     CLASS_ID = ClassID.ACTIVITY_CALENDAR
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("calendar_name_active", octet_string.ID),
                   ic.ICAElement("season_profile_active", SeasonProfile),
                   ic.ICAElement("week_profile_table_active", WeekProfileTable),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/arbitrator.py

@@ -1,5 +1,6 @@
 from .__class_init__ import *
 from ..types.implementations import structs, integers
+from .overview import VERSION_0
 
 
 class Actions(cdt.Array):
@@ -46,7 +47,7 @@ class RequestAction(cdt.Structure):
 class Arbitrator(ic.COSEMInterfaceClasses):
     """DLMS UA 1000-1 Ed. 14 4.5.12 Arbitrator"""
     CLASS_ID = ClassID.ARBITRATOR
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("actions", Actions),
                   ic.ICAElement("permission_table", PermissionsTable),
                   ic.ICAElement("weightings_table", WeightingsTable),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/association_ln/ver0.py

@@ -1,4 +1,6 @@
+from typing import Iterator
 from enum import IntFlag, auto
+from ..parameters import Parameter
 from ... import exceptions as exc
 from ..__class_init__ import *
 from ...types import choices
@@ -7,6 +9,7 @@ from ... import pdu_enums as pdu
 from . import mechanism_id, authentication_mechanism_name
 from . import method
 from . import abstract
+from ..overview import VERSION_0
 
 
 class AccessMode(abstract.AccessMode, elements=(0, 1, 2, 3)):
@@ -290,7 +293,7 @@ class CosemAttributeDescriptorWithSelection(ut.CosemAttributeDescriptorWithSelec
 class AssociationLN(ic.COSEMInterfaceClasses):
     """5.4.5 Association LN"""
     CLASS_ID = ClassID.ASSOCIATION_LN
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("object_list", ObjectListType, selective_access=SelectiveAccessDescriptor),
                   ic.ICAElement("associated_partners_id", AssociatedPartnersType),
                   ic.ICAElement("application_context_name", ApplicationContextName),
@@ -389,6 +392,9 @@ class AssociationLN(ic.COSEMInterfaceClasses):
         el: ObjectListElement
         return [el.logical_name  for el in self.object_list]
 
+    def iter_pars(self) -> Iterator[Parameter]:
+        return (Parameter(el.logical_name.contents) for el in self.object_list)
+
     def __check_empty_object_list(self):
         if self.object_list is None:
             raise exc.ITEApplication(F"empty <{self.get_attr_element(2).NAME}> in {self}")

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/association_ln/ver1.py

@@ -5,6 +5,7 @@ from ..__class_init__ import *
 from ...types.implementations import structs, arrays
 from . import authentication_mechanism_name
 from . import abstract
+from ..overview import VERSION_1
 
 
 class AccessMode(abstract.AccessMode, elements=tuple(range(7))):
@@ -105,7 +106,7 @@ class MechanismNameType(cdt.AXDR, authentication_mechanism_name.AuthenticationMe
 
 class AssociationLN(ver0.AssociationLN):
     """5.4.6 Association LN"""
-    VERSION = Version.V1
+    VERSION = VERSION_1
     A_ELEMENTS = (ic.ICAElement("object_list", ObjectListType, selective_access=ver0.SelectiveAccessDescriptor),
                   ver0.AssociationLN.get_attr_element(3),  # associated_partners_id
                   ic.ICAElement("application_context_name", ContextNameType),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/association_ln/ver2.py

@@ -1,11 +1,12 @@
 from ..__class_init__ import *
 from . import ver0, ver1
 from ...types.implementations import structs, arrays
+from ..overview import VERSION_2
 
 
 class AssociationLN(ver1.AssociationLN):
     """5.4.7 Association LN"""
-    VERSION = Version.V2
+    VERSION = VERSION_2
     A_ELEMENTS = (
         ver1.AssociationLN.get_attr_element(2),  # <object_list>
         ver0.AssociationLN.get_attr_element(3),  # associated_partners_id

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/clock.py

@@ -1,6 +1,7 @@
 import datetime
 from .__class_init__ import *
 from ..types.implementations import integers
+from .overview import VERSION_0
 
 
 class ClockStatus(cdt.Unsigned):
@@ -54,7 +55,7 @@ class TimeZone(cdt.Long):
 class Clock(ic.COSEMInterfaceClasses):
     """4.5.1 Clock"""
     CLASS_ID = ClassID.CLOCK
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("time", cst.OctetStringDateTime, classifier=ic.Classifier.DYNAMIC),
                   ic.ICAElement("time_zone", TimeZone, -720, 840),
                   ic.ICAElement("status", ClockStatus, classifier=ic.Classifier.DYNAMIC),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -57,7 +57,7 @@ from .tcp_udp_setup import TCPUDPSetup
 from .. import exceptions as exc
 from ..relation_to_OBIS import get_name
 from ..cosem_interface_classes import implementations as impl
-from ..cosem_interface_classes.overview import ClassID, Version, CountrySpecificIdentifiers
+from ..cosem_interface_classes.overview import ClassID, CountrySpecificIdentifiers
 from . import obis as o, ln_pattern
 from .. import pdu_enums as pdu
 from ..config_parser import config, get_message
@@ -742,7 +742,7 @@ class Collection:
                     except exc.EmptyObj as e:
                         logger.warning(F"can't copy {target} attr={i}, skipped. {e}")
 
-    def copy(self) -> result.Simple[Self]:
+    def copy(self) -> result.Simple["Collection"]:
         """copy collection with value by Association"""
         res = result.Simple(
             value=Collection(
@@ -779,7 +779,7 @@ class Collection:
                     target=new_obj,
                     association_id=ass_id)
             except Exception as e:
-                res.append_err(e)
+                res.append_e(e, "copy object value")
         return res
 
     @property
@@ -871,7 +871,7 @@ class Collection:
         """return: DLMSObject"""
         if obj := self.__objs.get(par.obis):
             return result.Simple(obj)
-        return result.Error.from_e(exc.NoObject(f"with {par=}"))
+        return result.Error.from_e(exc.NoObject(f"with {par=}"), "get object")
 
     def par2data(self, par: Parameter) -> result.Option[cdt.CommonDataType] | result.Error:
         """:return CDT by Parameter, return None if data wasn't setting"""
@@ -1122,12 +1122,12 @@ class Collection:
         return ret
 
     def sap2objects(self, value: enums.ClientSAP) -> result.List[ic.COSEMInterfaceClasses]:
-        res = result.List(msg=inspect.currentframe().f_code.co_qualname)
-        for ln in self.sap2association(value).get_lns():
-            try:
-                res.value.append(self.__get_object(ln.contents))
-            except exc.NoObject as e:
-                res.append_err(e)
+        res = result.List()
+        for par in self.sap2association(value).iter_pars():
+            if isinstance(res1 := self.par2obj(par), result.Error):
+                res1.append_err(res.err)
+            else:
+                res.append(res1.value)
         return res
 
     def iter_classID_objects(self,
@@ -1229,14 +1229,11 @@ class Collection:
         else:
             return obj
 
-    def obis2obj(self, obis: o.OBIS) -> result.Simple[InterfaceClass]:
-        res = result.Simple(
-            value=self.__objs.get(obis),
-            msg=inspect.currentframe().f_code.co_qualname
-        )
+    def obis2obj(self, obis: o.OBIS) -> result.Simple[InterfaceClass] | result.Error:
+        res = self.__objs.get(obis)
         if res.value is None:
-            res.append_err(exc.NoObject(obis))
-        return res
+            return result.Error.from_e(exc.NoObject(obis))
+        return result.Simple(res.value)
 
     def logicalName2obj(self, ln: cst.LogicalName) -> result.Simple[InterfaceClass]:
         return self.obis2obj(o.OBIS(ln.contents))

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py

@@ -4,7 +4,7 @@ DLMS UA 1000-1 Ed 14
 from dataclasses import dataclass
 from functools import lru_cache
 from typing_extensions import deprecated
-from typing import Iterator, Type, TypeAlias, Callable, Any, Self, Literal, Optional, Protocol
+from typing import Iterator, Type, TypeAlias, Callable, Any, Self, Literal, Optional, Protocol, ClassVar
 from ..types import cdt, ut, cst
 from StructResult import result
 from ..relation_to_OBIS import get_name
@@ -12,7 +12,7 @@ import logging
 from enum import IntEnum
 from itertools import count
 from .. import exceptions as exc
-from .overview import ClassID, Version
+from .overview import ClassID
 from ..settings import settings
 from ..config_parser import get_values
 from .. import literals
@@ -215,7 +215,7 @@ Name: Literal = Literal[
 
 
 @lru_cache(150)
-def ClassIDVer2Name(class_id: ClassID, ver: Version) -> Name:
+def ClassIDVer2Name(class_id: ClassID, ver: cdt.Unsigned) -> Name:
     """Table 3 – List of interface classes by class_id"""
     match int(class_id), int(ver):
         case 1, 0: return "Data"
@@ -326,8 +326,8 @@ def ClassIDVer2Name(class_id: ClassID, ver: Version) -> Name:
 
 
 class COSEMInterfaceClasses(Protocol):
-    CLASS_ID: ClassID
-    VERSION: Version | None = None
+    CLASS_ID: ClassVar[ut.CosemClassId]
+    VERSION: ClassVar[cdt.Unsigned]
     """ Identification code of the version of the class. The version of each object is retrieved together with the logical name and the class_id by reading the object_list 
     attribute of an “Association LN” / ”Association SN” object. Within one logical device, all instances of a certain class must be of the same version."""
     A_ELEMENTS: tuple[ICAElement, ...]
@@ -375,15 +375,26 @@ class COSEMInterfaceClasses(Protocol):
         # print(cls.__name__)
 
     @classmethod
-    def getAElement(cls, i: int) -> result.Simple[ICAElement] | result.Error:
+    @deprecated("use <getAElement>")
+    def get_attr_element(cls, i: int) -> ICAElement:
         """return element by order index. Override in each new class"""
         if i == 1:
-            return result.Simple(_LN_ELEMENT)
+            return _LN_ELEMENT
         elif i > len(cls.A_ELEMENTS) + 1:
             raise exc.DLMSException(F"got attribute index: {i}, expected 1..{len(cls.A_ELEMENTS) + 1}")
         else:
             return cls.A_ELEMENTS[i - 2]
 
+    @classmethod
+    def getAElement(cls, i: int) -> result.Simple[ICAElement] | result.Error:
+        """return element by order index. Override in each new class"""
+        if i == 1:
+            return result.Simple(_LN_ELEMENT)
+        elif i > len(cls.A_ELEMENTS) + 1:
+            return result.Error.from_e(exc.DLMSException(F"got attribute index: {i}, expected 1..{len(cls.A_ELEMENTS) + 1}"))
+        else:
+            return result.Simple(cls.A_ELEMENTS[i - 2])
+
     @classmethod
     def get_meth_element(cls, i: int) -> ICMElement:
         """ implement in subclasses with methods """

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/data.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
-from .__class_init__ import *
 from ..types import choices
+from . import cosem_interface_class as ic
+from .overview import ClassID
+from .overview import VERSION_0
 
 
 class Data(ic.COSEMInterfaceClasses):
     """ Object stores data related to internal meter object(s). The meaning of the value is identified by the logical_name.
     The data type of the value is CHOICE. “Data” is typically used to store configuration data and parameters """
     CLASS_ID = ClassID.DATA
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = ic.ICAElement("value", choices.common_dt, classifier=ic.Classifier.NOT_SPECIFIC),
 
     def characteristics_init(self):

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/demand_register/ver0.py

@@ -1,12 +1,13 @@
 from ..__class_init__ import *
 from ...types import choices
 from ...types.implementations import integers
+from ..overview import VERSION_0
 
 
 class DemandRegister(ic.COSEMInterfaceClasses):
     """DLMS UA 1000-1 Ed 14 4.3.4.Demand register"""
     CLASS_ID = ClassID.DEMAND_REGISTER
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (
         ic.ICAElement("current_average_value", choices.register, classifier=ic.Classifier.DYNAMIC),
         ic.ICAElement("last_average_value", choices.register, classifier=ic.Classifier.DYNAMIC),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/disconnect_control.py

@@ -2,6 +2,7 @@ from .__class_init__ import *
 from ..types.implementations import integers
 from itertools import chain
 from ..config_parser import get_message
+from .overview import VERSION_0
 
 
 class ControlState(cdt.Enum, elements=(0, 1, 2)):
@@ -42,7 +43,7 @@ class OutputState(cdt.Boolean):
 class DisconnectControl(ic.COSEMInterfaceClasses):
     """DLMS UA 1000-1 Ed. 14 4.5.8 Disconnect control"""
     CLASS_ID = ClassID.DISCONNECT_CONTROL
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("output_state", OutputState, classifier=ic.Classifier.DYNAMIC),
                   ic.ICAElement("control_state", ControlState, classifier=ic.Classifier.DYNAMIC),
                   ic.ICAElement("control_mode", ControlMode))

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/extended_register.py

@@ -1,6 +1,7 @@
 from . import register
 from .__class_init__ import *
 from ..types import choices
+from .overview import VERSION_0
 
 
 class ExtendedRegister(register.Register, ic.COSEMInterfaceClasses):
@@ -8,7 +9,7 @@ class ExtendedRegister(register.Register, ic.COSEMInterfaceClasses):
     the nature of the process value or of the status value. The nature of the value is described by the attribute
     “logical name” using the OBIS identification system. """
     CLASS_ID = ClassID.EXT_REGISTER
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (register.Register.get_attr_element(2),
                   register.Register.get_attr_element(3),
                   ic.ICAElement("status", choices.extended_register, classifier=ic.Classifier.DYNAMIC),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/gprs_modem_setup.py

@@ -1,4 +1,5 @@
 from . __class_init__ import *
+from ..overview import VERSION_0
 
 
 class QoSElement(cdt.Structure):
@@ -21,7 +22,7 @@ class QualityOfService(cdt.Structure):
 class GPRSModemSetup(ic.COSEMInterfaceClasses):
     """ This IC allow setting up GPRS modems, by handling all data necessary data for modem management. """
     CLASS_ID = ClassID.GPRS_MODEM_SETUP
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("APN", cdt.OctetString),
                   ic.ICAElement("PIN_code", cdt.LongUnsigned),
                   ic.ICAElement("quality_of_service", QualityOfService))

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/gsm_diagnostic/ver0.py

@@ -2,6 +2,7 @@ import logging
 
 from ..__class_init__ import *
 from ...config_parser import get_message
+from ..overview import VERSION_0
 
 
 class Status(cdt.Enum, elements=tuple(range(6))):
@@ -61,7 +62,7 @@ class GSMDiagnostic(ic.COSEMInterfaceClasses):
      to obtain diagnostic information that allows identifying communication problems in the network. An instance of the 'GSM diagnostic' class stores parameters of the GSM/GPRS
      network necessary for analysing the operation of the network."""
     CLASS_ID = ClassID.GSM_DIAGNOSTIC
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("operator", cdt.VisibleString, classifier=ic.Classifier.DYNAMIC),
                   ic.ICAElement("status", Status, 0, 255, 0, classifier=ic.Classifier.DYNAMIC),
                   ic.ICAElement("cs_attachment", CSAttachment, 0, 255, 0, classifier=ic.Classifier.DYNAMIC),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/iec_hdlc_setup/ver1.py

@@ -1,12 +1,13 @@
 from collections import deque
 from ..__class_init__ import *
 from ...types.implementations.enums import CommSpeed
+from ..overview import VERSION_0
 
 
 class IECHDLCSetup(ic.COSEMInterfaceClasses):
     """ This IC allows modelling and configuring communication channels according to Clause 8 of DLMS UA 1000-2 Ed. 8.0:2014. Several communication cnannels can be configured. """
     CLASS_ID = ClassID.IEC_HDLC_SETUP
-    VERSION = Version.V1
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("comm_speed", CommSpeed, 0, 9, 5),
                   ic.ICAElement("windows_size_transmit", cdt.Unsigned, 1, 7, 1),
                   ic.ICAElement("windows_size_receive", cdt.Unsigned, 1, 7, 1),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/iec_local_port_setup.py

@@ -1,10 +1,11 @@
-from .__class_init__ import *
+from ..cosem_interface_classes import cosem_interface_class as ic
+from .overview import ClassID, VERSION_1
 
 
 class IECLocalPortSetup(ic.COSEMInterfaceClasses):
     """ This IC allows modelling the configuration of communication ports using the protocols specified in IEC 62056-21:2002. Several ports can be configured. """
     CLASS_ID = ClassID.IEC_LOCAL_PORT_SETUP
-    VERSION = Version.V1
+    VERSION = VERSION_1
 
     def characteristics_init(self) -> None:
         """# TODO: not released ... """

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/image_transfer/ver0.py

@@ -1,6 +1,7 @@
 from ..__class_init__ import *
 from ...types.implementations import integers
 from . image_transfer_status import ImageTransferStatus
+from ..overview import VERSION_0
 
 
 class ImageToActivateInfoElement(cdt.Structure):
@@ -35,7 +36,7 @@ class ImageBlockTransfer(cdt.Structure):
 class ImageTransfer(ic.COSEMInterfaceClasses):
     """ Instance of the Image transfer IC model the process of transferring binary files, called Images to COSEM servers. """
     CLASS_ID = ClassID.IMAGE_TRANSFER
-    VERSION = Version.V0
+    VERSION = VERSION_0
     __blocks_for_update: list[bytearray]
     A_ELEMENTS = (ic.ICAElement("image_block_size", cdt.DoubleLongUnsigned),
                   ic.ICAElement("image_transferred_blocks_status", cdt.BitString, classifier=ic.Classifier.DYNAMIC),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/ipv4_setup.py

@@ -1,5 +1,6 @@
 from .__class_init__ import *
 from ..types.implementations import double_long_usingneds, arrays
+from .overview import VERSION_0
 
 
 class IPOptionsElement(cdt.Structure):
@@ -17,7 +18,7 @@ class IPv4Setup(ic.COSEMInterfaceClasses):
     connection on which these settings are used. There shall be and instance of this IC in a device for each different network interface implemented. For example, if a device has
     two interfaces (using the TCP-UDP/ITv4 profile on both of them), there shall be two instances of the IPc4 setup IC in that device: one for each of these interfaces."""
     CLASS_ID = ClassID.IPV4_SETUP
-    VERSION = Version.V0
+    VERSION = VERSION_0
     # TODO: more 7 attr and 3 methods
     A_ELEMENTS = (ic.ICAElement("DL_reference", cst.LogicalName),
                   ic.ICAElement("IP_address", double_long_usingneds.IPAddress),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/limiter.py

@@ -3,6 +3,9 @@ from .. import exceptions as exc
 from .__class_init__ import *
 from ..types import choices
 from ..types.implementations import structs, long_unsigneds, double_long_usingneds
+from .overview import VERSION_0
+
+
 threshold_scaler_unit = cdt.ScalUnitType(b'\x02\x02\x0f\x00\x16\x07')
 
 
@@ -41,7 +44,7 @@ class Limiter(ic.COSEMInterfaceClasses):
     time, and duration. The emergency profile id element is matched to an emergency profile group id: this mechanism enables the activation of the emergency threshold only
     for a specific emergency group. """
     CLASS_ID = ClassID.LIMITER
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("monitored_value", structs.ValueDefinition),
                   ic.ICAElement("threshold_active", choices.simple_dt, classifier=ic.Classifier.DYNAMIC),
                   ic.ICAElement("threshold_normal", choices.simple_dt),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/modem_configuration/ver0.py

@@ -1,5 +1,6 @@
 from ..__class_init__ import *
 from ...types.implementations.enums import CommSpeed
+from ..overview import VERSION_0
 
 
 class InitializationStringElement(cdt.Structure):
@@ -43,7 +44,7 @@ class PSTNModemConfiguration(ic.COSEMInterfaceClasses):
     """ An  instance of the 'PSTN modem configuration' IC stores data related to the initialization of modems, which are used for data transfer from/to a device. Several modems
     can be configured."""
     CLASS_ID = ClassID.MODEM_CONFIGURATION
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (ic.ICAElement("comm_speed", CommSpeed, 0, 9, 5),
                   ic.ICAElement("initialization_string", InitializationString),
                   ic.ICAElement("modem_profile", ModemProfile))

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/modem_configuration/ver1.py

@@ -1,5 +1,6 @@
 from ..__class_init__ import *
 from . import ver0
+from ..overview import VERSION_1
 
 
 class InitializationStringElement(cdt.Structure):
@@ -19,8 +20,8 @@ class InitializationString(cdt.Array):
 
 class ModemConfigurationVer1(ic.COSEMInterfaceClasses):
     """ This IC allow modelling the configuration and initialisation of modems used for data transfer from/to a device. Several modems can be configured."""
-    CLASS_ID = ut.CosemClassId(27)
-    VERSION = Version.V1
+    ClassID = ut.CosemClassId(27)
+    VERSION = VERSION_1
     A_ELEMENTS = (ver0.PSTNModemConfiguration.get_attr_element(2),
                   ic.ICAElement("initialization_string", InitializationString),
                   ver0.PSTNModemConfiguration.get_attr_element(4))

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/ntp_setup/ver0.py

@@ -1,5 +1,6 @@
 from ..__class_init__ import *
 from ...types.implementations import integers
+from ..overview import VERSION_0
 
 
 class ServerAddress(cdt.OctetString):
@@ -24,7 +25,7 @@ class AuthenticationKeys(cdt.Array):
 class NTPSetup(ic.COSEMInterfaceClasses):
     """DLMS UA 1000-1 Ed 14, 4.9.7 NTP setup"""
     CLASS_ID = ClassID.NTP_SETUP
-    VERSION = Version.V0
+    VERSION = VERSION_0
     A_ELEMENTS = (
         ic.ICAElement("activated", cdt.Boolean, default=False),
         ic.ICAElement("server_address", ServerAddress),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/overview.py

@@ -1,5 +1,7 @@
 """DLMS UA 1000-1 Ed 14 4.2 Overview of the COSEM interface classes"""
+from typing import Final
 from functools import lru_cache
+from typing_extensions import deprecated
 from enum import IntEnum
 from dataclasses import dataclass
 from ..types import ut, cdt
@@ -119,12 +121,11 @@ class ClassID:
         return tuple(map(int, filter(lambda it: isinstance(it, ut.CosemClassId), cls.__dict__.values())))
 
 
-@dataclass(frozen=True)
-class Version:
-    V0 = cdt.Unsigned(0)
-    V1 = cdt.Unsigned(1)
-    V2 = cdt.Unsigned(2)
-    V3 = cdt.Unsigned(3)
+VERSION_0: Final[cdt.Unsigned] = cdt.Unsigned(0)
+VERSION_1: Final[cdt.Unsigned] = cdt.Unsigned(1)
+VERSION_2: Final[cdt.Unsigned] = cdt.Unsigned(2)
+VERSION_3: Final[cdt.Unsigned] = cdt.Unsigned(3)
+VERSION_4: Final[cdt.Unsigned] = cdt.Unsigned(4)
 
 
 class CountrySpecificIdentifiers(IntEnum):

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/profile_generic/ver0.py

@@ -2,6 +2,7 @@
 from typing import Type
 from ..__class_init__ import *
 from ...types.implementations import long_unsigneds, integers
+from ..overview import VERSION_0
 
 
 BUFFER = 2
@@ -35,7 +36,7 @@ class SortMethod(cdt.Enum, elements=(1, 2, 3, 4, 5, 6)):
 class ProfileGeneric(ic.COSEMInterfaceClasses):
     """5.3.1 Profile generic"""
     CLASS_ID = ClassID.PROFILE_GENERIC
-    VERSION = Version.V0
+    VERSION = VERSION_0
     # todo: remove down following
     scaler_profile_key: bytes | None = None
     """ obis of scaler profile for this profile if need """

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/profile_generic/ver1.py

@@ -6,6 +6,7 @@ from ...relation_to_OBIS import get_name
 from ... import exceptions as exc
 from ..__class_init__ import *
 from ...types.implementations import integers, arrays, structs
+from ..overview import VERSION_1
 
 
 class CaptureObjects(cdt.Array):
@@ -37,7 +38,7 @@ class AccessSelector(ut.Unsigned8):
 
 class ProfileGeneric(ver0.ProfileGeneric):
     """4.3.6 Profile generic"""
-    VERSION = Version.V1
+    VERSION = VERSION_1
     A_ELEMENTS = (ic.ICAElement("buffer", arrays.SelectionAccess, classifier=ic.Classifier.DYNAMIC),
                   ic.ICAElement("capture_objects", CaptureObjects),
                   ver0.ProfileGeneric.get_attr_element(4),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/push_setup/ver2.py

@@ -2,6 +2,7 @@ from ..__class_init__ import *
 from ...types.implementations import structs, enums, integers
 from itertools import chain
 from ...types import choices
+from ..overview import VERSION_2
 
 
 class RestrictionElement(choices.StructureMixin, cdt.Structure):
@@ -89,7 +90,7 @@ class PushProtectionParameters(cdt.Array):
 class PushSetup(ic.COSEMInterfaceClasses):
     """ DLMS UA 1000-1 Ed. 14 4.4.8.2 Push setup"""
     CLASS_ID = ClassID.PUSH_SETUP
-    VERSION = Version.V2
+    VERSION = VERSION_2
     A_ELEMENTS = (ic.ICAElement("push_object_list", PushObjectList),
                   ic.ICAElement("send_destination_and_method", SendDestinationAndMethod),
                   ic.ICAElement("communication_window", CommunicationWindow),

{dlms_spodes-0.86.15 → dlms_spodes-0.86.17}/src/DLMS_SPODES/cosem_interface_classes/register.py

@@ -1,6 +1,7 @@
 from .__class_init__ import *
 from ..types import choices
 from ..types.implementations import integers
+from ..overview import VERSION_0
 
 
 class Register(ic.COSEMInterfaceClasses):
@@ -8,7 +9,7 @@ class Register(ic.COSEMInterfaceClasses):
     the nature of the process value or of the status value. The nature of the value is described by the attribute
     “logical name” using the OBIS identification system. """
     CLASS_ID = ClassID.REGISTER
-    VERSION = Version.V0
+    VERSION = VERSION_0
     scaler_unit_not_settable: bool
     A_ELEMENTS = (
         ic.ICAElement("value", choices.register, classifier=ic.Classifier.NOT_SPECIFIC),