fix: move unique ID generation, error suppression & response validation to generic_call

Author: reinierl

ocpp/charge_point.py

@@ -381,10 +381,6 @@ async def call(self, payload, suppress=True, unique_id=None):
         """
         camel_case_payload = snake_to_camel_case(serialize_as_dict(payload))
 
-        unique_id = (
-            unique_id if unique_id is not None else str(self._unique_id_generator())
-        )
-
         action_name = payload.__class__.__name__
         # Due to deprecated call and callresults, remove in the future.
         if "Payload" in payload.__class__.__name__:
@@ -397,15 +393,6 @@ async def call(self, payload, suppress=True, unique_id=None):
             unique_id=unique_id
         )
 
-        if response.message_type_id == MessageType.CallError:
-            LOGGER.warning("Received a CALLError: %s'", response)
-            if suppress:
-                return
-            raise response.to_exception()
-        else:
-            response.action = action_name
-            validate_payload(response, self._ocpp_version)
-
         snake_case_payload = camel_to_snake_case(response.payload)
         # Create the correct Payload instance based on the received payload. If
         # this method is called with a call.BootNotificationPayload, then it
@@ -437,6 +424,10 @@ async def generic_call(self, action, payload_json, suppress=True, unique_id=None
         CallError.
         """
 
+        unique_id = (
+            unique_id if unique_id is not None else str(self._unique_id_generator())
+        )
+
         call = Call(
             unique_id=unique_id,
             action=action,
@@ -450,7 +441,7 @@ async def generic_call(self, action, payload_json, suppress=True, unique_id=None
         async with self._call_lock:
             await self._send(call.to_json())
             try:
-                return await self._get_specific_response(
+                response = await self._get_specific_response(
                     call.unique_id, self._response_timeout
                 )
             except asyncio.TimeoutError:
@@ -459,6 +450,16 @@ async def generic_call(self, action, payload_json, suppress=True, unique_id=None
                     f"{call.to_json()}."
                 )
 
+        if response.message_type_id == MessageType.CallError:
+            LOGGER.warning("Received a CALLError: %s'", response)
+            if suppress:
+                return
+            raise response.to_exception()
+        else:
+            response.action = call.action
+            validate_payload(response, self._ocpp_version)
+            return response
+
     async def _get_specific_response(self, unique_id, timeout):
         """
         Return response with given unique ID or raise an asyncio.TimeoutError.