DLMS-SPODES-client 0.19.23__tar.gz → 0.19.24__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (78) hide show
  1. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/PKG-INFO +1 -1
  2. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/pyproject.toml +1 -1
  3. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/task.py +4 -5
  4. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client.egg-info/PKG-INFO +1 -1
  5. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/.github/workflows/publish.yaml +0 -0
  6. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/.gitignore +0 -0
  7. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/README.md +0 -0
  8. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/setup.cfg +0 -0
  9. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/FCS16.py +0 -0
  10. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/__init__.py +0 -0
  11. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/client.py +0 -0
  12. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_common/enums/TraceLevel.py +0 -0
  13. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_common/enums/__init__.py +0 -0
  14. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/AesGcmParameter.py +0 -0
  15. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/CountType.py +0 -0
  16. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXByteBuffer.py +0 -0
  17. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXCiphering.py +0 -0
  18. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMS.py +0 -0
  19. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSChippering.py +0 -0
  20. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSChipperingStream.py +0 -0
  21. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSConfirmedServiceError.py +0 -0
  22. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSException.py +0 -0
  23. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSLNParameters.py +0 -0
  24. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSSNParameters.py +0 -0
  25. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXDLMSSettings.py +0 -0
  26. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/GXReplyData.py +0 -0
  27. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/HdlcControlFrame.py +0 -0
  28. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/MBusCommand.py +0 -0
  29. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/MBusEncryptionMode.py +0 -0
  30. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/ResponseType.py +0 -0
  31. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/SetResponseType.py +0 -0
  32. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/_HDLCInfo.py +0 -0
  33. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/__init__.py +0 -0
  34. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Access.py +0 -0
  35. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/ApplicationReference.py +0 -0
  36. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Authentication.py +0 -0
  37. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/BerType.py +0 -0
  38. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Command.py +0 -0
  39. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Definition.py +0 -0
  40. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/ErrorCode.py +0 -0
  41. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/ExceptionServiceError.py +0 -0
  42. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/HardwareResource.py +0 -0
  43. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/HdlcFrameType.py +0 -0
  44. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Initiate.py +0 -0
  45. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/LoadDataSet.py +0 -0
  46. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/ObjectType.py +0 -0
  47. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Priority.py +0 -0
  48. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/RequestTypes.py +0 -0
  49. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Security.py +0 -0
  50. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Service.py +0 -0
  51. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/ServiceClass.py +0 -0
  52. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/ServiceError.py +0 -0
  53. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Standard.py +0 -0
  54. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/StateError.py +0 -0
  55. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/Task.py +0 -0
  56. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/VdeStateError.py +0 -0
  57. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/enums/__init__.py +0 -0
  58. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/gurux_dlms/internal/_GXCommon.py +0 -0
  59. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/logger.py +0 -0
  60. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/py.typed +0 -0
  61. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/services.py +0 -0
  62. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/session.py +0 -0
  63. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client/settings.py +0 -0
  64. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client.egg-info/SOURCES.txt +0 -0
  65. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client.egg-info/dependency_links.txt +0 -0
  66. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client.egg-info/entry_points.txt +0 -0
  67. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client.egg-info/requires.txt +0 -0
  68. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/src/DLMS_SPODES_client.egg-info/top_level.txt +0 -0
  69. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/Firmwares/firmwares.dat +0 -0
  70. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/Firmwares/firmwares_1_2_11.dat +0 -0
  71. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/Firmwares/firmwares_1_7_2.dat +0 -0
  72. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/client_log.txt +0 -0
  73. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/config.toml +0 -0
  74. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/name2.csv +0 -0
  75. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/test_Client.py +0 -0
  76. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/test_logger.py +0 -0
  77. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test/test_services.py +0 -0
  78. {dlms_spodes_client-0.19.23 → dlms_spodes_client-0.19.24}/test//320/272/320/276/320/275/321/204/320/270/320/263/321/203/321/200/320/260/321/206/320/270/321/217 GSM.csv" +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: DLMS_SPODES_client
3
- Version: 0.19.23
3
+ Version: 0.19.24
4
4
  Summary: dlms-spodes
5
5
  Author-email: Serj Kotilevski <youserj@outlook.com>
6
6
  Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -15,7 +15,7 @@ exclude = ["Types"]
15
15
 
16
16
  [project]
17
17
  name = "DLMS_SPODES_client"
18
- version = "0.19.23"
18
+ version = "0.19.24"
19
19
  requires-python = ">= 3.12"
20
20
  authors = [
21
21
  {name="Serj Kotilevski", email="youserj@outlook.com"}
@@ -224,10 +224,9 @@ class Base[T: result.Result](Protocol):
224
224
  case _ as diagnostic:
225
225
  return result.Error.from_e(exc.AssociationResultError(diagnostic))
226
226
  if c._objects is not None:
227
- if c.is_universal():
228
- await change_ldn.exchange(c)
229
- else:
230
- await match_ldn.exchange(c)
227
+ matchLDN = change_ldn if c.is_universal() else match_ldn
228
+ if isinstance(res_match_ldn := await matchLDN.exchange(c), result.Error):
229
+ return res_match_ldn
231
230
  return result.OK
232
231
 
233
232
  async def application(self, c: Client) -> T | result.Error:
@@ -728,7 +727,7 @@ class MatchLDN(OK):
728
727
  c.log(logL.WARN, F"connected to other server, change LDN")
729
728
  await init_type.exchange(c) # todo: maybe set spec?
730
729
  else:
731
- return result.Error(exc.IDError(F"got {res.value=}, expected {c._objects.LDN.value}"))
730
+ return result.Error.from_e(ValueError(F"got LDN: {res.value}, expected {c._objects.LDN.value}"))
732
731
  return result.OK
733
732
 
734
733
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: DLMS_SPODES_client
3
- Version: 0.19.23
3
+ Version: 0.19.24
4
4
  Summary: dlms-spodes
5
5
  Author-email: Serj Kotilevski <youserj@outlook.com>
6
6
  Project-URL: Source, https://github.com/youserj/SPODESclient_prj