Apply typing fixes from mypy

Author: nanomad

src/saic_ismart_client_ng/api/base.py

@@ -3,7 +3,7 @@
 import logging
 from abc import ABC
 from dataclasses import asdict
-from typing import Type, T, Optional, Any
+from typing import Type, Optional, Any, TypeVar
 
 import dacite
 import httpx
@@ -19,12 +19,14 @@
 
 logger = logging.getLogger(__name__)
 
+T = TypeVar('T')
+
 
 class AbstractSaicApi(ABC):
     def __init__(
             self,
             configuration: SaicApiConfiguration,
-            listener: SaicApiListener = None,
+            listener: Optional[SaicApiListener] = None,
     ):
         self.__configuration = configuration
         self.__api_client = SaicApiClient(configuration, listener=listener)
@@ -71,7 +73,7 @@ async def execute_api_call(
             params: Optional[QueryParamTypes] = None,
             headers: Optional[HeaderTypes] = None,
             allow_null_body: bool = False,
-    ) -> Optional[T]:
+    ) -> T:
         try:
             return await self.__execute_api_call(
                 method,

src/saic_ismart_client_ng/api/message/schema.py

@@ -15,18 +15,18 @@
 
 @dataclass
 class MessageEntity:
-    content: str = None
-    contentId: str = None
+    content: Optional[str] = None
+    contentId: Optional[str] = None
     contentIdList: list = field(default_factory=list)
-    createTime: int = None
-    messageId: Union[str, int] = None
-    messageTime: str = None
-    messageType: str = None
-    readStatus: int = None
-    sender: str = None
-    showCheckButton: bool = None
-    title: str = None
-    vin: str = None
+    createTime: Optional[int] = None
+    messageId: Union[str, int, None] = None
+    messageTime: Optional[str] = None
+    messageType: Optional[str] = None
+    readStatus: Optional[int] = None
+    sender: Optional[str] = None
+    showCheckButton: Optional[bool] = None
+    title: Optional[str] = None
+    vin: Optional[str] = None
 
     @property
     def message_time(self) -> datetime.datetime:
@@ -57,13 +57,13 @@ def details(self) -> str:
 
 @dataclass
 class MessageResp:
-    alarmNumber: int = None
-    commandNumber: int = None
+    alarmNumber: Optional[int] = None
+    commandNumber: Optional[int] = None
     messages: List[MessageEntity] = field(default_factory=list)
-    newsNumber: int = None
+    newsNumber: Optional[int] = None
     # notifications: List[Any] = None
-    recordsNumber: int = None
-    totalNumber: int = None
+    recordsNumber: Optional[int] = None
+    totalNumber: Optional[int] = None
 
 
 @dataclass

src/saic_ismart_client_ng/api/schema.py

@@ -1,6 +1,7 @@
 import logging
 from dataclasses import dataclass
 from enum import Enum
+from typing import Optional
 
 logger = logging.getLogger(__name__)
 
@@ -9,28 +10,28 @@
 class LoginResp():
     @dataclass
     class LoginRespDetail():
-        languageType: str = None,
+        languageType: Optional[str] = None
 
-    access_token: str = None,
-    account: str = None,
-    avatar: str = None
-    client_id: str = None,
-    dept_id: str = None,
-    detail: LoginRespDetail = None,
-    expires_in: int = None,
-    jti: str = None,
-    languageType: str = None,
-    license: str = None,
-    oauth_id: str = None,
-    post_id: str = None,
-    refresh_token: str = None,
-    role_id: str = None,
-    role_name: str = None,
-    scope: str = None,
-    tenant_id: str = None,
-    token_type: str = None,
-    user_id: str = None,
-    user_name: str = None,
+    access_token: Optional[str] = None
+    account: Optional[str] = None
+    avatar: Optional[str] = None
+    client_id: Optional[str] = None
+    dept_id: Optional[str] = None
+    detail: Optional[LoginRespDetail] = None
+    expires_in: Optional[int] = None
+    jti: Optional[str] = None
+    languageType: Optional[str] = None
+    license: Optional[str] = None
+    oauth_id: Optional[str] = None
+    post_id: Optional[str] = None
+    refresh_token: Optional[str] = None
+    role_id: Optional[str] = None
+    role_name: Optional[str] = None
+    scope: Optional[str] = None
+    tenant_id: Optional[str] = None
+    token_type: Optional[str] = None
+    user_id: Optional[str] = None
+    user_name: Optional[str] = None
 
 
 class GpsStatus(Enum):
@@ -46,22 +47,22 @@ class GpsPosition:
     class WayPoint:
         @dataclass
         class Position:
-            altitude: int = None
-            latitude: int = None
-            longitude: int = None
+            altitude: Optional[int] = None
+            latitude: Optional[int] = None
+            longitude: Optional[int] = None
 
-        hdop: int = None
-        heading: int = None
-        position: Position = None
-        satellites: int = None
-        speed: int = None
+        hdop: Optional[int] = None
+        heading: Optional[int] = None
+        position: Optional[Position] = None
+        satellites: Optional[int] = None
+        speed: Optional[int] = None
 
-    gpsStatus: int = None
-    timeStamp: int = None
-    wayPoint: WayPoint = None
+    gpsStatus: Optional[int] = None
+    timeStamp: Optional[int] = None
+    wayPoint: Optional[WayPoint] = None
 
     @property
-    def gps_status_decoded(self) -> GpsStatus | None:
+    def gps_status_decoded(self) -> Optional[GpsStatus]:
         value = self.gpsStatus
         if value is None:
             return None

src/saic_ismart_client_ng/api/vehicle/alarm/__init__.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from saic_ismart_client_ng import SaicVehicleApi
 from saic_ismart_client_ng.api.vehicle.alarm.schema import AlarmSwitchReq, AlarmSwitchResp, AlarmType, AlarmSwitch
 from saic_ismart_client_ng.crypto_utils import sha256_hex_digest
@@ -14,7 +16,7 @@ async def get_alarm_switch(self, vin) -> AlarmSwitchResp:
             }
         )
 
-    async def set_alarm_switches(self, alarm_switches: [AlarmType], vin: str) -> None:
+    async def set_alarm_switches(self, alarm_switches: List[AlarmType], vin: str) -> None:
         actual_switches = [
             AlarmSwitch(alarmType=alarm_type.value, alarmSwitch=1, functionSwitch=1)
             for alarm_type in alarm_switches

src/saic_ismart_client_ng/api/vehicle/alarm/schema.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import List
+from typing import List, Optional
 
 
 class AlarmType(Enum):
@@ -11,9 +11,9 @@ class AlarmType(Enum):
 
 @dataclass
 class AlarmSwitch:
-    alarmType: int = None
-    functionSwitch: int = None
-    alarmSwitch: int = None
+    alarmType: Optional[int] = None
+    functionSwitch: Optional[int] = None
+    alarmSwitch: Optional[int] = None
 
 
 @dataclass

src/saic_ismart_client_ng/api/vehicle/locks/__init__.py

@@ -5,6 +5,7 @@
 from saic_ismart_client_ng.api.vehicle.schema import VehicleControlReq, VehicleControlResp, RvcParams, \
     RvcReqType, RvcParamsId
 from saic_ismart_client_ng.crypto_utils import sha256_hex_digest
+from saic_ismart_client_ng.exceptions import SaicApiException
 
 
 class SaicVehicleLocksApi(SaicVehicleApi):
@@ -29,6 +30,8 @@ async def control_vehicle_locks(
             request_type = RvcReqType.CLOSE_LOCKS
             params = None
         else:
+            if lock_id is None:
+                raise SaicApiException("Can't unlock without lock_id")
             request_type = RvcReqType.OPEN_LOCKS
             params = [
                 RvcParams(RvcParamsId.UNK_4, b'\x00'),