JTT-112 Feat: Enable mypy support

.github/workflows/pull-request.yml

@@ -28,9 +28,8 @@ jobs:
     - name: Install dependencies
       run: make install-local
 
-# TODO: Fix MyPy issues https://github.com/SwitchEV/iso15118/issues/93
-#    - name: Mypy
-#      run: make mypy
+    - name: Mypy
+      run: make mypy
 
     - name: Black
       run: make black

Makefile

@@ -103,7 +103,7 @@ test:
 
 # Run mypy checks
 mypy:
-	poetry run mypy --config-file mypy.ini iso15118 tests
+	poetry run mypy --config-file mypy.ini --check-untyped-defs iso15118 tests
 
 # Reformat with isort and black
 reformat:

iso15118/evcc/comm_session_handler.py

@@ -11,7 +11,7 @@
 import logging
 from asyncio.streams import StreamReader, StreamWriter
 from ipaddress import IPv6Address
-from typing import List, Optional, Tuple, Union
+from typing import Coroutine, List, Optional, Tuple, Union
 
 from pydantic.error_wrappers import ValidationError
 
@@ -106,7 +106,7 @@ def __init__(
         self.service_details_to_request: List[int] = []
         # Protocols supported by the EVCC as sent to the SECC via
         # the SupportedAppProtocolReq message
-        self.supported_protocols: List[Protocol] = []
+        self.supported_app_protocols: List[AppProtocol] = []
         # The Ongoing timer (given in seconds) starts running once the EVCC
         # receives a response with the field EVSEProcessing set to 'Ongoing'.
         # Once the timer is up, the EV will terminate the communication session.
@@ -197,8 +197,8 @@ def create_sap(self) -> Union[SupportedAppProtocolReq, None]:
             )
             app_protocols.append(app_protocol_entry)
 
-        self.supported_protocols = app_protocols
-        sap_req = SupportedAppProtocolReq(app_protocol=self.supported_protocols)
+        self.supported_app_protocols = app_protocols
+        sap_req = SupportedAppProtocolReq(app_protocol=self.supported_app_protocols)
 
         return sap_req
 
@@ -269,21 +269,21 @@ def __init__(
         codec: IEXICodec,
         ev_controller: EVControllerInterface,
     ):
-        self.list_of_tasks = []
-        self.udp_client = None
-        self.tcp_client = None
-        self.tls_client = None
-        self.config = config
-        self.iface = iface
-        self.ev_controller = ev_controller
+        self.list_of_tasks: List[Coroutine] = []
+        self.udp_client: UDPClient = None
+        self.tcp_client: TCPClient = None
+        self.tls_client: bool = None
+        self.config: EVCCConfig = config
+        self.iface: str = iface
+        self.ev_controller: EVControllerInterface = ev_controller
         self.sdp_retries_number = SDP_MAX_REQUEST_COUNTER
         self._sdp_retry_cycles = self.config.sdp_retry_cycles
 
         # Set the selected EXI codec implementation
         EXI().set_exi_codec(codec)
 
         # Receiving queue for UDP client to notify about incoming datagrams
-        self._rcv_queue = asyncio.Queue(0)
+        self._rcv_queue: asyncio.Queue = asyncio.Queue(0)
 
         # The communication session is a tuple containing the session itself
         # and the associated task, so we can cancel the task when needed

iso15118/evcc/controller/simulator.py

@@ -194,13 +194,13 @@ async def select_vas_services_v20(
         matched_vas_services = [
             service for service in services if not service.is_energy_service
         ]
-        selected_vas_services: List[MatchedService] = []
+        selected_vas_services: List[SelectedVAS] = []
         for vas_service in matched_vas_services:
             selected_vas_services.append(
                 SelectedVAS(
-                    service=vas_service,
+                    service=vas_service.service,
                     is_free=vas_service.is_free,
-                    parameter_set=selected_vas_services.parameter_sets[0],
+                    parameter_set=vas_service.parameter_sets[0],
                 )
             )
         return selected_vas_services

iso15118/evcc/evcc_config.py

@@ -30,7 +30,7 @@ class EVCCConfig(BaseModel):
     raw_supported_energy_services: List[str] = Field(
         _default_supported_energy_services, max_items=4, alias="supportedEnergyServices"
     )
-    supported_energy_services: Optional[List[ServiceV20]] = None
+    supported_energy_services: List[ServiceV20] = None
     is_cert_install_needed: bool = Field(False, alias="isCertInstallNeeded")
     # Indicates the security level (either TCP (unencrypted) or TLS (encrypted))
     # the EVCC shall send in the SDP request
@@ -119,3 +119,4 @@ async def load_from_file(file_name: str) -> EVCCConfig:
         return ev_config
     except Exception as err:
         logger.debug(f"Error on loading evcc config file:{err}")
+    return EVCCConfig()

iso15118/evcc/states/evcc_state.py

@@ -12,14 +12,12 @@
     SupportedAppProtocolReq,
     SupportedAppProtocolRes,
 )
-from iso15118.shared.messages.din_spec.body import BodyBase as BodyBaseDINSPEC
 from iso15118.shared.messages.din_spec.body import Response as ResponseDINSPEC
 from iso15118.shared.messages.din_spec.body import (
     SessionSetupRes as SessionSetupResDINSPEC,
 )
 from iso15118.shared.messages.din_spec.msgdef import V2GMessage as V2GMessageDINSPEC
 from iso15118.shared.messages.enums import ISOV20PayloadTypes, Namespace
-from iso15118.shared.messages.iso15118_2.body import BodyBase as BodyBaseV2
 from iso15118.shared.messages.iso15118_2.body import Response as ResponseV2
 from iso15118.shared.messages.iso15118_2.body import (
     SessionSetupRes as SessionSetupResV2,
@@ -132,9 +130,14 @@ def check_msg_v20(
             V2GMessageV20,
             V2GMessageDINSPEC,
         ],
-        expected_msg_type: Type[T],
-    ) -> Optional[T]:
-        return self.check_msg(message, expected_msg_type, expected_msg_type)
+        expected_msg_type: Union[
+            Type[SupportedAppProtocolRes],
+            Type[ResponseV2],
+            Type[V2GResponseV20],
+            Type[ResponseDINSPEC],
+        ],
+    ) -> Optional[V2GMessageV20]:
+        return self.check_msg(message, V2GMessageV20, expected_msg_type)
 
     def check_msg(
         self,
@@ -184,12 +187,9 @@ def check_msg(
             )
             return None
 
-        msg_body: Union[
-            SupportedAppProtocolRes, BodyBaseV2, V2GResponseV20, BodyBaseDINSPEC
-        ]
         if isinstance(message, V2GMessageV2) or isinstance(message, V2GMessageDINSPEC):
             # ISO 15118-2 or DIN SPEC 72101
-            msg_body = message.body.get_message()
+            msg_body = message.body.get_message()  # type: ignore
         else:
             # SupportedAppProtocolReq, V2GRequest (ISO 15118-20)
             msg_body = message
@@ -208,7 +208,8 @@ def check_msg(
             return None
 
         if (
-            not isinstance(
+            message is not None
+            and not isinstance(
                 msg_body,
                 (
                     SupportedAppProtocolRes,