DLMS-SPODES-client 0.19.25__py3-none-any.whl → 0.19.27__py3-none-any.whl

DLMS_SPODES_client/client.py

@@ -338,7 +338,7 @@ class Client:
         # TODO: make return pdu
         if reply.command is None:
             if reply.data.size - reply.data.position == 0:
-                return result.Error(ValueError("Invalid PDU"), "getpdu")
+                return result.Error.from_e(ValueError("Invalid PDU"), "getpdu")
             index = reply.data.position
             reply.command = XDLMSAPDU(reply.data.getUInt8())
             match reply.command:
@@ -444,7 +444,7 @@ class Client:
                         case pdu.ActionResponse.NORMAL:
                             reply.error = pdu.ActionResult(reply.data.getUInt8())
                             if reply.error != 0:
-                                return result.Error(exc.ResultError(reply.error), "get pdu")
+                                return result.Error.from_e(exc.ResultError(reply.error), "get pdu")
                             if reply.data.position < reply.data.size:
                                 ret = reply.data.getUInt8()
                                 if ret == 0:
@@ -780,7 +780,10 @@ class Client:
                     return result.Error.from_e(exc.NoObject(), "read data block")
                 case _:
                     return result.Error.from_e(GXDLMSException(reply.error), "read data block")
-            if self.received_frames[-1].control.is_info() or self.received_frames[-1].control == frame.Control.UI_PF:
+            if (
+                self.received_frames[-1].control.is_info() 
+                or self.received_frames[-1].control == frame.Control.UI_PF
+            ):
                 if self.received_frames[-1].is_segmentation:
                     """pass handle frame. wait all information"""
                 else:

DLMS_SPODES_client/task.py

@@ -104,7 +104,7 @@ class Base[T: result.Result](Protocol):
             return res_terminate
         return ret
 
-    async def DL_connect(self, c: Client) -> None:
+    async def DL_connect(self, c: Client) -> result.Ok | result.Error:
         """Data link Layer connect"""
         c.send_frames.clear()
         # calculate addresses  todo: move to c.com_profile(HDLC)
@@ -128,10 +128,12 @@ class Base[T: result.Result](Protocol):
         if isinstance(res_pdu := await c.read_data_block(), result.Error):
             return res_pdu
         c.level |= OSI.DATA_LINK
+        return result.OK
 
     async def data_link(self, c: Client) -> T | result.Error:
         if OSI.DATA_LINK not in c.level:
-            await self.DL_connect(c)
+            if isinstance(res_conn := await self.DL_connect(c), result.Error):
+                return res_conn
         # todo: make tile
         return await self.application(c)
 
@@ -212,7 +214,11 @@ class Base[T: result.Result](Protocol):
         if isinstance(res_pdu := await c.read_data_block(), result.Error):
             return res_pdu
         # await c.read_attr(ut.CosemAttributeDescriptor((collection.ClassID.ASSOCIATION_LN, ut.CosemObjectInstanceId("0.0.40.0.0.255"), ut.CosemObjectAttributeId(6)))) # for test only
-        match c.parseAareResponse(res_pdu.value):
+        try:
+            parse = c.parseAareResponse(res_pdu.value)
+        except IndexError as e:
+            print(e)
+        match parse:
             case AcseServiceUser.NULL:
                 c.log(logL.INFO, "Authentication success")
                 c.level |= OSI.APPLICATION

{dlms_spodes_client-0.19.25.dist-info → dlms_spodes_client-0.19.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.25
+Version: 0.19.27
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj

{dlms_spodes_client-0.19.25.dist-info → dlms_spodes_client-0.19.27.dist-info}/RECORD

@@ -1,12 +1,12 @@
 DLMS_SPODES_client/FCS16.py,sha256=RhoN4fX7eesKWfWCkRT_uWNfiQHqFd3T6lRwxfamUqw,2697
 DLMS_SPODES_client/__init__.py,sha256=6wphXvqkodng7h4nKNmkfldbaxf--IDVGfT0yNbas-o,449
-DLMS_SPODES_client/client.py,sha256=pRkFriDGu2DKZQDDNWmNaYXTRvPeWWIcITjfHwYx3CE,112082
+DLMS_SPODES_client/client.py,sha256=HnsbECdBGzrlyT0RzNGweIBms5LKRNP4uUMSmaMEPIA,112148
 DLMS_SPODES_client/logger.py,sha256=zAbihLloMU99w8Sw3djQ0cwItzyGq0Fz8DI9_suazv4,1913
 DLMS_SPODES_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES_client/services.py,sha256=xM_-h322V1bGBcw9cJh7XOSUMTL3_E-GX89-z3YwIYw,3909
 DLMS_SPODES_client/session.py,sha256=nPzXujpmGSTFFvhyZRjgH_RLX1DS9moRddUEZuf-QEE,12760
 DLMS_SPODES_client/settings.py,sha256=6mitGe9UYeEgL61sf933MJ-S5N-ReoxvXqiI3agBGYE,1623
-DLMS_SPODES_client/task.py,sha256=wW6sjKKR31dc1FNKFptGTcob3mBRAVaOVa1h6tUWp10,78083
+DLMS_SPODES_client/task.py,sha256=hylTkESBK3J8xVksmLGGhdGiI0tYNnkqShThZioaGN0,78300
 DLMS_SPODES_client/gurux_common/enums/TraceLevel.py,sha256=Ne0Rn3c9ACqQjmde_ksbiQxIUv6nXsPQRnhkGwIv3QI,521
 DLMS_SPODES_client/gurux_common/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES_client/gurux_dlms/AesGcmParameter.py,sha256=HJt0uvxtkqKEkvfiqXTMNsiayN15AgPJa9_iMSSFZsQ,1429
@@ -54,8 +54,8 @@ DLMS_SPODES_client/gurux_dlms/enums/Task.py,sha256=chuOL6-IMxBvABUZtoFcaYaQQB4GZ
 DLMS_SPODES_client/gurux_dlms/enums/VdeStateError.py,sha256=qT87LMbIYEs3TYPIp3N-dR2Tcg9KhKyiELwhVl5U-tw,233
 DLMS_SPODES_client/gurux_dlms/enums/__init__.py,sha256=F_sgGwNmmdpbKvP1klJQUNiLXxU2BtZ-LgEI9e6xP8g,1314
 DLMS_SPODES_client/gurux_dlms/internal/_GXCommon.py,sha256=7D9EYcfiZxwbk8sfpHv7s2nYqrbmGf-Tbwv2T-gqmgk,53226
-dlms_spodes_client-0.19.25.dist-info/METADATA,sha256=bn_R-U_lc1TyTuOOGkNrUZFYRc6oDiEcYF7IZgISCl0,1062
-dlms_spodes_client-0.19.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes_client-0.19.25.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
-dlms_spodes_client-0.19.25.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
-dlms_spodes_client-0.19.25.dist-info/RECORD,,
+dlms_spodes_client-0.19.27.dist-info/METADATA,sha256=be94iVnDwl0ng1Xn9cUQWwK_BMlkVTboSIqkemsBeUQ,1062
+dlms_spodes_client-0.19.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes_client-0.19.27.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
+dlms_spodes_client-0.19.27.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
+dlms_spodes_client-0.19.27.dist-info/RECORD,,