DLMS-SPODES-client 0.19.6__tar.gz → 0.19.8__tar.gz

{dlms_spodes_client-0.19.6/src/DLMS_SPODES_client.egg-info → dlms_spodes_client-0.19.8}/PKG-INFO

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

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

{dlms_spodes_client-0.19.6 → dlms_spodes_client-0.19.8}/src/DLMS_SPODES_client/client.py

@@ -318,7 +318,7 @@ class Client:
         self.reply.blockNumberAck = bna
         self.settings.blockNumberAck = self.reply.blockNumber
         self.reply.command = None
-        len_ = _GXCommon.getObjectCount(self.reply.data)
+        len_, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
         if len_ > self.reply.data.size - self.reply.data.position:
             self.reply.complete = False
             return
@@ -369,7 +369,7 @@ class Client:
                             match self.reply.data.getUInt8():  # DataBlock-G.result
                                 case 0:
                                     if self.reply.data.position != len(self.reply.data):
-                                        block_length = _GXCommon.getObjectCount(self.reply.data)
+                                        block_length, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
                                         if (self.reply.moreData & RequestTypes.FRAME) == 0:
                                             if block_length > len(self.reply.data) - self.reply.data.position:
                                                 raise ValueError("Invalid block length.")
@@ -416,7 +416,7 @@ class Client:
                         case pdu.SetResponse.LAST_DATABLOCK_WITH_LIST:
                             raise ValueError("Not released in Client")
                         case pdu.SetResponse.WITH_LIST:
-                            cnt = _GXCommon.getObjectCount(self.reply.data)
+                            cnt, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
                             pos = 0
                             while pos != cnt:
                                 self.reply.error = pdu.DataAccessResult(self.reply.data.getUInt8())
@@ -425,7 +425,7 @@ class Client:
                                 pos += 1
                         case err: raise ValueError(F"Got Invalid Set response {err}, expect {', '.join(map(lambda it: F'{it.name} = {it.value}', pdu.SetResponse))}")
                 case XDLMSAPDU.WRITE_RESPONSE:
-                    cnt = _GXCommon.getObjectCount(self.reply.data)
+                    cnt, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
                     pos = 0
                     while pos != cnt:
                         ret = self.reply.data.getUInt8()
@@ -569,7 +569,7 @@ class Client:
                     pass
                 case XDLMSAPDU.GATEWAY_RESPONSE:
                     self.reply.data.getUInt8()
-                    len_ = _GXCommon.getObjectCount(self.reply.data)
+                    len_, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
                     pda = bytearray(len_)
                     self.reply.data.get(pda)
                     GXDLMS.getDataFromBlock(self.reply, index)
@@ -1144,7 +1144,7 @@ class Client:
         else:
             if tag != (BerType.APPLICATION | BerType.CONSTRUCTED | AARQapdu.APPLICATION_CONTEXT_NAME):
                 raise ValueError("Invalid tag.")
-        if _GXCommon.getObjectCount(buff) > len(buff) - buff.position:
+        if cdt.get_length_and_pdu(buff)[0] > len(buff) - buff.position:  # _GXCommon.getObjectCount(buff)
             raise ValueError("PDU: Not enough data.")
         resultComponent = AssociationResult.ACCEPTED
         resultDiagnosticValue = AcseServiceUser.NULL
@@ -1583,14 +1583,25 @@ class Client:
         reply = GXByteBuffer()
         messages = list()
         frame_ = 0
-        if p.command == XDLMSAPDU.DATA_NOTIFICATION or p.command == XDLMSAPDU.EVENT_NOTIFICATION_REQUEST:
+        if (
+            p.command == XDLMSAPDU.DATA_NOTIFICATION
+            or p.command == XDLMSAPDU.EVENT_NOTIFICATION_REQUEST
+        ):
             frame_ = 0x13
         while True:
             # """ Get next logical name PDU. @param p LN parameters. @param reply Generated message. """
-            ciphering = p.command != ACSEAPDU.AARQ and p.command != ACSEAPDU.AARE and self.settings.cipher and self.settings.cipher.security != Security.NONE
+            ciphering = (
+                p.command != ACSEAPDU.AARQ
+                and p.command != ACSEAPDU.AARE
+                and self.settings.cipher
+                and self.settings.cipher.security != Security.NONE
+            )
             len_ = 0
             if p.command == ACSEAPDU.AARQ:
-                if self.settings.gateway and self.settings.gateway.physicalDeviceAddress:
+                if (
+                    self.settings.gateway
+                    and self.settings.gateway.physicalDeviceAddress
+                ):
                     reply.setUInt8(XDLMSAPDU.GATEWAY_REQUEST)
                     reply.setUInt8(self.settings.gateway.networkId)
                     reply.setUInt8(len(self.settings.gateway.physicalDeviceAddress))
@@ -1614,16 +1625,26 @@ class Client:
                             reply.move(pos + 1, pos, len(reply) - pos - 1)
                     GXDLMS.multipleBlocks(p, reply, ciphering)
                 elif p.command != ACSEAPDU.RLRQ:
-                    if p.command != XDLMSAPDU.GET_REQUEST and p.data and reply:
+                    if (
+                        p.command != XDLMSAPDU.GET_REQUEST
+                        and p.data
+                        and reply
+                    ):
                         GXDLMS.multipleBlocks(p, reply, ciphering)
                     if p.command == XDLMSAPDU.SET_REQUEST:
-                        if p.multipleBlocks and not self.negotiated_conformance.general_block_transfer:
+                        if (
+                            p.multipleBlocks
+                            and not self.negotiated_conformance.general_block_transfer
+                        ):
                             if p.requestType == 1:
                                 p.requestType = SetRequest.SET_REQUEST_FIRST_DATABLOCK
                             elif p.requestType == 2:
                                 p.requestType = SetRequest.SET_REQUEST_WITH_DATABLOCK
                     if p.command == XDLMSAPDU.GET_RESPONSE:
-                        if p.multipleBlocks and not self.negotiated_conformance.general_block_transfer:
+                        if (
+                            p.multipleBlocks
+                            and not self.negotiated_conformance.general_block_transfer
+                        ):
                             if p.requestType == 1:
                                 p.requestType = 2
                     if p.command != XDLMSAPDU.GENERAL_BLOCK_TRANSFER:
@@ -1633,7 +1654,10 @@ class Client:
                         else:
                             reply.setUInt8(GXDLMS.getInvokeIDPriority(self.settings))
                 reply.set(p.attributeDescriptor)
-                if self.settings.is_multiple_block() and self.negotiated_conformance.general_block_transfer:
+                if (
+                    self.settings.is_multiple_block()
+                    and self.negotiated_conformance.general_block_transfer
+                ):
                     if p.lastBlock:
                         reply.setUInt8(1)
                         self.settings.setCount(0)
@@ -1643,7 +1667,10 @@ class Client:
                     reply.setUInt32(p.blockIndex)
                     p.blockIndex += 1
                     if p.status != 0xFF:
-                        if p.status != 0 and p.command == XDLMSAPDU.GET_RESPONSE:
+                        if (
+                            p.status != 0
+                            and p.command == XDLMSAPDU.GET_RESPONSE
+                        ):
                             reply.setUInt8(1)
                         reply.setUInt8(p.status)
                     if p.data:
@@ -1661,8 +1688,14 @@ class Client:
                     _GXCommon.setObjectCount(len_, reply)
                     reply.set(p.data, len_)
                 if len_ == 0:
-                    if p.status != 0xFF and p.command != XDLMSAPDU.GENERAL_BLOCK_TRANSFER:
-                        if p.status != 0 and p.command == XDLMSAPDU.GET_RESPONSE:
+                    if (
+                        p.status != 0xFF
+                        and p.command != XDLMSAPDU.GENERAL_BLOCK_TRANSFER
+                    ):
+                        if (
+                            p.status != 0
+                            and p.command == XDLMSAPDU.GET_RESPONSE
+                        ):
                             reply.setUInt8(1)
                         reply.setUInt8(p.status)
                     if p.data:
@@ -1680,7 +1713,10 @@ class Client:
                         if self.negotiated_conformance.general_block_transfer:
                             if 7 + len_ + len(reply) > self.settings.maxPduSize:
                                 len_ = self.settings.maxPduSize - len(reply) - 7
-                            if ciphering and p.command != XDLMSAPDU.GENERAL_BLOCK_TRANSFER:
+                            if (
+                                ciphering
+                                and p.command != XDLMSAPDU.GENERAL_BLOCK_TRANSFER
+                            ):
                                 reply.set(p.data)
                                 tmp = []
                                 if self.settings.cipher.securitySuite == SecuritySuite.AES_GCM_128_AUT_ENCR_AND_AES_128_KEY_WRAP:
@@ -1692,11 +1728,25 @@ class Client:
                                 if 7 + len_ > self.settings.maxPduSize:
                                     len_ = self.settings.maxPduSize - 7
                                 ciphering = False
-                        elif p.command != XDLMSAPDU.GET_REQUEST and len_ + len(reply) > self.settings.maxPduSize:
+                        elif (
+                            p.command != XDLMSAPDU.GET_REQUEST
+                            and len_ + len(reply) > self.settings.maxPduSize
+                        ):
                             len_ = self.settings.maxPduSize - len(reply)
                         reply.set(p.data, p.data.position, len_)
-                    elif (self.settings.gateway and self.settings.gateway.physicalDeviceAddress) and \
-                            not (p.command == XDLMSAPDU.GENERAL_BLOCK_TRANSFER or (p.multipleBlocks and self.negotiated_conformance.general_block_transfer)):
+                    elif (
+                        (
+                            self.settings.gateway
+                            and self.settings.gateway.physicalDeviceAddress
+                        )
+                        and not (
+                            p.command == XDLMSAPDU.GENERAL_BLOCK_TRANSFER
+                            or (
+                                p.multipleBlocks
+                                and self.negotiated_conformance.general_block_transfer
+                            )
+                        )
+                    ):
                         if 3 + len_ + len(self.settings.gateway.physicalDeviceAddress) > self.settings.maxPduSize:
                             len_ -= (3 + len(self.settings.gateway.physicalDeviceAddress))
                         tmp = GXByteBuffer(reply)
@@ -1706,27 +1756,42 @@ class Client:
                         reply.setUInt8(len(self.settings.gateway.physicalDeviceAddress))
                         reply.set(self.settings.gateway.physicalDeviceAddress)
                         reply.set(tmp)
-                if ciphering and reply and not self.negotiated_conformance.general_block_transfer and p.command != XDLMSAPDU.RELEASE_REQUEST:
+                if (
+                    ciphering
+                    and reply
+                    and not self.negotiated_conformance.general_block_transfer
+                    and p.command != XDLMSAPDU.RELEASE_REQUEST
+                ):
                     tmp = []
                     if self.settings.cipher.securitySuite == SecuritySuite.AES_GCM_128_AUT_ENCR_AND_AES_128_KEY_WRAP:
                         tmp = self.cipher0(p, reply.array())
                     reply.size = 0
                     reply.set(tmp)
-            if p.command == XDLMSAPDU.GENERAL_BLOCK_TRANSFER or (p.multipleBlocks and self.negotiated_conformance.general_block_transfer):
+            if (
+                p.command == XDLMSAPDU.GENERAL_BLOCK_TRANSFER
+                or (
+                    p.multipleBlocks
+                    and self.negotiated_conformance.general_block_transfer
+                )
+            ):
                 bb = GXByteBuffer()
                 bb.set(reply)
                 reply.clear()
                 reply.setUInt8(XDLMSAPDU.GENERAL_BLOCK_TRANSFER)
-                value = 0
                 if p.lastBlock:
                     value = 0x80
                 elif p.streaming:
-                    value |= 0x40
+                    value = 0x40
+                else:
+                    value = 0
                 value |= p.windowSize
                 reply.setUInt8(value)
                 reply.setUInt16(p.blockIndex)
                 p.blockIndex += 1
-                if p.command != XDLMSAPDU.DATA_NOTIFICATION and p.blockNumberAck != 0:
+                if (
+                    p.command != XDLMSAPDU.DATA_NOTIFICATION
+                    and p.blockNumberAck != 0
+                ):
                     reply.setUInt16(p.blockNumberAck)
                     p.blockNumberAck += 1
                 else:
@@ -1737,7 +1802,10 @@ class Client:
                 if p.command != XDLMSAPDU.GENERAL_BLOCK_TRANSFER:
                     p.command = XDLMSAPDU.GENERAL_BLOCK_TRANSFER
                     p.blockNumberAck += 1
-                if self.settings.gateway and self.settings.gateway.physicalDeviceAddress:
+                if (
+                    self.settings.gateway
+                    and self.settings.gateway.physicalDeviceAddress
+                ):
                     if 3 + len_ + len(self.settings.gateway.physicalDeviceAddress) > self.settings.maxPduSize:
                         len_ -= (3 + len(self.settings.gateway.physicalDeviceAddress))
                     tmp = GXByteBuffer(reply)
@@ -1747,11 +1815,13 @@ class Client:
                     reply.setUInt8(len(self.settings.gateway.physicalDeviceAddress))
                     reply.set(self.settings.gateway.physicalDeviceAddress)
                     reply.set(tmp)
-
             p.lastBlock = True
             if p.attributeDescriptor is None:
                 self.settings.increaseBlockIndex()
-            if p.command == ACSEAPDU.AARQ and p.command == XDLMSAPDU.GET_REQUEST:
+            if (
+                p.command == ACSEAPDU.AARQ
+                and p.command == XDLMSAPDU.GET_REQUEST
+            ):
                 assert not self.settings.maxPduSize < len(reply)
             match self.com_profile:
                 case c_pf.TCPUDPIP():
@@ -1762,7 +1832,10 @@ class Client:
                     raise ValueError("InterfaceType")
             reply.clear()
             frame_ = 0
-            if not p.data or p.data.position == p.data.size:
+            if (
+                not p.data
+                or p.data.position == p.data.size
+            ):
                 break
         return messages
 

{dlms_spodes_client-0.19.6 → dlms_spodes_client-0.19.8}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSLNParameters.py

@@ -14,19 +14,19 @@ class GXDLMSLNParameters:
     data: GXByteBuffer | None
     # Reply status.
     status: ErrorCode | int
+    windowSize: int = 1
+    streaming: bool = False
+    """ Is this last block in send. """
 
     def __post_init__(self):
         self.blockIndex = self.settings.blockIndex
         self.blockNumberAck = self.settings.blockNumberAck
         self.time = None
         """ Send date and time.  This is used in Data notification messages. """
-        self.multipleBlocks = self.settings.count != self.settings.index
-        """ Are there more data to send or more data to receive. DEPRECATED, USE: client.setting.is_multiple_block """
+        self.multipleBlocks = self.settings.is_multiple_block()
+        """ Are there more data to send or more data to receive"""
         self.lastBlock = self.settings.count == self.settings.index
         """ Is this last block in send. """
-        self.windowSize = 1
-        self.streaming = False
-        """ Is this last block in send. """
         if self.settings:
             self.settings.command = self.command
             if self.command == XDLMSAPDU.GET_REQUEST and self.requestType != ResponseType.WITH_DATABLOCK:

{dlms_spodes_client-0.19.6 → dlms_spodes_client-0.19.8}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSSettings.py

@@ -176,7 +176,6 @@ class GXDLMSSettings:
     # update invoke ID.
     #
     def updateInvokeId(self, value):
-        #pylint: disable=bad-option-value,redefined-variable-type
         if (value & 0x80) != 0:
             self.priority = Priority.HIGH
         else:

{dlms_spodes_client-0.19.6 → dlms_spodes_client-0.19.8}/src/DLMS_SPODES_client/task.py

@@ -1030,7 +1030,7 @@ class ReadObjAttr(SimpleCopy, CDT):
 
 
 @dataclass
-class Par2Data[T: cdt.CommonDataType](SimpleCopy, CDT):
+class Par2Data[T: cdt.CommonDataType](SimpleCopy, CDT[T]):
     """get CommonDataType by Parameter"""
     par: Parameter
     msg: str = "read data by Parameter"
@@ -1162,6 +1162,7 @@ class ReadAttributes(SimpleCopy, _List[cdt.CommonDataType]):
 
 
 @dataclass
+@deprecated("use <Write2>")
 class Write(SimpleCopy, OK):
     """write with ParameterData struct"""
     par_data: ParData
@@ -1189,6 +1190,35 @@ class Write(SimpleCopy, 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 Par2Data[cdt.CommonDataType](self.par.attr).exchange(c), result.Error):
+            return res_read
+        else:
+            data = res_read.value
+            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
+@deprecated("use <WriteTranscript>")
 class WriteParValue(SimpleCopy, OK):
     """write with ParameterValues struct"""
     par_value: ParValues[cdt.Transcript]
@@ -1694,6 +1724,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,42 +1741,71 @@ class WriteParDatas(SimpleCopy, _List[result.Ok]):
         return res
 
 
+class WriteList(SimpleCopy, _List[result.Ok]):
+    """write by list"""
+    par_datas: tuple[tuple[Parameter, cdt.CommonDataType], ...]
+    err_ignore: bool
+
+    def __init__(self, *par_datas: tuple[Parameter, cdt.CommonDataType], err_ignore: bool = False, msg: str = "") -> None:
+        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):
+class WriteTranscript(SimpleCopy, OK):
     """write by ParValues[Transcript]"""
     par: Parameter
     value: cdt.Transcript
     msg: str = ""
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
-        if isinstance((res := await Par2Data(self.par).exchange(c)), result.Error):
+        if isinstance((res := await Par2Data[cdt.CommonDataType](self.par).exchange(c)), result.Error):
             return res
-        data = copy(res.value)
         if isinstance(data, cdt.Digital):
             s_u = c.objects.par2su(self.par)
             if isinstance(s_u, cdt.ScalUnitType):
-                value = int(float(self.value) * 10 ** -int(s_u.scaler))
-        data.set(self.value)
-        return await WriteAttribute(
-            ln=self.par.obis,
-            index=self.par.i,
-            value=data.encoding
-        ).exchange(c)
-
-
-Ts = TypeVarTuple("Ts")
+                if not isinstance(self.value, str):
+                    return result.Error.from_e(TypeError(), f"for {self.par} got type: {self.value}, expected String")
+                try:
+                    data = res.value.parse(value := str(float(self.value) * 10 ** -int(s_u.scaler)))
+                except ValueError as e:
+                    return result.Error.from_e(e, f"for {self.par} got value: {self.value}, expected Float or Digital")
+            else:
+                data = res.value.parse(self.value)
+        else:
+            data = res.value.parse(self.value)
+        return await Write2(self.par, data).exchange(c)
 
 
-@dataclass
-class WriteParTranscripts(SimpleCopy, Sequence[*Ts]):
+class WriteTranscripts(SimpleCopy, _List[result.Ok]):
     """write by ParValues[Transcript] list"""
-    par_values: list[ParValues[cdt.Transcript]]
-    msg: str = ""
+    par_values: tuple[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: str =""):
+        self.par_values = par_values
+        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, value in self.par_values:
+            if (
+                isinstance(res_one := await WriteTranscript(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 → dlms_spodes_client-0.19.8/src/DLMS_SPODES_client.egg-info}/PKG-INFO

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