DLMS-SPODES 0.87.17__py3-none-any.whl → 0.88.1__py3-none-any.whl

DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -1,172 +1,172 @@
-from dataclasses import dataclass
-from functools import cached_property
-from typing import Self
-from .parameter import Parameter
-
-
-@dataclass(frozen=True)
-class Data(Parameter):
-    @property
-    def value(self) -> Parameter:
-        return self.get_attr(2)
-
-
-class ActiveFirmwareIdentifier(Data):
-
-    @classmethod
-    def from_b(cls, b: int = 0) -> "ActiveFirmwareIdentifier":
-        return cls.parse(f"0.{b}.0.2.0.255")
-
-
-LDN = Data.parse("0.0.42.0.0.255")
-ACTIVE_FIRMWARE_IDENTIFIER_0 = ActiveFirmwareIdentifier.from_b()
-
-
-@dataclass(frozen=True)
-class Register(Data):
-    @property
-    def scaler_unit(self) -> Parameter:
-        return self.get_attr(3)
-
-
-@dataclass(frozen=True)
-class Clock(Parameter):
-    @classmethod
-    def from_be(cls, b: int = 0, e: int = 0) -> "Clock":
-        return cls.parse(f"0.{b}.1.0.{e}.255")
-
-    @property
-    def time(self) -> "Clock":
-        return self.get_attr(2)
-
-    @property
-    def time_zone(self) -> "Clock":
-        return self.get_attr(3)
-
-    @property
-    def status(self) -> "Clock":
-        return self.get_attr(4)
-
-    @property
-    def daylight_savings_begin(self) -> "Clock":
-        return self.get_attr(5)
-
-    @property
-    def daylight_savings_end(self) -> "Clock":
-        return self.get_attr(6)
-
-    @property
-    def daylight_savings_deviation(self) -> "Clock":
-        return self.get_attr(7)
-
-    @property
-    def daylight_savings_enabled(self) -> "Clock":
-        return self.get_attr(8)
-
-    @property
-    def clock_base(self) -> "Clock":
-        return self.get_attr(9)
-
-    @property
-    def adjust_to_quarter(self) -> "Clock":
-        return self.get_meth(1)
-
-    @property
-    def adjust_to_measuring_period(self) -> "Clock":
-        return self.get_meth(2)
-
-    @property
-    def adjust_to_minute(self) -> "Clock":
-        return self.get_meth(3)
-
-    @property
-    def adjust_to_preset_time(self) -> "Clock":
-        return self.get_meth(4)
-
-    @property
-    def preset_adjusting_time(self) -> "Clock":
-        return self.get_meth(5)
-
-    @property
-    def shift_time(self) -> "Clock":
-        return self.get_meth(6)
-
-
-@dataclass(frozen=True)
-class DisconnectControl(Parameter):
-
-    @classmethod
-    def from_b(cls, b: int) -> "DisconnectControl":
-        return cls.parse(f"0.{b}.96.3.10.255")
-
-    @property
-    def output_state(self) -> "DisconnectControl":
-        return self.get_attr(2)
-
-    @property
-    def control_state(self) -> "DisconnectControl":
-        return self.get_attr(3)
-
-    @property
-    def control_mode(self) -> "DisconnectControl":
-        return self.get_attr(4)
-
-    @property
-    def remote_disconnect(self) -> "DisconnectControl":
-        return self.get_meth(1)
-
-    @property
-    def remote_reconnect(self) -> "DisconnectControl":
-        return self.get_meth(2)
-
-
-DISCONNECT_CONTROL_0 = DisconnectControl.from_b(0)
-
-
-@dataclass(frozen=True)
-class ImageTransfer(Parameter):
-    @classmethod
-    def from_e(cls, e: int = 0) -> "ImageTransfer":
-        return cls.parse(f"0.0.44.0.{e}.255")
-
-    @property
-    def image_block_size(self) -> "ImageTransfer":
-        return self.get_attr(2)
-
-    @property
-    def image_transferred_blocks_status(self) -> "ImageTransfer":
-        return self.get_attr(3)
-
-    @property
-    def image_first_not_transferred_block_number(self) -> "ImageTransfer":
-        return self.get_attr(4)
-
-    @property
-    def image_transfer_enabled(self) -> "ImageTransfer":
-        return self.get_attr(5)
-
-    @property
-    def image_transfer_status(self) -> "ImageTransfer":
-        return self.get_attr(6)
-
-    @property
-    def image_to_activate_info(self) -> "ImageTransfer":
-        return self.get_attr(7)
-
-    @property
-    def image_transfer_initiate(self) -> "ImageTransfer":
-        return self.get_meth(1)
-
-    @property
-    def image_block_transfer(self) -> "ImageTransfer":
-        return self.get_meth(2)
-
-    @property
-    def image_verify(self) -> "ImageTransfer":
-        return self.get_meth(3)
-
-    @property
-    def image_activate(self) -> "ImageTransfer":
-        return self.get_meth(4)
-
-
+from dataclasses import dataclass
+from functools import cached_property
+from typing import Self
+from .parameter import Parameter
+
+
+@dataclass(frozen=True)
+class Data(Parameter):
+    @property
+    def value(self) -> Parameter:
+        return self.get_attr(2)
+
+
+class ActiveFirmwareIdentifier(Data):
+
+    @classmethod
+    def from_b(cls, b: int = 0) -> "ActiveFirmwareIdentifier":
+        return cls.parse(f"0.{b}.0.2.0.255")
+
+
+LDN = Data.parse("0.0.42.0.0.255")
+ACTIVE_FIRMWARE_IDENTIFIER_0 = ActiveFirmwareIdentifier.from_b()
+
+
+@dataclass(frozen=True)
+class Register(Data):
+    @property
+    def scaler_unit(self) -> Parameter:
+        return self.get_attr(3)
+
+
+@dataclass(frozen=True)
+class Clock(Parameter):
+    @classmethod
+    def from_be(cls, b: int = 0, e: int = 0) -> "Clock":
+        return cls.parse(f"0.{b}.1.0.{e}.255")
+
+    @property
+    def time(self) -> "Clock":
+        return self.get_attr(2)
+
+    @property
+    def time_zone(self) -> "Clock":
+        return self.get_attr(3)
+
+    @property
+    def status(self) -> "Clock":
+        return self.get_attr(4)
+
+    @property
+    def daylight_savings_begin(self) -> "Clock":
+        return self.get_attr(5)
+
+    @property
+    def daylight_savings_end(self) -> "Clock":
+        return self.get_attr(6)
+
+    @property
+    def daylight_savings_deviation(self) -> "Clock":
+        return self.get_attr(7)
+
+    @property
+    def daylight_savings_enabled(self) -> "Clock":
+        return self.get_attr(8)
+
+    @property
+    def clock_base(self) -> "Clock":
+        return self.get_attr(9)
+
+    @property
+    def adjust_to_quarter(self) -> "Clock":
+        return self.get_meth(1)
+
+    @property
+    def adjust_to_measuring_period(self) -> "Clock":
+        return self.get_meth(2)
+
+    @property
+    def adjust_to_minute(self) -> "Clock":
+        return self.get_meth(3)
+
+    @property
+    def adjust_to_preset_time(self) -> "Clock":
+        return self.get_meth(4)
+
+    @property
+    def preset_adjusting_time(self) -> "Clock":
+        return self.get_meth(5)
+
+    @property
+    def shift_time(self) -> "Clock":
+        return self.get_meth(6)
+
+
+@dataclass(frozen=True)
+class DisconnectControl(Parameter):
+
+    @classmethod
+    def from_b(cls, b: int) -> "DisconnectControl":
+        return cls.parse(f"0.{b}.96.3.10.255")
+
+    @property
+    def output_state(self) -> "DisconnectControl":
+        return self.get_attr(2)
+
+    @property
+    def control_state(self) -> "DisconnectControl":
+        return self.get_attr(3)
+
+    @property
+    def control_mode(self) -> "DisconnectControl":
+        return self.get_attr(4)
+
+    @property
+    def remote_disconnect(self) -> "DisconnectControl":
+        return self.get_meth(1)
+
+    @property
+    def remote_reconnect(self) -> "DisconnectControl":
+        return self.get_meth(2)
+
+
+DISCONNECT_CONTROL_0 = DisconnectControl.from_b(0)
+
+
+@dataclass(frozen=True)
+class ImageTransfer(Parameter):
+    @classmethod
+    def from_e(cls, e: int = 0) -> "ImageTransfer":
+        return cls.parse(f"0.0.44.0.{e}.255")
+
+    @property
+    def image_block_size(self) -> "ImageTransfer":
+        return self.get_attr(2)
+
+    @property
+    def image_transferred_blocks_status(self) -> "ImageTransfer":
+        return self.get_attr(3)
+
+    @property
+    def image_first_not_transferred_block_number(self) -> "ImageTransfer":
+        return self.get_attr(4)
+
+    @property
+    def image_transfer_enabled(self) -> "ImageTransfer":
+        return self.get_attr(5)
+
+    @property
+    def image_transfer_status(self) -> "ImageTransfer":
+        return self.get_attr(6)
+
+    @property
+    def image_to_activate_info(self) -> "ImageTransfer":
+        return self.get_attr(7)
+
+    @property
+    def image_transfer_initiate(self) -> "ImageTransfer":
+        return self.get_meth(1)
+
+    @property
+    def image_block_transfer(self) -> "ImageTransfer":
+        return self.get_meth(2)
+
+    @property
+    def image_verify(self) -> "ImageTransfer":
+        return self.get_meth(3)
+
+    @property
+    def image_activate(self) -> "ImageTransfer":
+        return self.get_meth(4)
+
+

DLMS_SPODES/cosem_interface_classes/profile_generic/ver0.py

@@ -1,133 +1,90 @@
-"""DLMS UA 1000-1 Ed 14"""
-from typing import Type
-from ..__class_init__ import *
-from ...types.implementations import long_unsigneds, integers
-from ..overview import VERSION_0
-
-
-BUFFER = 2
-CAPTURE_OBJECTS = 3
-CAPTURE_PERIOD = 4
-SORT_METHOD = 5
-SORT_OBJECT = 6
-ENTRIES_IN_USE = 7
-PROFILE_ENTRIES = 8
-
-
-class ObjectDefinition(cdt.Structure):
-    """ObjectDefinition"""
-    logical_name: cst.LogicalName
-    class_id: long_unsigneds.ClassId
-    attribute_index: cdt.Integer
-
-    def __hash__(self):
-        return hash((self.logical_name.contents, self.class_id.contents, self.attribute_index.contents))
-
-
-class CaptureObjects(cdt.Array):
-    """ Specifies the list of capture objects """
-    TYPE = ObjectDefinition
-
-
-class SortMethod(cdt.Enum, elements=(1, 2, 3, 4, 5, 6)):
-    """sort_method"""
-
-
-class GetBufferByIndex(cdt.Structure):
-    """get_buffer_by_index"""
-    from_index: cdt.DoubleLongUnsigned
-    to_index: cdt.DoubleLongUnsigned
-    selected_values: cdt.Array
-    
-
-
-class ProfileGeneric(ic.COSEMInterfaceClasses):
-    """5.3.1 Profile generic"""
-    CLASS_ID = ClassID.PROFILE_GENERIC
-    VERSION = VERSION_0
-    # todo: remove down following
-    scaler_profile_key: bytes | None = None
-    """ obis of scaler profile for this profile if need """
-    buffer_capture_objects: CaptureObjects
-    range_descriptor: Type[cdt.Structure] = None
-    attr_descriptor_with_selection: Type[ut.CosemAttributeDescriptorWithSelection] = None
-
-    A_ELEMENTS = (
-        ic.ICAElement("buffer", cdt.Array, classifier=ic.Classifier.DYNAMIC),
-        ic.ICAElement("capture_objects", CaptureObjects),
-        ic.ICAElement("capture_period", cdt.DoubleLongUnsigned),  # 5.3.1 Profile generic. capture_period
-        ic.ICAElement("sort_method", SortMethod),
-        ic.ICAElement("sort_object", ObjectDefinition),
-        ic.ICAElement("entries_in_use", cdt.DoubleLongUnsigned, 0, default=0, classifier=ic.Classifier.DYNAMIC),
-        ic.ICAElement("profile_entries", cdt.DoubleLongUnsigned, 1, default=1)
-    )
-    M_ELEMENTS = (
-        ic.ICMElement("reset", integers.Only0),
-        ic.ICMElement("capture", integers.Only0),
-        ic.ICMElement("write", cdt.Structure),  # todo: make anyhow
-        ic.ICMElement("get_buffer_by_range", integers.Only0),
-        ic.ICMElement("get_buffer_by_index", integers.Only0)
-        # more 2 elements
-    )
-
-    def characteristics_init(self):
-        self.set_attr(BUFFER, None)
-
-        # todo remove it
-        self.buffer.register_cb_preset(lambda _: self.__create_buffer_struct_type())  # value not used for creating struct type
-
-        self._cbs_attr_post_init.update({CAPTURE_OBJECTS: self.__create_buffer_struct_type})
-
-        self.buffer_capture_objects = self.capture_objects
-        """ objects for buffer. Change with access_selection """
-
-    @property
-    def buffer(self) -> cdt.Array:
-        return self.get_attr(2)
-
-    @property
-    def capture_objects(self) -> CaptureObjects:
-        return self.get_attr(3)
-
-    @property
-    def capture_period(self) -> cdt.DoubleLongUnsigned:
-        return self.get_attr(4)
-
-    @property
-    def sort_method(self) -> SortMethod:
-        return self.get_attr(5)
-
-    @property
-    def sort_object(self) -> ObjectDefinition:
-        return self.get_attr(6)
-
-    @property
-    def entries_in_use(self) -> cdt.DoubleLongUnsigned:
-        return self.get_attr(7)
-
-    @property
-    def profile_entries(self) -> cdt.DoubleLongUnsigned:
-        return self.get_attr(8)
-
-    @property
-    def reset(self) -> integers.Only0:
-        return self.get_meth(1)
-
-    @property
-    def capture(self) -> integers.Only0:
-        return self.get_meth(2)
-
-    def __create_buffer_struct_type(self):
-        """ TODO: more refactoring !!! """
-        # rename ObjectDefinition's and adding object if it absense in collection
-        el_value: ObjectDefinition
-        if self.capture_objects is None:
-            raise ValueError(F"{self}: create buffer Struct type, not set <capture_object> attribute. Need initiate <capture_objects> before")
-        for el_value in self.capture_objects:
-            self.collection.add_if_missing(
-                class_id=ut.CosemClassId(el_value.class_id.contents),
-                version=None,
-                logical_name=el_value.logical_name)
-            el_value.set_name(self.collection.get_name_and_type(el_value)[0][-1])
-        self.buffer_capture_objects = self.capture_objects
-        self.buffer.set_type(self.capture_objects.__class__)
+"""DLMS UA 1000-1 Ed 14"""
+from typing import Optional
+from ...types.implementations import long_unsigneds, integers
+from ...types import cdt, cst, ut
+from ..cosem_interface_class import ICAuto, ICAElement, ICMElement, Classifier, Cardinality
+from ..Overview import class_id
+
+BUFFER = 2
+CAPTURE_OBJECTS = 3
+CAPTURE_PERIOD = 4
+SORT_METHOD = 5
+SORT_OBJECT = 6
+ENTRIES_IN_USE = 7
+PROFILE_ENTRIES = 8
+
+
+class ObjectDefinition(cdt.Structure):
+    """ObjectDefinition"""
+    logical_name: cst.LogicalName
+    class_id: long_unsigneds.ClassId
+    attribute_index: cdt.Integer
+
+    def __hash__(self):
+        return hash((self.logical_name.contents, self.class_id.contents, self.attribute_index.contents))
+
+
+class CaptureObjects(cdt.Array):
+    """ Specifies the list of capture objects """
+    TYPE = ObjectDefinition
+
+
+class SortMethod(cdt.Enum, elements=(1, 2, 3, 4, 5, 6)):
+    """sort_method"""
+
+
+class ProfileGeneric(ICAuto):
+    """5.3.1 Profile generic"""
+    CLASS_ID = class_id.PROFILE_GENERIC
+    VERSION = 0
+    # todo: remove down following
+    scaler_profile_key: bytes | None = None
+    """ obis of scaler profile for this profile if need """
+    buffer_capture_objects: CaptureObjects
+    range_descriptor: type[cdt.Structure] = None
+    attr_descriptor_with_selection: type[ut.CosemAttributeDescriptorWithSelection] = None
+
+    A_ELEMENTS = (
+        ICAElement(2, "buffer", cdt.Array, classifier=Classifier.DYNAMIC),
+        ICAElement(3, "capture_objects", CaptureObjects),
+        ICAElement(4, "capture_period", cdt.DoubleLongUnsigned),
+        ICAElement(5, "sort_method", SortMethod),
+        ICAElement(6, "sort_object", ObjectDefinition),
+        ICAElement(7, "entries_in_use", cdt.DoubleLongUnsigned, 0, default=0, classifier=Classifier.DYNAMIC),
+        ICAElement(8, "profile_entries", cdt.DoubleLongUnsigned, 1, default=1)
+    )
+    M_ELEMENTS = (
+        ICMElement(1, "reset", integers.Only0),
+        ICMElement(2, "capture", integers.Only0),
+        # more 2 elements
+    )
+    buffer: Optional[cdt.Array]
+    capture_objects: Optional[CaptureObjects]
+    capture_period: Optional[cdt.DoubleLongUnsigned]
+    sort_method: Optional[SortMethod]
+    sort_object: Optional[ObjectDefinition]
+    entries_in_use: Optional[cdt.DoubleLongUnsigned]
+    profile_entries: Optional[cdt.DoubleLongUnsigned]
+
+    def characteristics_init(self):
+        self.set_attr(BUFFER, None)
+        # todo remove it
+        self.buffer.register_cb_preset(lambda _: self.__create_buffer_struct_type())  # value not used for creating struct type
+        self._cbs_attr_post_init.update({CAPTURE_OBJECTS: self.__create_buffer_struct_type})
+        self.buffer_capture_objects = self.capture_objects
+        """ objects for buffer. Change with access_selection """
+
+    def __create_buffer_struct_type(self):
+        """ TODO: more refactoring !!! """
+        # rename ObjectDefinition's and adding object if it absense in collection
+        el_value: ObjectDefinition
+        if self.capture_objects is None:
+            raise ValueError(F"{self}: create buffer Struct type, not set <capture_object> attribute. Need initiate <capture_objects> before")
+        for el_value in self.capture_objects:
+            self.collection.add_if_missing(
+                class_id=ut.CosemClassId(el_value.class_id.contents),
+                version=None,
+                logical_name=el_value.logical_name)
+            el_value.set_name(self.collection.get_name_and_type(el_value)[0][-1])
+        self.buffer_capture_objects = self.capture_objects
+        self.buffer.set_type(self.capture_objects.__class__)