DLMS-SPODES 0.87.5__tar.gz → 0.87.7__tar.gz

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/PKG-INFO

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

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/pyproject.toml

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

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/clock.py

@@ -72,7 +72,7 @@ class Clock(ic.COSEMInterfaceClasses):
                   ic.ICMElement("shift_time", ShiftTime))
 
     def characteristics_init(self):
-        self.cardinality = (0, 1)
+        ...
 
     @property
     def time(self) -> cst.OctetStringDateTime:

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -1234,7 +1234,7 @@ class Collection:
     def obis2obj(self, obis: o.OBIS) -> result.SimpleOrError[InterfaceClass]:
         if obj := self.__objs.get(obis):
             return result.Simple(obj)
-        return result.Error.from_e(exc.NoObject(obis))
+        return result.Error.from_e(ValueError(str(obis)), "no object")
 
     def logicalName2obj(self, ln: cst.LogicalName) -> result.SimpleOrError[InterfaceClass]:
         return self.obis2obj(o.OBIS(ln.contents))

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py

@@ -1,7 +1,7 @@
 """
 DLMS UA 1000-1 Ed 14
 """
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from functools import lru_cache
 from typing_extensions import deprecated
 from typing import Iterator, Type, TypeAlias, Callable, Any, Self, Literal, Optional, Protocol, ClassVar
@@ -318,18 +318,26 @@ def ClassIDVer2Name(class_id: ClassID, ver: cdt.Unsigned) -> Name:
         case _: raise exc.ITEApplication(F"not find <Interface class name> with: {class_id=}, {ver=}")
 
 
+@dataclass
+class Cardinality:
+    """4.1.4 Class description notation"""
+    min: int = 0
+    max: int = -1
+    """default -1 as infinity"""
+
+
 class COSEMInterfaceClasses(Protocol):
     CLASS_ID: ClassVar[ut.CosemClassId]
     VERSION: ClassVar[cdt.Unsigned]
     """ Identification code of the version of the class. The version of each object is retrieved together with the logical name and the class_id by reading the object_list 
     attribute of an “Association LN” / ”Association SN” object. Within one logical device, all instances of a certain class must be of the same version."""
     A_ELEMENTS: tuple[ICAElement, ...]
+    cardinality: ClassVar[Cardinality] = field(default_factory=Cardinality)
     M_ELEMENTS: tuple[ICMElement, ...] = tuple()  # empty if class not has the methods
-    cardinality: tuple[int, int | None]
     __attributes: list[cdt.CommonDataType | None]
     __specific_methods: tuple[cdt.CommonDataType, ...] = None
     _cbs_attr_post_init: dict[int, Callable]
-    collection: Any | None  # Collection. todo: remove in future
+    # collection: Any | None  # Collection. todo: remove in future
     hash_: int
 
     def __init__(self, logical_name: cst.LogicalName | bytes | str):
@@ -535,15 +543,6 @@ class COSEMInterfaceClasses(Protocol):
         """ Cosem-Attribute-Descriptor IS/IEC 62056-53 : 2006, 8.3 Useful types """
         return self.CLASS_ID.contents + self.instance_id.contents + ut.CosemObjectAttributeId(index).contents
 
-    @property
-    def string_type_cardinality(self) -> str:
-        min_cardinality, max_cardinality = self.cardinality
-        if min_cardinality == max_cardinality:
-            return str(min_cardinality)
-        else:
-            max_cardinality = str(max_cardinality) if max_cardinality else 'n'
-            return F'{str(min_cardinality)}...{max_cardinality}'
-
     def reset_attribute(self, index: int):
         """ try set default to value """
         self.set_attr(index, self.get_attr_element(index).default)

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/implementations/profile_generic.py

@@ -64,7 +64,6 @@ class SPODES3DisplayReadout(ver1.ProfileGeneric):
             obj = self.collection.add_if_missing(class_id=ut.CosemClassId(el_value.class_id.contents),
                                                  version=None,
                                                  logical_name=el_value.logical_name)
-            # self.collection.raise_before(obj, self)
             el_value.set_name(self.collection.get_name_and_type(el_value)[0][-1])
         self.buffer_capture_objects = self.capture_objects
         buffer_elements: list[cdt.StructElement] = list()

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/parameter.py

@@ -62,7 +62,7 @@ class Parameter:
 
     @cached_property
     def logical_name(self) -> "Parameter":
-        return self.get_attr(2)
+        return self.get_attr(1)
 
     def __eq__(self, other: object) -> bool:
         if isinstance(other, Parameter):

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -18,6 +18,7 @@ class ActiveFirmwareIdentifier(Data):
         return cls.parse(f"0.{b}.0.2.0.255")
 
 
+LDN = Data.parse("0.0.42.0.0.255")
 ACTIVE_FIRMWARE_IDENTIFIER_0 = ActiveFirmwareIdentifier.from_b()
 
 
@@ -46,14 +47,6 @@ class Clock(Parameter):
     def status(self) -> "Clock":
         return self.get_attr(4)
 
-    @property
-    def time_zone(self) -> "Clock":
-        return self.get_attr(3)
-
-    @property
-    def status(self) -> "Clock":
-        return self.get_attr(4)
-
     @property
     def daylight_savings_begin(self) -> "Clock":
         return self.get_attr(5)

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/profile_generic/ver1.py

@@ -6,6 +6,7 @@ from ...relation_to_OBIS import get_name
 from ... import exceptions as exc
 from ..__class_init__ import *
 from ...types.implementations import integers, arrays, structs
+from ...types.choices import CommonDataTypeChoiceBase
 from ..overview import VERSION_1
 
 
@@ -36,6 +37,59 @@ class AccessSelector(ut.Unsigned8):
             raise ValueError(F'The {self.__class__.__name__} got {int(self)}, expected 1..2')
 
 
+class RangeDescriptorValueChoice(CommonDataTypeChoiceBase, types=(
+        cdt.DoubleLong,
+        cdt.DoubleLongUnsigned,
+        cdt.OctetString,
+        cdt.VisibleString,
+        cdt.Utf8String,
+        cdt.Integer,
+        cdt.Unsigned,
+        cdt.LongUnsigned,
+        cdt.Long,
+        cdt.Long64Unsigned,
+        cdt.Float32,
+        cdt.Float64,
+        cdt.DateTime,
+        cdt.Date,
+        cdt.Time
+)):
+    """Types of range_descriptor.from_value/to_value"""
+
+
+class RangeDescriptor(cdt.Structure):
+    restricting_object: structs.CaptureObjectDefinition
+    from_value: RangeDescriptorValueChoice
+    to_value: RangeDescriptorValueChoice
+    selected_values: CaptureObjects
+
+
+class Data(ut.Data):
+    restricting_object: structs.CaptureObjectDefinition
+    from_value: cdt.SimpleDataType
+    to_value: cdt.SimpleDataType
+    selected_values: CaptureObjects
+    from_entry: FromEntry
+    to_entry: cdt.DoubleLongUnsigned
+    from_selected_value: cdt.LongUnsigned
+    to_selected_value: cdt.LongUnsigned
+    ELEMENTS = {1: ut.SequenceElement('range_descriptor', RangeDescriptor),
+                2: ut.SequenceElement('entry_descriptor', EntryDescriptor)}
+
+
+class SelectiveAccessDescriptor(ut.SelectiveAccessDescriptor):
+    access_selector: AccessSelector
+    access_parameters: Data
+    ELEMENTS = (ut.SequenceElement('access_selector', AccessSelector),
+                ut.SequenceElement('access_parameters', Data))
+
+
+class CosemAttributeDescriptorWithSelection(ut.CosemAttributeDescriptorWithSelection):
+    access_selection: SelectiveAccessDescriptor
+    ELEMENTS = (ut.SequenceElement('cosem_attribute_descriptor', ut.CosemAttributeDescriptor),
+                ut.SequenceElement('access_selection', SelectiveAccessDescriptor))
+
+
 class ProfileGeneric(ver0.ProfileGeneric):
     """4.3.6 Profile generic"""
     VERSION = VERSION_1
@@ -132,45 +186,6 @@ class ProfileGeneric(ver0.ProfileGeneric):
         """ Available after got sort object. TODO: need rewrite. maybe replace to collection level. Wrong used sort_obj, it can be any element from capture_objects"""
         if self.sort_object is None:
             raise exc.EmptyObj(F"<sort object> is empty")
-        sort_obj: ic.COSEMInterfaceClasses = self.collection.get_object(self.sort_object.logical_name)
-        if sort_obj.CLASS_ID.contents == self.sort_object.class_id.contents:
-            value_type: Type[cdt.CommonDataType] = sort_obj.get_attr_data_type(int(self.sort_object.attribute_index))
-        else:
-            exc.NoObject(F"got {self.sort_object.class_id=}, expected {sort_obj.CLASS_ID=} from collection")
-
-        class RangeDescriptor(cdt.Structure):
-            # cb_preset = TODO: make check 'selected_values' from self.capture_objects or
-            # cb_post_set = TODO: make check 'selected_values' from self.capture_objects
-            DEFAULT = b'\x02\x04\x02\x04\x12\x00\x01\x09\x06\x00\x00\x01\x00\x00\xff\x0f\x02\x12\x00\x00\x09\x0c\x07\xe4\x01\x01\xff\xff\xff\xff\xff\x80\x00\xff' \
-                      b'\x09\x0c\x07\xe4\x01\x02\xff\xff\xff\xff\xff\x80\x00\xff\x01\x00'
-            restricting_object: structs.CaptureObjectDefinition
-            from_value: value_type
-            to_value: value_type
-            selected_values: CaptureObjects
-
-        class Data(ut.Data):
-            restricting_object: structs.CaptureObjectDefinition
-            from_value: cdt.SimpleDataType
-            to_value: cdt.SimpleDataType
-            selected_values: CaptureObjects
-            from_entry: FromEntry
-            to_entry: cdt.DoubleLongUnsigned
-            from_selected_value: cdt.LongUnsigned
-            to_selected_value: cdt.LongUnsigned
-            ELEMENTS = {1: ut.SequenceElement('range_descriptor', RangeDescriptor),
-                        2: ut.SequenceElement('entry_descriptor', EntryDescriptor)}
-
-        class SelectiveAccessDescriptor(ut.SelectiveAccessDescriptor):
-            access_selector: AccessSelector
-            access_parameters: Data
-            ELEMENTS = (ut.SequenceElement('access_selector', AccessSelector),
-                        ut.SequenceElement('access_parameters', Data))
-
-        class CosemAttributeDescriptorWithSelection(ut.CosemAttributeDescriptorWithSelection):
-            access_selection: SelectiveAccessDescriptor
-            ELEMENTS = (ut.SequenceElement('cosem_attribute_descriptor', ut.CosemAttributeDescriptor),
-                        ut.SequenceElement('access_selection', SelectiveAccessDescriptor))
-
         self.attr_descriptor_with_selection = CosemAttributeDescriptorWithSelection
         self.buffer.selective_access = SelectiveAccessDescriptor()
 

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/cosem_interface_classes/special_days_table.py

@@ -52,8 +52,6 @@ class SpecialDaysTable(ic.COSEMInterfaceClasses):
                   ic.ICMElement("delete", cdt.LongUnsigned))  # Todo: was Delete.with_cb(None, self.entries.get_indexes)
 
     def characteristics_init(self):
-        self.cardinality = (0, 1)
-
         self._cbs_attr_post_init.update({2: self.__set_delete})
         self.set_attr(2, None)
 

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES/obis/media_id.py

@@ -1,15 +1,31 @@
 from abc import ABC, abstractmethod
+from typing import Protocol
 from itertools import count
 from ..config_parser import config
+from ..settings import settings
+from ..types import cdt
 
 
-_mid_names = config["DLMS"]["media_id_name"]
+_mid_names = config["DLMS"]["media_id_name"]  # todo: make with settings
 
 
-class MediaId(ABC):
+class MediaIdProto(Protocol):
+    _value: tuple[int]
+    _inst = None
+    TYPE: type[cdt.CommonDataType]
+
+    def __eq__(self, other: int) -> bool:
+        """with integer"""
+
+    def __hash__(self) -> int:
+        """for hashable"""
+
+
+class MediaId(MediaIdProto):
     """DLMS UA 1000-1 Ed 14. Table 53 – OBIS code structure and use of value groups. For Group A"""
     _value: tuple[int]
     _inst = None
+    TYPE: type[cdt.CommonDataType]
 
     @classmethod
     def from_int(cls, value: int):
@@ -24,15 +40,7 @@ class MediaId(ABC):
             case int(): return Reserved(value)
             case _:     raise ValueError(F"can't create {cls.__name__} from {value=}")
 
-    @abstractmethod
-    def __eq__(self, other: int):
-        """with integer"""
-
-    @abstractmethod
-    def __hash__(self):
-        """for hashable"""
-
-    def __str__(self):
+    def __str__(self) -> str:
         if _mid_names and (t := _mid_names.get(self.__class__.__name__)):
             return t
         else:
@@ -66,16 +74,6 @@ class TwoValueMixin:
         return self._value[0]
 
 
-class Singleton:
-    _inst: MediaId | None
-
-    def __new__(cls, *args, **kwargs):
-        if cls._inst:
-            return cls._inst
-        else:
-            return super().__new__(cls)
-
-
 sub_group_hash = count()
 
 
@@ -289,6 +287,7 @@ class CompactDataObjects(Abstract):
 
 class DeviceIdObjects(Abstract):
     """6_2_42"""
+    TYPE = cdt.DoubleLongUnsigned | cdt.OctetString | cdt.VisibleString | cdt.Utf8String | cdt.Unsigned | cdt.LongUnsigned
 
 
 class MeteringPointIdObjects(Abstract):

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/src/DLMS_SPODES.egg-info/PKG-INFO

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

{dlms_spodes-0.87.5 → dlms_spodes-0.87.7}/test/test_cdt.py

@@ -97,7 +97,6 @@ class TestType(unittest.TestCase):
         col.add(class_id=ut.CosemClassId(3), version=cdt.Unsigned(0), logical_name=cst.LogicalName.from_obis('1.0.3.29.0.255'))
         col.add(class_id=ut.CosemClassId(3), version=cdt.Unsigned(0), logical_name=cst.LogicalName.from_obis('1.0.4.29.0.255'))
         profile = col.add(class_id=ut.CosemClassId(7), version=cdt.Unsigned(1), logical_name=cst.LogicalName.from_obis('1.0.94.7.4.255'))
-        profile.collection = col
         profile.set_attr(6, structs.CaptureObjectDefinition().encoding)
         profile.set_attr(3, bytes.fromhex('01 05 02 04 12 00 08 09 06 00 00 01 00 00 ff 0f 02 12 00 00 02 04 12 00 03 09 06 01 00 02 1d 00 ff 0f 03 12 00 00 02 04 12 00 03 09 06 01 00 01 1d 00 ff 0f 03 12 00 00 02 04 12 00 03 09 06 01 00 03 1d 00 ff 0f 03 12 00 00 02 04 12 00 03 09 06 01 00 04 1d 00 ff 0f 03 12 00 00'))
         profile.buffer.selective_access.access_selector.set_contents_from(2)