pycupra 0.0.6__py3-none-any.whl → 0.0.8__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.0.6"
+__version__ = "0.0.8"

pycupra/connection.py

@@ -136,6 +136,10 @@ class Connection:
         _LOGGER.info(f'Init PyCupra library, version {lib_version}')
         _LOGGER.debug(f'Using service {self._session_base}')
 
+        self._sessionRequestCounter = 0
+        self._sessionRequestTimestamp = datetime.now(tz= None)
+        self._sessionRequestCounterHistory = {}
+
 
     def _clear_cookies(self):
         self._session._cookie_jar._cookies.clear()
@@ -604,6 +608,19 @@ class Connection:
         """Perform a HTTP query"""
         if self._session_fulldebug:
             _LOGGER.debug(f'HTTP {method} "{url}"')
+        try:
+            if datetime.now(tz=None).date() != self._sessionRequestTimestamp.date():
+                # A new day has begun. Store _sessionRequestCounter in history and reset timestamp and counter
+                self._sessionRequestCounterHistory[self._sessionRequestTimestamp.strftime('%Y-%m-%d')]=self._sessionRequestCounter
+                _LOGGER.info(f'History of the number of API calls:')
+                for key, value in self._sessionRequestCounterHistory.items:
+                    _LOGGER.info(f'   Date: {key}: {value} API calls')
+
+                self._sessionRequestTimestamp= datetime.now(tz=None)
+                self._sessionRequestCounter = 0
+        except Exception as e:
+            _LOGGER.error(f'Error while preparing output of API call history. Error: {e}')
+        self._sessionRequestCounter = self._sessionRequestCounter + 1
         async with self._session.request(
             method,
             url,
@@ -694,7 +711,7 @@ class Connection:
             for vehicle in self.vehicles:
                 if vehicle.vin not in update_list:
                     _LOGGER.debug(f'Adding {vehicle.vin} for data refresh')
-                    update_list.append(vehicle.update())
+                    update_list.append(vehicle.update(updateType=1))
                 else:
                     _LOGGER.debug(f'VIN {vehicle.vin} is already queued for data refresh')
 
@@ -884,6 +901,14 @@ class Connection:
                 _LOGGER.info('Unhandled error while trying to fetch mycar data')
         except Exception as error:
             _LOGGER.warning(f'Could not fetch mycar report, error: {error}')
+        if data=={}:
+            return False
+        return data
+
+    async def getMileage(self, vin, baseurl):
+        """Get car information from customer profile, VIN, nickname, etc."""
+        await self.set_token(self._session_auth_brand)
+        data={}
         try:
             response = await self.get(eval(f"f'{API_MILEAGE}'"))
             if response.get('mileageKm', {}):

pycupra/dashboard.py

@@ -444,9 +444,9 @@ class RequestFlash(Switch):
         return dict(last_result = self.vehicle.honkandflash_action_status)
 
 
-class RequestUpdate(Switch):
+class RequestRefresh(Switch):
     def __init__(self):
-        super().__init__(attr="refresh_data", name="Force data refresh", icon="mdi:car-connected")
+        super().__init__(attr="refresh_data", name="Request wakeup vehicle", icon="mdi:car-connected")
 
     @property
     def state(self):
@@ -454,7 +454,7 @@ class RequestUpdate(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_refresh()
-        await self.vehicle.update()
+        await self.vehicle.update(updateType=1) #full update after set_refresh
         if self.callback is not None:
             self.callback()
 
@@ -470,6 +470,31 @@ class RequestUpdate(Switch):
         return dict(last_result = self.vehicle.refresh_action_status)
 
 
+class RequestUpdate(Switch):
+    def __init__(self):
+        super().__init__(attr="update_data", name="Request full update", icon="mdi:timer-refresh")
+
+    @property
+    def state(self):
+        return False #self.vehicle.update
+
+    async def turn_on(self):
+        await self.vehicle.update(updateType=1) #full update after set_refresh
+        if self.callback is not None:
+            self.callback()
+
+    async def turn_off(self):
+        pass
+
+    @property
+    def assumed_state(self):
+        return False
+
+    #@property
+    #def attributes(self):
+    #    return dict()
+
+
 class ElectricClimatisation(Switch):
     def __init__(self):
         super().__init__(attr="electric_climatisation", name="Electric Climatisation", icon="mdi:radiator")
@@ -916,6 +941,7 @@ def create_instruments():
         TrunkLock(),
         RequestFlash(),
         RequestHonkAndFlash(),
+        RequestRefresh(),
         RequestUpdate(),
         WindowHeater(),
         BatteryClimatisation(),
@@ -1000,6 +1026,12 @@ def create_instruments():
             icon="mdi:clock",
             device_class="timestamp"
         ),
+        Sensor(
+            attr="last_full_update",
+            name="Last full update",
+            icon="mdi:clock",
+            device_class="timestamp"
+        ),
         Sensor(
             attr="parking_time",
             name="Parking time",

pycupra/vehicle.py

@@ -74,14 +74,17 @@ class Vehicle:
             'transactionHistoryHonkFlash': {'active': False, 'reason': 'not supported'},
         }
 
+        self._last_full_update = datetime.now(tz=None) - timedelta(seconds=1200)
+
+
  #### API get and set functions ####
   # Init and update vehicle data
     async def discover(self):
         """Discover vehicle and initial data."""
-        await asyncio.gather(
-            self.get_basiccardata(),
-            return_exceptions=True
-        )
+        #await asyncio.gather(
+        #    self.get_basiccardata(),
+        #    return_exceptions=True
+        #)
         # Extract information of relevant capabilities
         for capa in self._capabilities:
             id=capa.get('id', '')
@@ -104,13 +107,13 @@ class Vehicle:
                 self._relevantCapabilties[id].update(data)
                 
 
-        await self.get_trip_statistic(),
+        await self.get_trip_statistic()
         # Get URLs for model image
-        self._modelimages = await self.get_modelimageurl(),
+        self._modelimages = await self.get_modelimageurl()
 
         self._discovered = datetime.now()
 
-    async def update(self):
+    async def update(self, updateType=0):
         """Try to fetch data for all known API endpoints."""
         # Update vehicle information if not discovered or stale information
         if not self._discovered:
@@ -125,6 +128,21 @@ class Vehicle:
         # Fetch all data if car is not deactivated
         if not self.deactivated:
             try:
+                # Data to be updated most often
+                await asyncio.gather(
+                    self.get_charger(),
+                    self.get_basiccardata(),
+                    return_exceptions=True
+                )
+
+                fullUpdateExpired = datetime.now(tz=None) - timedelta(seconds= 1100)
+                if hasattr(self, '_last_full_update'):
+                    _LOGGER.debug(f'last_full_update= {self._last_full_update}, fullUpdateExpired= {fullUpdateExpired}.')
+                if updateType!=1 and (hasattr(self, '_last_full_update') and self._last_full_update>fullUpdateExpired):
+                    _LOGGER.debug(f'Just performed small update for vehicle with VIN {self.vin}.')
+                    return True
+                
+                # Data to be updated less often
                 await asyncio.gather(
                     self.get_preheater(),
                     self.get_climater(),
@@ -132,13 +150,15 @@ class Vehicle:
                     self.get_position(),
                     self.get_statusreport(),
                     self.get_vehicleHealthWarnings(),
-                    self.get_charger(),
                     self.get_departure_timers(),
                     self.get_departure_profiles(),
-                    self.get_basiccardata(),
+                    self.get_mileage(),
                     #self.get_modelimageurl(), #commented out, because getting the images discover() should be sufficient
                     return_exceptions=True
                 )
+                self._last_full_update = datetime.now(tz=None)
+                _LOGGER.debug(f'Performed full update for vehicle with VIN {self.vin}.')
+                _LOGGER.debug(f'So far about {self._connection._sessionRequestCounter} API calls since {self._connection._sessionRequestTimestamp}.')
             except:
                 raise SeatException("Update failed")
             return True
@@ -158,6 +178,12 @@ class Vehicle:
         if data:
             self._states.update(data)
 
+    async def get_mileage(self):
+        """Fetch basic car data."""
+        data = await self._connection.getMileage(self.vin, self._apibase)
+        if data:
+            self._states.update(data)
+
     async def get_preheater(self):
         """Fetch pre-heater data if function is enabled."""
         _LOGGER.info('get_preheater() not implemented yet')
@@ -320,7 +346,7 @@ class Vehicle:
             raise SeatInvalidRequestException('Remote start/stop of charger is not supported.')
         if self._requests['batterycharge'].get('id', False):
             timestamp = self._requests.get('batterycharge', {}).get('timestamp', datetime.now())
-            expired = datetime.now() - timedelta(minutes=3)
+            expired = datetime.now() - timedelta(minutes=1)
             if expired > timestamp:
                 self._requests.get('batterycharge', {}).pop('id')
             else:
@@ -574,7 +600,7 @@ class Vehicle:
             raise SeatInvalidRequestException('Departure timers are not supported.')
         if self._requests['departuretimer'].get('id', False):
             timestamp = self._requests.get('departuretimer', {}).get('timestamp', datetime.now())
-            expired = datetime.now() - timedelta(minutes=3)
+            expired = datetime.now() - timedelta(minutes=1)
             if expired > timestamp:
                 self._requests.get('departuretimer', {}).pop('id')
             else:
@@ -848,7 +874,7 @@ class Vehicle:
             raise SeatInvalidRequestException('Remote control of climatisation functions is not supported.')
         if self._requests['climatisation'].get('id', False):
             timestamp = self._requests.get('climatisation', {}).get('timestamp', datetime.now())
-            expired = datetime.now() - timedelta(minutes=3)
+            expired = datetime.now() - timedelta(minutes=1)
             if expired > timestamp:
                 self._requests.get('climatisation', {}).pop('id')
             else:
@@ -913,7 +939,7 @@ class Vehicle:
             raise SeatInvalidRequestException('No parking heater support.')
         if self._requests['preheater'].get('id', False):
             timestamp = self._requests.get('preheater', {}).get('timestamp', datetime.now())
-            expired = datetime.now() - timedelta(minutes=3)
+            expired = datetime.now() - timedelta(minutes=1)
             if expired > timestamp:
                 self._requests.get('preheater', {}).pop('id')
             else:
@@ -1053,7 +1079,7 @@ class Vehicle:
            raise SeatInvalidRequestException('Data refresh is not supported.')
         if self._requests['refresh'].get('id', False):
             timestamp = self._requests.get('refresh', {}).get('timestamp', datetime.now() - timedelta(minutes=5))
-            expired = datetime.now() - timedelta(minutes=3)
+            expired = datetime.now() - timedelta(minutes=1)
             if expired > timestamp:
                 self._requests.get('refresh', {}).pop('id')
             else:
@@ -1228,6 +1254,18 @@ class Vehicle:
         if 'updatedAt' in self.attrs.get('status', {}):
             return True
 
+  # Update status
+    @property
+    def last_full_update(self):
+        """Return when the last full update for the vehicle took place."""
+        return self._last_full_update.astimezone(tz=None)
+
+    @property
+    def is_last_full_update_supported(self):
+        """Return when last full update for vehicle took place."""
+        if hasattr(self,'_last_full_update'):
+            return True
+
   # Service information
     @property
     def distance(self):
@@ -2683,6 +2721,16 @@ class Vehicle:
         if self._connectivities.get('mode', '') == 'online':
             return True
 
+    @property
+    def update_data(self):
+        """Get state of data update"""
+        return False
+
+    @property
+    def is_update_data_supported(self):
+        """Data update is supported."""
+        return True
+
    # Honk and flash
     @property
     def request_honkandflash(self):

{pycupra-0.0.6.dist-info → pycupra-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycupra
-Version: 0.0.6
+Version: 0.0.8
 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.0.8.dist-info/RECORD

@@ -0,0 +1,13 @@
+pycupra/__init__.py,sha256=VPzUfKd5mBFD1UERNV61FbGHih5dQPupLgIfYtmIUi4,230
+pycupra/__version__.py,sha256=g845Cq_z0hjlwG9RG4nM9vit4t_cEbb5HkAMZ7Iav3Y,207
+pycupra/connection.py,sha256=fNjyrj6nBLOfEpKcygDs47UFlWjmR4tgJa1KPLLNZLU,82411
+pycupra/const.py,sha256=VEYH8TUsJGJwBwloaajwoElYd0qxE7oesvoagvDdE-4,10161
+pycupra/dashboard.py,sha256=Dqs4qDF-rEoYXoS7NrNsvRMsCGzoAjVUEbfTSOdDAXo,41310
+pycupra/exceptions.py,sha256=Nq_F79GP8wjHf5lpvPy9TbSIrRHAJrFMo0T1N9TcgSQ,2917
+pycupra/utilities.py,sha256=cH4MiIzT2WlHgmnl_E7rR0R5LvCXfDNvirJolct50V8,2563
+pycupra/vehicle.py,sha256=J5jUAseVTtb9HK0-RvCi-VzkJ1z0h4Phn_Tgno6Sgzk,122420
+pycupra-0.0.8.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pycupra-0.0.8.dist-info/METADATA,sha256=Z8QMsbcu3IXFWgeNLKTk91sGirawTdhXhEoCqFvhAPs,2578
+pycupra-0.0.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pycupra-0.0.8.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
+pycupra-0.0.8.dist-info/RECORD,,

pycupra-0.0.6.dist-info/RECORD

@@ -1,13 +0,0 @@
-pycupra/__init__.py,sha256=VPzUfKd5mBFD1UERNV61FbGHih5dQPupLgIfYtmIUi4,230
-pycupra/__version__.py,sha256=YbGN0knQ3fpcD8GGO6OA7ZBYa-fQ4unLaw-NTYREVn8,207
-pycupra/connection.py,sha256=4bcaHn6AwAAY9e3MfVwlPMQzKJZQo_BZttts0lubnro,81120
-pycupra/const.py,sha256=VEYH8TUsJGJwBwloaajwoElYd0qxE7oesvoagvDdE-4,10161
-pycupra/dashboard.py,sha256=difLM3R2uXUrVslUjqzH8nN6WPJA-u26rHlGUU6W8Oo,40454
-pycupra/exceptions.py,sha256=Nq_F79GP8wjHf5lpvPy9TbSIrRHAJrFMo0T1N9TcgSQ,2917
-pycupra/utilities.py,sha256=cH4MiIzT2WlHgmnl_E7rR0R5LvCXfDNvirJolct50V8,2563
-pycupra/vehicle.py,sha256=vlSuvrspX_I1RlS8KoZkN09u5cCNNdcIslsA0xPUuqA,120442
-pycupra-0.0.6.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pycupra-0.0.6.dist-info/METADATA,sha256=k-diSYUQOySb2FxopmNeWMOXqf_FQG1A5yGwnMpo03M,2578
-pycupra-0.0.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pycupra-0.0.6.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
-pycupra-0.0.6.dist-info/RECORD,,