DLMS-SPODES-client 0.19.17__py3-none-any.whl → 0.19.19__py3-none-any.whl

DLMS_SPODES_client/task.py

@@ -945,14 +945,14 @@ class MapTypeCreator:
         res = await self.con[id_sap].exchange(c)
         async with self.lock:
             try:
-                gotten, _ = self.adapter.get_collection(col_id)  # check for first update
+                gotten, _ = self.adapter.get_collection(col_id).unpack()  # check for first update
                 if gotten.has_sap(id_sap.sap):
                     """not need keep"""
                 else:
                     self.adapter.set_collection(res.value)  # todo: make as ADAPTER.merge_collection(ret)
             except AdapterException as e:
                 self.adapter.set_collection(res.value)
-        res.value, err = res.value.copy()
+        res.value, err = res.value.copy().unpack()
         if err is not None:
             res.extend_err(err)
         return res
@@ -1356,25 +1356,36 @@ 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 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):
-        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
+        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.17.dist-info → dlms_spodes_client-0.19.19.dist-info}/METADATA

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

{dlms_spodes_client-0.19.17.dist-info → dlms_spodes_client-0.19.19.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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=SG-KBkTbpTtbdnF3kt3lBtPqUQFTilYo6dHtfKYS0sY,76360
+DLMS_SPODES_client/task.py,sha256=42nfG3b30NCLUxw4PH0nsTv63N_Ulrxqb-ihKk42Dgo,76850
 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.17.dist-info/METADATA,sha256=RLzKk2GpHLFe1HTrRUqkJkOr3Nq5kUGFzJCTk-KvW-s,986
-dlms_spodes_client-0.19.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes_client-0.19.17.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
-dlms_spodes_client-0.19.17.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
-dlms_spodes_client-0.19.17.dist-info/RECORD,,
+dlms_spodes_client-0.19.19.dist-info/METADATA,sha256=SWD9H2Un2xHu6ysMHdkj6Fl580t6rOjLd7b5A-P8eRs,986
+dlms_spodes_client-0.19.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes_client-0.19.19.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
+dlms_spodes_client-0.19.19.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
+dlms_spodes_client-0.19.19.dist-info/RECORD,,