DLMS-SPODES 0.86.9__tar.gz → 0.86.11__tar.gz

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.9
+Version: 0.86.11
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
+Project-URL: Source, https://github.com/youserj/DlmsSPODES-project
 Keywords: dlms
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
@@ -13,7 +14,7 @@ Requires-Dist: pydantic>=2.11
 Requires-Dist: cryptography>=45.0
 Requires-Dist: semver>=3.0
 Requires-Dist: typing-extensions>=4.12.2
-Requires-Dist: StructResult>=0.7.3
+Requires-Dist: StructResult>=0.8.0
 Provides-Extra: dev
 Requires-Dist: mypy>=1.5.0; extra == "dev"
 Requires-Dist: ruff>=0.11; extra == "dev"

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/pyproject.toml

@@ -1,18 +1,20 @@
 [build-system]
 requires = [
     "setuptools",
-    "setuptools-scm"]
+    "setuptools-scm"
+]
 build-backend = "setuptools.build_meta"
 
-#[tool.setuptools]
-#package-dir = {"" = "src"}
+[tool.setuptools]
+license-files = []
+
 [tool.setuptools.packages.find]
 where = ["src"]
 exclude = ["test","KPZ"]
 
 [project]
 name = "DLMS_SPODES"
-version = "0.86.9"
+version = "0.86.11"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
 ]
@@ -21,7 +23,7 @@ dependencies = [
     "cryptography>=45.0",
     "semver>=3.0",
     "typing-extensions>=4.12.2",  # remove for 3.13(use for @deprecated)
-    "StructResult>=0.7.3"
+    "StructResult>=0.8.0"
 ]
 description="dlms-spodes"
 readme = "README.md"
@@ -33,6 +35,10 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 
+[project.urls]
+Source = "https://github.com/youserj/DlmsSPODES-project"
+
+
 [project.optional-dependencies]
 dev = [
     "mypy>=1.5.0",

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -522,8 +522,6 @@ __func_map_for_create.update({
     (1, 0, 148, 136, 0): RegisterMap,
     (1, 94, 7, 0): ProfileGenericMap.renew(1, impl.profile_generic.SPODES3CurrentProfile),
     (1, 94, 7, (1, 2, 3, 4, 5, 6)): ProfileGenericMap.renew(1, impl.profile_generic.SPODES3ScalesProfile),  # Todo: RU. Scaler-profile With 1 entry and more
-    # KPZ
-    (128, 0, tuple(range(20)), 0, 0): RegisterMap
 })
 
 func_maps["SPODES_3"] = get_func_map(__func_map_for_create)
@@ -537,6 +535,7 @@ __func_map_for_create.update({
     (0, 128, 96, 13, 1): ClassMap({0: impl.data.ITEBitMap}),
     (0, 128, 154, 0, 0): ClassMap({0: impl.data.KPZGSMPingIP}),
     (0, 0, 128, (100, 101, 102, 103, 150, 151, 152, 170)): DataMap,
+    (128, 0, tuple(range(20)), 0, 0): RegisterMap
 })
 func_maps["KPZ"]: FUNC_MAP = get_func_map(__func_map_for_create)
 # KPZ1 with bag in log event profiles
@@ -607,7 +606,7 @@ def get_filtered(objects: Iterable[InterfaceClass],
                  keys: ObjFilteredKey) -> list[InterfaceClass]:
     c_ids: list[ut.CosemClassId] = list()
     patterns: list[LNPattern] = list()
-    ch: Channel | None = None
+    ch: Optional[Channel] = None
     for k in keys:
         if isinstance(k, ut.CosemClassId):
             c_ids.append(k)
@@ -680,7 +679,7 @@ class Collection:
         self.__country_ver = cntr_ver
         """country version specification"""
         self.spec_map = "DLMS_6"
-        self.__objs = dict()
+        self.__objs = {}
         """ all DLMS objects container with obis key """
 
     @property
@@ -1128,6 +1127,19 @@ class Collection:
                 res.append_err(e)
         return res
 
+    def iter_classID_objects(self,
+                        class_id: ut.CosemClassId) -> Iterator[InterfaceClass]:
+        return (obj for obj in self.__objs.values() if obj.CLASS_ID == value)
+
+    def LNPattern2objects(self,
+                          pat: LNPattern) -> list[InterfaceClass]:
+        ret = []
+        for obj in self.__objs.values():
+            if obj.logical_name in pat:
+                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))
@@ -1142,17 +1154,14 @@ class Collection:
         else:
             raise exc.NoObject(F"not found at least one DLMS Objects from collection with {values=}")
 
+    @deprecated("use <iter_classID_objects>")
     def get_objects_by_class_id(self, value: ut.CosemClassId) -> list[InterfaceClass]:
         return list(filter(lambda obj: obj.CLASS_ID == value, self.__objs.values()))
 
-    def get_objects_descriptions(self) -> list[tuple[cst.LogicalName, cdt.LongUnsigned, cdt.Unsigned]]:
-        """ return container of objects for get device clone """
-        return list(map(lambda obj: (obj.logical_name, obj.CLASS_ID, obj.VERSION), self.__objs.values()))
-
     def get_writable_attr(self) -> UsedAttributes:
         """return all writable {obj.ln: {attribute_index}}"""
         ret: UsedAttributes = dict()
-        for ass in self.get_objects_by_class_id(ClassID.ASSOCIATION_LN):
+        for ass in self.iter_classID_objects(ClassID.ASSOCIATION_LN):
             if (
                 ass.logical_name.e == 0
                 or ass.object_list is None
@@ -1352,7 +1361,7 @@ class Collection:
             raise ValueError(F"absent association with {client_sap}")
 
     def sap2association(self, sap: enums.ClientSAP) -> AssociationLN:
-        for ass in get_filtered(self, (ClassID.ASSOCIATION_LN,)):
+        for ass in self.iter_classID_objects(ClassID.ASSOCIATION_LN):
             if (
                 ass.associated_partners_id is not None
                 and ass.associated_partners_id.client_SAP == sap

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/src/DLMS_SPODES/cosem_interface_classes/ln_pattern.py

@@ -1,48 +1,87 @@
 from dataclasses import dataclass
 from typing import Self, Literal
 from ..types import cst
+from copy import copy
 
-SKIP = bytes(range(256))
-RANGE64 = bytes(range(65))
-type ObisGroup = int | set[int]
-type GroupLiteral = Literal['a', 'b', 'c', 'd', 'e', 'f']
+SKIP: int = 0
+RANGE256 = set(range(256))
+RANGE64 = bytes(range(64))
+RANGE64_WITH_LENGTH = b'\x40' + RANGE64
 
 
-@dataclass
+@dataclass(frozen=True, slots=True)
 class LNPattern:
-    """pattern for use in get_filtered.
-    value "x.x.x.x.x.x" where x is:
-    0..255 - simple value
-    a,b,c,d,e,f - for skip value in each group
-    (y, z, ...) - set of simple values(y or z)
-    ((y-z), ...) - set of simple values with range(from y to z)
-    !() - as () but, set of exclude values
-    example: "a.0.(1,2,3).(0-64).0.f"
     """
-    __values: tuple[bytes, ...]
+    LNPattern ::= SEQUENCE (SIZE (6)) OF GroupPattern
+
+    GroupPattern ::= CHOICE {
+      skip        [0] NULL,               -- SKIP marker
+      single      [1] INTEGER (0..255),   -- single value
+      multiple   [2] SEQUENCE OF INTEGER (0..255)  -- set of values
+    }
+    LNPattern Binary Encoding Specification:
+    ---------------------------------------
+    A compact tag-less binary format for storing 6 OBIS-like groups.
+
+    Structure:
+      [L1][V1][L2][V2]...[L6][V6]
+      where:
+        - Ln: 1-byte length prefix for group n (0-255)
+        - Vn: Value bytes (interpretation depends on Ln)
 
-    def __post_init__(self):
-        if len(self.__values) != 6:
-            raise ValueError(F"for {self.__class__.__name__} got values with length={len(self.__values)}, expected 6")
+    Length Semantics:
+      - L=0      : SKIP group (no value bytes follow)
+      - L=1      : Single value (V is 1-byte integer 0-255)
+      - L=2..255 : Value set (V contains L bytes as possible values)
+
+    Special Cases:
+      - Group 'b' (index 1) when marked SKIP uses predefined RANGE64 (0-64)
+      - Empty exclusion sets "!()" are prohibited
+
+    Example:
+      Pattern "a.1.(2-5).!().0.f" encodes as:
+      [00][01][01][04][02][03][04][05][00][01][00][00]
+      (SKIP|1|{2,3,4,5}|SKIP|0|SKIP)
+
+    Properties:
+      - Fixed overhead: 6 bytes (1 length byte per group)
+      - Max size: 6 + 255*6 = 1536 bytes
+      - Order-preserving
+      - Comparison-friendly memory layout
+    """
+    buffer: bytes
 
     @classmethod
     def parse(cls, value: str) -> Self:
-        values: list[bytes] = [SKIP, SKIP, SKIP, SKIP, SKIP, SKIP]
-        for i, val in enumerate(value.split('.', maxsplit=5)):
-            if (
-                len(val) == 1
-                and (ord(val) == 97+i)
-            ):
-                if val == 'b':
-                    values[i] = RANGE64
-                else:
+        buffer = bytearray()
+        parts = value.split('.', maxsplit=5)
+        if len(parts) != 6:
+            raise ValueError(f"got {len(parts)} elements, expected 6")
+        for i, val in enumerate(parts):
+            if val.isdigit():
+                num = int(val)
+                if 0 <= num <= 255:
+                    buffer.extend((1, num))
+                    continue
+                raise ValueError(f"Value {val} out of range 0-255")
+            if len(val) == 1:
+                if val == "x":
+                    buffer.append(SKIP)
+                    continue
+                elif (
+                    i == 1
+                    and val == "b"
+                ):
+                    buffer.extend(RANGE64_WITH_LENGTH)
                     continue
-            elif val.isdigit():
-                values[i] = int(val)
-                if not (0 <= values[i] <= 255):
-                    raise ValueError(F"in {value=} got element {val=}, expected 0..255")
-            elif val.startswith('(') and val.endswith(')'):
-                el: set[int] = set()
+                elif ord(val) == i + 97:
+                    buffer.append(SKIP)
+                    continue
+            if val == "":
+                buffer.append(SKIP)
+                continue
+            if val[0]=='(' and val[-1]==')':
+                el = set()
                 val = val.replace('(', "").replace(')', "")
                 for j in val.split(","):
                     j = j.replace(" ", '')
@@ -53,12 +92,16 @@ class LNPattern:
                             start, end = j.split("-")
                             el.update(range(
                                 cls.__simple_validate(start),
-                                cls.__simple_validate(end)+1))
+                                cls.__simple_validate(end) + 1))
                         case err:
                             raise ValueError(F"got a lot of <-> in pattern: {value}, expected one")
-                values[i] = bytes(el)
-            elif val.startswith('!(') and val.endswith(')'):
-                el: set[int] = set(range(256))
+                # values = bytes(el)
+                # buffer.extend([len(values)] + list(values))
+                buffer.append(len(el))
+                buffer.extend(el)
+                continue
+            if val.startswith('!(') and val.endswith(')'):
+                el = copy(RANGE256)
                 val = val.replace('!(', "").replace(')', "")
                 for j in val.split(","):
                     j = j.replace(" ", '')
@@ -69,15 +112,18 @@ class LNPattern:
                             start, end = j.split("-")
                             el.difference_update(range(
                                 cls.__simple_validate(start),
-                                cls.__simple_validate(end)+1))
+                                cls.__simple_validate(end) + 1))
                         case err:
                             raise ValueError(F"got a lot of <-> in pattern: {value}, expected one")
-                if len(el) == 0:
-                    raise ValueError(F"no one element in group: {chr(97+i)}")
-                values[i] = bytes(el)
-            else:
-                raise ValueError(F"got wrong symbol: {val} in pattern")
-        return cls(tuple(values))
+                if len(el)==0:
+                    raise ValueError(F"no one element in group: {chr(97 + i)}")
+                # values = bytes(el)
+                # buffer.extend([len(values)] + list(values))
+                buffer.append(len(el))
+                buffer.extend(el)
+                continue
+            raise ValueError(f"Invalid pattern: {val}")
+        return cls(bytes(buffer))
 
     @staticmethod
     def __simple_validate(value: str) -> int:
@@ -86,26 +132,66 @@ class LNPattern:
         else:
             raise ValueError(F"got not valid element: {value} in pattern, expected 0..255")
 
-    def get_update(self, group: GroupLiteral, value: str) -> Self:
-        """get new instance with updated group value"""
-        # todo: make this
-        raise RuntimeError("no implement now")
-
-    def __eq__(self, other: cst.LogicalName):
-        for i, j in zip(self.__values, other):
-            if i == j or (i == -1):
-                continue
-            elif isinstance(i, set) and j in i:
+    def __eq__(self, other: "LNPattern") -> bool:
+        ptr = 0
+        for i in range(6):
+            length = self.buffer[ptr]
+            ptr += 1
+            if length == 0:  # SKIP
                 continue
-            else:
-                return False
+            other_byte = other.contents[i]
+            if length == 1:  # Single byte
+                if self.buffer[ptr]!=other_byte:
+                    return False
+            else:  # Multiple bytes
+                if other_byte not in self.buffer[ptr:ptr + length]:
+                    return False
+            ptr += length
         return True
 
-    def __repr__(self) -> str:
-        return F"{self.__class__.__name__}(\"{".".join(map(lambda it: str(it) if isinstance(it, int) else str(tuple(it)), self.__values))}\")"
+    @staticmethod
+    def _format_ranges(values: list[int]) -> str:
+        if not values:
+            return "!()"
+        ranges = []
+        start = end = values[0]
+        for num in values[1:]:
+            if num==end + 1:
+                end = num
+            else:
+                ranges.append((start, end))
+                start = end = num
+        ranges.append((start, end))
+        parts = []
+        for start, end in ranges:
+            if start==end:
+                parts.append(str(start))
+            elif end==start + 1:  # Диапазон из 2 чисел
+                parts.extend([str(start), str(end)])
+            else:
+                parts.append(f"{start}-{end}")
+        if len(parts) > 3 and len(values) > 128:  # Эмпирический порог
+            all_values = set(range(256))
+            excluded = sorted(all_values - set(values))
+            if len(excluded) < len(values):
+                return f"!({','.join(self._format_ranges(excluded))})"
+        return f"({','.join(parts)})"
 
-    def __hash__(self) -> int:
-        return hash(self.__values)
+    def __str__(self) -> str:
+        parts = []
+        ptr = 0
+        for _ in range(6):
+            length = self.buffer[ptr]
+            ptr += 1
+            if length == 0:
+                parts.append("x")
+            elif length == 1:
+                parts.append(str(self.buffer[ptr]))
+            else:
+                values = sorted(set(self.buffer[ptr:ptr + length]))
+                parts.append(self._format_ranges(values))
+            ptr += length
+        return ".".join(parts)
 
 
 @dataclass
@@ -115,14 +201,17 @@ class LNPatterns:
     def __iter__(self):
         return iter(self.value)
 
+    def __str__(self) -> str:
+        return f"[{" | ".join(map(str, self.value))}]"
+
 
-ABSTRACT = LNPattern.parse("0")
-ELECTRICITY = LNPattern.parse("1")
-HCA = LNPattern.parse("4")
-THERMAL = LNPattern.parse("(5,6)")
-GAS = LNPattern.parse("7")
-WATER = LNPattern.parse("(8,9)")
-OTHER_MEDIA = LNPattern.parse("15")
+ABSTRACT = LNPattern.parse("0.....")
+ELECTRICITY = LNPattern.parse("1.....")
+HCA = LNPattern.parse("4.....")
+THERMAL = LNPattern.parse("(5,6).....")
+GAS = LNPattern.parse("7.....")
+WATER = LNPattern.parse("(8,9).....")
+OTHER_MEDIA = LNPattern.parse("15.....")
 
 
 BILLING_PERIOD_VALUES_RESET_COUNTER_ENTRIES = LNPatterns((

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/src/DLMS_SPODES/cosem_interface_classes/parameter.py

@@ -1,6 +1,5 @@
 from typing_extensions import deprecated
 from dataclasses import dataclass
-import functools
 import numpy as np
 from struct import Struct, pack, unpack_from
 from typing import Optional, cast, Iterator

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

@@ -0,0 +1,18 @@
+from typing import Protocol, ClassVar
+from functools import cached_property
+from .parameter import Parameter
+
+
+class Base(Protocol):
+    OBIS: ClassVar[Parameter]
+
+    @cached_property
+    def LN(self) -> Parameter:
+        return self.OBIS.set_i(1)
+
+
+class Data(Base, Protocol):
+
+    @cached_property
+    def VALUE(self) -> Parameter:
+        return self.OBIS.set_i(2)

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/src/DLMS_SPODES/pardata.py

@@ -25,5 +25,5 @@ class ParValues[T]:
 
 
 @dataclass(frozen=True)
-class ParData(ParValues):
+class ParData(ParValues[cdt.CommonDataType]):
     data: Optional[cdt.CommonDataType]

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/src/DLMS_SPODES.egg-info/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.9
+Version: 0.86.11
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
+Project-URL: Source, https://github.com/youserj/DlmsSPODES-project
 Keywords: dlms
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
@@ -13,7 +14,7 @@ Requires-Dist: pydantic>=2.11
 Requires-Dist: cryptography>=45.0
 Requires-Dist: semver>=3.0
 Requires-Dist: typing-extensions>=4.12.2
-Requires-Dist: StructResult>=0.7.3
+Requires-Dist: StructResult>=0.8.0
 Provides-Extra: dev
 Requires-Dist: mypy>=1.5.0; extra == "dev"
 Requires-Dist: ruff>=0.11; extra == "dev"

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/src/DLMS_SPODES.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ src/DLMS_SPODES/cosem_interface_classes/ln_pattern.py
 src/DLMS_SPODES/cosem_interface_classes/obis.py
 src/DLMS_SPODES/cosem_interface_classes/overview.py
 src/DLMS_SPODES/cosem_interface_classes/parameter.py
+src/DLMS_SPODES/cosem_interface_classes/parameters.py
 src/DLMS_SPODES/cosem_interface_classes/register.py
 src/DLMS_SPODES/cosem_interface_classes/register_monitor.py
 src/DLMS_SPODES/cosem_interface_classes/reports.py
@@ -159,6 +160,7 @@ test/test_electric_obj.py
 test/test_enums.py
 test/test_hdlc.py
 test/test_overview.py
+test/test_pars.py
 test/test_report.py
 test/test_save_type.typ
 test/test_settings.py

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/src/DLMS_SPODES.egg-info/requires.txt

@@ -2,7 +2,7 @@ pydantic>=2.11
 cryptography>=45.0
 semver>=3.0
 typing-extensions>=4.12.2
-StructResult>=0.7.3
+StructResult>=0.8.0
 
 [dev]
 mypy>=1.5.0

{dlms_spodes-0.86.9 → dlms_spodes-0.86.11}/test/test_LNPatterns.py

@@ -11,19 +11,19 @@ from src.DLMS_SPODES.exceptions import NeedUpdate, NoObject
 
 
 class TestType(unittest.TestCase):
+    def setUp(self):
+        self.pattern = ln_pattern.LNPattern.parse("0.b.0.(1-5, 7-8).0.255")
 
     @staticmethod
     def get_pattern():
         return ln_pattern.LNPattern.parse("0.b.0.1.0.255")
 
     def test_create(self):
-        p = self.get_pattern()
-        print(p)
+        print(self.pattern)
 
     def test_equal(self):
-        p = self.get_pattern()
-        self.assertEqual(p, cst.LogicalName.from_obis("0.2.0.1.0.255"))
-        self.assertNotEqual(p, cst.LogicalName.from_obis("1.0.0.1.0.255"))
+        self.assertEqual(self.pattern, cst.LogicalName.from_obis("0.2.0.1.0.255"))
+        self.assertNotEqual(self.pattern, cst.LogicalName.from_obis("1.0.0.1.0.255"))
 
     def test_country(self):
         print(ln_pattern.COUNTRY_SPECIFIC_IDENTIFIERS)
@@ -34,4 +34,4 @@ class TestType(unittest.TestCase):
 
     def test_convert(self):
         clock_pat = ln_pattern.CLOCK
-        print(clock_pat)
+        print(clock_pat)

dlms_spodes-0.86.11/test/test_pars.py

@@ -0,0 +1,11 @@
+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):
+        class My(prs.Data):
+            OBIS = Parameter.parse("0.0.0.1.0.255")
+
+        print(My().LN)