pycupra 0.1.6__py3-none-any.whl → 0.1.7__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.6"
+__version__ = "0.1.7"

pycupra/connection.py

@@ -151,6 +151,7 @@ class Connection:
         self.addToAnonymisationKeys('family_name')
         self.addToAnonymisationKeys('birthdate')
         self.addToAnonymisationKeys('vin')
+        self._error401 = False
 
 
     def _clear_cookies(self):
@@ -596,22 +597,31 @@ class Connection:
                 'request_info': error.request_info
             }
             if error.status == 401:
-                _LOGGER.warning('Received "Unauthorized" while fetching data.\nThis can occur if tokens expired or refresh service is unavailable.')
+                _LOGGER.warning('Received "Unauthorized" while fetching data. This can occur if tokens expired or refresh service is unavailable.')
+                if self._error401 != True:
+                    self._error401 = True
+                    rc=await self.refresh_token(self._session_auth_brand)
+                    if rc:
+                        _LOGGER.info('Successfully refreshed tokens after error 401.')
+                        self._error401 = False
+                        #return True
+                    else:
+                        _LOGGER.info('Refresh of tokens after error 401 not successful.')
             elif error.status == 400:
-                _LOGGER.error('Received "Bad Request" from server.\nThe request might be malformed or not implemented correctly for this vehicle.')
+                _LOGGER.error('Received "Bad Request" from server. The request might be malformed or not implemented correctly for this vehicle.')
             elif error.status == 412:
-                _LOGGER.debug('Received "Pre-condition failed".\nService might be temporarily unavailable.')
+                _LOGGER.debug('Received "Pre-condition failed". Service might be temporarily unavailable.')
             elif error.status == 500:
-                _LOGGER.info('Received "Internal server error".\nThe service is temporarily unavailable.')
+                _LOGGER.info('Received "Internal server error". The service is temporarily unavailable.')
             elif error.status == 502:
-                _LOGGER.info('Received "Bad gateway".\nEither the endpoint is temporarily unavailable or not supported for this vehicle.')
+                _LOGGER.info('Received "Bad gateway". Either the endpoint is temporarily unavailable or not supported for this vehicle.')
             elif 400 <= error.status <= 499:
                 _LOGGER.error('Received unhandled error indicating client-side problem.\nRestart or try again later.')
             elif 500 <= error.status <= 599:
                 _LOGGER.error('Received unhandled error indicating server-side problem.\nThe service might be temporarily unavailable.')
             else:
                 _LOGGER.error('Received unhandled error while requesting API endpoint.')
-            _LOGGER.debug(f'HTTP request information: {data}')
+            _LOGGER.debug(self.anonymise(f'HTTP request information: {data}'))
             return data
         except Exception as e:
             _LOGGER.debug(f'Got non HTTP related error: {e}')
@@ -704,7 +714,7 @@ class Connection:
             _LOGGER.debug(self.anonymise(f'Data call returned: {response}'))
             return response
         except aiohttp.client_exceptions.ClientResponseError as error:
-            _LOGGER.debug(f'Request failed. Data: {data}, HTTP request headers: {self._session_headers}')
+            _LOGGER.debug(self.anonymise(f'Request failed. Data: {data}, HTTP request headers: {self._session_headers}'))
             if error.status == 401:
                 _LOGGER.error('Unauthorized')
             elif error.status == 400:
@@ -1625,7 +1635,7 @@ class Connection:
             if expires > now:
                 return expires
             else:
-                _LOGGER.debug(f'Token expired at {expires.strftime("%Y-%m-%d %H:%M:%S")})')
+                _LOGGER.debug(f'Token expired at {expires.strftime("%Y-%m-%d %H:%M:%S")}')
                 return False
         except Exception as e:
             _LOGGER.info(f'Token validation failed, {e}')

pycupra/const.py

@@ -192,3 +192,4 @@ FIREBASE_STATUS_NOT_INITIALISED= 0
 FIREBASE_STATUS_ACTIVATED= 1
 FIREBASE_STATUS_NOT_WANTED= -2
 FIREBASE_STATUS_ACTIVATION_FAILED= -1
+FIREBASE_STATUS_ACTIVATION_STOPPED= -3

pycupra/dashboard.py

@@ -755,6 +755,18 @@ class Warnings(Sensor):
     def assumed_state(self):
         return False
 
+    @property
+    def attributes(self):
+        attrs = {'warnings': 'No warnings'}
+        if self.vehicle.attrs.get('warninglights', {}).get('statuses',[]):
+            warningTextList = []
+            for elem in self.vehicle.attrs['warninglights']['statuses']:
+                if isinstance(elem, dict):
+                    if elem.get('text',''):
+                        warningTextList.append(elem.get('text',''))
+            attrs['warnings'] = warningTextList
+        return attrs
+
 class DepartureTimer1(Switch):
     def __init__(self):
         super().__init__(attr="departure1", name="Departure timer 1", icon="mdi:radiator")

pycupra/firebase_messaging/fcmpushclient.py

@@ -599,10 +599,21 @@ class FcmPushClient:  # pylint:disable=too-many-instance-attributes
             return
 
         if isinstance(msg, DataMessageStanza):
-            await self._handle_data_message(msg)
-            self.persistent_ids.append(msg.persistent_id)
+            #await self._handle_data_message(msg)
+            #self.persistent_ids.append(msg.persistent_id)
+            #if self.config.send_selective_acknowledgements:
+            #    await self._send_selective_ack(msg.persistent_id)
             if self.config.send_selective_acknowledgements:
-                await self._send_selective_ack(msg.persistent_id)
+                # As handle_data_message with the callback of onNotification can take some time, send_selective_ack is called in parallel
+                await asyncio.gather(
+                    self._handle_data_message(msg),
+                    self._send_selective_ack(msg.persistent_id),
+                    return_exceptions=True
+                )
+                self.persistent_ids.append(msg.persistent_id),
+            else:
+                await self._handle_data_message(msg)
+                self.persistent_ids.append(msg.persistent_id)
         elif isinstance(msg, HeartbeatPing):
             await self._handle_ping(msg)
         elif isinstance(msg, HeartbeatAck):

pycupra/vehicle.py

@@ -24,6 +24,7 @@ from .const import (
     FIREBASE_STATUS_NOT_INITIALISED,
     FIREBASE_STATUS_ACTIVATED,
     FIREBASE_STATUS_ACTIVATION_FAILED,
+    FIREBASE_STATUS_ACTIVATION_STOPPED,
     FIREBASE_STATUS_NOT_WANTED,
 )
 
@@ -153,6 +154,11 @@ class Vehicle:
         if not self.deactivated:
             try:
                 if self.firebaseStatus == FIREBASE_STATUS_ACTIVATED:
+                    # Check, if fcmpushclient still started
+                    if not self.firebase._pushClient.is_started():
+                        _LOGGER.warning(f'firebaseStatus={self.firebaseStatus}, but state of push client is not started. Changing firebaseStatus to {FIREBASE_STATUS_ACTIVATION_STOPPED}')
+                        self.firebaseStatus = FIREBASE_STATUS_ACTIVATION_STOPPED
+
                     fullUpdateExpired = datetime.now(tz=None) - timedelta(seconds= 1700)
                     oldMileage = self.distance
                     if self._last_get_mileage < datetime.now(tz=None) - timedelta(seconds= 300):
@@ -192,6 +198,17 @@ class Vehicle:
                 if self.firebaseStatus != FIREBASE_STATUS_ACTIVATED:
                     await self.get_mileage() 
 
+                if self.firebaseStatus == FIREBASE_STATUS_ACTIVATION_STOPPED:
+                    # Trying to activate firebase connection again
+                    await self.firebase._pushClient.start()
+                    #await asyncio.sleep(5)
+                    if self.firebase._pushClient.is_started():
+                        self.firebaseStatus = FIREBASE_STATUS_ACTIVATED
+                        _LOGGER.debug(f'Successfully restarted push client. New firebase status ={self.firebaseStatus}')
+                    else:
+                        _LOGGER.debug(f'Restart of push client failed. Firebase status ={self.firebaseStatus}')
+
+
                 await asyncio.gather(
                     #self.get_statusreport(),
                     self.get_charger(),
@@ -2236,14 +2253,7 @@ class Vehicle:
     @property
     def warnings(self):
         """Return warnings."""
-        if self.attrs.get('warninglights', {}).get('statuses',[]):
-            warningTextList = []
-            for elem in self.attrs['warninglights']['statuses']:
-                if isinstance(elem, dict):
-                    if elem.get('text',''):
-                        warningTextList.append(elem.get('text',''))
-            return warningTextList
-        return 'No warnings'
+        return len(self.attrs.get('warninglights', {}).get('statuses',[]))
 
     @property
     def is_warnings_supported(self):
@@ -3320,8 +3330,6 @@ class Vehicle:
         else:
             _LOGGER.warning(f'   Don\'t know what to do with a notification of type \'{type}\')')
 
-            
-
 
     def storeFirebaseNotifications(self, obj, notification, data_message):
         _LOGGER.debug(f'In storeFirebaseNotifications. notification={notification}')

{pycupra-0.1.6.dist-info → pycupra-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycupra
-Version: 0.1.6
+Version: 0.1.7
 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.6.dist-info → pycupra-0.1.7.dist-info}/RECORD

@@ -1,25 +1,25 @@
 pycupra/__init__.py,sha256=p0880jPkLqOErX3u3qaLboBLOsEHFpe44axApdaGeqI,231
-pycupra/__version__.py,sha256=orABFX8h4AFdsffPt4uVXqXeC0Wz3ZJOeNAzyeNw7O8,207
-pycupra/connection.py,sha256=cZIqsjEwA1rTkhVyjowrTdbWnviOXFSso-WR8FnSrmg,90610
-pycupra/const.py,sha256=cJJ9xrof6HZ7ZE7nXnB6tU4qMbSadlN8mgs43Igy7Mo,10591
-pycupra/dashboard.py,sha256=RlJPdTvJV7Urog5gCz_4pYWNd5_ApQIVJUCwJIi_7L8,43822
+pycupra/__version__.py,sha256=DKM773a_0KC1VMvD1yaWYuzJUpp3XsxR_HcWB1g_-Ys,207
+pycupra/connection.py,sha256=GWup_DcxnHNydb0DRJV79Hd108HJxMrGk89vi5R7meE,91150
+pycupra/const.py,sha256=F6y3qt_wS1QxhdSR-NHxB7lpUcf5uKLeoeTAJcAXgsE,10630
+pycupra/dashboard.py,sha256=xWggxTyKTBm3ByjRtymVzLJWtlIa52IEJsNx0z7bA9Q,44324
 pycupra/exceptions.py,sha256=Nq_F79GP8wjHf5lpvPy9TbSIrRHAJrFMo0T1N9TcgSQ,2917
 pycupra/firebase.py,sha256=tuN_W3OX3h3-yfdprWzmCn6z_T-BMx-OpL7Z6hOA8Lc,3451
 pycupra/utilities.py,sha256=6sDxWP13-XtxmqhuBJBGdVbkj48BQ9AxFMrBPxH0J7g,2679
-pycupra/vehicle.py,sha256=stxeyn2vd2j2yQ3dWEmT9XX1aZNZ7FdYvxbIraF6M0o,157175
+pycupra/vehicle.py,sha256=jOtpn8WUxKBYPIuCuPMfmH19AVfY0Mn1GXtRJM_gosQ,157941
 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
 pycupra/firebase_messaging/checkin_pb2.py,sha256=lFzCIAkYz9NFUpRbVuW-2kM_EaYKVWHeifHS1PV2eHQ,2795
 pycupra/firebase_messaging/checkin_pb2.pyi,sha256=mHOqbedt5jZDI20jcyFrTMSnQ0f_tq4zkIlHiaSC3xI,14626
 pycupra/firebase_messaging/const.py,sha256=XMy8kJ37uBSkTpVpdLeSjxk5UIPuvDuo-rxYdgmo2G8,1191
-pycupra/firebase_messaging/fcmpushclient.py,sha256=nO3WJUMQ7G2M9CE3aUlEdD75tFbC04gDsd4UsksQqKM,29543
+pycupra/firebase_messaging/fcmpushclient.py,sha256=7ADEYA6Aw4c42bwbIJr_I76wGiLOu99oV7PSNC4UcVs,30157
 pycupra/firebase_messaging/fcmregister.py,sha256=yZngC-0ZfTygtjfdzg03OW_3xk2n_uSQQ3Lrash5Y_E,18091
 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.6.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pycupra-0.1.6.dist-info/METADATA,sha256=u9ZdIDY607S5-5APn3VwI1nJgvWHPngzptNHedmY_k4,3757
-pycupra-0.1.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pycupra-0.1.6.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
-pycupra-0.1.6.dist-info/RECORD,,
+pycupra-0.1.7.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pycupra-0.1.7.dist-info/METADATA,sha256=hQAjfqNAkgF72DsnoCrLL6NtkF5_iIWY8mgc4ssgsCo,3757
+pycupra-0.1.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pycupra-0.1.7.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
+pycupra-0.1.7.dist-info/RECORD,,