Merge branch 'master' into OCPP-2.0.1-add-additional-reason-codes-fro…

…m-v1.3
mobilityhouse · Dec 8, 2023 · 8b07918 · 8b07918
2 parents b231862 + 06e13d7
commit 8b07918
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change log
 
+
 - [#518](https://github.com/mobilityhouse/ocpp/issues/518) OCPP 2.0.1 add additional reason codes from v1.3
+=======
+## 0.24.0 (2023-12-07)
+
+- [#539](https://github.com/mobilityhouse/ocpp/issues/539) feat: Add ChargePoint._handle_call return value. Thanks [@wafa-yah](https://github.com/wafa-yah)
+- [#266](https://github.com/mobilityhouse/ocpp/issues/266) fix: Central System documentation link.
+- [#516](https://github.com/mobilityhouse/ocpp/issues/516) OCPP 2.0.1 add additional security events from v1.3.
+- [#537](https://github.com/mobilityhouse/ocpp/pull/537) Fix DataTransfer data types. Thanks [@mdwcrft](https://github.com/mdwcrft)
 
 ## 0.23.0 (2023-11-30)
 
@@ -9,7 +17,6 @@
 - [#510](https://github.com/mobilityhouse/ocpp/issues/510) v2.0.1 UnitOfMeasureType - Enums missing and update docstring to allow use for variableCharacteristics.
 - [#508](https://github.com/mobilityhouse/ocpp/issues/508) Exception - OccurrenceConstraintViolationError doc string correction.
 
-
 ## 0.22.0 (2023-11-03)
 
 - [#493](https://github.com/mobilityhouse/ocpp/issues/493) Reduce use of NotSupportedError in favor of NotImplementedError. Thanks [drc38](@https://github.com/drc38).

diff --git a/README.rst b/README.rst
@@ -50,7 +50,7 @@ Central system
 
 The code snippet below creates a simple OCPP 2.0 central system which is able
 to handle BootNotification calls. You can find a detailed explanation of the
-code in the `Central System documentation_`.
+code in the `Central System documentation`_.
 
 
 .. code-block:: python

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -23,7 +23,7 @@
 author = "Auke Willem Oosterhoff"
 
 # The full version, including alpha/beta/rc tags
-release = "0.23.0"
+release = "0.24.0"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/ocpp/charge_point.py b/ocpp/charge_point.py
@@ -267,6 +267,7 @@ async def _handle_call(self, msg):
             # '_on_after' hooks are not required. Therefore ignore exception
             # when no '_on_after' hook is installed.
             pass
+        return response
 
     async def call(self, payload, suppress=True, unique_id=None):
         """

diff --git a/ocpp/v201/call.py b/ocpp/v201/call.py
@@ -90,7 +90,7 @@ class CustomerInformationPayload:
 class DataTransferPayload:
     vendor_id: str
     message_id: Optional[str] = None
-    data: Optional[str] = None
+    data: Optional[Any] = None
     custom_data: Optional[Dict[str, Any]] = None
 
 

diff --git a/ocpp/v201/call_result.py b/ocpp/v201/call_result.py
@@ -87,7 +87,7 @@ class CustomerInformationPayload:
 class DataTransferPayload:
     status: str
     status_info: Optional[Dict] = None
-    data: Optional[Dict] = None
+    data: Optional[Any] = None
     custom_data: Optional[Dict[str, Any]] = None
 
 

diff --git a/ocpp/v201/enums.py b/ocpp/v201/enums.py
@@ -1334,7 +1334,9 @@ class StatusInfoReasonType(str, Enum):
 
 
 class SecurityEventType(str, Enum):
-    """Security Events as listed in Appendices (Appendix 1. Security Events)"""
+    """
+    Security Events as listed in Appendices (Appendix 1. Security Events) v1.3
+    """
 
     firmware_updated = "FirmwareUpdated"
     failed_to_authenticate_at_csms = "FailedToAuthenticateAtCsms"
@@ -1354,3 +1356,5 @@ class SecurityEventType(str, Enum):
     invalid_charging_station_certificate = "InvalidChargingStationCertificate"
     invalid_tls_version = "InvalidTLSVersion"
     invalid_tls_cipher_suite = "InvalidTLSCipherSuite"
+    maintenance_login_accepted = "MaintenanceLoginAccepted"
+    maintenance_login_failed = "MaintenanceLoginFailed"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ocpp"
-version = "0.23.0"
+version = "0.24.0"
 description = "Python package implementing the JSON version of the Open Charge Point Protocol (OCPP)."
 authors = [
 	"André Duarte <[email protected]>",