pycupra 0.0.7__py3-none-any.whl → 0.0.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.0.7"
+__version__ = "0.0.9"

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,

pycupra/vehicle.py

@@ -74,6 +74,9 @@ 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):
@@ -104,7 +107,8 @@ class Vehicle:
                 self._relevantCapabilties[id].update(data)
                 
 
-        await self.get_trip_statistic()
+        #await self.get_trip_statistic() # in full update
+        
         # Get URLs for model image
         self._modelimages = await self.get_modelimageurl()
 
@@ -129,10 +133,11 @@ class Vehicle:
                 await asyncio.gather(
                     self.get_charger(),
                     self.get_basiccardata(),
+                    self.get_statusreport(),
                     return_exceptions=True
                 )
 
-                fullUpdateExpired = datetime.now(timezone.utc) - timedelta(seconds= 1100)
+                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):
@@ -143,9 +148,9 @@ class Vehicle:
                 await asyncio.gather(
                     self.get_preheater(),
                     self.get_climater(),
-                    #self.get_trip_statistic(), # commented out, because getting the trip statistic in discover() should be sufficient
+                    self.get_trip_statistic(), 
                     self.get_position(),
-                    self.get_statusreport(),
+                    self.get_maintenance(),
                     self.get_vehicleHealthWarnings(),
                     self.get_departure_timers(),
                     self.get_departure_profiles(),
@@ -153,8 +158,9 @@ class Vehicle:
                     #self.get_modelimageurl(), #commented out, because getting the images discover() should be sufficient
                     return_exceptions=True
                 )
-                self._last_full_update = datetime.now(timezone.utc)
+                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
@@ -247,6 +253,9 @@ class Vehicle:
                 self._states.update(data)
             else:
                 _LOGGER.debug('Could not fetch status report')
+
+    async def get_maintenance(self):
+        """Fetch maintenance data if function is enabled."""
         if self._relevantCapabilties.get('vehicleHealthInspection', {}).get('active', False):
             data = await self._connection.getMaintenance(self.vin, self._apibase)
             if data:
@@ -1002,7 +1011,25 @@ class Vehicle:
                     'status': response.get('state', 'Unknown'),
                     'id': response.get('id', 0),
                 }
-                return True
+                # Update the lock data and check, if they have changed as expected
+                retry = 0
+                actionSuccessful = False
+                while not actionSuccessful and retry < 2:
+                    await asyncio.sleep(15)
+                    await self.get_statusreport()
+                    if action == 'lock':
+                        if self.door_locked:
+                            actionSuccessful = True
+                    else:
+                        if not self.door_locked:
+                            actionSuccessful = True
+                    retry = retry +1
+                if actionSuccessful:
+                    _LOGGER.debug('POST request for lock/unlock successful. New status as expected.')
+                    self._requests.get('lock', {}).pop('id')
+                    return True
+                _LOGGER.error('Response to POST request seemed successful but the lock status did not change as expected.')
+                return False
         except (SeatInvalidRequestException, SeatException):
             raise
         except Exception as error:
@@ -1259,7 +1286,8 @@ class Vehicle:
     @property
     def is_last_full_update_supported(self):
         """Return when last full update for vehicle took place."""
-        return True
+        if hasattr(self,'_last_full_update'):
+            return True
 
   # Service information
     @property

{pycupra-0.0.7.dist-info → pycupra-0.0.9.dist-info}/METADATA

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

@@ -0,0 +1,13 @@
+pycupra/__init__.py,sha256=VPzUfKd5mBFD1UERNV61FbGHih5dQPupLgIfYtmIUi4,230
+pycupra/__version__.py,sha256=4zEieEZtA29wLX4UeSljs9SWOL-1Feo5CB4ZC3aPdrY,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=Xdd07m-KKDaV7fA4c9hF5ohSg0y_UPoiR8o9ykfJyzE,123464
+pycupra-0.0.9.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pycupra-0.0.9.dist-info/METADATA,sha256=vXsQzwLRLEE0qYRyabQPpvAVsokywfRS0UDg3NlC1L4,2578
+pycupra-0.0.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pycupra-0.0.9.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
+pycupra-0.0.9.dist-info/RECORD,,

pycupra-0.0.7.dist-info/RECORD

@@ -1,13 +0,0 @@
-pycupra/__init__.py,sha256=VPzUfKd5mBFD1UERNV61FbGHih5dQPupLgIfYtmIUi4,230
-pycupra/__version__.py,sha256=sE47EQF8GjjvZy9jhhygnhK2JLO76vFrSBB6HfkoIW4,207
-pycupra/connection.py,sha256=LK1v3Eb37lbVKIbQWIjn4xAIAFJqxXwlguX5iq2Ylm8,81393
-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=cEg7wG4WX6p4MfShRGZZ955cqvYERI6CmfWSN5NanSQ,122147
-pycupra-0.0.7.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pycupra-0.0.7.dist-info/METADATA,sha256=0W-3PCD7jSDrUtYauZKSzFfSe_dzbTqREQjNxlv28Qo,2578
-pycupra-0.0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pycupra-0.0.7.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
-pycupra-0.0.7.dist-info/RECORD,,