DLMS-SPODES 0.86.21__tar.gz → 0.86.23__tar.gz

{dlms_spodes-0.86.21 → dlms_spodes-0.86.23}/PKG-INFO

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

{dlms_spodes-0.86.21 → dlms_spodes-0.86.23}/pyproject.toml

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

{dlms_spodes-0.86.21 → dlms_spodes-0.86.23}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -946,7 +946,7 @@ class Collection:
 
     def get_object(self, value: LNContaining) -> InterfaceClass:
         """ return object from obis<string> or raise exception if it absence """
-        return self.__get_object(lnContents2obis(value))
+        return self.obis2obj(lnContents2obis(value)).unwrap()
 
     @deprecated("use <par2rep>")
     def get_report(self,
@@ -1114,7 +1114,7 @@ class Collection:
         """return only association objects"""
         ret = list()
         for olt in self.getASSOCIATION(ass_id).object_list:
-            ret.append(self.__get_object(olt.logical_name.contents))
+            ret.append(self.par2obj(Parameter(olt.logical_name.contents)).unwrap())
         return ret
 
     def sap2objects(self, value: enums.ClientSAP) -> result.List[ic.COSEMInterfaceClasses]:
@@ -1138,11 +1138,6 @@ class Collection:
                 ret.append(obj)
         return ret
 
-
-    def get_attr(self, value: ut.CosemAttributeDescriptor) -> cdt.CommonDataTypes:
-        """attribute value from descriptor"""
-        return self.__get_object(value.instance_id.contents).get_attr(int(value.attribute_id))
-
     def get_first(self, values: list[str | bytes | cst.LogicalName]) -> InterfaceClass:
         """ return first object from it exist in collection from value"""
         for val in values:
@@ -1199,7 +1194,7 @@ class Collection:
     def copy_obj_attr_values_from(self, other: InterfaceClass) -> bool:
         """ copy all attributes value from other and return bool result """
         try:
-            obj: InterfaceClass = self.__get_object(other.get_obis())
+            obj: InterfaceClass = self.par2obj(Parameter(other.logical_name.contents)).unwrap()
             for i, attr in other.get_index_with_attributes(in_init_order=True):
                 if i == 1:
                     continue
@@ -1217,18 +1212,10 @@ class Collection:
         else:
             return False
 
-    @deprecated("use <obis2obj>")
-    def __get_object(self, obis: bytes) -> InterfaceClass:
-        if (obj := self.__objs.get(obis)) is None:
-            logical_name = cst.LogicalName(bytearray(obis))
-            raise exc.NoObject(F"{get_name(logical_name)}:{logical_name} is absence")
-        else:
-            return obj
-
     def obis2obj(self, obis: o.OBIS) -> result.SimpleOrError[InterfaceClass]:
         if obj := self.__objs.get(obis):
-            return result.Error.from_e(exc.NoObject(obis))
-        return result.Simple(obj)
+            return result.Simple(obj)
+        return result.Error.from_e(exc.NoObject(obis))
 
     def logicalName2obj(self, ln: cst.LogicalName) -> result.SimpleOrError[InterfaceClass]:
         return self.obis2obj(o.OBIS(ln.contents))
@@ -1317,14 +1304,14 @@ class Collection:
 
     def get_script_names(self, ln: cst.LogicalName, selector: cdt.LongUnsigned) -> str:
         """return name from script by selector"""
-        obj = self.__get_object(bytes(ln))
+        obj = self.par2obj(Parameter(ln.contents))
         if isinstance(obj, ScriptTable):
             for script in obj.scripts:
                 script: ScriptTable.scripts
                 if script.script_identifier == selector:
                     names: list[str] = list()
                     for action in script.actions:
-                        action_obj = self.__get_object(bytes(action.logical_name))
+                        action_obj = self.par2obj(Parameter(action.logical_name.contents)).unwrap()
                         if int(action_obj.CLASS_ID) != int(action.class_id):
                             raise ValueError(F"got {action_obj.CLASS_ID}, expected {action.class_id}")
                         match int(action.service_id):
@@ -1391,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,
@@ -1409,7 +1412,7 @@ class Collection:
     def get_name_and_type(self, value: structs.CaptureObjectDefinition) -> tuple[list[str], Type[cdt.CommonDataType]]:
         """ return names and type of element from collection"""
         names: list[str] = list()
-        obj = self.__get_object(value.logical_name.contents)
+        obj = self.par2obj(Parameter(value.logical_name.contents)).unwrap()
         names.append(get_name(obj.logical_name))
         attr_index = int(value.attribute_index)
         data_index = int(value.data_index)

{dlms_spodes-0.86.21 → dlms_spodes-0.86.23}/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.21 → dlms_spodes-0.86.23}/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.21 → dlms_spodes-0.86.23}/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.21 → dlms_spodes-0.86.23}/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.21 → dlms_spodes-0.86.23}/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.21 → dlms_spodes-0.86.23}/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.21 → dlms_spodes-0.86.23}/src/DLMS_SPODES.egg-info/PKG-INFO

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

{dlms_spodes-0.86.21 → dlms_spodes-0.86.23}/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")