revert workflow changes

mytoyota/api.py

@@ -41,7 +41,9 @@ def __init__(self, controller: Controller) -> None:  # noqa: D417
 
     async def _request_and_parse(self, model, method: str, endpoint: str, **kwargs):
         """Parse requests and responses."""
-        response = await self.controller.request_json(method=method, endpoint=endpoint, **kwargs)
+        response = await self.controller.request_json(
+            method=method, endpoint=endpoint, **kwargs
+        )
         return model(**response)
 
     async def set_vehicle_alias_endpoint(self, alias: str, guid: str, vin: str):
@@ -58,7 +60,7 @@ async def set_vehicle_alias_endpoint(self, alias: str, guid: str, vin: str):
             body={"guid": guid, "vin": vin, "nickName": alias},
         )
 
-    #    TODO: Remove for now as it seems to have no effect. The App is sending it!
+    #    TODO: Remove for now as it seems to have no effect. The App is sending it! # pylint: disable=W0511
     #    async def post_wake_endpoint(self) -> None:
     #        """Send a wake request to the vehicle."""
     #        await self.controller.request_raw(
@@ -67,9 +69,13 @@ async def set_vehicle_alias_endpoint(self, alias: str, guid: str, vin: str):
 
     async def get_vehicles_endpoint(self) -> VehiclesResponseModel:
         """Return list of vehicles registered with provider."""
-        return await self._request_and_parse(VehiclesResponseModel, "GET", VEHICLE_GUID_ENDPOINT)
+        return await self._request_and_parse(
+            VehiclesResponseModel, "GET", VEHICLE_GUID_ENDPOINT
+        )
 
-    async def get_location_endpoint(self, vin: str) -> LocationResponseModel:  # noqa: D417
+    async def get_location_endpoint(
+        self, vin: str
+    ) -> LocationResponseModel:  # noqa: D417
         """Get the last known location of your car. Only updates when car is parked.
 
         Response includes Lat, Lon position. * If supported.
@@ -78,18 +84,25 @@ async def get_location_endpoint(self, vin: str) -> LocationResponseModel:  # noq
         ----------
             vin: str:   The vehicles VIN
         """
-        return await self._request_and_parse(LocationResponseModel, "GET", VEHICLE_LOCATION_ENDPOINT, vin=vin)
+        return await self._request_and_parse(
+            LocationResponseModel, "GET", VEHICLE_LOCATION_ENDPOINT, vin=vin
+        )
 
-    async def get_vehicle_health_status_endpoint(self, vin: str) -> VehicleHealthResponseModel:  # noqa: D417
+    async def get_vehicle_health_status_endpoint(
+        self, vin: str
+    ) -> VehicleHealthResponseModel:  # noqa: D417
         """Get the latest health status.
 
-        Response includes the quantity of engine oil and any dashboard warning lights. * If supported.
+        Response includes the quantity of engine oil and any dashboard warning lights. \n
+        * If supported.
 
         Parameters
         ----------
             vin: str:   The vehicles VIN
         """
-        return await self._request_and_parse(VehicleHealthResponseModel, "GET", VEHICLE_HEALTH_STATUS_ENDPOINT, vin=vin)
+        return await self._request_and_parse(
+            VehicleHealthResponseModel, "GET", VEHICLE_HEALTH_STATUS_ENDPOINT, vin=vin
+        )
 
     async def get_remote_status_endpoint(self, vin: str) -> RemoteStatusResponseModel:
         """Get information about the vehicle."""
@@ -100,11 +113,13 @@ async def get_remote_status_endpoint(self, vin: str) -> RemoteStatusResponseMode
             vin=vin,
         )
 
-    async def get_vehicle_electric_status_endpoint(self, vin: str) -> ElectricResponseModel:  # noqa: D417
+    async def get_vehicle_electric_status_endpoint(
+        self, vin: str
+    ) -> ElectricResponseModel:  # noqa: D417
         """Get the latest electric status.
 
-        Response includes current battery level, EV Range, EV Range with AC, fuel level, fuel range and
-        current charging status
+        Response includes current battery level, EV Range, EV Range with AC, \n
+        fuel level, fuel range and current charging status
 
         Parameters
         ----------
@@ -117,7 +132,9 @@ async def get_vehicle_electric_status_endpoint(self, vin: str) -> ElectricRespon
             vin=vin,
         )
 
-    async def get_telemetry_endpoint(self, vin: str) -> TelemetryResponseModel:  # noqa: D417
+    async def get_telemetry_endpoint(
+        self, vin: str
+    ) -> TelemetryResponseModel:  # noqa: D417
         """Get the latest telemetry status.
 
         Response includes current fuel level, distance to empty and odometer
@@ -126,9 +143,13 @@ async def get_telemetry_endpoint(self, vin: str) -> TelemetryResponseModel:  # n
         ----------
             vin: str:   The vehicles VIN
         """
-        return await self._request_and_parse(TelemetryResponseModel, "GET", VEHICLE_TELEMETRY_ENDPOINT, vin=vin)
+        return await self._request_and_parse(
+            TelemetryResponseModel, "GET", VEHICLE_TELEMETRY_ENDPOINT, vin=vin
+        )
 
-    async def get_notification_endpoint(self, vin: str) -> NotificationResponseModel:  # noqa: D417
+    async def get_notification_endpoint(
+        self, vin: str
+    ) -> NotificationResponseModel:  # noqa: D417
         """Get all available notifications for the vehicle.
 
         A notification includes a message, notification date, read flag, date read.
@@ -158,7 +179,8 @@ async def get_trips_endpoint(  # noqa: PLR0913, D417
     ) -> TripsResponseModel:
         """Get list of trips.
 
-        Retrieves a list of all trips between the given dates. The default data(route = False, summary = False) provides
+        Retrieves a list of all trips between the given dates. \n
+        The default data(route = False, summary = False) provides
         a basic summary of each trip and includes Coaching message and electrical use.
 
         Parameters
@@ -180,4 +202,6 @@ async def get_trips_endpoint(  # noqa: PLR0913, D417
             limit=limit,
             offset=offset,
         )
-        return await self._request_and_parse(TripsResponseModel, "GET", endpoint, vin=vin)
+        return await self._request_and_parse(
+            TripsResponseModel, "GET", endpoint, vin=vin
+        )

mytoyota/client.py

@@ -25,7 +25,8 @@ class MyT:
 
     Connected services client class.
 
-    NOTE: Only tested with Toyota endpoints to this point. Do you have a Lexus/Subaru and are willing to help?
+    NOTE: Only tested with Toyota endpoints to this point.
+        Do you have a Lexus/Subaru and are willing to help?
     """
 
     def __init__(

mytoyota/const.py

@@ -41,7 +41,9 @@
 
 # API URLs
 API_BASE_URL = "HTTPS://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io"
-ACCESS_TOKEN_URL = "HTTPS://b2c-login.toyota-europe.com/oauth2/realms/root/realms/tme/access_token"
+ACCESS_TOKEN_URL = (
+    "HTTPS://b2c-login.toyota-europe.com/oauth2/realms/root/realms/tme/access_token"
+)
 AUTHENTICATE_URL = "HTTPS://b2c-login.toyota-europe.com/json/realms/root/realms/tme/authenticate?authIndexType=service&authIndexValue=oneapp"  # pylint: disable=C0301
 AUTHORIZE_URL = "HTTPS://b2c-login.toyota-europe.com/oauth2/realms/root/realms/tme/authorize?client_id=oneapp&scope=openid+profile+write&response_type=code&redirect_uri=com.toyota.oneapp:/oauth2Callback&code_challenge=plain&code_challenge_method=plain"  # pylint: disable=C0301
 
@@ -55,9 +57,7 @@
 VEHICLE_GLOBAL_REMOTE_ELECTRIC_STATUS_ENDPOINT = "/v1/global/remote/electric/status"
 VEHICLE_TELEMETRY_ENDPOINT = "/v3/telemetry"
 VEHICLE_NOTIFICATION_HISTORY_ENDPOINT = "/v2/notification/history"
-VEHICLE_TRIPS_ENDPOINT = (
-    "/v1/trips?from={from_date}&to={to_date}&route={route}&summary={summary}&limit={limit}&offset={offset}"
-)
+VEHICLE_TRIPS_ENDPOINT = "/v1/trips?from={from_date}&to={to_date}&route={route}&summary={summary}&limit={limit}&offset={offset}"  # pylint: disable=C0301
 
 # Timestamps
 UNLOCK_TIMESTAMP_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"

mytoyota/controller.py

@@ -1,8 +1,8 @@
 """Toyota Connected Services Controller."""
-import json
-import logging
 from datetime import datetime, timedelta
 from http import HTTPStatus
+import json
+import logging
 from os.path import exists, expanduser
 from typing import Any, Dict, Optional
 from urllib import parse
@@ -11,16 +11,23 @@
 import httpx
 import jwt
 
-from mytoyota.const import ACCESS_TOKEN_URL, API_BASE_URL, AUTHENTICATE_URL, AUTHORIZE_URL
+from mytoyota.const import (
+    ACCESS_TOKEN_URL,
+    API_BASE_URL,
+    AUTHENTICATE_URL,
+    AUTHORIZE_URL,
+)
 from mytoyota.exceptions import ToyotaApiError, ToyotaInternalError, ToyotaLoginError
 from mytoyota.utils.logs import format_httpx_response
 
 _LOGGER: logging.Logger = logging.getLogger(__package__)
 
-CACHE_FILENAME: Optional[str] = expanduser("~/.cache/toyota_credentials_cache_contains_secrets")
+CACHE_FILENAME: Optional[str] = expanduser(
+    "~/.cache/toyota_credentials_cache_contains_secrets"
+)
 
 
-# TODO There is an issue if you login with the application on a phone as all the tokens change.
+# TODO There is an issue if you login with the application on a phone as all the tokens change. # pylint: disable=W0511
 #      This seems to work sometimes but no others. Needs investigation.
 
 
@@ -43,13 +50,15 @@ def __init__(self, username: str, password: str, timeout: int = 60) -> None:
 
         # Do we have a cache file?
         if CACHE_FILENAME and exists(CACHE_FILENAME):
-            with open(CACHE_FILENAME, "r") as f:
+            with open(CACHE_FILENAME, "r", encoding="utf-8") as f:
                 cache_data = json.load(f)
                 if self._username == cache_data["username"]:
                     self._token = cache_data["access_token"]
                     self._refresh_token = cache_data["refresh_token"]
                     self._uuid = cache_data["uuid"]
-                    self._token_expiration = datetime.fromisoformat(cache_data["expiration"])
+                    self._token_expiration = datetime.fromisoformat(
+                        cache_data["expiration"]
+                    )
 
     async def login(self) -> None:
         """Perform first login."""
@@ -76,14 +85,21 @@ async def _authenticate(self):
             for _ in range(10):
                 if "callbacks" in data:
                     for cb in data["callbacks"]:
-                        if cb["type"] == "NameCallback" and cb["output"][0]["value"] == "User Name":
+                        if (
+                            cb["type"] == "NameCallback"
+                            and cb["output"][0]["value"] == "User Name"
+                        ):
                             cb["input"][0]["value"] = self._username
                         elif cb["type"] == "PasswordCallback":
                             cb["input"][0]["value"] = self._password
-                resp = await client.post(self._authenticate_url, json=data)  # , headers=standard_headers)
+                resp = await client.post(
+                    self._authenticate_url, json=data
+                )  # , headers=standard_headers)
                 _LOGGER.debug(format_httpx_response(resp))
                 if resp.status_code != HTTPStatus.OK:
-                    raise ToyotaLoginError(f"Authentication Failed. {resp.status_code}, {resp.text}.")
+                    raise ToyotaLoginError(
+                        f"Authentication Failed. {resp.status_code}, {resp.text}."
+                    )
                 data = resp.json()
                 # Wait for tokenId to be returned in response
                 if "tokenId" in data:
@@ -99,8 +115,12 @@ async def _authenticate(self):
             )
             _LOGGER.debug(format_httpx_response(resp))
             if resp.status_code != HTTPStatus.FOUND:
-                raise ToyotaLoginError(f"Authorization failed. {resp.status_code}, {resp.text}.")
-            authentication_code = parse.parse_qs(httpx.URL(resp.headers.get("location")).query.decode())["code"]
+                raise ToyotaLoginError(
+                    f"Authorization failed. {resp.status_code}, {resp.text}."
+                )
+            authentication_code = parse.parse_qs(
+                httpx.URL(resp.headers.get("location")).query.decode()
+            )["code"]
 
             # Retrieve tokens
             resp = await client.post(
@@ -116,7 +136,9 @@ async def _authenticate(self):
             )
             _LOGGER.debug(format_httpx_response(resp))
             if resp.status_code != HTTPStatus.OK:
-                raise ToyotaLoginError(f"Token retrieval failed. {resp.status_code}, {resp.text}.")
+                raise ToyotaLoginError(
+                    f"Token retrieval failed. {resp.status_code}, {resp.text}."
+                )
 
             self._update_tokens(resp.json())
 
@@ -142,7 +164,9 @@ async def _refresh_tokens(self) -> None:
             )
             _LOGGER.debug(format_httpx_response(resp))
             if resp.status_code != HTTPStatus.OK:
-                raise ToyotaLoginError(f"Token refresh failed. {resp.status_code}, {resp.text}.")
+                raise ToyotaLoginError(
+                    f"Token refresh failed. {resp.status_code}, {resp.text}."
+                )
 
             self._update_tokens(resp.json())
 
@@ -154,7 +178,9 @@ def _update_tokens(self, resp: json):
             or "refresh_token" not in access_tokens
             or "expires_in" not in access_tokens
         ):
-            raise ToyotaLoginError(f"Token retrieval failed. Missing Tokens. {resp.status_code}, {resp.text}.")
+            raise ToyotaLoginError(
+                f"Token retrieval failed. Missing Tokens. {resp.status_code}, {resp.text}."
+            )
 
         self._token = access_tokens["access_token"]
         self._refresh_token = access_tokens["refresh_token"]
@@ -164,10 +190,12 @@ def _update_tokens(self, resp: json):
             options={"verify_signature": False},
             audience="oneappsdkclient",
         )["uuid"]
-        self._token_expiration = datetime.now() + timedelta(seconds=access_tokens["expires_in"])
+        self._token_expiration = datetime.now() + timedelta(
+            seconds=access_tokens["expires_in"]
+        )
 
         if CACHE_FILENAME:
-            with open(CACHE_FILENAME, "w") as f:
+            with open(CACHE_FILENAME, "w", encoding="utf-8") as f:
                 f.write(
                     json.dumps(
                         {
@@ -230,7 +258,9 @@ async def request_raw(  # noqa: PLR0913
             ]:
                 return response
 
-        raise ToyotaApiError(f"Request Failed.  {response.status_code}, {response.text}.")
+        raise ToyotaApiError(
+            f"Request Failed.  {response.status_code}, {response.text}."
+        )
 
     async def request_json(  # noqa: PLR0913
         self,
@@ -247,12 +277,12 @@ async def request_json(  # noqa: PLR0913
         ----
             method (str): The HTTP method to use for the request.
             endpoint (str): The endpoint to send the request to.
-            vin (Optional[str], optional): The VIN (Vehicle Identification Number) to include in the request.
-                Defaults to None.
+            vin (Optional[str], optional): The VIN (Vehicle Identification Number) to include
+                in the request. Defaults to None.
             body (Optional[Dict[str, Any]], optional): The JSON body to include in the request.
                 Defaults to None.
-            params (Optional[Dict[str, Any]], optional): The query parameters to include in the request.
-                Defaults to None.
+            params (Optional[Dict[str, Any]], optional): The query parameters to
+                include in the request. Defaults to None.
             headers (Optional[Dict[str, Any]], optional): The headers to include in the request.
                 Defaults to None.
 

mytoyota/models/dashboard.py

@@ -11,7 +11,7 @@
 class Dashboard:
     """Information that may be found on a vehicles dashboard."""
 
-    # TODO do we want to supply last update times?
+    # TODO do we want to supply last update times?  # pylint: disable=W0511
 
     def __init__(  # noqa: D417
         self,
@@ -34,7 +34,11 @@ def __init__(  # noqa: D417
     def __repr__(self):
         """Representation of the Dashboard model."""
         return " ".join(
-            [f"{k}={getattr(self, k)!s}" for k, v in type(self).__dict__.items() if isinstance(v, property)],
+            [
+                f"{k}={getattr(self, k)!s}"
+                for k, v in type(self).__dict__.items()
+                if isinstance(v, property)
+            ],
         )
 
     @property
@@ -45,7 +49,9 @@ def odometer(self) -> float:
         -------
             The latest odometer reading in the current selected units
         """
-        return convert_distance(self._metric, self._telemetry.odometer.unit, self._telemetry.odometer.value)
+        return convert_distance(
+            self._metric, self._telemetry.odometer.unit, self._telemetry.odometer.value
+        )
 
     @property
     def fuel_level(self) -> int:
@@ -79,8 +85,12 @@ def fuel_range(self) -> Optional[float]:
             If vehicle doesn't support fuel range returns None
         """
         if self._electric:
-            return convert_distance(self._metric, self._electric.fuel_range.unit, self._electric.fuel_range.value)
-        elif self._telemetry.distance_to_empty:
+            return convert_distance(
+                self._metric,
+                self._electric.fuel_range.unit,
+                self._electric.fuel_range.value,
+            )
+        if self._telemetry.distance_to_empty:
             return convert_distance(
                 self._metric,
                 self._telemetry.distance_to_empty.unit,
@@ -101,7 +111,11 @@ def battery_range(self) -> Optional[float]:
             If vehicle doesn't support battery range returns None
         """
         if self._electric:
-            return convert_distance(self._metric, self._electric.ev_range.unit, self._electric.ev_range.value)
+            return convert_distance(
+                self._metric,
+                self._electric.ev_range.unit,
+                self._electric.ev_range.value,
+            )
 
         return None