DLMS-SPODES 0.86.22__tar.gz → 0.87.0__tar.gz

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.22
+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.22 → dlms_spodes-0.87.0}/pyproject.toml

@@ -14,7 +14,7 @@ exclude = ["test","KPZ"]
 
 [project]
 name = "DLMS_SPODES"
-version = "0.86.22"
+version = "0.87.0"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
 ]

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -1378,6 +1378,22 @@ class Collection:
             security_policy=security_policy
         )
 
+    @lru_cache(maxsize=1000)
+    def isnt_mutable(self,
+                   par: Parameter,
+                   association_id: int,
+                   security_policy: pdu.SecurityPolicy = pdu.SecurityPolicyVer0.NOTHING
+                   ) -> bool:
+        """is not writable and STATIC data"""
+        if (
+            not self.is_writable(par.ln, par.i, association_id, security_policy, security_policy)
+            and self.par2obj(par
+                             ).unwrap().getAElement(par.i
+                                                    ).unwrap().classifier == ic.Classifier.STATIC
+        ):
+            return True
+        return False
+
     @lru_cache(maxsize=1000)
     def is_accessible(self, ln: cst.LogicalName,
                       index: int,

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py

@@ -8,21 +8,14 @@ from typing import Iterator, Type, TypeAlias, Callable, Any, Self, Literal, Opti
 from ..types import cdt, ut, cst
 from StructResult import result
 from ..relation_to_OBIS import get_name
-import logging
 from enum import IntEnum
 from itertools import count
 from .. import exceptions as exc
 from .overview import ClassID
 from ..settings import settings
-from ..config_parser import get_values
 from .. import literals
 
 
-logger = logging.getLogger(__name__)
-logger.level = logging.INFO
-
-logger.info(F'Register start')
-
 _n_class = count(0)
 
 

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/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-0.87.0/src/DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -0,0 +1,41 @@
+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)
+
+
+@dataclass(frozen=True)
+class Register(Data):
+    @property
+    def scaler_unit(self) -> Parameter:
+        return self.get_attr(3)
+
+
+@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)
+
+
+DISCONNECT_CONTROL_0 = DisconnectControl.from_b(0)

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES/pardata.py

@@ -18,7 +18,8 @@ class ParValues[T]:
             raise StopIteration
 
     def __iter__(self) -> Iterator[Parameter | T]:
-        return iter((self.par, self.data))
+        yield self.par
+        yield self.data
 
     def __str__(self):
         return F"{self.par} - {self.data}"
@@ -26,4 +27,4 @@ class ParValues[T]:
 
 @dataclass(frozen=True)
 class ParData(ParValues[cdt.CommonDataType]):
-    data: Optional[cdt.CommonDataType]
+    data: cdt.CommonDataType

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES/settings.py

@@ -478,11 +478,39 @@ class _AmNames(BaseModel):
     xDLMS_context_info: str = "xDLMS context info"
 
 
+class Conformance(BaseModel):
+    reserved_zero: str = "reserved-zero"
+    general_protection: str = "general-protection"
+    general_block_transfer: str = "general-block-transfer"
+    read: str = "read"
+    write: str = "write"
+    unconfirmed_write: str = "unconfirmed-write"
+    reserved_six: str = "reserved-six"
+    reserved_seven: str = "reserved-seven"
+    attribute0_supported_with_set: str = "attribute0-supported-with-set"
+    priority_mgmt_supported: str = "priority-mgmt-supported"
+    attribute0_supported_with_get: str = "attribute0-supported-with-get"
+    block_transfer_with_get_or_read: str = "block-transfer-with-get-or-read"
+    block_transfer_with_set_or_write: str = "block-transfer-with-set-or-write"
+    block_transfer_with_action: str = "block-transfer-with-action"
+    multiple_references: str = "multiple-references"
+    information_report: str = "information-report"
+    data_notification: str = "data-notification"
+    access: str = "access"
+    parameterized_access: str = "parameterized-access"
+    get: str = "get"
+    set: str = "set"
+    selective_access: str = "selective-access"
+    event_notification: str = "event-notification"
+    action: str = "action"
+
+
 class Settings(BaseModel):
     collection: _Collection = Field(default_factory=_Collection)
     report: _Report = Field(default_factory=_Report)
     firmwares: list[_Firmware] = Field(default_factory=list)
     am_names: _AmNames = Field(default_factory=_AmNames)
+    class_name: dict[int, str] = Field(default={1: "Data"})
 
 
 if not os.path.isfile(path := ".//config.toml"):

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES/types/common_data_types.py

@@ -1669,7 +1669,7 @@ class OctetString(_String, SimpleDataType):
         temp = list()
         for i in self.contents:
             temp.append(i if i > 32 else 63)
-        return bytes(temp).decode(encoding)
+        return bytes(temp).decode(encoding, errors="ignore")
 
     def pretty_str(self) -> str:
         """decode to utf-8 or hex labal"""

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES/types/implementations/bitstrings.py

@@ -1,5 +1,7 @@
 from ...types import common_data_types as cdt
 from ...config_parser import get_values
+from ...settings import settings
+
 
 base = get_values("DLMS", "Conformance")
 

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES/types/useful_types.py

@@ -5,7 +5,7 @@ from typing import Type, Any, Callable
 from dataclasses import dataclass
 from ..types import common_data_types as cdt
 from ..exceptions import DLMSException
-from ..config_parser import get_values
+from ..settings import settings
 
 
 class UserfulTypesException(DLMSException):
@@ -401,9 +401,9 @@ class CosemClassId(Unsigned16):
         - class_id-s from 32 768 to 65 535 are reserved for user group specific ICs.
     The DLMS UA reserves the right to assign ranges to individual manufacturers or user groups. """
 
-    def __str__(self):
-        if _class_names:
-            return _class_names.get(self, repr(self))
+    def __str__(self) -> str:
+        if res := settings.class_name.get(int(self)):
+            return res
         else:
             return repr(self)
 
@@ -411,9 +411,6 @@ class CosemClassId(Unsigned16):
         return F"{self.__class__.__name__}({int(self)})"
 
 
-_class_names = {CosemClassId(k): v for k, v in class_names.items()} if (class_names := get_values("DLMS", "class_name")) else None
-
-
 class CosemObjectInstanceId(OCTET_STRING, UsefulType):
     LENGTH = 6
 

{dlms_spodes-0.86.22 → dlms_spodes-0.87.0}/src/DLMS_SPODES.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.22
+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.22 → dlms_spodes-0.87.0}/test/test_cdt.py

@@ -63,10 +63,10 @@ class TestType(unittest.TestCase):
 
     def test_DateTime(self):
         data: cdt.DateTime
-        data = cdt.DateTime.parse("1.1.0001")
-        data = cdt.DateTime.parse("00:00:00")
-        data = cdt.DateTime.parse("__.__.____ __:00")
+        data = cdt.DateTime.parse("1.1.2001")
+        # data = cdt.DateTime.parse("__.__.____ __:00")
         z = data.get_right_nearest_datetime(datetime.datetime.now(tz=datetime.timezone.utc))
+        z1 = data.get_left_nearest_datetime(datetime.datetime.now(tz=datetime.timezone.utc))
         pattern = datetime.datetime(2021, 1, 1, 10, tzinfo=datetime.timezone.utc)
         self.assertEqual((new := cdt.DateTime(pattern)).to_datetime(), pattern, 'init from datetime and decoding')
         data = cdt.DateTime("01.__.2021 10:00 700")

dlms_spodes-0.87.0/test/test_pars.py

@@ -0,0 +1,12 @@
+import unittest
+from src.DLMS_SPODES.cosem_interface_classes.parameter import Parameter
+from src.DLMS_SPODES.cosem_interface_classes import parameters as prs
+
+
+class TestType(unittest.TestCase):
+    def test_one(self):
+        My = prs.Data.parse("0.0.0.1.0.255")
+        My2 = prs.Data.parse("0.0.1.1.0.255")
+        My3 = prs.Register.parse("0.2.1.1.0.255")
+
+        print(My.logical_name, My2.logical_name, My3.scaler_unit)

dlms_spodes-0.86.22/src/DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -1,26 +0,0 @@
-from dataclasses import dataclass
-from functools import cached_property
-from .parameter import Parameter
-
-
-@dataclass
-class Base:
-    OBIS: Parameter
-
-    @cached_property
-    def LN(self) -> Parameter:
-        return self.OBIS.set_i(1)
-
-
-@dataclass
-class Data(Base):
-    @cached_property
-    def VALUE(self) -> Parameter:
-        return self.OBIS.set_i(2)
-
-
-@dataclass
-class Register(Data):
-    @cached_property
-    def SCALER_UNIT(self) -> Parameter:
-        return self.OBIS.set_i(3)

dlms_spodes-0.86.22/test/test_pars.py

@@ -1,12 +0,0 @@
-import unittest
-from src.DLMS_SPODES.cosem_interface_classes.parameter import Parameter
-from src.DLMS_SPODES.cosem_interface_classes import parameters as prs
-
-
-class TestType(unittest.TestCase):
-    def test_one(self):
-        My = prs.Data(Parameter.parse("0.0.0.1.0.255"))
-        My2 = prs.Data(Parameter.parse("0.0.1.1.0.255"))
-        My3 = prs.Register(Parameter.parse("0.2.1.1.0.255"))
-
-        print(My.LN, My2.LN, My3.SCALER_UNIT)