DLMS-SPODES 0.86.19__py3-none-any.whl → 0.86.21__py3-none-any.whl

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.dist-info → dlms_spodes-0.86.21.dist-info}/METADATA

@@ -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.dist-info → dlms_spodes-0.86.21.dist-info}/RECORD

@@ -25,7 +25,7 @@ DLMS_SPODES/cosem_interface_classes/activity_calendar.py,sha256=VWSiKn2LNBA1VLAA
 DLMS_SPODES/cosem_interface_classes/arbitrator.py,sha256=S9TguoMG6O5DpMBp6mpcJpw6PHanvh4SEAN3M_v6qts,3240
 DLMS_SPODES/cosem_interface_classes/attr_indexes.py,sha256=aUSnT-dKoBsDbwLhlgtLIHGRl7PZrT-ld2ThCEUjUeA,328
 DLMS_SPODES/cosem_interface_classes/clock.py,sha256=9OJwRGrbFPws_VZPayHv-hzFJegIcjgoJoenIqofd5w,4525
-DLMS_SPODES/cosem_interface_classes/collection.py,sha256=HOvQhrrYTk90fqTp1QOHiE9RU3eHDOWTw80inco_ark,96424
+DLMS_SPODES/cosem_interface_classes/collection.py,sha256=kvT_bRn134OWpfgYkitiG98nx2mjmlPithUqvHjlYBA,96258
 DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py,sha256=LUtooNc45Fvk2d7oIPRT41zJDQnyo5Y3S5T-90WV7QE,23506
 DLMS_SPODES/cosem_interface_classes/data.py,sha256=YSjA3Y0M5NMcfYzWPEuZw6ojIqr2UghgW_ck8dXySMU,809
 DLMS_SPODES/cosem_interface_classes/disconnect_control.py,sha256=CIx7I4QRpPxAC5iYxpbhCIuv6U2P3s6ELam8eD-kD5w,2926
@@ -112,7 +112,7 @@ DLMS_SPODES/types/implementations/integers.py,sha256=KAcaTY8ZwhBaJThbLSr39Oh_-9h
 DLMS_SPODES/types/implementations/long_unsigneds.py,sha256=SxmFvD2moQ03p-KZSBYK1Rv7bQSaywlHVXBfkTZG1OQ,8761
 DLMS_SPODES/types/implementations/octet_string.py,sha256=Jo_sfWcsfstiP4O6mXfBOOQlksx1c2qJMI-vbAOV-yM,294
 DLMS_SPODES/types/implementations/structs.py,sha256=GMOo6Jy8jA9d6KTLs0D-j5t0oSRvxUIwtBr_4UePwbA,2059
-dlms_spodes-0.86.19.dist-info/METADATA,sha256=KYI-oxbN0Kd8JiXX7-mn3kzU09Ph_dUc8s9rZLXnhhY,1028
-dlms_spodes-0.86.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes-0.86.19.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
-dlms_spodes-0.86.19.dist-info/RECORD,,
+dlms_spodes-0.86.21.dist-info/METADATA,sha256=WDKahOpl6Y545DitGKIQecn58woKS4tyd2JFmwhIM6c,1028
+dlms_spodes-0.86.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes-0.86.21.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
+dlms_spodes-0.86.21.dist-info/RECORD,,