DLMS-SPODES-client 0.19.9__tar.gz → 0.19.11__tar.gz

{dlms_spodes_client-0.19.9/src/DLMS_SPODES_client.egg-info → dlms_spodes_client-0.19.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.9
+Version: 0.19.11
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -13,7 +13,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pydantic>=2.11
 Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: semver>=3.0
-Requires-Dist: StructResult<0.10,>=0.9.1
+Requires-Dist: StructResult<0.10,>=0.9.2
 Requires-Dist: DLMS-SPODES-communications<1.5,>=1.4.9
 Requires-Dist: DLMS_SPODES<0.88,>=0.87.6
 Requires-Dist: DLMSadapter<0.8,>=0.7.5

{dlms_spodes_client-0.19.9 → dlms_spodes_client-0.19.11}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["Types"]
 
 [project]
 name = "DLMS_SPODES_client"
-version = "0.19.9"
+version = "0.19.11"
 requires-python = ">= 3.12"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
@@ -24,7 +24,7 @@ dependencies = [
     "pydantic>=2.11",
     "pycryptodomex >= 3.22.0",
     "semver >= 3.0",
-    "StructResult >= 0.9.1, <0.10",
+    "StructResult >= 0.9.2, <0.10",
     "DLMS-SPODES-communications >= 1.4.9, <1.5",
     "DLMS_SPODES >= 0.87.6, < 0.88",
     "DLMSadapter >= 0.7.5, < 0.8",

{dlms_spodes_client-0.19.9 → dlms_spodes_client-0.19.11}/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_, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
+        len_ = _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, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
+                                        block_length = _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, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
+                            cnt = _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, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
+                    cnt = _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_, _ = cdt.get_length_and_pdu(self.reply.data.get_data())  # _GXCommon.getObjectCount(self.reply.data)
+                    len_ = _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 cdt.get_length_and_pdu(buff)[0] > len(buff) - buff.position:  # _GXCommon.getObjectCount(buff)
+        if _GXCommon.getObjectCount(buff) > len(buff) - buff.position:
             raise ValueError("PDU: Not enough data.")
         resultComponent = AssociationResult.ACCEPTED
         resultDiagnosticValue = AcseServiceUser.NULL

{dlms_spodes_client-0.19.9 → dlms_spodes_client-0.19.11}/src/DLMS_SPODES_client/task.py

@@ -1036,9 +1036,9 @@ class Par2Data[T: cdt.CommonDataType](SimpleCopy, CDT[T]):
     msg: str = "read data by Parameter"
 
     async def exchange(self, c: Client) -> result.SimpleOrError[T]:
-        if isinstance((res := c.objects.par2obj(self.par)), result.Error):
-            return res
-        if isinstance((res := await ReadObjAttr(res.value, self.par.i).exchange(c)), result.Error):
+        if isinstance((res_obj := c.objects.par2obj(self.par)), result.Error):
+            return res_obj
+        if isinstance((res := await ReadObjAttr(res_obj.value, self.par.i).exchange(c)), result.Error):
             return res
         for el in self.par.elements():
             res.value = res.value[el]

{dlms_spodes_client-0.19.9 → dlms_spodes_client-0.19.11/src/DLMS_SPODES_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.9
+Version: 0.19.11
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -13,7 +13,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pydantic>=2.11
 Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: semver>=3.0
-Requires-Dist: StructResult<0.10,>=0.9.1
+Requires-Dist: StructResult<0.10,>=0.9.2
 Requires-Dist: DLMS-SPODES-communications<1.5,>=1.4.9
 Requires-Dist: DLMS_SPODES<0.88,>=0.87.6
 Requires-Dist: DLMSadapter<0.8,>=0.7.5

{dlms_spodes_client-0.19.9 → dlms_spodes_client-0.19.11}/src/DLMS_SPODES_client.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pydantic>=2.11
 pycryptodomex>=3.22.0
 semver>=3.0
-StructResult<0.10,>=0.9.1
+StructResult<0.10,>=0.9.2
 DLMS-SPODES-communications<1.5,>=1.4.9
 DLMS_SPODES<0.88,>=0.87.6
 DLMSadapter<0.8,>=0.7.5