pycupra 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

pycupra/__version__.py

@@ -3,4 +3,4 @@ pycupra - A Python 3 library for interacting with the My Cupra/My Seat portal.
 
 For more details and documentation, visit the github page at https://github.com/WulfgarW/pycupra
 """
-__version__ = "0.1.8"
+__version__ = "0.1.9"

pycupra/connection.py

@@ -98,6 +98,7 @@ from .const import (
     API_DESTINATION,
 
     PUBLIC_MODEL_IMAGES_SERVER,
+    FIREBASE_STATUS_NOT_INITIALISED,
 )
 
 version_info >= (3, 0) or exit('Python 3 required')
@@ -109,14 +110,14 @@ TIMEOUT = timedelta(seconds=90)
 class Connection:
     """ Connection to Connect services """
   # Init connection class
-    def __init__(self, session, brand='cupra', username='', password='', fulldebug=False, nightlyUpdateReduction=False, anonymise=True, tripStatisticsStartYear=None, **optional):
+    def __init__(self, session, brand='cupra', username='', password='', fulldebug=False, nightlyUpdateReduction=False, anonymise=True, tripStatisticsStartDate=None, **optional):
         """ Initialize """
         self._session = session
         self._lock = asyncio.Lock()
         self._session_fulldebug = fulldebug
         self._session_nightlyUpdateReduction = nightlyUpdateReduction
         self._session_anonymise = anonymise
-        self._session_tripStatisticsStartYear = tripStatisticsStartYear
+        self._session_tripStatisticsStartDate = tripStatisticsStartDate
         self._session_headers = HEADERS_SESSION.get(brand).copy()
         self._session_base = BASE_SESSION
         self._session_auth_headers = HEADERS_AUTH.copy()
@@ -561,8 +562,10 @@ class Connection:
         for v in self.vehicles:
             _LOGGER.debug(self.anonymise(f'Calling stopFirebase() for vehicle {v.vin}'))
             newStatus = await v.stopFirebase()
-            if newStatus != 0:
+            if newStatus != FIREBASE_STATUS_NOT_INITIALISED:
                 _LOGGER.debug(self.anonymise(f'stopFirebase() not successful for vehicle {v.vin}'))
+                # Although stopFirebase() was not successful, the firebase status is reset to FIREBASE_STATUS_NOT_INITIALISED to allow a new initialisation
+                v.firebaseStatus = FIREBASE_STATUS_NOT_INITIALISED
         await self.logout()
 
     async def logout(self):
@@ -1089,12 +1092,12 @@ class Connection:
     async def getTripStatistics(self, vin, baseurl, supportsCyclicTrips):
         """Get short term and cyclic trip statistics."""
         await self.set_token(self._session_auth_brand)
-        if self._session_tripStatisticsStartYear==None:
-            # If connection was not initialised with parameter tripStatisticsStartYear, then the value of the last year is used
+        if self._session_tripStatisticsStartDate==None:
+            # If connection was not initialised with parameter tripStatisticsStartDate, then 360 day is used for the CYCLIC trips and 90 days for the SHORT trips
             # (This keeps the statistics shorter in Home Assistant)
-            startYear = datetime.now().year - 1
+            startDate = (datetime.now() - timedelta(days= 360)).strftime('%Y-%m-%d')
         else:
-            startYear = self._session_tripStatisticsStartYear
+            startDate = self._session_tripStatisticsStartDate
         try:
             data={'tripstatistics': {}}
             if supportsCyclicTrips:
@@ -1109,6 +1112,10 @@ class Connection:
             else:
                 _LOGGER.info(f'Vehicle does not support cyclic trips.')
             dataType='SHORT'
+            if self._session_tripStatisticsStartDate==None:
+                # If connection was not initialised with parameter tripStatisticsStartDate, then 360 day is used for the CYCLIC trips and 90 days for the SHORT trips
+                # (This keeps the statistics shorter in Home Assistant)
+                startDate = (datetime.now() - timedelta(days= 90)).strftime('%Y-%m-%d')
             response = await self.get(eval(f"f'{API_TRIP}'"))
             if response.get('data', []):
                 data['tripstatistics']['short']= response.get('data', [])

pycupra/const.py

@@ -138,7 +138,7 @@ API_DEPARTURE_TIMERS = '{baseurl}/v1/vehicles/{vin}/departure-timers'
 API_DEPARTURE_PROFILES = '{baseurl}/v1/vehicles/{vin}/departure/profiles'                             # Departure profiles
 API_POSITION = '{baseurl}/v1/vehicles/{vin}/parkingposition'                                         # Position data
 API_POS_TO_ADDRESS= 'https://maps.googleapis.com/maps/api/directions/json?origin={lat},{lon}&destination={lat},{lon}&traffic_model=best_guess&departure_time=now&language=de&key={apiKeyForGoogle}&mode=driving'
-API_TRIP = '{baseurl}/v1/vehicles/{vin}/driving-data/{dataType}?from={startYear}-07-01T00:00:00Z&to=2099-12-31T09:59:01Z' # Trip statistics (whole history) SHORT/LONG/CYCLIC (WEEK only with from)
+API_TRIP = '{baseurl}/v1/vehicles/{vin}/driving-data/{dataType}?from={startDate}T00:00:00Z&to=2099-12-31T09:59:01Z' # Trip statistics (whole history) SHORT/LONG/CYCLIC (WEEK only with from)
 API_MILEAGE = '{baseurl}/v1/vehicles/{vin}/mileage'                                                  # Total km etc
 API_MAINTENANCE = '{baseurl}/v1/vehicles/{vin}/maintenance'                                          # Inspection information
 API_MEASUREMENTS = '{baseurl}/v1/vehicles/{vin}/measurements/engines'                                # ???

pycupra/dashboard.py

@@ -455,7 +455,7 @@ class RequestRefresh(Switch):
     async def turn_on(self):
         _LOGGER.debug('User has called RequestRefresh().')
         await self.vehicle.set_refresh()
-        await self.vehicle.update(updateType=1) #full update after set_refresh
+        #await self.vehicle.update(updateType=1) #full update after set_refresh
         if self.callback is not None:
             self.callback()
 
@@ -776,11 +776,12 @@ class DepartureTimer1(Switch):
 
     @property
     def state(self):
-        status = self.vehicle.departure1.get("enabled", "")
-        if status:
-            return True
-        else:
-            return False
+        if self.vehicle.departure1 != None:
+            status = self.vehicle.departure1.get("enabled", "")
+            if status:
+                return True
+        #else:
+        return False
 
     async def turn_on(self):
         await self.vehicle.set_timer_active(id=1, action="on")
@@ -808,11 +809,12 @@ class DepartureTimer2(Switch):
 
     @property
     def state(self):
-        status = self.vehicle.departure2.get("enabled", "")
-        if status:
-            return True
-        else:
-            return False
+        if self.vehicle.departure2 != None:
+            status = self.vehicle.departure2.get("enabled", "")
+            if status:
+                return True
+        #else:
+        return False
 
     async def turn_on(self):
         await self.vehicle.set_timer_active(id=2, action="on")
@@ -839,11 +841,12 @@ class DepartureTimer3(Switch):
 
     @property
     def state(self):
-        status = self.vehicle.departure3.get("enabled", "")
-        if status:
-            return True
-        else:
-            return False
+        if self.vehicle.departure3 != None:
+            status = self.vehicle.departure3.get("enabled", "")
+            if status:
+                return True
+        #else:
+        return False
 
     async def turn_on(self):
         await self.vehicle.set_timer_active(id=3, action="on")
@@ -1004,7 +1007,7 @@ class ChargingState(BinarySensor):
 
 class AreaAlarm(BinarySensor):
     def __init__(self):
-        super().__init__(attr="area_alarm", name="Area alarm", icon="mdi:alarm-light", device_class='safety')
+        super().__init__(attr="area_alarm", name="Area alarm", icon="mdi:alarm-light", device_class=None)
 
     @property
     def state(self):

pycupra/firebase.py

@@ -43,7 +43,7 @@ class Firebase():
             await asyncio.sleep(5)
             return self._pushClient.is_started()
         except Exception as e:
-            _LOGGER.error('Error in firebaseStart. Error: {e}')
+            _LOGGER.error(f'Error in firebaseStart. Error: {e}')
             return False
 
     async def firebaseStop(self): 
@@ -54,7 +54,7 @@ class Firebase():
             self._pushClient = None
             return True
         except Exception as e:
-            _LOGGER.error('Error in firebaseStop. Error: {e}')
+            _LOGGER.error(f'Error in firebaseStop. Error: {e}')
             return False
 
 def readFCMCredsFile(credsFile):
@@ -70,7 +70,7 @@ def readFCMCredsFile(credsFile):
             _LOGGER.debug(f'{credsFile} not found.')
             return {}
     except Exception as e:
-        _LOGGER.warning('readFCMCredsFile() not successful. Error: {e}')
+        _LOGGER.warning(f'readFCMCredsFile() not successful. Error: {e}')
         return ''
 
 def writeFCMCredsFile(creds, firebaseCredentialsFileName):

pycupra/vehicle.py

@@ -188,6 +188,8 @@ class Vehicle:
                     newStatus = await self.stopFirebase()
                     if newStatus != FIREBASE_STATUS_NOT_INITIALISED:
                         _LOGGER.debug(f'stopFirebase() not successful.')
+                        # Although stopFirebase() was not successful, the firebase status is reset to FIREBASE_STATUS_NOT_INITIALISED to allow a new initialisation
+                        self.firebaseStatus = FIREBASE_STATUS_NOT_INITIALISED
                     newStatus = await self.initialiseFirebase(self._firebaseCredentialsFileName, self.updateCallback)
                     if newStatus == FIREBASE_STATUS_ACTIVATED:
                         _LOGGER.debug(f'Reinitialisation of firebase successful.New firebase status={self.firebaseStatus}.')
@@ -1384,6 +1386,11 @@ class Vehicle:
                     'status': response.get('status', 'Unknown'),
                     'id': response.get('id', 0)
                 }
+                # if firebaseStatus is FIREBASE_STATUS_ACTIVATED, the request is assumed successful. Waiting for push notification before rereading status
+                if self.firebaseStatus == FIREBASE_STATUS_ACTIVATED:
+                    _LOGGER.debug('POST request for wakeup vehicle assumed successful. Waiting for push notification')
+                    return True
+                await self.update(updateType=1) #full update after set_refresh
                 return True
         except(SeatInvalidRequestException, SeatException):
             raise
@@ -3291,10 +3298,6 @@ class Vehicle:
         _LOGGER.debug(f'Received push notification: notification id={notification}, type={obj.get('data',{}).get('type','')}, requestId={obj.get('data',{}).get('requestId','[None]')}')
         _LOGGER.debug(f'   data_message={data_message}, payload={obj.get('data',{}).get('payload','[None]')}')
 
-        #temporary output of notifications in a file, will be removed in the next release
-        #if self.updateCallback == self.update:
-        #    self.storeFirebaseNotifications(obj, notification, data_message)
-
         if self.firebaseStatus != FIREBASE_STATUS_ACTIVATED:
             if self.firebaseStatus != FIREBASE_STATUS_ACTIVATION_STOPPED:
                 _LOGGER.info(f'While firebase is not fully activated, received notifications are just acknowledged.')
@@ -3402,7 +3405,7 @@ class Vehicle:
             self._states.update(areaAlarm)
             if self.updateCallback:
                 await self.updateCallback(2)
-        elif type == 'vehicle-wakeup-succeeded':
+        elif type in ('vehicle-wake-up-succeeded', 'vehicle-wakeup-succeeded'):
             if self._requests.get('refresh', {}).get('id', None):
                 openRequest= self._requests.get('refresh', {}).get('id', None)
                 if openRequest == requestId:
@@ -3417,18 +3420,3 @@ class Vehicle:
         else:
             _LOGGER.warning(f'   Don\'t know what to do with a notification of type \'{type}\')')
 
-
-    #temporary output of notifications in a file, will be removed in the next release
-    #def storeFirebaseNotifications(self, obj, notification, data_message):
-    #    _LOGGER.debug(f'In storeFirebaseNotifications. notification={notification}')
-    #    fName = self._firebaseCredentialsFileName
-    #    fName = fName.replace('pycupra_firebase_credentials.json', 'pycupra_firebasenotifications.txt')
-
-    #    with open(fName, "a") as ofile:
-    #        ofile.write(f'{datetime.now()}\n')
-    #        ofile.write(f'   notification id={notification}, data_message={data_message}\n')
-    #        ofile.write(f'   obj={obj}\n')
-    #        ofile.write("----------------------------------------------------------------\n")
-
-
-

{pycupra-0.1.8.dist-info → pycupra-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycupra
-Version: 0.1.8
+Version: 0.1.9
 Summary: A library to read and send vehicle data via Cupra/Seat portal using the same API calls as the MyCupra/MySeat mobile app.
 Home-page: https://github.com/WulfgarW/pycupra
 Author: WulfgarW

{pycupra-0.1.8.dist-info → pycupra-0.1.9.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pycupra/__init__.py,sha256=p0880jPkLqOErX3u3qaLboBLOsEHFpe44axApdaGeqI,231
-pycupra/__version__.py,sha256=ahbRianoeRb9v2bqw7g3dKIyoW7jt_rvwY0nas5Bn0c,207
-pycupra/connection.py,sha256=5bUxSUC03O-4kceZn8fPWKyOaxOq13JVMjY-_UqrOwo,92187
-pycupra/const.py,sha256=hCtDfI0gRewmVjXOQRrC4pUphOxGwCA3_Plfp2NwFXU,10637
-pycupra/dashboard.py,sha256=bEmIRvxX08WNa0rftpQ6JrD0GW5FeVTDu5yQr0IUjMM,45178
+pycupra/__version__.py,sha256=dcxJ-u8Zz6qTGBXri5kGr0y8fa_8l43365hGXeOK-zU,207
+pycupra/connection.py,sha256=Knu3vzokMRrsg9psjeD_r-2cl04ySJ1j7Mrn2g9mzdg,92941
+pycupra/const.py,sha256=5b4uuNUE1AGZHmqQfIZv-76Ad20mJTXXQPGI8TU6FfY,10631
+pycupra/dashboard.py,sha256=AlffEx8WmhLaSwX-eVcrOc54rUmwpzZUuR1fhruYkzI,45337
 pycupra/exceptions.py,sha256=Nq_F79GP8wjHf5lpvPy9TbSIrRHAJrFMo0T1N9TcgSQ,2917
-pycupra/firebase.py,sha256=tuN_W3OX3h3-yfdprWzmCn6z_T-BMx-OpL7Z6hOA8Lc,3451
+pycupra/firebase.py,sha256=lmI4a8f5VAlmHAqP2OiJWZhn7dmhyHkIBxL252qdtkA,3454
 pycupra/utilities.py,sha256=6sDxWP13-XtxmqhuBJBGdVbkj48BQ9AxFMrBPxH0J7g,2679
-pycupra/vehicle.py,sha256=1sKJJ4xuBIrx6ZWnH50-b7bzjmqyBgRiETOSzDiNNN8,162609
+pycupra/vehicle.py,sha256=12pFVqgIRkPMJ9IoBt0TAuSS4RRQOdTCq4-ltNtbN9c,162376
 pycupra/firebase_messaging/__init__.py,sha256=oerLHWvEf4qRqu3GxSX6SLY_OYI430ydAiAhKtzyMEM,666
 pycupra/firebase_messaging/android_checkin_pb2.py,sha256=-U1oGroFt3KRuGDieae3iTcux6mAfx1TFkE1Q35ul2E,2849
 pycupra/firebase_messaging/android_checkin_pb2.pyi,sha256=7KL-zQIz2Zz7uftcLkv57Podzu-yk6trn50FN4X4A8E,9379
@@ -18,8 +18,8 @@ pycupra/firebase_messaging/fcmregister.py,sha256=yZngC-0ZfTygtjfdzg03OW_3xk2n_uS
 pycupra/firebase_messaging/mcs_pb2.py,sha256=nwXY7IDgLYPxgpSGs6wyTSyYDdomQsyGqH8R8EgODLg,7733
 pycupra/firebase_messaging/mcs_pb2.pyi,sha256=HfIhInC3wRg8_caKwUm-V3knE2jTdEQvBy6uXgQ5rHY,33959
 pycupra/firebase_messaging/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycupra-0.1.8.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pycupra-0.1.8.dist-info/METADATA,sha256=GC1Av2ilKrcM3hNfIoFPsBRKsSBjzlkIQrH8nmUzijY,3757
-pycupra-0.1.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pycupra-0.1.8.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
-pycupra-0.1.8.dist-info/RECORD,,
+pycupra-0.1.9.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pycupra-0.1.9.dist-info/METADATA,sha256=5LDPYAqO74WlAZanWVES__uzRngZlq2t_JS8cbABI9w,3757
+pycupra-0.1.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pycupra-0.1.9.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
+pycupra-0.1.9.dist-info/RECORD,,