DLMS-SPODES 0.87.12__py3-none-any.whl → 0.87.15__py3-none-any.whl

DLMS_SPODES/cosem_interface_classes/single_action_schedule.py

@@ -1,50 +1,50 @@
-from .__class_init__ import *
-from ..types.implementations import structs
-from .overview import VERSION_0
-
-
-class TYPE(cdt.Enum, elements=(1, 2, 3, 4, 5)):
-    """"""
-
-
-class ExecutionTimeDate(cdt.Structure):
-    """ Specifies the time and teh date when the script is executed. The two octet-string s contain time and date, in this order; time and date are
-     formatted as specified in DLMS UA 1000-1 Ed.12.0 4.1.6.1. Hundredths of second shall be zero. """
-    time: cst.OctetStringTime
-    date: cst.OctetStringDate
-
-
-class ExecutionTime(cdt.Array):
-    """ Specifies the list of execution time and date """
-    TYPE = ExecutionTimeDate
-
-
-class SingleActionSchedule(ic.COSEMInterfaceClasses):
-    """ This IC allows modelling the execution of periodic actions within a meter. Such actions are not necessarily linked to tariffication
-    (see “Activity calendar” or “Schedule”).  """
-    CLASS_ID = ClassID.SINGLE_ACTION_SCHEDULE
-    VERSION = VERSION_0
-    A_ELEMENTS = (ic.ICAElement("executed_script", structs.ActionItem),
-                  ic.ICAElement("type", TYPE),
-                  ic.ICAElement("execution_time", ExecutionTime))
-
-    def characteristics_init(self):
-        """nothing do it"""
-
-    @property
-    def executed_script(self) -> structs.ActionItem:
-        return self.get_attr(2)
-
-    @property
-    def type_(self) -> TYPE:
-        return self.get_attr(3)
-
-    @property
-    def execution_time(self) -> ExecutionTime:
-        return self.get_attr(4)
-
-
-if __name__ == '__main__':
-    a = ExecutionTimeDate(b'\x02\x02\t\x04\x12\x007\x00\t\x05\x07\xe5\x05\x1f\x01')
-    a = SingleActionSchedule('0.0.15.0.0.255')
-    print(a)
+from .__class_init__ import *
+from ..types.implementations import structs
+from .overview import VERSION_0
+
+
+class TYPE(cdt.Enum, elements=(1, 2, 3, 4, 5)):
+    """"""
+
+
+class ExecutionTimeDate(cdt.Structure):
+    """ Specifies the time and teh date when the script is executed. The two octet-string s contain time and date, in this order; time and date are
+     formatted as specified in DLMS UA 1000-1 Ed.12.0 4.1.6.1. Hundredths of second shall be zero. """
+    time: cst.OctetStringTime
+    date: cst.OctetStringDate
+
+
+class ExecutionTime(cdt.Array):
+    """ Specifies the list of execution time and date """
+    TYPE = ExecutionTimeDate
+
+
+class SingleActionSchedule(ic.COSEMInterfaceClasses):
+    """ This IC allows modelling the execution of periodic actions within a meter. Such actions are not necessarily linked to tariffication
+    (see “Activity calendar” or “Schedule”).  """
+    CLASS_ID = ClassID.SINGLE_ACTION_SCHEDULE
+    VERSION = VERSION_0
+    A_ELEMENTS = (ic.ICAElement("executed_script", structs.ActionItem),
+                  ic.ICAElement("type", TYPE),
+                  ic.ICAElement("execution_time", ExecutionTime))
+
+    def characteristics_init(self):
+        """nothing do it"""
+
+    @property
+    def executed_script(self) -> structs.ActionItem:
+        return self.get_attr(2)
+
+    @property
+    def type_(self) -> TYPE:
+        return self.get_attr(3)
+
+    @property
+    def execution_time(self) -> ExecutionTime:
+        return self.get_attr(4)
+
+
+if __name__ == '__main__':
+    a = ExecutionTimeDate(b'\x02\x02\t\x04\x12\x007\x00\t\x05\x07\xe5\x05\x1f\x01')
+    a = SingleActionSchedule('0.0.15.0.0.255')
+    print(a)

DLMS_SPODES/cosem_interface_classes/special_days_table.py

@@ -1,84 +1,84 @@
-import datetime
-from .__class_init__ import *
-from .overview import VERSION_0
-
-
-class SpecDayEntry(cdt.Structure):
-    """ Specifies a special day identifier for a given date. The date may have wildcards for repeating special days like Christmas. """
-    index: cdt.LongUnsigned
-    specialday_date: cst.OctetStringDate
-    day_id: cdt.Unsigned
-
-
-class Entries(cdt.Array):
-    """ Specifies the list of spec_day_entry """
-    TYPE = SpecDayEntry
-    values: list[SpecDayEntry]
-    __getitem__: SpecDayEntry
-
-    def new_element(self) -> SpecDayEntry:
-        indexes: list[int] = [int(el.index) for el in self.values]
-        for i in range(0x1_00_00):
-            if i not in indexes:
-                return SpecDayEntry((i, None, None))  # TODO: insert first DayID from ActiveCalendar as 3 element
-        raise ValueError(F'in {self} all indexes is busy')
-
-    def __check_index(self, value):
-        """validate day_id from DayProfile"""
-        if cdt.LongUnsigned(value) in (entry.index for entry in self.values):
-            raise ValueError(F'{cdt.LongUnsigned(value)} already exist in {self}')
-        else:
-            """validate OK"""
-
-    def validate_exist_index(self, value):
-        """pass if value in indexes"""
-        if cdt.LongUnsigned(value) not in (entry.index for entry in self.values):
-            raise ValueError(F'{cdt.LongUnsigned(value)} not exist in {self}')
-        else:
-            """validate OK"""
-
-    def get_indexes(self) -> list[int]:
-        """ getter for callback Index """
-        return [int(entries_element.index) for entries_element in self.values]
-
-
-class SpecialDaysTable(ic.COSEMInterfaceClasses):
-    """ The interface class allows defining dates, which will override normal switching behaviour for special days. The interface class works in
-    conjunction with the class "Schedule" or "Activity calendar" and the linking data item is day_id """
-    CLASS_ID = ClassID.SPECIAL_DAYS_TABLE
-    VERSION = VERSION_0
-    A_ELEMENTS = ic.ICAElement("entries", Entries),
-    M_ELEMENTS = (ic.ICMElement("insert", SpecDayEntry),
-                  ic.ICMElement("delete", cdt.LongUnsigned))  # Todo: was Delete.with_cb(None, self.entries.get_indexes)
-
-    def characteristics_init(self):
-        self._cbs_attr_post_init.update({2: self.__set_delete})
-        self.set_attr(2, None)
-
-    @property
-    def entries(self) -> Entries:
-        return self.get_attr(2)
-
-    @property
-    def insert(self) -> SpecDayEntry:
-        return self.get_meth(1)
-
-    @property
-    def delete(self) -> cdt.LongUnsigned:
-        return self.get_meth(2)
-
-    def __set_delete(self):
-        try:
-            self.delete.register_cb_preset(self.entries.validate_exist_index)
-            self.insert.index.register_cb_preset(self.entries.validate_exist_index)
-        except KeyError:  # At init time
-            print('set delete NO:')
-
-    def __delete_entry(self):
-        """remove one entry by according delete method index. Call after execute"""
-        for entry in self.entries.values:
-            if entry.index == self.delete:
-                self.entries.values.remove(entry)
-                return
-        else:
-            raise ValueError(F'not found entry with index {self.delete} for remove')
+import datetime
+from .__class_init__ import *
+from .overview import VERSION_0
+
+
+class SpecDayEntry(cdt.Structure):
+    """ Specifies a special day identifier for a given date. The date may have wildcards for repeating special days like Christmas. """
+    index: cdt.LongUnsigned
+    specialday_date: cst.OctetStringDate
+    day_id: cdt.Unsigned
+
+
+class Entries(cdt.Array):
+    """ Specifies the list of spec_day_entry """
+    TYPE = SpecDayEntry
+    values: list[SpecDayEntry]
+    __getitem__: SpecDayEntry
+
+    def new_element(self) -> SpecDayEntry:
+        indexes: list[int] = [int(el.index) for el in self.values]
+        for i in range(0x1_00_00):
+            if i not in indexes:
+                return SpecDayEntry((i, None, None))  # TODO: insert first DayID from ActiveCalendar as 3 element
+        raise ValueError(F'in {self} all indexes is busy')
+
+    def __check_index(self, value):
+        """validate day_id from DayProfile"""
+        if cdt.LongUnsigned(value) in (entry.index for entry in self.values):
+            raise ValueError(F'{cdt.LongUnsigned(value)} already exist in {self}')
+        else:
+            """validate OK"""
+
+    def validate_exist_index(self, value):
+        """pass if value in indexes"""
+        if cdt.LongUnsigned(value) not in (entry.index for entry in self.values):
+            raise ValueError(F'{cdt.LongUnsigned(value)} not exist in {self}')
+        else:
+            """validate OK"""
+
+    def get_indexes(self) -> list[int]:
+        """ getter for callback Index """
+        return [int(entries_element.index) for entries_element in self.values]
+
+
+class SpecialDaysTable(ic.COSEMInterfaceClasses):
+    """ The interface class allows defining dates, which will override normal switching behaviour for special days. The interface class works in
+    conjunction with the class "Schedule" or "Activity calendar" and the linking data item is day_id """
+    CLASS_ID = ClassID.SPECIAL_DAYS_TABLE
+    VERSION = VERSION_0
+    A_ELEMENTS = ic.ICAElement("entries", Entries),
+    M_ELEMENTS = (ic.ICMElement("insert", SpecDayEntry),
+                  ic.ICMElement("delete", cdt.LongUnsigned))  # Todo: was Delete.with_cb(None, self.entries.get_indexes)
+
+    def characteristics_init(self):
+        self._cbs_attr_post_init.update({2: self.__set_delete})
+        self.set_attr(2, None)
+
+    @property
+    def entries(self) -> Entries:
+        return self.get_attr(2)
+
+    @property
+    def insert(self) -> SpecDayEntry:
+        return self.get_meth(1)
+
+    @property
+    def delete(self) -> cdt.LongUnsigned:
+        return self.get_meth(2)
+
+    def __set_delete(self):
+        try:
+            self.delete.register_cb_preset(self.entries.validate_exist_index)
+            self.insert.index.register_cb_preset(self.entries.validate_exist_index)
+        except KeyError:  # At init time
+            print('set delete NO:')
+
+    def __delete_entry(self):
+        """remove one entry by according delete method index. Call after execute"""
+        for entry in self.entries.values:
+            if entry.index == self.delete:
+                self.entries.values.remove(entry)
+                return
+        else:
+            raise ValueError(F'not found entry with index {self.delete} for remove')

DLMS_SPODES/cosem_interface_classes/tcp_udp_setup.py

@@ -1,42 +1,42 @@
-from .__class_init__ import *
-from .overview import VERSION_0
-
-
-class TCPUDPSetup(ic.COSEMInterfaceClasses):
-    """ This IC allows modelling the setup of the TCP or UDP sub-layer of the COSEM TCP or UDP  based transport layer of a TCP-UDP/IP based communication profile.
-     In TCP-UDP/IP based communication profiles, all AAs between a physical device hosting one or more COSEM client application processes and a physical device hosting one or more
-     COSEM server APs rely on a single TCP or UDP  connection. The TCP or UDP entity is wrapped in the COSEM TCP-UDP based transport layer. Within a physical device, each
-     AP - client AP or server logical device - is bound to a Wrapper Port (WPort). The binding is done with the help of the SAP Assignment object. See 4.4.5 DLMS 1000-1 Ed. 12.0.
-     On the other hand, COSEM TCP  or UDP based transport layer may be capable to support more than one TCP or UDP connections, between a physical device and several peer physical
-     devices hosting COSEM APs.
-     When a COSEM physical device supports various data link layers - for example Ethernet and PPP - an instance of the TCP-UDP setup object is necessary for each of them. """
-    CLASS_ID = ClassID.TCP_UDP_SETUP
-    VERSION = VERSION_0
-    A_ELEMENTS = (ic.ICAElement("TCP_UDP_port", cdt.LongUnsigned, default=4059),
-                  ic.ICAElement("IP_reference", cst.LogicalName),
-                  ic.ICAElement("MMS", cdt.LongUnsigned, 40, 535, 535),  # TODO: max, def not according by BlueBook
-                  ic.ICAElement("nb_of_sim_conn", cdt.Unsigned, 1),
-                  ic.ICAElement("inactivity_time_out", cdt.LongUnsigned, default=180))
-
-    def characteristics_init(self):
-        """nothing do it"""
-
-    @property
-    def TCP_UDP_port(self) -> cdt.LongUnsigned:
-        return self.get_attr(2)
-
-    @property
-    def IP_reference(self) -> cst.LogicalName:
-        return self.get_attr(3)
-
-    @property
-    def MMS(self) -> cdt.LongUnsigned:
-        return self.get_attr(4)
-
-    @property
-    def nb_of_sim_conn(self) -> cdt.Unsigned:
-        return self.get_attr(5)
-
-    @property
-    def inactivity_time_out(self) -> cdt.LongUnsigned:
-        return self.get_attr(6)
+from .__class_init__ import *
+from .overview import VERSION_0
+
+
+class TCPUDPSetup(ic.COSEMInterfaceClasses):
+    """ This IC allows modelling the setup of the TCP or UDP sub-layer of the COSEM TCP or UDP  based transport layer of a TCP-UDP/IP based communication profile.
+     In TCP-UDP/IP based communication profiles, all AAs between a physical device hosting one or more COSEM client application processes and a physical device hosting one or more
+     COSEM server APs rely on a single TCP or UDP  connection. The TCP or UDP entity is wrapped in the COSEM TCP-UDP based transport layer. Within a physical device, each
+     AP - client AP or server logical device - is bound to a Wrapper Port (WPort). The binding is done with the help of the SAP Assignment object. See 4.4.5 DLMS 1000-1 Ed. 12.0.
+     On the other hand, COSEM TCP  or UDP based transport layer may be capable to support more than one TCP or UDP connections, between a physical device and several peer physical
+     devices hosting COSEM APs.
+     When a COSEM physical device supports various data link layers - for example Ethernet and PPP - an instance of the TCP-UDP setup object is necessary for each of them. """
+    CLASS_ID = ClassID.TCP_UDP_SETUP
+    VERSION = VERSION_0
+    A_ELEMENTS = (ic.ICAElement("TCP_UDP_port", cdt.LongUnsigned, default=4059),
+                  ic.ICAElement("IP_reference", cst.LogicalName),
+                  ic.ICAElement("MMS", cdt.LongUnsigned, 40, 535, 535),  # TODO: max, def not according by BlueBook
+                  ic.ICAElement("nb_of_sim_conn", cdt.Unsigned, 1),
+                  ic.ICAElement("inactivity_time_out", cdt.LongUnsigned, default=180))
+
+    def characteristics_init(self):
+        """nothing do it"""
+
+    @property
+    def TCP_UDP_port(self) -> cdt.LongUnsigned:
+        return self.get_attr(2)
+
+    @property
+    def IP_reference(self) -> cst.LogicalName:
+        return self.get_attr(3)
+
+    @property
+    def MMS(self) -> cdt.LongUnsigned:
+        return self.get_attr(4)
+
+    @property
+    def nb_of_sim_conn(self) -> cdt.Unsigned:
+        return self.get_attr(5)
+
+    @property
+    def inactivity_time_out(self) -> cdt.LongUnsigned:
+        return self.get_attr(6)

DLMS_SPODES/cosem_pdu.py

@@ -1,93 +1,93 @@
-from __future__ import annotations
-from typing import Dict, Type, Union
-from abc import ABC, abstractmethod
-from struct import pack
-
-
-_services: Dict[int, Type[Union[AARE, ]]] = dict()
-""" COSEM Services dictionary """
-
-
-class Tag:
-    """ APDU tag TODO: """
-    value: int
-
-    def __init__(self, value: int):
-        self.value = value
-
-    def __get__(self, instance, owner: COSEMPdu) -> int:
-        return self.value
-
-    def __set__(self, instance, value):
-        raise ValueError("Tag no supported change")
-
-
-class COSEMPdu(ABC):
-    """ TODO: """
-    tag: Tag
-
-    def __init__(self, content: bytearray):
-        if content.pop(0) != self.tag:
-            raise ValueError(F'Wrong {self.__class__.__name__} tag, expected {self.tag}')
-        length = content.pop(0)
-        if len(content) != length:
-            raise ValueError(F'Wrong PDU length, expected {length}, got {len(content)}')
-
-    def __init_subclass__(cls, **kwargs):
-        """ register subclass in _types with unique tag  """
-        super().__init_subclass__(**kwargs)
-        if hasattr(cls, 'tag'):
-            _services.setdefault(cls.tag, cls)
-        else:
-            """ Handler for subclass without tag """
-
-    @classmethod
-    def from_content(cls, content: bytearray):
-        tag = content[0]
-        service = _services.get(tag, None)(content)
-        if service is None:
-            raise ValueError(F'service with tag:{tag} is absence in Service Dictionary')
-        else:
-            return service
-
-    @property
-    @abstractmethod
-    def info(self) -> bytes:
-        """ return info. All services, objects etc... TODO: """
-
-    def content(self) -> bytes:
-        return pack('BB', self.tag, len(self.info)) + self.info
-
-
-class ACSE(COSEMPdu, ABC):
-    """ TODO: """
-
-
-class AARE(ACSE):
-    """ TODO: """
-    tag = Tag(61)
-
-    def __init__(self, content: bytearray):
-        super(AARE, self).__init__(content)
-
-    @property
-    def info(self) -> bytes:
-        return bytes()
-
-
-class AARQ(ACSE):
-    """ TODO: """
-    tag = Tag(60)
-
-    def __init__(self, content: bytearray):
-        super(AARQ, self).__init__(content)
-
-    @property
-    def info(self) -> bytes:
-        return bytes()
-
-
-if __name__ == '__main__':
-    a = COSEMPdu.from_content(bytearray((61,3,1,2,4)))
-    b = a.content().hex(' ')
-    print(a)
+from __future__ import annotations
+from typing import Dict, Type, Union
+from abc import ABC, abstractmethod
+from struct import pack
+
+
+_services: Dict[int, Type[Union[AARE, ]]] = dict()
+""" COSEM Services dictionary """
+
+
+class Tag:
+    """ APDU tag TODO: """
+    value: int
+
+    def __init__(self, value: int):
+        self.value = value
+
+    def __get__(self, instance, owner: COSEMPdu) -> int:
+        return self.value
+
+    def __set__(self, instance, value):
+        raise ValueError("Tag no supported change")
+
+
+class COSEMPdu(ABC):
+    """ TODO: """
+    tag: Tag
+
+    def __init__(self, content: bytearray):
+        if content.pop(0) != self.tag:
+            raise ValueError(F'Wrong {self.__class__.__name__} tag, expected {self.tag}')
+        length = content.pop(0)
+        if len(content) != length:
+            raise ValueError(F'Wrong PDU length, expected {length}, got {len(content)}')
+
+    def __init_subclass__(cls, **kwargs):
+        """ register subclass in _types with unique tag  """
+        super().__init_subclass__(**kwargs)
+        if hasattr(cls, 'tag'):
+            _services.setdefault(cls.tag, cls)
+        else:
+            """ Handler for subclass without tag """
+
+    @classmethod
+    def from_content(cls, content: bytearray):
+        tag = content[0]
+        service = _services.get(tag, None)(content)
+        if service is None:
+            raise ValueError(F'service with tag:{tag} is absence in Service Dictionary')
+        else:
+            return service
+
+    @property
+    @abstractmethod
+    def info(self) -> bytes:
+        """ return info. All services, objects etc... TODO: """
+
+    def content(self) -> bytes:
+        return pack('BB', self.tag, len(self.info)) + self.info
+
+
+class ACSE(COSEMPdu, ABC):
+    """ TODO: """
+
+
+class AARE(ACSE):
+    """ TODO: """
+    tag = Tag(61)
+
+    def __init__(self, content: bytearray):
+        super(AARE, self).__init__(content)
+
+    @property
+    def info(self) -> bytes:
+        return bytes()
+
+
+class AARQ(ACSE):
+    """ TODO: """
+    tag = Tag(60)
+
+    def __init__(self, content: bytearray):
+        super(AARQ, self).__init__(content)
+
+    @property
+    def info(self) -> bytes:
+        return bytes()
+
+
+if __name__ == '__main__':
+    a = COSEMPdu.from_content(bytearray((61,3,1,2,4)))
+    b = a.content().hex(' ')
+    print(a)