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

DLMS_SPODES/cosem_interface_classes/tcp_udp_setup.py

@@ -1,42 +1,20 @@
-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 ..types import cdt, cst
+from ..types.type_alias import Attr
+from .cosem_interface_class import ICAuto, ICAElement
+from .Overview import class_id
+
+
+class TCPUDPSetup(ICAuto):
+    """4.9.1 TCP-UDP setup"""
+    CLASS_ID = class_id.TCP_UDP_SETUP
+    VERSION = 0
+    A_ELEMENTS = (ICAElement(2, "TCP_UDP_port", cdt.LongUnsigned, default=4059),
+                  ICAElement(3, "IP_reference", cst.LogicalName),
+                  ICAElement(4, "MMS", cdt.LongUnsigned, 40, 535, 535),  # TODO: max, def not according by BlueBook
+                  ICAElement(5, "nb_of_sim_conn", cdt.Unsigned, 1),
+                  ICAElement(6, "inactivity_time_out", cdt.LongUnsigned, default=180))
+    TCP_UDP_port: Attr
+    IP_reference: Attr
+    MMS: Attr
+    nb_of_sim_conn: Attr
+    inactivity_time_out: Attr

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)