DLMS-SPODES 0.86.23__py3-none-any.whl → 0.87.0__py3-none-any.whl

DLMS_SPODES/cosem_interface_classes/parameter.py

@@ -4,6 +4,7 @@ import numpy as np
 from struct import Struct, pack, unpack_from
 from typing import Optional, cast, Iterator
 import re
+from functools import cached_property
 from .. import exceptions as exc
 from .obis import OBIS
 
@@ -37,10 +38,10 @@ class Parameter:
         piece OPTIONAL
     }
     """
-    value: bytes
+    _value: bytes
 
     def __bytes__(self) -> bytes:
-        return self.value
+        return self._value
 
     @classmethod
     def parse(cls, value: str) -> "Parameter":
@@ -59,25 +60,29 @@ class Parameter:
                 ret += (g1 + int(a)).to_bytes(2)
             return cls(ret)
 
+    @cached_property
+    def logical_name(self) -> "Parameter":
+        return self.get_attr(2)
+
     def __eq__(self, other) -> bool:
         if isinstance(other, Parameter):
-            return cast("bool", self.value == other.value)
+            return cast("bool", self._value==other._value)
         return NotImplemented
 
     def __lt__(self, other: "Parameter") -> bool:
         """comparing for sort method"""
-        if len(self.value) > len(other.value):
+        if len(self._value) > len(other._value):
             return True
         else:
             return False
 
     def __str__(self) -> str:
-        if (l := len(self.value)) < 6:
+        if (l := len(self._value)) < 6:
             return "No valid"
         elif l == 7:
             return "No valid Index"
         else:
-            res = F"{".".join(map(str, self.value[:6]))}"
+            res = F"{".".join(map(str, self._value[:6]))}"
         if l > 6:
             res += F":{"m" if self.is_method() else ""}{self.i}"
         if l > 8:
@@ -87,41 +92,51 @@ class Parameter:
         return res
 
     def validate(self) -> None:
-        if (length := len(self.value)) < 6:
+        if (length := len(self._value)) < 6:
             raise exc.DLMSException(F"Parameter got {length=}, expected at least 6")
         if length == 7:
             raise exc.DLMSException(F"Parameter got wrong index")
 
     @property
     def has_index(self) -> bool:
-        return len(self.value) > 6
+        return len(self._value) > 6
 
     @property
     @deprecated("use obis")
     def ln(self) -> bytes:
         """Logical Name"""
-        return self.value[:6]
+        return self._value[:6]
 
     def is_method(self) -> bool:
-        return self.value[6] == 1
+        return self._value[6] == 1
 
     @property
     def i(self) -> int:
         """attribute or method index"""
-        return self.value[7]
+        return self._value[7]
+
+    def get_attr(self, i: int) -> "Parameter":
+        """get attribute"""
+        val = Index.pack(0, i)
+        return self.__class__(self._value[:6] + val)
+
+    def get_meth(self, i: int) -> "Parameter":
+        """get method"""
+        val = Index.pack(1, i)
+        return self.__class__(self._value[:6] + val)
 
     def set_i(self, index: int, is_method: bool = False) -> "Parameter":
         val = Index.pack(is_method, index)
-        if len(self.value) == 6:
-            tmp = self.value + val
+        if len(self._value) == 6:
+            tmp = self._value + val
         else:
-            tmp = bytearray(self.value)
+            tmp = bytearray(self._value)
             tmp[6:8] = val
             tmp = bytes(tmp)
         return self.__class__(tmp)
 
     def append_validate(self) -> None:
-        if (l := len(self.value)) < 7:
+        if (l := len(self._value)) < 7:
             raise exc.DLMSException(F"Parameter must has index before")
         elif l % 2 != 0:
             raise exc.DLMSException(F"Can't append to Parameter with piece")
@@ -129,11 +144,11 @@ class Parameter:
     def append(self, index: int) -> "Parameter":
         """add new sequence(array or struct) index element"""
         self.append_validate()
-        return self.__class__(self.value + pack(">H", index))
+        return self.__class__(self._value + pack(">H", index))
 
     def extend(self, *indexes: int) -> "Parameter":
         self.append_validate()
-        return self.__class__(self.value + pack(F">{len(indexes)}H", *indexes))
+        return self.__class__(self._value + pack(F">{len(indexes)}H", *indexes))
 
     def pop(self) -> tuple[Optional[int], int, "Parameter"]:
         """
@@ -141,20 +156,20 @@ class Parameter:
         ex.: Parameter("0.0.0.0.0.0:2 1/1/1 p3") => (1, Parameter("0.0.0.0.0.0:2 1/1"))
         """
         if self.has_piece():
-            return self.value[-1], int.from_bytes(self.value[-3:-1]), self.__class__(self.value[:-3])
+            return self._value[-1], int.from_bytes(self._value[-3:-1]), self.__class__(self._value[:-3])
         else:
-            return None, int.from_bytes(self.value[-2:]), self.__class__(self.value[:-2])
+            return None, int.from_bytes(self._value[-2:]), self.__class__(self._value[:-2])
 
     def set_piece(self, index: int) -> "Parameter":
         """add new sequence(array or struct) index element"""
-        if len(self.value) >= 7:
-            return self.__class__(self.value + pack("B", index))
+        if len(self._value) >= 7:
+            return self.__class__(self._value + pack("B", index))
         else:
             raise exc.DLMSException(F"Parameter must has index before")
 
     def has_piece(self) -> bool:
         if (
-            (l := len(self.value)) >= 9
+            (l := len(self._value)) >= 9
             and l % 2 != 0
         ):
             return True
@@ -164,22 +179,22 @@ class Parameter:
     @property
     def piece(self) -> Optional[int]:
         if self.has_piece():
-            return self.value[-1]
+            return self._value[-1]
 
     def clear_piece(self) -> "Parameter":
         if self.has_piece():
-            return self.__class__(self.value[:-1])
+            return self.__class__(self._value[:-1])
 
     def elements(self, start: int = 0) -> Iterator[int]:
         """return: index elements nested in attribute, started with"""
         for i in range(8 + start, 8 + 2 * self.n_elements, 2):
-            res = int.from_bytes(self.value[i:i+2], "big")
+            res = int.from_bytes(self._value[i:i + 2], "big")
             yield res
 
     def __iter__(self) -> Iterator[int]:
-        for it in self.value[:6]:
+        for it in self._value[:6]:
             yield it
-        if self.value[6] == 1:
+        if self._value[6] == 1:
             yield -self.i
         else:
             yield self.i
@@ -190,15 +205,15 @@ class Parameter:
         if self.n_elements == 0:
             raise ValueError("Parameter hasn't elements")
         if self.has_piece():
-            val = self.value[-3: -1]
+            val = self._value[-3: -1]
         else:
-            val = self.value[-2:]
+            val = self._value[-2:]
         return int.from_bytes(val, "big")
 
     @property
     def n_elements(self) -> int:
         """return: amount of elements nested in attribute"""
-        return max(0, (len(self.value) - 8) // 2)
+        return max(0, (len(self._value) - 8) // 2)
 
     def set(self,
             a: int = None,
@@ -208,7 +223,7 @@ class Parameter:
             e: int = None,
             f: int = None
             ) -> "Parameter":
-        val = bytearray(self.value)
+        val = bytearray(self._value)
         if a is not None:
             val[0] = a
         if b is not None:
@@ -224,52 +239,52 @@ class Parameter:
         return self.__class__(bytes(val))
 
     def __contains__(self, item: "Parameter"):
-        return item.value in self.value
+        return item._value in self._value
 
     def __getitem__(self, item) -> Optional[int]:
         if self.n_elements > 0:
-            return unpack_from(">H", self.value, item*2 + 8)[0]
+            return unpack_from(">H", self._value, item * 2 + 8)[0]
         else:
             return None
 
     @property
     def a(self) -> int:
-        return self.value[0]
+        return self._value[0]
 
     @property
     def b(self) -> int:
-        return self.value[1]
+        return self._value[1]
 
     @property
     def c(self) -> int:
-        return self.value[2]
+        return self._value[2]
 
     @property
     def d(self) -> int:
-        return self.value[3]
+        return self._value[3]
 
     @property
     def e(self) -> int:
-        return self.value[4]
+        return self._value[4]
 
     @property
     def f(self) -> int:
-        return self.value[5]
+        return self._value[5]
 
     @property
     def attr(self) -> "Parameter":
         if self.has_index:
-            return Parameter(self.value[:8])
+            return Parameter(self._value[:8])
         else:
             raise exc.DLMSException(F"Parameter must has index before")
 
     @property
     def obj(self) -> "Parameter":
-        return Parameter(self.value[:6])
+        return Parameter(self._value[:6])
 
     @property
     def obis(self) -> OBIS:
-        return OBIS(self.value[:6])
+        return OBIS(self._value[:6])
 
 
 RANGE64 = bytes(range(65))  # Предвычисленный диапазон 0-64

DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -1,26 +1,41 @@
 from dataclasses import dataclass
 from functools import cached_property
+from typing import Self
 from .parameter import Parameter
 
 
-@dataclass
-class Base:
-    OBIS: Parameter
+@dataclass(frozen=True)
+class Data(Parameter):
+    @property
+    def value(self) -> Parameter:
+        return self.get_attr(2)
 
-    @cached_property
-    def LN(self) -> Parameter:
-        return self.OBIS.set_i(1)
 
+@dataclass(frozen=True)
+class Register(Data):
+    @property
+    def scaler_unit(self) -> Parameter:
+        return self.get_attr(3)
 
-@dataclass
-class Data(Base):
-    @cached_property
-    def VALUE(self) -> Parameter:
-        return self.OBIS.set_i(2)
 
+@dataclass(frozen=True)
+class DisconnectControl(Parameter):
 
-@dataclass
-class Register(Data):
-    @cached_property
-    def SCALER_UNIT(self) -> Parameter:
-        return self.OBIS.set_i(3)
+    @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)
+
+
+DISCONNECT_CONTROL_0 = DisconnectControl.from_b(0)

{dlms_spodes-0.86.23.dist-info → dlms_spodes-0.87.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.23
+Version: 0.87.0
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project

{dlms_spodes-0.86.23.dist-info → dlms_spodes-0.87.0.dist-info}/RECORD

@@ -37,8 +37,8 @@ DLMS_SPODES/cosem_interface_classes/limiter.py,sha256=LDVoix4L2yq4yPxbfSv6zoyA5p
 DLMS_SPODES/cosem_interface_classes/ln_pattern.py,sha256=IPluhyGWJQLBEUjOjdfEMct8JP_4orUwF92c3sQfSNM,13921
 DLMS_SPODES/cosem_interface_classes/obis.py,sha256=yEwYm5CshJx8X8uSy3QH8XIbdVPg8Tt6zPUjFgkAB0M,575
 DLMS_SPODES/cosem_interface_classes/overview.py,sha256=0eko1CW0eH397J5kM20G7RSQUzCGV6lGCMPbLsKPEqQ,7146
-DLMS_SPODES/cosem_interface_classes/parameter.py,sha256=ukoDSqGutYV4K4QSaM7i9zKYm8eyqQ8gnOWvqqAeDCo,18252
-DLMS_SPODES/cosem_interface_classes/parameters.py,sha256=UOsqKZeqxDjqtXOcpnxInwgmFTWOkCar9ZuIOaIEjvo,513
+DLMS_SPODES/cosem_interface_classes/parameter.py,sha256=3jisBFy5JwssActfoA7l4RWwR5Hg7wNHu-x3QwoOKAU,18769
+DLMS_SPODES/cosem_interface_classes/parameters.py,sha256=VzBgxWLrMFgbKcBAyahqcLR6-SygXMyVnm9-0V3SV3E,960
 DLMS_SPODES/cosem_interface_classes/register.py,sha256=Cfikftpo1Nzg_B2drOmJDwoGkbS2wXlqQpxVgXL1w2U,1886
 DLMS_SPODES/cosem_interface_classes/register_monitor.py,sha256=fNM-JrjHxQB8b5DgUOtDcnkO_hxu5bFICiuKEoZa37g,1792
 DLMS_SPODES/cosem_interface_classes/reports.py,sha256=9kOt9Ztyp5D59j3k3x5URy7WD1qlFNMa8xFlMu7nUmA,3320
@@ -112,7 +112,7 @@ DLMS_SPODES/types/implementations/integers.py,sha256=KAcaTY8ZwhBaJThbLSr39Oh_-9h
 DLMS_SPODES/types/implementations/long_unsigneds.py,sha256=SxmFvD2moQ03p-KZSBYK1Rv7bQSaywlHVXBfkTZG1OQ,8761
 DLMS_SPODES/types/implementations/octet_string.py,sha256=Jo_sfWcsfstiP4O6mXfBOOQlksx1c2qJMI-vbAOV-yM,294
 DLMS_SPODES/types/implementations/structs.py,sha256=GMOo6Jy8jA9d6KTLs0D-j5t0oSRvxUIwtBr_4UePwbA,2059
-dlms_spodes-0.86.23.dist-info/METADATA,sha256=M1BybUqRFelStgVtaXOxSuvMqxPDJlQZfDQFuz6eG0s,1028
-dlms_spodes-0.86.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes-0.86.23.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
-dlms_spodes-0.86.23.dist-info/RECORD,,
+dlms_spodes-0.87.0.dist-info/METADATA,sha256=2jD61CR1E2XCM2X8egSNxQSfYh6qvxVwZLSv7RGxbNc,1027
+dlms_spodes-0.87.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes-0.87.0.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
+dlms_spodes-0.87.0.dist-info/RECORD,,