DLMS-SPODES-client 0.19.6__py3-none-any.whl → 0.19.7__py3-none-any.whl

DLMS_SPODES_client/task.py

@@ -1162,9 +1162,10 @@ class ReadAttributes(SimpleCopy, _List[cdt.CommonDataType]):
 
 
 @dataclass
+@deprecated("use <Write2>")
 class Write(SimpleCopy, OK):
     """write with ParameterData struct"""
-    par_data: ParData
+    pardata: ParData
     msg: str = "write attribute"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
@@ -1188,6 +1189,34 @@ class Write(SimpleCopy, OK):
         return result.OK
 
 
+@dataclass
+class Write2(SimpleCopy, OK):
+    """write with ParameterData struct"""
+    par: Parameter
+    data: cdt.CommonDataType
+    msg: str = "write Data"
+
+    async def exchange(self, c: Client) -> result.Ok | result.Error:
+        if isinstance(res_obj := c.objects.par2obj(self.par), result.Error):
+            return res_obj
+        if self.par.n_elements == 0:
+            enc = self.data.encoding
+        elif isinstance(res_read := await ReadObjAttr(res_obj.value, self.par.i).exchange(c), result.Error):
+            return res_read
+        else:
+            data = a_data
+            for el in self.par.elements():
+                data = data[el]
+            data.set(self.data)
+            enc = data.encoding
+        data = c.get_set_request_normal(
+            obj=res_obj.value,
+            attr_index=self.par.i,
+            value=enc)
+        ret = await c.read_data_block()
+        return result.OK
+
+
 @dataclass
 class WriteParValue(SimpleCopy, OK):
     """write with ParameterValues struct"""
@@ -1694,6 +1723,7 @@ class AccessValidate(Base[result.Ok | result.Simple[list[Parameter]]]):
 
 
 @dataclass
+@deprecated("use <WriteList>")
 class WriteParDatas(SimpleCopy, _List[result.Ok]):
     """write by ParData list"""
     par_datas: list[ParData]
@@ -1710,6 +1740,28 @@ class WriteParDatas(SimpleCopy, _List[result.Ok]):
         return res
 
 
+class WriteList(SimpleCopy, _List[result.Ok]):
+    """write by list"""
+    par_datas: tuple[Parameter, cdt.CommonDataType]
+    err_ignore: bool
+
+    def __init__(self, *par_datas: tuple[Parameter, cdt.CommonDataType], err_ignore: bool = False, msg = ""):
+        self.par_datas = par_datas
+        self.err_ignore = err_ignore
+        self.msg = msg
+
+    async def exchange(self, c: Client) -> result.List[result.Ok] | result.Error:
+        res = result.List[result.Ok]()
+        for par, data in self.par_datas:
+            if (
+                isinstance(res_one := await Write2(par, data).exchange(c), result.Error)
+                and not self.err_ignore
+            ):
+                return res_one
+            res.append(res_one)
+        return res
+
+
 @dataclass
 class WriteParTranscript(SimpleCopy, OK):
     """write by ParValues[Transcript]"""
@@ -1733,19 +1785,23 @@ class WriteParTranscript(SimpleCopy, OK):
         ).exchange(c)
 
 
-Ts = TypeVarTuple("Ts")
-
-
-@dataclass
-class WriteParTranscripts(SimpleCopy, Sequence[*Ts]):
+class WriteParTranscripts(SimpleCopy, _List[result.Ok]):
     """write by ParValues[Transcript] list"""
-    par_values: list[ParValues[cdt.Transcript]]
-    msg: str = ""
+    par_values: tuple[Parameter, cdt.Transcript]
+    err_ignore: bool
 
-    async def exchange(self, c: Client) -> result.Sequence[*Ts] | result.Error:
-        res = result.Sequence()
-        for par_value in self.par_values:
-            if isinstance(res_one := await WriteParTranscript(*par_value).exchange(c), result.Error):
+    def __init__(self, *par_values: tuple[Parameter, cdt.Transcript], err_ignore: bool = False, msg=""):
+        self.par_values = par_values
+        self.err_ignore = err_ignore
+        self.msg = msg
+
+    async def exchange(self, c: Client) -> result.List[T] | result.Error:
+        res = result.List[result.Ok]()
+        for par, value in self.par_values:
+            if (
+                isinstance(res_one := await WriteParTranscript(par, value).exchange(c), result.Error)
+                and not self.err_ignore
+            ):
                 return res_one
-            res = res.add(res_one)
+            res.append(res_one)
         return res

{dlms_spodes_client-0.19.6.dist-info → dlms_spodes_client-0.19.7.dist-info}/METADATA

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

{dlms_spodes_client-0.19.6.dist-info → dlms_spodes_client-0.19.7.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=1sa4wJny2xwDqL3DXpfYTS7mZcabVdC5fW1H60VB5QA,12681
 DLMS_SPODES_client/settings.py,sha256=6mitGe9UYeEgL61sf933MJ-S5N-ReoxvXqiI3agBGYE,1623
-DLMS_SPODES_client/task.py,sha256=UoO30-funB7GdtkMV1O92w4J19RvdUTHBFLtvdnZJbc,73530
+DLMS_SPODES_client/task.py,sha256=9A13pYO0n335nv7sDPu83Rg0cQP_-StCLkw2QZZ_m9Y,75566
 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.6.dist-info/METADATA,sha256=nnzRSETexkBVYyytykmBtUPx7O-AWSSFgjhkMiClWVM,985
-dlms_spodes_client-0.19.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes_client-0.19.6.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
-dlms_spodes_client-0.19.6.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
-dlms_spodes_client-0.19.6.dist-info/RECORD,,
+dlms_spodes_client-0.19.7.dist-info/METADATA,sha256=6ulnXqlGP0-tPH_pafbEQfO7Q9FTNEdQE_F8q-j0hSQ,985
+dlms_spodes_client-0.19.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes_client-0.19.7.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
+dlms_spodes_client-0.19.7.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
+dlms_spodes_client-0.19.7.dist-info/RECORD,,