DLMS-SPODES-client 0.19.18__tar.gz → 0.19.19__tar.gz

{dlms_spodes_client-0.19.18/src/DLMS_SPODES_client.egg-info → dlms_spodes_client-0.19.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.18
+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.18 → dlms_spodes_client-0.19.19}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["Types"]
 
 [project]
 name = "DLMS_SPODES_client"
-version = "0.19.18"
+version = "0.19.19"
 requires-python = ">= 3.12"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}

{dlms_spodes_client-0.19.18 → dlms_spodes_client-0.19.19}/src/DLMS_SPODES_client/task.py

@@ -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.18 → dlms_spodes_client-0.19.19/src/DLMS_SPODES_client.egg-info}/PKG-INFO

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