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

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

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

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

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

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

@@ -865,11 +865,9 @@ class Collection:
         """ get object, return None if it absence """
         return self.__objs.get(obis, None)
 
-    def par2obj(self, par: Parameter) -> result.Simple[InterfaceClass] | result.Error:
+    def par2obj(self, par: Parameter) -> result.SimpleOrError[InterfaceClass]:
         """return: DLMSObject"""
-        if obj := self.__objs.get(par.obis):
-            return result.Simple(obj)
-        return result.Error.from_e(exc.NoObject(f"with {par=}"), "get object")
+        return self.obis2obj(par.obis)
 
     def par2data(self, par: Parameter) -> result.Option[cdt.CommonDataType] | result.Error:
         """:return CDT by Parameter, return None if data wasn't setting"""
@@ -1227,13 +1225,12 @@ class Collection:
         else:
             return obj
 
-    def obis2obj(self, obis: o.OBIS) -> result.Simple[InterfaceClass] | result.Error:
-        res = self.__objs.get(obis)
-        if res.value is None:
+    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(res.value)
+        return result.Simple(obj)
 
-    def logicalName2obj(self, ln: cst.LogicalName) -> result.Simple[InterfaceClass]:
+    def logicalName2obj(self, ln: cst.LogicalName) -> result.SimpleOrError[InterfaceClass]:
         return self.obis2obj(o.OBIS(ln.contents))
 
     @cached_property

{dlms_spodes-0.86.19 → dlms_spodes-0.86.21}/src/DLMS_SPODES.egg-info/PKG-INFO

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

{dlms_spodes-0.86.19 → dlms_spodes-0.86.21}/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.8.3
+StructResult>=0.8.5
 numpy>=2.3.2
 
 [dev]