DLMS-SPODES-client 0.19.20__tar.gz → 0.19.22__tar.gz

{dlms_spodes_client-0.19.20/src/DLMS_SPODES_client.egg-info → dlms_spodes_client-0.19.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.20
+Version: 0.19.22
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -14,7 +14,7 @@ Requires-Dist: pydantic>=2.11
 Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: semver>=3.0
 Requires-Dist: StructResult<0.10,>=0.9.2
-Requires-Dist: DLMS-SPODES-communications<1.5,>=1.4.9
+Requires-Dist: DLMS-SPODES-communications<1.6,>=1.5.0
 Requires-Dist: DLMS_SPODES<0.88,>=0.87.8
 Requires-Dist: DLMSadapter<0.8,>=0.7.6
 Requires-Dist: DLMSCommunicationProfile<0.2,>=0.1.11

{dlms_spodes_client-0.19.20 → dlms_spodes_client-0.19.22}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["Types"]
 
 [project]
 name = "DLMS_SPODES_client"
-version = "0.19.20"
+version = "0.19.22"
 requires-python = ">= 3.12"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
@@ -25,7 +25,7 @@ dependencies = [
     "pycryptodomex >= 3.22.0",
     "semver >= 3.0",
     "StructResult >= 0.9.2, <0.10",
-    "DLMS-SPODES-communications >= 1.4.9, <1.5",
+    "DLMS-SPODES-communications >= 1.5.0, <1.6",
     "DLMS_SPODES >= 0.87.8, < 0.88",
     "DLMSadapter >= 0.7.6, < 0.8",
     "DLMSCommunicationProfile >= 0.1.11, < 0.2",

{dlms_spodes_client-0.19.20 → dlms_spodes_client-0.19.22}/src/DLMS_SPODES_client/client.py

@@ -260,12 +260,12 @@ class Client:
             case _:         raise ValueError(F"can't calculate channel index by media: {self.media}")
 
     def get_frame(self, read_data: bytearray, reply: GXReplyData) -> frame.Frame | None:
+        reply.complete = False
         while len(read_data) != 0:
             new_frame = frame.Frame.try_from(read_data)
-            reply.complete = True
-            if new_frame is None:
-                reply.complete = False
+            if not isinstance(new_frame, frame.Frame):
                 return None
+            reply.complete = True
             if new_frame.is_for_me(self.DA, self.SA):
                 self.received_frames.append(new_frame)
                 if new_frame.is_segmentation:
@@ -319,7 +319,7 @@ class Client:
         len_ = _GXCommon.getObjectCount(reply.data)
         if len_ > reply.data.size - reply.data.position:
             reply.complete = False
-            return
+            return result.Error.from_e(RuntimeError("not enouth reply data size"))
         GXDLMS.getDataFromBlock(reply.data, index)
         if (bc & 0x80) == 0:
             reply.moreData = (RequestTypes(reply.moreData | RequestTypes.GBT))
@@ -758,22 +758,19 @@ class Client:
                 self.log(logL.INFO, F"TX: {send_frame.content.hex(" ")}")
             attempt: int = 1
             while attempt < 3:
-                try:
-                    await asyncio.wait_for(                 # todo: don't work exception!!!! Why????
-                        fut=self.media.receive(recv_buf),
-                        timeout=self.com_profile.parameters.inactivity_time_out)  # todo: only for HDLC
-                    if self.__is_frame(notify, recv_buf, reply):
-                        break
-                    elif notify.data.size != 0:
-                        if not notify.isMoreData():
-                            notify.clear()
-                        continue
-                    else:
-                        """our frame not was found"""
-                except TimeoutError as e:
-                    self.log(logL.WARN, F'Data send failed: {e}.  Try to resend {attempt+1}/3. RX_buffer: {recv_buf.hex(" ")}')
+                if not await self.media.receive(recv_buf):  # todo: make for BLE
+                    self.log(logL.WARN, F'Data receive failed: Try to resend {attempt + 1}/3. RX_buffer: {recv_buf.hex(" ")}')
                     await self.media.send(send_frame.content)
                     attempt += 1
+                    continue
+                if self.__is_frame(notify, recv_buf, reply):
+                    break
+                if notify.data.size != 0:
+                    if not notify.isMoreData():
+                        notify.clear()
+                    continue
+                else:
+                    """our frame not was found"""
             else:
                 return result.Error.from_e(TimeoutError("Failed to receive reply from the device in given time"), "read data block")
             recv_buf.clear()

{dlms_spodes_client-0.19.20 → dlms_spodes_client-0.19.22}/src/DLMS_SPODES_client/task.py

@@ -76,7 +76,8 @@ class Base[T: result.Result](Protocol):
         if c.media is None:
             return result.Error.from_e(exc.NoPort("no media"), "PH_connect")
         if not c.media.is_open():
-            await c.media.open()
+            if isinstance(res_open := await c.media.open(), result.Error):
+                return res_open
         c.level = OSI.PHYSICAL
         c.log(logL.INFO, F"Open port communication channel: {c.media}")
         # todo: replace to <data_link>
@@ -322,7 +323,8 @@ class TestDataLink(SimpleCopy, OK):
     async def physical(self, c: Client) -> result.Ok | result.Error:
         if OSI.PHYSICAL not in c.level:
             if not c.media.is_open():
-                await c.media.open()
+                if isinstance(res_open := await c.media.open(), result.Error):
+                    return res_open
             c.level = OSI.PHYSICAL
             c.DA = frame.Address(
                 upper_address=int(c.server_SAP),

{dlms_spodes_client-0.19.20 → dlms_spodes_client-0.19.22/src/DLMS_SPODES_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.20
+Version: 0.19.22
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -14,7 +14,7 @@ Requires-Dist: pydantic>=2.11
 Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: semver>=3.0
 Requires-Dist: StructResult<0.10,>=0.9.2
-Requires-Dist: DLMS-SPODES-communications<1.5,>=1.4.9
+Requires-Dist: DLMS-SPODES-communications<1.6,>=1.5.0
 Requires-Dist: DLMS_SPODES<0.88,>=0.87.8
 Requires-Dist: DLMSadapter<0.8,>=0.7.6
 Requires-Dist: DLMSCommunicationProfile<0.2,>=0.1.11

{dlms_spodes_client-0.19.20 → dlms_spodes_client-0.19.22}/src/DLMS_SPODES_client.egg-info/requires.txt

@@ -2,7 +2,7 @@ pydantic>=2.11
 pycryptodomex>=3.22.0
 semver>=3.0
 StructResult<0.10,>=0.9.2
-DLMS-SPODES-communications<1.5,>=1.4.9
+DLMS-SPODES-communications<1.6,>=1.5.0
 DLMS_SPODES<0.88,>=0.87.8
 DLMSadapter<0.8,>=0.7.6
 DLMSCommunicationProfile<0.2,>=0.1.11

{dlms_spodes_client-0.19.20 → dlms_spodes_client-0.19.22}/test/client_log.txt

@@ -157292,3 +157292,40 @@ KPZ101000007851: 22.10 08:52.22 - DLMSClient - DEBUG - close
 KPZ101000007851: 22.10 08:52.22 - DLMSClient - INFO - TX: 7e a0 08 02 21 61 53 6f 51 7e
 KPZ101000007851: 22.10 08:52.22 - DLMSClient - INFO - RX: 7e a0 1f 61 02 21 73 e1 e2 81 80 12 05 01 80 06 01 80 07 04 00 00 00 01 08 04 00 00 00 01 53 3b 7e
 KPZ101000007851: 22.10 08:52.22 - DLMSClient - DEBUG - closed communication channel: COM6,9600
+#common: 24.10 13:45.18 - DLMSClient - DEBUG - Start <Logger DLMSClient (DEBUG)>
+c_Serial_HIGH: 24.10 13:45.18 - DLMSClient - INFO - Acquire
+c_Serial_HIGH: 24.10 13:45.18 - DLMSClient - INFO - Open port communication channel: COM6,9600
+c_Serial_HIGH: 24.10 13:45.18 - DLMSClient - INFO - c.SA=Address(upper_address=48, lower_address=None) c.DA=Address(upper_address=1, lower_address=16)
+c_Serial_HIGH: 24.10 13:45.18 - DLMSClient - INFO - TX: 7e a0 08 02 21 61 93 63 97 7e
+c_Serial_HIGH: 24.10 13:45.18 - DLMSClient - INFO - RX: 7e a0 08 61 02 21 73 7d 66 7e
+c_Serial_HIGH: 24.10 13:45.18 - DLMSClient - INFO - negotiation setup: NEGOTIATION: 128->[info_size]->128 1->[window]->1
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - TX: 7e a0 4d 02 21 61 10 86 c6 e6 e6 00 60 3e a1 09 06 07 60 85 74 05 08 01 01 8a 02 07 80 8b 07 60 85 74 05 08 02 02 ac 12 80 10 90 bc 95 6a 5c b8 80 20 08 1b db 02 0a 5b b7 e0 be 10 04 0e 01 00 00 00 06 5f 1f 04 00 7f ff ff ff ff 33 65 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - RX: 7e a0 59 61 02 21 30 c4 68 e6 e7 00 61 4a a1 09 06 07 60 85 74 05 08 01 01 a2 03 02 01 00 a3 05 a1 03 02 01 0e 88 02 07 80 89 07 60 85 74 05 08 02 02 aa 12 80 10 79 b4 a3 ff d0 e8 42 b4 72 c6 56 db cd 4c 21 00 be 10 04 0e 08 00 06 5f 1f 04 00 00 18 9d 04 00 00 07 0f 82 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - SET CONFORMANCE: 000000000001100010011101
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - TX: 7e a0 2c 02 21 61 32 61 6e e6 e6 00 c3 01 c1 00 0f 00 00 28 00 00 ff 01 01 09 10 10 c6 1b f8 75 a3 60 8c 3a 13 17 20 f4 02 f1 d6 0c f1 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - RX: 7e a0 25 61 02 21 52 13 4a e6 e7 00 c7 01 c1 00 01 00 09 10 ac a5 ce 67 51 89 8e d3 1f 75 0d e2 15 ed 10 66 28 1e 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - TX: 7e a0 1a 02 21 61 54 18 87 e6 e6 00 c0 01 c1 00 01 00 00 2a 00 00 ff 02 00 12 80 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - RX: 7e a0 22 61 02 21 74 fb 3e e6 e7 00 c4 01 c1 00 09 0f 4b 50 5a 31 30 31 30 30 30 30 30 37 38 35 31 62 2d 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - TX: 7e a0 1a 02 21 61 76 08 85 e6 e6 00 c0 01 c1 00 01 00 00 00 02 00 ff 02 00 f4 3a 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - RX: 7e a0 21 61 02 21 96 2b e7 e6 e7 00 c4 01 c1 00 09 0e 50 57 52 4d 5f 4d 32 4d 5f 31 5f 46 34 5f 66 7c 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - TX: 7e a0 1a 02 21 61 98 78 8b e6 e6 00 c0 01 c1 00 01 00 00 00 02 01 ff 02 00 4f 26 7e
+c_Serial_HIGH: 24.10 13:45.19 - DLMSClient - INFO - RX: 7e a0 19 61 02 21 b8 a6 a1 e6 e7 00 c4 01 c1 00 09 06 31 2e 37 2e 31 35 30 08 7e
+c_Serial_HIGH: 24.10 13:45.20 - DLMSClient - INFO - find collection in <DLMSAdapter.xml_.Xml50 object at 0x0000025C08063530>
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - DEBUG - close
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - TX: 7e a0 08 02 21 61 53 6f 51 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - RX: 7e a0 1f 61 02 21 73 e1 e2 81 80 12 05 01 80 06 01 80 07 04 00 00 00 01 08 04 00 00 00 01 53 3b 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - c.SA=Address(upper_address=48, lower_address=None) c.DA=Address(upper_address=1, lower_address=16)
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - TX: 7e a0 08 02 21 61 93 63 97 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - RX: 7e a0 08 61 02 21 73 7d 66 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - negotiation setup: NEGOTIATION: 128->[info_size]->128 1->[window]->1
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - TX: 7e a0 4d 02 21 61 10 86 c6 e6 e6 00 60 3e a1 09 06 07 60 85 74 05 08 01 01 8a 02 07 80 8b 07 60 85 74 05 08 02 02 ac 12 80 10 2c 5f 4f 25 15 28 be cb b8 f9 30 f1 36 7d b8 7f be 10 04 0e 01 00 00 00 06 5f 1f 04 00 7f ff ff ff ff f0 cf 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - RX: 7e a0 59 61 02 21 30 c4 68 e6 e7 00 61 4a a1 09 06 07 60 85 74 05 08 01 01 a2 03 02 01 00 a3 05 a1 03 02 01 0e 88 02 07 80 89 07 60 85 74 05 08 02 02 aa 12 80 10 3a ed a5 57 69 8f c6 f0 19 e2 88 56 64 52 54 9b be 10 04 0e 08 00 06 5f 1f 04 00 00 18 9d 04 00 00 07 f1 56 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - SET CONFORMANCE: 000000000001100010011101
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - TX: 7e a0 2c 02 21 61 32 61 6e e6 e6 00 c3 01 c1 00 0f 00 00 28 00 00 ff 01 01 09 10 bb d7 63 31 1b 51 93 f8 6b 7a e9 e7 d4 fb 2f de 71 dc 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - RX: 7e a0 25 61 02 21 52 13 4a e6 e7 00 c7 01 c1 00 01 00 09 10 a5 5b 01 73 9f cb 46 f6 7a 9e 2d b8 7f 08 b2 a8 30 93 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - TX: 7e a0 1a 02 21 61 54 18 87 e6 e6 00 c0 01 c1 00 01 00 00 2a 00 00 ff 02 00 12 80 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - RX: 7e a0 22 61 02 21 74 fb 3e e6 e7 00 c4 01 c1 00 09 0f 4b 50 5a 31 30 31 30 30 30 30 30 37 38 35 31 62 2d 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - DEBUG - close
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - TX: 7e a0 08 02 21 61 53 6f 51 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - INFO - RX: 7e a0 1f 61 02 21 73 e1 e2 81 80 12 05 01 80 06 01 80 07 04 00 00 00 01 08 04 00 00 00 01 53 3b 7e
+KPZ101000007851: 24.10 13:45.20 - DLMSClient - DEBUG - closed communication channel: COM6,9600