commit last one

custom_components/polestar_api/__init__.py

@@ -6,22 +6,16 @@
 from aiohttp import ClientConnectionError
 from async_timeout import timeout
 
-from .pypolestar.exception import PolestarApiException
-from .pypolestar.polestar import PolestarApi
-from .polestar import Polestar
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_USERNAME,
-    CONF_PASSWORD,
-    Platform,
-)
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
-from .const import (
-    DOMAIN,
-    TIMEOUT
-)
+
+from .const import DOMAIN, TIMEOUT
+from .polestar import Polestar
+from .pypolestar.exception import PolestarApiException
+from .pypolestar.polestar import PolestarApi
 
 PLATFORMS = [
     Platform.SENSOR,

custom_components/polestar_api/config_flow.py

@@ -5,13 +5,12 @@
 from aiohttp import ClientError
 from async_timeout import timeout
 import voluptuous as vol
-from .polestar import Polestar
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
-
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
 from .const import DOMAIN, TIMEOUT
+from .polestar import Polestar
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/polestar_api/entity.py

@@ -1,9 +1,9 @@
 import logging
 
-from .polestar import Polestar
+from homeassistant.helpers.entity import DeviceInfo, Entity
 
 from .const import DOMAIN as POLESTAR_API_DOMAIN
-from homeassistant.helpers.entity import DeviceInfo, Entity
+from .polestar import Polestar
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/polestar_api/pypolestar/auth.py

@@ -1,12 +1,11 @@
-import logging
+from datetime import datetime, timedelta
 import json
-import httpx
+import logging
 
-from datetime import datetime, timedelta
+import httpx
 
 from .exception import PolestarAuthException
 
-
 _LOGGER = logging.getLogger(__name__)
 
 

custom_components/polestar_api/pypolestar/polestar.py

@@ -1,11 +1,16 @@
+from datetime import datetime, timedelta
 import logging
-import httpx
 
-from datetime import datetime, timedelta
+import httpx
 
-from .exception import PolestarApiException, PolestarAuthException, PolestarNoDataException, PolestarNotAuthorizedException
 from .auth import PolestarAuth
-from .const import CACHE_TIME, BATTERY_DATA, CAR_INFO_DATA, ODO_METER_DATA
+from .const import BATTERY_DATA, CACHE_TIME, CAR_INFO_DATA, ODO_METER_DATA
+from .exception import (
+    PolestarApiException,
+    PolestarAuthException,
+    PolestarNoDataException,
+    PolestarNotAuthorizedException,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -172,7 +177,7 @@ async def get_graph_ql(self, params: dict):
         if resultData.get('errors'):
             self.latest_call_code = 500
             error_message = resultData['errors'][0]['message']
-            if error_message == "User is not authorized":
+            if error_message == "User not authenticated":
                 raise PolestarNotAuthorizedException("Unauthorized Exception")
             _LOGGER.error(error_message)
 

custom_components/polestar_api/sensor.py

@@ -496,13 +496,6 @@ def state(self) -> StateType:
                 return datetime.now().replace(second=0, microsecond=0) + timedelta(minutes=round(value))
             return 'Not charging'
 
-        # round the value
-        if self.entity_description.round_digits is not None:
-            # if the value is integer, remove the decimal
-            if self.entity_description.round_digits == 0 and isinstance(self._attr_native_value, int):
-                return int(self._attr_native_value)
-            return round(float(self._attr_native_value), self.entity_description.round_digits)
-
         if self.entity_description.key in ('estimate_full_charge_range', 'estimate_full_charge_range_miles'):
             battery_level = self._device.get_latest_data(
                 self.entity_description.query, 'batteryChargeLevelPercentage')
@@ -522,12 +515,17 @@ def state(self) -> StateType:
 
             return estimate_range
 
-        if self.entity_description.key in 'current_odometer_meters' and int(self._attr_native_value) > 1000:
-            self._attr_native_value = int(self._attr_native_value)
-            km = round(self._attr_native_value / 1000,
-                       self.entity_description.round_digits if self.entity_description.round_digits is not None else 0)
+        if self.entity_description.key in ('current_odometer_meters'):
+            if int(self._attr_native_value) > 1000:
+                km = self._attr_native_value / 1000
+                self._attr_native_value = int(km)
 
-            return km
+        # round the value
+        if self.entity_description.round_digits is not None:
+            # if the value is integer, remove the decimal
+            if self.entity_description.round_digits == 0 and isinstance(self._attr_native_value, int):
+                return int(self._attr_native_value)
+            return round(float(self._attr_native_value), self.entity_description.round_digits)
 
         return self._attr_native_value