fixing slow execution

teslajsonpy/BatterySensor.py

@@ -23,8 +23,6 @@ def __init__(self, data, controller):
             str(self.__vin[3]).upper(), self.__vin, self.type)
         self.bin_type = 0x5
 
-        self.update()
-
     def update(self):
         self.__controller.update(self.__id)
         data = self.__controller.get_charging_params(self.__id)

teslajsonpy/BinarySensor.py

@@ -20,8 +20,6 @@ def __init__(self, data, controller):
             str(self.__vin[3]).upper(), self.__vin, self.type)
         self.bin_type = 0x1
 
-        self.update()
-
     def update(self):
         self.__controller.update(self.__id)
         data = self.__controller.get_drive_params(self.__id)
@@ -56,8 +54,6 @@ def __init__(self, data, controller):
             str(self.__vin[3]).upper(), self.__vin, self.type)
         self.bin_type = 0x2
 
-        self.update()
-
     def update(self):
         self.__controller.update(self.__id)
         data = self.__controller.get_charging_params(self.__id)

teslajsonpy/Charger.py

@@ -20,8 +20,6 @@ def __init__(self, data, controller):
             str(self.__vin[3]).upper(), self.__vin, self.type)
         self.bin_type = 0x8
 
-        self.update()
-
     def update(self):
         self.__controller.update(self.__id)
         data = self.__controller.get_charging_params(self.__id)

teslajsonpy/Climate.py

@@ -109,8 +109,6 @@ def __init__(self, data, controller):
             str(self.__vin[3]).upper(), self.__vin, self.type)
         self.bin_type = 0x4
 
-        self.update()
-
     def get_inside_temp(self):
         return self.__inside_temp
 

teslajsonpy/GPS.py

@@ -26,8 +26,6 @@ def __init__(self, data, controller):
         self.uniq_name = 'Tesla model {} {} {}'.format(
             str(self.__vin[3]).upper(), self.__vin, self.type)
 
-        self.update()
-
     def get_location(self):
         return self.__location
 

teslajsonpy/Lock.py

@@ -23,7 +23,6 @@ def __init__(self, data, controller):
             str(self.__vin[3]).upper(), self.__vin, self.type)
         self.bin_type = 0x7
 
-        self.update()
 
     def update(self):
         self.__controller.update(self.__id)

teslajsonpy/connection.py

@@ -2,48 +2,29 @@
 import datetime
 from urllib.parse import urlencode
 from urllib.request import Request, build_opener
+from urllib.error import HTTPError
 import json
+from time import sleep
 
 
 class Connection(object):
     """Connection to Tesla Motors API"""
-
-    def __init__(self,
-                 email='',
-                 password='',
-                 access_token='',
-                ):
-        """Initialize connection object
-
-        Sets the vehicles field, a list of Vehicle objects
-        associated with your account
-        Required parameters:
-        email: your login for teslamotors.com
-        password: your password for teslamotors.com
-
-        Optional parameters:
-        access_token: API access token
-        proxy_url: URL for proxy server
-        proxy_user: username for proxy server
-        proxy_password: password for proxy server
-        """
+    def __init__(self, email, password, logger):
+        """Initialize connection object"""
         self.user_agent = 'Model S 2.1.79 (SM-G900V; Android REL 4.4.4; en_US';
 
-        self.client_id = "81527cff06843c8634fdc09e8ac0abefb46ac849f38fe1e431c2ef2106796384"
-        self.client_secret = "c7257eb71a564034f9419ee651c7d0e5f7aa6bfbd18bafb5c5c033b093bb2fa3"
+        self.client_id = "e4a9949fcfa04068f59abb5a658f2bac0a3428e4652315490b659d5ab3f35a9e"
+        self.client_secret = "c75f14bbadc8bee3a7594412c31416f8300256d7668ea7e6e7f06727bfb9d220"
         self.baseurl = 'https://owner-api.teslamotors.com'
         self.api = '/api/1/'
-
-        if access_token:
-            self.__sethead(access_token)
-        else:
-            self.oauth = {
-                "grant_type": "password",
-                "client_id": self.client_id,
-                "client_secret": self.client_secret,
-                "email": email,
-                "password": password}
-            self.expiration = 0
+        self.oauth = {
+            "grant_type": "password",
+            "client_id": self.client_id,
+            "client_secret": self.client_secret,
+            "email": email,
+            "password": password}
+        self.expiration = 0
+        self.logger = logger
 
     def get(self, command):
         """Utility command to get data from API"""
@@ -54,14 +35,15 @@ def post(self, command, data={}):
         now = calendar.timegm(datetime.datetime.now().timetuple())
         if now > self.expiration:
             auth = self.__open("/oauth/token", data=self.oauth)
-            self.__sethead(auth['access_token'],
-                           auth['created_at'] + auth['expires_in'] - 86400)
+            self.__sethead(auth['access_token'])
         return self.__open("%s%s" % (self.api, command), headers=self.head, data=data)
 
-    def __sethead(self, access_token, expiration=float('inf')):
+    def __sethead(self, access_token):
         """Set HTTP header"""
         self.access_token = access_token
-        self.expiration = expiration
+        now = calendar.timegm(datetime.datetime.now().timetuple())
+        self.expiration = now + 600
+        print(self.expiration)
         self.head = {"Authorization": "Bearer %s" % access_token,
                      "User-Agent": self.user_agent
                      }
@@ -72,13 +54,20 @@ def __open(self, url, headers={}, data=None, baseurl=""):
             baseurl = self.baseurl
         req = Request("%s%s" % (baseurl, url), headers=headers)
         try:
-            req.data = urlencode(data).encode('utf-8')  # Python 3
-        except:
-            try:
-                req.add_data(urlencode(data))  # Python 2
-            except:
-                pass
+            req.data = urlencode(data).encode('utf-8')
+        except TypeError:
+            pass
         opener = build_opener()
-        resp = opener.open(req)
+        self.logger.error(req.full_url)
+        while True:
+            try:
+                resp = opener.open(req)
+            except HTTPError as ex:
+                self.logger.error('HTTPError: %s %s. Sleeping 1 second', ex.code, ex.reason)
+                sleep(1)
+                continue
+            break
         charset = resp.info().get('charset', 'utf-8')
-        return json.loads(resp.read().decode(charset))
+        data = json.loads(resp.read().decode(charset))
+        opener.close()
+        return data

teslajsonpy/controller.py

@@ -1,5 +1,4 @@
 import time
-from threading import RLock
 
 from teslajsonpy.connection import Connection
 from teslajsonpy.BatterySensor import Battery
@@ -8,24 +7,25 @@
 from teslajsonpy.BinarySensor import ParkingSensor, ChargerConnectionSensor
 from teslajsonpy.Charger import ChargerSwitch
 from teslajsonpy.GPS import GPS
+from json import dumps
 
 
 class Controller:
-    def __init__(self, email, password, update_interval):
-        self.__connection = Connection(email, password)
+    def __init__(self, email, password, update_interval, logger):
+        self.__connection = Connection(email, password, logger)
         self.__vehicles = []
         self.update_interval = update_interval
         self.__climate = {}
         self.__charging = {}
         self.__state = {}
         self.__driving = {}
         self.__last_update_time = {}
-        self.__lock = RLock()
-
+        self.__logger = logger
         cars = self.__connection.get('vehicles')['response']
-
+        self.debug_msg('Found cars: {}'.format(dumps(cars)))
         for car in cars:
             self.__last_update_time[car['id']] = 0
+            self.debug_msg('Initializing car with ID: {}'.format(car['id']))
             self.update(car['id'])
             self.__vehicles.append(Climate(car, self))
             self.__vehicles.append(Battery(car, self))
@@ -36,10 +36,17 @@ def __init__(self, email, password, update_interval):
             self.__vehicles.append(ParkingSensor(car, self))
             self.__vehicles.append(GPS(car, self))
 
+    def debug_msg(self, msg):
+        if self.__logger:
+            print(msg)
+            self.__logger.debug(msg)
+
     def post(self, vehicle_id, command, data={}):
+        self.debug_msg('vehicles/%i/%s' % (vehicle_id, command))
         return self.__connection.post('vehicles/%i/%s' % (vehicle_id, command), data)
 
     def get(self, vehicle_id, command):
+        self.debug_msg('vehicles/%i/%s' % (vehicle_id, command))
         return self.__connection.get('vehicles/%i/%s' % (vehicle_id, command))
 
     def data_request(self, vehicle_id, name):
@@ -51,20 +58,31 @@ def command(self, vehicle_id, name, data={}):
     def list_vehicles(self):
         return self.__vehicles
 
-    def wake_up(self, car_id):
-        self.post(car_id, 'wake_up')
+    def wake_up(self, vehicle_id):
+        self.debug_msg('{} {}'.format(vehicle_id, 'wake_up'))
+        self.post(vehicle_id, 'wake_up')
 
     def update(self, car_id):
-        if time.time() - self.__last_update_time[car_id] > self.update_interval:
-            self.__lock.acquire()
+        cur_time = time.time()
+        if cur_time - self.__last_update_time[car_id] > self.update_interval:
+
             self.wake_up(car_id)
             data = self.get(car_id, 'data')['response']
             self.__climate[car_id] = data['climate_state']
             self.__charging[car_id] = data['charge_state']
             self.__state[car_id] = data['vehicle_state']
             self.__driving[car_id] = data['drive_state']
             self.__last_update_time[car_id] = time.time()
-            self.__lock.release()
+            self.debug_msg(
+                'Update requested:\n\t'
+                'Cat_ID: {}\n\t'
+                'TS: \n\t\t'
+                'Last Update:{}\n\t\t'
+                'Current: {} \n\t\t'
+                'Delta: {}\n\t'
+                'Data: {}'.format(
+                    car_id, self.__last_update_time[car_id], cur_time, cur_time - self.__last_update_time[car_id],
+                    dumps(data)))
 
     def get_climate_params(self, car_id):
         return self.__climate[car_id]