Run ruff check --fix

Author: nanomad

examples/main.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 import logging
 import sys

src/saic_ismart_client_ng/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from saic_ismart_client_ng.api.message import SaicMessageApi
 from saic_ismart_client_ng.api.user import SaicUserApi
 from saic_ismart_client_ng.api.vehicle import SaicVehicleApi as SaicVehicleApi

src/saic_ismart_client_ng/api/base.py

@@ -1,14 +1,16 @@
+from __future__ import annotations
+
+from abc import ABC
+from dataclasses import asdict
 import datetime
 import json
 import logging
-from abc import ABC
-from dataclasses import asdict
-from typing import Type, Optional, Any, TypeVar
+from typing import Any, Optional, Type, TypeVar
 
 import dacite
 import httpx
+from httpx._types import HeaderTypes, QueryParamTypes
 import tenacity
-from httpx._types import QueryParamTypes, HeaderTypes
 
 from saic_ismart_client_ng.api.schema import LoginResp
 from saic_ismart_client_ng.crypto_utils import sha1_hex_digest
@@ -112,7 +114,7 @@ async def __execute_api_call(
         headers: Optional[HeaderTypes] = None,
         allow_null_body: bool = False,
     ) -> Optional[T]:
-        url = f"{self.__configuration.base_uri}{path[1:] if path.startswith('/') else path}"
+        url = f"{self.__configuration.base_uri}{path.removeprefix('/')}"
         json_body = asdict(body) if body else None
         req = httpx.Request(
             method, url, params=params, headers=headers, data=form_body, json=json_body
@@ -195,27 +197,24 @@ async def __deserialize(
                         event_id=request_event_id,
                         return_code=return_code,
                     )
-                else:
-                    logger.error(
-                        f"API call return code is not acceptable: {return_code}: {response.text}. Headers: {response.headers}"
-                    )
-                    raise SaicApiException(error_message, return_code=return_code)
+                logger.error(
+                    f"API call return code is not acceptable: {return_code}: {response.text}. Headers: {response.headers}"
+                )
+                raise SaicApiException(error_message, return_code=return_code)
 
             if data_class is None:
                 return None
-            elif "data" in json_data:
+            if "data" in json_data:
                 if data_class is str:
                     return json.dumps(json_data["data"])
-                elif data_class is dict:
+                if data_class is dict:
                     return json_data["data"]
-                else:
-                    return dacite.from_dict(data_class, json_data["data"])
-            elif allow_null_body:
+                return dacite.from_dict(data_class, json_data["data"])
+            if allow_null_body:
                 return None
-            else:
-                raise SaicApiException(
-                    f"Failed to deserialize response, missing 'data' field: {response.text}"
-                )
+            raise SaicApiException(
+                f"Failed to deserialize response, missing 'data' field: {response.text}"
+            )
 
         except SaicApiException as se:
             raise se
@@ -230,16 +229,14 @@ async def __deserialize(
                     raise SaicLogoutException(
                         response.text, response.status_code
                     ) from e
-                else:
-                    logger.error(
-                        f"API call failed: {response.status_code} {response.text}",
-                        exc_info=e,
-                    )
-                    raise SaicApiException(response.text, response.status_code) from e
-            else:
-                raise SaicApiException(
-                    f"Failed to deserialize response: {e}. Original json was {response.text}"
-                ) from e
+                logger.error(
+                    f"API call failed: {response.status_code} {response.text}",
+                    exc_info=e,
+                )
+                raise SaicApiException(response.text, response.status_code) from e
+            raise SaicApiException(
+                f"Failed to deserialize response: {e}. Original json was {response.text}"
+            ) from e
 
     def logout(self):
         self.__api_client.user_token = ""
@@ -277,13 +274,12 @@ def saic_api_retry_policy(retry_state):
         if isinstance(wrapped_exception, SaicApiRetryException):
             logger.debug("Retrying since we got SaicApiRetryException")
             return True
-        elif isinstance(wrapped_exception, SaicLogoutException):
+        if isinstance(wrapped_exception, SaicLogoutException):
             logger.error("Not retrying since we got logged out")
             return False
-        elif isinstance(wrapped_exception, SaicApiException):
+        if isinstance(wrapped_exception, SaicApiException):
             logger.error("Not retrying since we got a generic exception")
             return False
-        else:
-            logger.error(f"Not retrying {retry_state.args} {wrapped_exception}")
-            return False
+        logger.error(f"Not retrying {retry_state.args} {wrapped_exception}")
+        return False
     return False

src/saic_ismart_client_ng/api/message/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Optional, Union
 
 from saic_ismart_client_ng.api.base import AbstractSaicApi

src/saic_ismart_client_ng/api/message/schema.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
 import datetime
 import logging
-from dataclasses import dataclass, field
 from typing import List, Optional, Union
 
 LOGGER = logging.getLogger(__name__)
@@ -49,10 +51,9 @@ def message_time(self) -> datetime.datetime:
     def read_status(self) -> str:
         if self.readStatus is None:
             return "unknown"
-        elif self.readStatus == 0:
+        if self.readStatus == 0:
             return "unread"
-        else:
-            return "read"
+        return "read"
 
     @property
     def details(self) -> str:

src/saic_ismart_client_ng/api/schema.py

@@ -1,6 +1,8 @@
-import logging
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
+import logging
 from typing import Optional
 
 logger = logging.getLogger(__name__)

src/saic_ismart_client_ng/api/serialization_utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import base64
 import logging
 from typing import Optional
@@ -11,7 +13,7 @@ def decode_bytes(
     try:
         if isinstance(input_value, str):
             return base64.b64decode(input_value)
-        elif isinstance(input_value, int):
+        if isinstance(input_value, int):
             return input_value.to_bytes((input_value.bit_length() + 7) // 8, "big")
     except Exception as e:
         __LOGGER.error("Failed to decode %s: %s", field_name, input_value, exc_info=e)

src/saic_ismart_client_ng/api/user/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from saic_ismart_client_ng.api.base import AbstractSaicApi
 from saic_ismart_client_ng.api.user.schema import UserTimezoneResp
 

src/saic_ismart_client_ng/api/user/schema.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from typing import Optional
 

src/saic_ismart_client_ng/api/vehicle/__init__.py

@@ -1,14 +1,16 @@
+from __future__ import annotations
+
 import tenacity
 
 from saic_ismart_client_ng.api.base import AbstractSaicApi
 from saic_ismart_client_ng.api.vehicle.schema import (
-    VehicleListResp,
-    VehicleStatusResp,
-    VehicleControlReq,
-    VehicleControlResp,
     RvcParams,
-    RvcReqType,
     RvcParamsId,
+    RvcReqType,
+    VehicleControlReq,
+    VehicleControlResp,
+    VehicleListResp,
+    VehicleStatusResp,
 )
 from saic_ismart_client_ng.crypto_utils import sha256_hex_digest