Merge pull request #105 from zabuldon/dev

2020-07-28

teslajsonpy/__init__.py

@@ -5,20 +5,21 @@
 For more details about this api, please refer to the documentation at
 https://github.com/zabuldon/teslajsonpy
 """
-from teslajsonpy.battery_sensor import Battery, Range
-from teslajsonpy.binary_sensor import (
+from teslajsonpy.controller import Controller
+from teslajsonpy.exceptions import TeslaException, UnknownPresetMode
+from teslajsonpy.homeassistant.battery_sensor import Battery, Range
+from teslajsonpy.homeassistant.binary_sensor import (
     ChargerConnectionSensor,
     OnlineSensor,
     ParkingSensor,
+    UpdateSensor,
 )
-from teslajsonpy.charger import ChargerSwitch, ChargingSensor, RangeSwitch
-from teslajsonpy.climate import Climate, TempSensor
-from teslajsonpy.controller import Controller
-from teslajsonpy.exceptions import TeslaException, UnknownPresetMode
-from teslajsonpy.gps import GPS, Odometer
-from teslajsonpy.lock import Lock
-from teslajsonpy.sentry_mode import SentryModeSwitch
-from teslajsonpy.trunk import TrunkLock, FrunkLock
+from teslajsonpy.homeassistant.charger import ChargerSwitch, ChargingSensor, RangeSwitch
+from teslajsonpy.homeassistant.climate import Climate, TempSensor
+from teslajsonpy.homeassistant.gps import GPS, Odometer
+from teslajsonpy.homeassistant.lock import Lock
+from teslajsonpy.homeassistant.sentry_mode import SentryModeSwitch
+from teslajsonpy.homeassistant.trunk import FrunkLock, TrunkLock
 
 from .__version__ import __version__
 
@@ -29,6 +30,7 @@
     "ChargingSensor",
     "OnlineSensor",
     "ParkingSensor",
+    "UpdateSensor",
     "ChargerSwitch",
     "RangeSwitch",
     "Climate",

teslajsonpy/connection.py

@@ -16,8 +16,8 @@
 import aiohttp
 from yarl import URL
 
-from teslajsonpy.exceptions import IncompleteCredentials, TeslaException
 from teslajsonpy.const import DRIVING_INTERVAL, WEBSOCKET_TIMEOUT
+from teslajsonpy.exceptions import IncompleteCredentials, TeslaException
 
 _LOGGER = logging.getLogger(__name__)
 

teslajsonpy/controller.py

@@ -10,19 +10,10 @@
 import time
 from typing import Callable, Optional, Text, Tuple
 
+from aiohttp import ClientConnectorError
 import backoff
 import wrapt
-from aiohttp import ClientConnectorError
 
-from teslajsonpy.battery_sensor import Battery, Range
-from teslajsonpy.binary_sensor import (
-    ChargerConnectionSensor,
-    OnlineSensor,
-    ParkingSensor,
-    UpdateSensor,
-)
-from teslajsonpy.charger import ChargerSwitch, ChargingSensor, RangeSwitch
-from teslajsonpy.climate import Climate, TempSensor
 from teslajsonpy.connection import Connection
 from teslajsonpy.const import (
     DRIVING_INTERVAL,
@@ -31,10 +22,19 @@
     SLEEP_INTERVAL,
 )
 from teslajsonpy.exceptions import RetryLimitError, TeslaException
-from teslajsonpy.gps import GPS, Odometer
-from teslajsonpy.lock import ChargerLock, Lock
-from teslajsonpy.sentry_mode import SentryModeSwitch
-from teslajsonpy.trunk import TrunkLock, FrunkLock
+from teslajsonpy.homeassistant.battery_sensor import Battery, Range
+from teslajsonpy.homeassistant.binary_sensor import (
+    ChargerConnectionSensor,
+    OnlineSensor,
+    ParkingSensor,
+    UpdateSensor,
+)
+from teslajsonpy.homeassistant.charger import ChargerSwitch, ChargingSensor, RangeSwitch
+from teslajsonpy.homeassistant.climate import Climate, TempSensor
+from teslajsonpy.homeassistant.gps import GPS, Odometer
+from teslajsonpy.homeassistant.lock import ChargerLock, Lock
+from teslajsonpy.homeassistant.sentry_mode import SentryModeSwitch
+from teslajsonpy.homeassistant.trunk import FrunkLock, TrunkLock
 
 _LOGGER = logging.getLogger(__name__)
 

teslajsonpy/homeassistant/__init__.py

@@ -0,0 +1,6 @@
+"""
+Python Package for controlling Tesla API.
+
+For more details about this api, please refer to the documentation at
+https://github.com/zabuldon/teslajsonpy
+"""

teslajsonpy/battery_sensor.py → teslajsonpy/homeassistant/battery_sensor.py

@@ -7,7 +7,7 @@
 """
 from typing import Dict, Optional, Text
 
-from teslajsonpy.vehicle import VehicleDevice
+from teslajsonpy.homeassistant.vehicle import VehicleDevice
 
 
 class Battery(VehicleDevice):
@@ -37,6 +37,14 @@ def __init__(self, data: Dict, controller) -> None:
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the battery state."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_charging_params(self._id)
         if data:
             self.__battery_level = data["battery_level"]
@@ -100,6 +108,14 @@ def __init__(self, data: Dict, controller) -> None:
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the battery range state."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_charging_params(self._id)
         if data:
             self.__battery_range = data["battery_range"]

teslajsonpy/binary_sensor.py → teslajsonpy/homeassistant/binary_sensor.py

@@ -7,8 +7,8 @@
 """
 from typing import Dict, Optional, Text
 
-from teslajsonpy.vehicle import VehicleDevice
 from teslajsonpy.const import RELEASE_NOTES_URL
+from teslajsonpy.homeassistant.vehicle import VehicleDevice
 
 
 class BinarySensor(VehicleDevice):
@@ -94,6 +94,14 @@ def __init__(self, data: Dict, controller):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the parking brake sensor."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_drive_params(self._id)
         if data:
             self.attrs["shift_state"] = (
@@ -142,6 +150,14 @@ def __init__(self, data, controller):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the charger connection sensor."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_charging_params(self._id)
         if data:
             self.attrs["charging_state"] = data["charging_state"]
@@ -182,6 +198,14 @@ def __init__(self, data: Dict, controller) -> None:
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the battery state."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         self.__online_state = self._controller.car_online[self._vin]
         self.attrs["state"] = self._controller.car_state[self._vin].get("state")
 
@@ -211,6 +235,14 @@ def __init__(self, data: Dict, controller) -> None:
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the battery state."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         self.attrs = (
             self.device_state_attributes.copy() if self.device_state_attributes else {}
         )

teslajsonpy/charger.py → teslajsonpy/homeassistant/charger.py

@@ -8,7 +8,7 @@
 import time
 from typing import Dict, Optional, Text
 
-from teslajsonpy.vehicle import VehicleDevice
+from teslajsonpy.homeassistant.vehicle import VehicleDevice
 
 
 class ChargerSwitch(VehicleDevice):
@@ -42,6 +42,14 @@ def __init__(self, data, controller):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the charging state of the Tesla Vehicle."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         last_update = self._controller.get_last_update_time(self._id)
         if last_update >= self.__manual_update_time:
             data = self._controller.get_charging_params(self._id)
@@ -97,6 +105,14 @@ def __init__(self, data, controller):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the status of the range setting."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         last_update = self._controller.get_last_update_time(self._id)
         if last_update >= self.__manual_update_time:
             data = self._controller.get_charging_params(self._id)
@@ -165,6 +181,14 @@ def __init__(self, data: Dict, controller) -> None:
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the battery state."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_gui_params(self._id)
         if data:
             self.measurement = data["gui_distance_units"]

teslajsonpy/climate.py → teslajsonpy/homeassistant/climate.py

@@ -8,8 +8,8 @@
 import time
 from typing import List, Optional, Text
 
-from teslajsonpy.vehicle import VehicleDevice
 from teslajsonpy.exceptions import UnknownPresetMode
+from teslajsonpy.homeassistant.vehicle import VehicleDevice
 
 
 class Climate(VehicleDevice):
@@ -75,6 +75,14 @@ def get_fan_status(self):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the HVAC state."""
         await super().async_update(wake_if_asleep=wake_if_asleep, force=force)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_climate_params(self._id)
         if data:
             last_update = self._controller.get_last_update_time(self._id)
@@ -222,6 +230,14 @@ def get_outside_temp(self):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the temperature."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_climate_params(self._id)
         if data:
             self.__inside_temp = (

teslajsonpy/gps.py → teslajsonpy/homeassistant/gps.py

@@ -7,7 +7,7 @@
 """
 from typing import Optional, Text
 
-from teslajsonpy.vehicle import VehicleDevice
+from teslajsonpy.homeassistant.vehicle import VehicleDevice
 
 
 class GPS(VehicleDevice):
@@ -60,6 +60,14 @@ def get_location(self):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the current GPS location."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_drive_params(self._id)
         if data:
             if data["native_location_supported"]:
@@ -115,6 +123,14 @@ def __init__(self, data, controller):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the odometer and the unit of measurement based on GUI."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         data = self._controller.get_state_params(self._id)
         if data:
             self.__odometer = data["odometer"]

teslajsonpy/lock.py → teslajsonpy/homeassistant/lock.py

@@ -7,7 +7,7 @@
 """
 import time
 
-from teslajsonpy.vehicle import VehicleDevice
+from teslajsonpy.homeassistant.vehicle import VehicleDevice
 
 
 class Lock(VehicleDevice):
@@ -47,6 +47,14 @@ def __init__(self, data, controller):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update the lock state."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         last_update = self._controller.get_last_update_time(self._id)
         if last_update >= self.__manual_update_time:
             data = self._controller.get_state_params(self._id)
@@ -117,6 +125,14 @@ def __init__(self, data, controller):
     async def async_update(self, wake_if_asleep=False, force=False) -> None:
         """Update state of the charger lock."""
         await super().async_update(wake_if_asleep=wake_if_asleep)
+        self.refresh()
+
+    def refresh(self) -> None:
+        """Refresh data.
+
+        This assumes the controller has already been updated
+        """
+        super().refresh()
         last_update = self._controller.get_last_update_time(self._id)
         if last_update >= self.__manual_update_time:
             data = self._controller.get_charging_params(self._id)