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

DLMS_SPODES_client/client.py

@@ -115,7 +115,7 @@ class Client:
     __universal: bool
     level: OSI
     log_file: TextIO
-    media: base.Media | None
+    media: base.Media
     lock: asyncio.Lock
     last_transfer_time: datetime.timedelta | None
     connection_time_release: int
@@ -140,11 +140,11 @@ class Client:
     state: State
 
     def __init__(self,
+                 media: base.Media,
                  SAP: int = 0x10,
                  secret: str | bytes = "",
                  conformance: str = None,
                  addr_size: int = -1,
-                 media: base.Media = None,
                  id_: str | int = None,
                  m_id: int = 0,
                  universal: bool = False,
@@ -163,7 +163,7 @@ class Client:
         self._objects = None
         self.__sap = enums.ClientSAP(SAP)
         """Service Access Point. Default <Public>"""
-        self.media = Serial(port="COM3") if media is None else media
+        self.media = media
         """ physical layer """
         if com_profile is None:
             self.com_profile = c_pf.HDLC()
@@ -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,18 @@ 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):
+                    await self.media.end_transaction()
+                    break
+                if notify.data.size != 0:
+                    if not notify.isMoreData():
+                        notify.clear()
+                    continue
             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/task.py

@@ -76,9 +76,10 @@ 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.log(logL.INFO, F"Open port communication channel: {c.media} {res_open.value}sec")
         c.level = OSI.PHYSICAL
-        c.log(logL.INFO, F"Open port communication channel: {c.media}")
         # todo: replace to <data_link>
         if (
             c._objects is None
@@ -223,10 +224,9 @@ class Base[T: result.Result](Protocol):
             case _ as diagnostic:
                 return result.Error.from_e(exc.AssociationResultError(diagnostic))
         if c._objects is not None:
-            if c.is_universal():
-                await change_ldn.exchange(c)
-            else:
-                await match_ldn.exchange(c)
+            matchLDN = change_ldn if c.is_universal() else match_ldn
+            if isinstance(res_match_ldn := await matchLDN.exchange(c), result.Error):
+                return res_match_ldn
         return result.OK
 
     async def application(self, c: Client) -> T | result.Error:
@@ -322,7 +322,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),
@@ -726,7 +727,7 @@ class MatchLDN(OK):
             c.log(logL.WARN, F"connected to other server, change LDN")
             await init_type.exchange(c)  # todo: maybe set spec?
         else:
-            return result.Error(exc.IDError(F"got {res.value=}, expected {c._objects.LDN.value}"))
+            return result.Error.from_e(ValueError(F"got LDN: {res.value}, expected {c._objects.LDN.value}"))
         return result.OK
 
 
@@ -1356,25 +1357,65 @@ class Execute2(SimpleCopy, OK):
             return result.Error.from_e(e)
 
 
-class WriteTime(SimpleCopy, Base):
-    msg: str = "write Clock.time depend from transfer time"
+@dataclass
+class GetTimeDelta(SimpleCopy, Simple[float]):
+    """Read and return <time delta> in second: """
+    msg: str = "Read Clock.time"
 
-    async def exchange(self, c: Client):
-        try:
-            obj = c._objects.clock
-            c.get_get_request_normal(obj.get_attr_descriptor(3))
-            if isinstance(res_pdu := await c.read_data_block(), result.Error):
-                return res_pdu
-            tz = obj.get_attr_element(3).DATA_TYPE(res_pdu.value)
-            res = await WriteAttribute(
-                ln=obj.logical_name,
-                index=2,
-                value=(datetime.datetime.utcnow() + datetime.timedelta(minutes=int(tz)) + c.last_transfer_time)
-            ).exchange(c)
-            return res
-        except Exception as e:
-            # logger.info(F'ERROR: write Clock: attribute 2 {e}')
-            return result.Error.from_e(exc.DLMSException(F"write time: {e}"))
+    async def exchange(self, c: Client) -> result.SimpleOrError[float]:
+        acc = result.ErrorAccumulator()
+        obj = c._objects.clock
+        if isinstance(
+            res_read_tz := await ReadObjAttr(
+                obj=obj,
+                index=3
+                ).exchange(c),
+        result.Error):
+            return res_read_tz
+        tz = datetime.timezone(datetime.timedelta(minutes=int(res_read_tz.value)))
+        if isinstance(
+            res_read := await ReadObjAttr(
+                obj=obj,
+                index=2
+                ).exchange(c),
+        result.Error):
+            return res_read
+        value = datetime.datetime.now(tz=tz)
+        value2 = res_read.value.to_datetime().replace(tzinfo=tz)
+        return result.Simple((value2 - value).total_seconds()).append_err(acc.err)
+
+
+
+@dataclass
+class WriteTime(SimpleCopy, Simple[float]):
+    """Write and return <record time> in second: """
+    limit: float = 5.0
+    number_of_retries: int = 10
+    msg: str = "write Clock.time"
+
+    async def exchange(self, c: Client) -> result.SimpleOrError[float]:
+        acc = result.ErrorAccumulator()
+        obj = c._objects.clock
+        c.get_get_request_normal(obj.get_attr_descriptor(3))
+        if isinstance(res_pdu := await c.read_data_block(), result.Error):
+            return res_pdu
+        tz = obj.get_attr_element(3).DATA_TYPE(res_pdu.value)
+        for i in range(self.number_of_retries):
+            pre_time = time.time()
+            if isinstance(
+                res_write := await WriteAttribute(
+                    ln=obj.logical_name,
+                    index=2,
+                    value=(datetime.datetime.utcnow() + datetime.timedelta(minutes=int(tz)))).exchange(c),
+            result.Error):
+                return res_write
+            rec_time = time.time() - pre_time
+            if rec_time < self.limit:
+                break
+            acc.append_e(TimeoutError(f"can't write in {i} attemp in time"))
+        else:
+            return result.Error.from_e(TimeoutError(f"can't write time for limit: {self.limit} second"))
+        return result.Simple(rec_time).append_err(acc.err)
 
 
 @dataclass

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.18
+Version: 0.19.25
 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.4
 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
@@ -23,5 +23,7 @@ Provides-Extra: dev
 Requires-Dist: mypy>=1.5.0; extra == "dev"
 Requires-Dist: ruff>=0.11; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 
 # SPODES-client

{dlms_spodes_client-0.19.18.dist-info → dlms_spodes_client-0.19.25.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=T_8nI6_tCWK6Us74gjIM_2I8EtETs4dQX4ygFmnV70A,112333
+DLMS_SPODES_client/client.py,sha256=pRkFriDGu2DKZQDDNWmNaYXTRvPeWWIcITjfHwYx3CE,112082
 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=K2GyX4_DMV5_vYk2QhCwNkXK4gEqd9UmmcjHa46I49c,76378
+DLMS_SPODES_client/task.py,sha256=wW6sjKKR31dc1FNKFptGTcob3mBRAVaOVa1h6tUWp10,78083
 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.18.dist-info/METADATA,sha256=hYlGdBkjzcYlM28DJTQnpUQ-lF83f9ozF7i2z1C1L_s,986
-dlms_spodes_client-0.19.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes_client-0.19.18.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
-dlms_spodes_client-0.19.18.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
-dlms_spodes_client-0.19.18.dist-info/RECORD,,
+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,,