DLMS-SPODES 0.86.13__tar.gz → 0.86.15__tar.gz

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.13
+Version: 0.86.15
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project
@@ -14,7 +14,8 @@ 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.8.0
+Requires-Dist: StructResult>=0.8.2
+Requires-Dist: numpy>=2.3.2
 Provides-Extra: dev
 Requires-Dist: mypy>=1.5.0; extra == "dev"
 Requires-Dist: ruff>=0.11; extra == "dev"

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/pyproject.toml

@@ -14,7 +14,7 @@ exclude = ["test","KPZ"]
 
 [project]
 name = "DLMS_SPODES"
-version = "0.86.13"
+version = "0.86.15"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
 ]
@@ -23,7 +23,8 @@ dependencies = [
     "cryptography>=45.0",
     "semver>=3.0",
     "typing-extensions>=4.12.2",  # remove for 3.13(use for @deprecated)
-    "StructResult>=0.8.0"
+    "StructResult>=0.8.2",
+    "numpy>=2.3.2"
 ]
 description="dlms-spodes"
 readme = "README.md"

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -669,7 +669,7 @@ class Collection:
     spec_map: str
 
     def __init__(self,
-                 id_: ID = None,
+                 id_: ID,
                  dlms_ver: int = 6,
                  country: CountrySpecificIdentifiers = None,
                  cntr_ver: ParameterValue = None):
@@ -867,19 +867,22 @@ class Collection:
         """ get object, return None if it absence """
         return self.__objs.get(obis, None)
 
-    def par2obj(self, par: Parameter) -> InterfaceClass:
+    def par2obj(self, par: Parameter) -> result.Simple[InterfaceClass] | result.Error:
         """return: DLMSObject"""
-        if ret := self.__objs.get(par.obis):
-            return ret
-        raise exc.NoObject(f"with {par=}")
+        if obj := self.__objs.get(par.obis):
+            return result.Simple(obj)
+        return result.Error.from_e(exc.NoObject(f"with {par=}"))
 
-    def par2data(self, par: Parameter) -> Optional[cdt.CommonDataType]:
+    def par2data(self, par: Parameter) -> result.Option[cdt.CommonDataType] | result.Error:
         """:return CDT by Parameter, return None if data wasn't setting"""
-        if (a_data := self.par2obj(par).get_attr(par.i)) is None:
-            return None
+        if isinstance((res1 := self.par2obj(par)), result.Error):
+            return res1
+        res = result.Option(res1.value.get_attr(par.i))
+        if res.value is None:
+            return res
         for el in par.elements():
-            a_data = a_data[el]
-        return a_data
+            res.value = res.value.a_data[el]
+        return res
 
     def values(self) -> tuple[InterfaceClass]:
         return tuple(self.__objs.values())
@@ -1009,7 +1012,7 @@ class Collection:
                 else:
                     rep.log = cdt.Log(logging.ERROR, F"absent script with ID: {data.script_selector}")
             else:
-                obj = self.par2obj(par)
+                obj = self.par2obj(par).unwrap()
                 elements = tuple(par.elements())
                 if unit := get_unit(obj.CLASS_ID, elements):
                     rep.unit = cdt.Unit(unit).get_name()
@@ -1070,7 +1073,7 @@ class Collection:
     def par2su(self, par: Parameter) -> Optional[cdt.ScalUnitType]:
         """convert Parameter -> Optional[ScalerUnit],
         raise: NoObject, EmptyAttribute"""
-        match (obj := self.par2obj(par)).CLASS_ID, par.i:
+        match (obj := self.par2obj(par).unwrap()).CLASS_ID, par.i:
             case (exc.NoObject, _):
                 raise obj
             case (ClassID.REGISTER | ClassID.EXT_REGISTER, 2) | (ClassID.DEMAND_REGISTER, 2 | 3):
@@ -1099,7 +1102,7 @@ class Collection:
 
     def par2float(self, par: Parameter) -> float:
         """try convert CDT value according with Parameter to build-in float"""
-        data = self.par2data(par)
+        data = self.par2data(par).unwrap()
         if hasattr(data, "__int__"):
             value = float(int(data))
         elif hasattr(data, "__float__"):
@@ -1129,7 +1132,7 @@ class Collection:
 
     def iter_classID_objects(self,
                         class_id: ut.CosemClassId) -> Iterator[InterfaceClass]:
-        return (obj for obj in self.__objs.values() if obj.CLASS_ID == value)
+        return (obj for obj in self.__objs.values() if obj.CLASS_ID == class_id)
 
     def LNPattern2objects(self,
                           pat: LNPattern) -> list[InterfaceClass]:

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/src/DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py

@@ -6,6 +6,7 @@ from functools import lru_cache
 from typing_extensions import deprecated
 from typing import Iterator, Type, TypeAlias, Callable, Any, Self, Literal, Optional, Protocol
 from ..types import cdt, ut, cst
+from StructResult import result
 from ..relation_to_OBIS import get_name
 import logging
 from enum import IntEnum
@@ -374,10 +375,10 @@ class COSEMInterfaceClasses(Protocol):
         # print(cls.__name__)
 
     @classmethod
-    def get_attr_element(cls, i: int) -> ICAElement:
+    def getAElement(cls, i: int) -> result.Simple[ICAElement] | result.Error:
         """return element by order index. Override in each new class"""
         if i == 1:
-            return _LN_ELEMENT
+            return result.Simple(_LN_ELEMENT)
         elif i > len(cls.A_ELEMENTS) + 1:
             raise exc.DLMSException(F"got attribute index: {i}, expected 1..{len(cls.A_ELEMENTS) + 1}")
         else:

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/src/DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -1,11 +1,10 @@
 from dataclasses import dataclass
-from typing import Protocol, ClassVar
 from functools import cached_property
 from .parameter import Parameter
 
 
 @dataclass
-class Base(Protocol):
+class Base:
     OBIS: Parameter
 
     @cached_property

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/src/DLMS_SPODES.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.86.13
+Version: 0.86.15
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project
@@ -14,7 +14,8 @@ 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.8.0
+Requires-Dist: StructResult>=0.8.2
+Requires-Dist: numpy>=2.3.2
 Provides-Extra: dev
 Requires-Dist: mypy>=1.5.0; extra == "dev"
 Requires-Dist: ruff>=0.11; extra == "dev"

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/src/DLMS_SPODES.egg-info/requires.txt

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

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/test/test_KPZ.py

@@ -594,7 +594,7 @@ class TestType(unittest.TestCase):
     def test_par2rep(self):
         col = self.create_collection()
         par = Parameter.parse("0.0.13.0.0.255:9").extend(0, 0)
-        data = col.par2data(par)
+        data = col.par2data(par).unwrap()
         rep1 = col.par2rep(par, data)
         print(str(col[par.obis].get_attr_element(1)))
         print(rep1)

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/test/test_collection.py

@@ -589,7 +589,7 @@ class TestType(unittest.TestCase):
     def test_par2rep(self):
         col = self.create_collection()
         par = Parameter.parse("0.0.13.0.0.255:9").extend(0, 0)
-        data = col.par2data(par)
+        data = col.par2data(par).unwrap()
         rep1 = col.par2rep(par, data)
         print(str(col[par.obis].get_attr_element(1)))
         print(rep1)

{dlms_spodes-0.86.13 → dlms_spodes-0.86.15}/test/test_pars.py

@@ -7,5 +7,6 @@ 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)
+        print(My.LN, My2.LN, My3.SCALER_UNIT)