pycupra 0.0.4__tar.gz → 0.0.6__tar.gz

{pycupra-0.0.4/pycupra.egg-info → pycupra-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycupra
-Version: 0.0.4
+Version: 0.0.6
 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.4 → pycupra-0.0.6}/example/PyCupra.py

@@ -59,6 +59,9 @@ RESOURCES = [
         "departure1",
         "departure2",
         "departure3",
+        "departure_profile1",
+        "departure_profile2",
+        "departure_profile3",
 		"distance",
 		"door_closed_left_back",
 		"door_closed_left_front",

{pycupra-0.0.4 → pycupra-0.0.6}/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.4"
+__version__ = "0.0.6"

{pycupra-0.0.4 → pycupra-0.0.6}/pycupra/connection.py

@@ -15,6 +15,8 @@ import string
 import secrets
 import xmltodict
 
+from PIL import Image
+from io import BytesIO
 from sys import version_info, argv
 from datetime import timedelta, datetime, timezone
 from urllib.parse import urljoin, parse_qs, urlparse, urlencode
@@ -77,6 +79,7 @@ from .const import (
     API_CLIMATER_STATUS,
     API_CLIMATER,
     API_DEPARTURE_TIMERS,
+    API_DEPARTURE_PROFILES,
     API_MILEAGE,
     API_CAPABILITIES,
     #API_CAPABILITIES_MANAGEMENT,
@@ -621,6 +624,8 @@ class Connection:
             try:
                 if response.status == 204:
                     res = {'status_code': response.status}
+                elif response.status == 202 and method==METH_PUT:
+                    res = response
                 elif response.status >= 200 or response.status <= 300:
                     # If this is a revoke token url, expect Content-Length 0 and return
                     if int(response.headers.get('Content-Length', 0)) == 0 and 'revoke' in url:
@@ -879,16 +884,6 @@ 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}')
-        try:
-            response = await self.get(eval(f"f'{API_WARNINGLIGHTS}'"))
-            if 'statuses' in response:
-                data['warninglights'] = response
-            elif response.get('status_code', {}):
-                _LOGGER.warning(f'Could not fetch warnlights, HTTP status code: {response.get("status_code")}')
-            else:
-                _LOGGER.info('Unhandled error while trying to fetch warnlights')
-        except Exception as error:
-            _LOGGER.warning(f'Could not fetch warnlights, error: {error}')
         try:
             response = await self.get(eval(f"f'{API_MILEAGE}'"))
             if response.get('mileageKm', {}):
@@ -903,6 +898,24 @@ class Connection:
             return False
         return data
 
+    async def getVehicleHealthWarnings(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_WARNINGLIGHTS}'"))
+            if 'statuses' in response:
+                data['warninglights'] = response
+            elif response.get('status_code', {}):
+                _LOGGER.warning(f'Could not fetch warnlights, HTTP status code: {response.get("status_code")}')
+            else:
+                _LOGGER.info('Unhandled error while trying to fetch warnlights')
+        except Exception as error:
+            _LOGGER.warning(f'Could not fetch warnlights, error: {error}')
+        if data=={}:
+            return False
+        return data
+
     #async def getOperationList(self, vin, baseurl):
         """Collect operationlist for VIN, supported/licensed functions."""
         """try:
@@ -940,6 +953,26 @@ class Connection:
                             if len(pic)>0:
                                 loop = asyncio.get_running_loop()
                                 await loop.run_in_executor(None, self.writeImageFile, pos,pic, images)
+                            if pos=='front':
+                                # Crop the front image to a square format
+                                try:
+                                    im= Image.open(BytesIO(pic))
+                                    width, height = im.size
+                                    if height>width:
+                                        width, height = height, width
+                                    # Setting the points for cropped image
+                                    left = (width-height)/2
+                                    top = 0
+                                    right = height+(width-height)/2
+                                    bottom = height
+                                    # Cropped image of above dimension
+                                    im1 = im.crop((left, top, right, bottom))
+                                    byteIO = BytesIO()
+                                    im1.save(byteIO, format='PNG')
+                                    await loop.run_in_executor(None, self.writeImageFile, pos+'_cropped',byteIO.getvalue(), images)
+                                except:
+                                    _LOGGER.warning('Cropping front image to square format failed.')
+ 
                     _LOGGER.debug('Read images from web site and wrote them to file.')
                     response['images']=images
                     return response
@@ -987,19 +1020,22 @@ class Connection:
             return False
         return data
 
-    async def getTripStatistics(self, vin, baseurl):
+    async def getTripStatistics(self, vin, baseurl, supportsCyclicTrips):
         """Get short term and cyclic trip statistics."""
         await self.set_token(self._session_auth_brand)
         try:
             data={'tripstatistics': {}}
-            dataType='CYCLIC'
-            response = await self.get(eval(f"f'{API_TRIP}'"))
-            if response.get('data', []):
-                data['tripstatistics']['cyclic']= response.get('data', [])
-            elif response.get('status_code', {}):
-                _LOGGER.warning(f'Could not fetch trip statistics, HTTP status code: {response.get("status_code")}')
+            if supportsCyclicTrips:
+                dataType='CYCLIC'
+                response = await self.get(eval(f"f'{API_TRIP}'"))
+                if response.get('data', []):
+                    data['tripstatistics']['cyclic']= response.get('data', [])
+                elif response.get('status_code', {}):
+                    _LOGGER.warning(f'Could not fetch trip statistics, HTTP status code: {response.get("status_code")}')
+                else:
+                    _LOGGER.info(f'Unhandled error while trying to fetch trip statistics')
             else:
-                _LOGGER.info(f'Unhandled error while trying to fetch trip statistics')
+                _LOGGER.info(f'Vehicle does not support cyclic trips.')
             dataType='SHORT'
             response = await self.get(eval(f"f'{API_TRIP}'"))
             if response.get('data', []):
@@ -1059,11 +1095,33 @@ class Connection:
                 data['departureTimers'] = response
                 return data
             elif response.get('status_code', {}):
-                _LOGGER.warning(f'Could not fetch timers, HTTP status code: {response.get("status_code")}')
+                _LOGGER.warning(f'Could not fetch departure timers, HTTP status code: {response.get("status_code")}')
             else:
                 _LOGGER.info('Unknown error while trying to fetch data for departure timers')
         except Exception as error:
-            _LOGGER.warning(f'Could not fetch timers, error: {error}')
+            _LOGGER.warning(f'Could not fetch departure timers, error: {error}')
+        return False
+
+    async def getDepartureprofiles(self, vin, baseurl):
+        """Get departure timers."""
+        await self.set_token(self._session_auth_brand)
+        try:
+            response = await self.get(eval(f"f'{API_DEPARTURE_PROFILES}'"))
+            if response.get('timers', {}):
+                for e in range(len(response.get('timers', []))):
+                    if response['timers'][e].get('singleTimer','')==None:
+                        response['timers'][e].pop('singleTimer')
+                    if response['timers'][e].get('recurringTimer','')==None:
+                        response['timers'][e].pop('recurringTimer')
+                data={}
+                data['departureProfiles'] = response
+                return data
+            elif response.get('status_code', {}):
+                _LOGGER.warning(f'Could not fetch departure profiles, HTTP status code: {response.get("status_code")}')
+            else:
+                _LOGGER.info('Unknown error while trying to fetch data for departure profiles')
+        except Exception as error:
+            _LOGGER.warning(f'Could not fetch departure profiles, error: {error}')
         return False
 
     async def getClimater(self, vin, baseurl):
@@ -1249,6 +1307,39 @@ class Connection:
             raise
         return False
 
+    async def _setViaPUTtoAPI(self, endpoint, **data):
+        """PUT call to API to set a value or to start an action."""
+        await self.set_token(self._session_auth_brand)
+        try:
+            url = endpoint 
+            response = await self._request(METH_PUT,url, **data)
+            if not response:
+                raise SeatException(f'Invalid or no response for endpoint {endpoint}')
+            elif response == 429:
+                raise SeatThrottledException('Action rate limit reached. Start the car to reset the action limit')
+            else:
+                data = {'id': '', 'state' : ''}
+                if 'requestId' in response:
+                    data['state'] = 'Request accepted'
+                for key in response:
+                    if isinstance(response.get(key), dict):
+                        for k in response.get(key):
+                            if 'id' in k.lower():
+                                data['id'] = str(response.get(key).get(k))
+                            if 'state' in k.lower():
+                                data['state'] = response.get(key).get(k)
+                    else:
+                        if 'Id' in key:
+                            data['id'] = str(response.get(key))
+                        if 'State' in key:
+                            data['state'] = response.get(key)
+                if response.get('rate_limit_remaining', False):
+                    data['rate_limit_remaining'] = response.get('rate_limit_remaining', None)
+                return data
+        except:
+            raise
+        return False
+
     async def setCharger(self, vin, baseurl, mode, data):
         """Start/Stop charger."""
         if mode in {'start', 'stop'}:
@@ -1299,21 +1390,25 @@ class Connection:
             raise
         return False
 
+    async def setDepartureprofile(self, vin, baseurl, data, spin):
+        """Set departure profiles."""
+        try:
+            url= eval(f"f'{API_DEPARTURE_PROFILES}'")
+            #if data:
+                #if data.get('minSocPercentage',False):
+                #    url=url+'/settings'
+            return await self._setViaPUTtoAPI(url, json = data)
+        except:
+            raise
+        return False
+
     async def sendDestination(self, vin, baseurl, data, spin):
         """Send destination to vehicle."""
 
         await self.set_token(self._session_auth_brand)
         try:
             url= eval(f"f'{API_DESTINATION}'")
-            response = await self._session.request(
-                METH_PUT,
-                url,
-                headers=self._session_headers,
-                timeout=ClientTimeout(total=TIMEOUT.seconds),
-                cookies=self._session_cookies,
-                raise_for_status=False,
-                json=data
-                )
+            response = await self._request(METH_PUT, url, json=data)
             if response.status==202: #[202 Accepted]
                 _LOGGER.debug(f'Destination {data[0]} successfully sent to API.')
                 return response

{pycupra-0.0.4 → pycupra-0.0.6}/pycupra/const.py

@@ -133,6 +133,7 @@ API_CHARGING = '{baseurl}/v1/vehicles/{vin}/charging'
 API_CLIMATER_STATUS = '{baseurl}/v1/vehicles/{vin}/climatisation/status'                             # Climatisation data
 API_CLIMATER = '{baseurl}/v2/vehicles/{vin}/climatisation'                         # Climatisation data
 API_DEPARTURE_TIMERS = '{baseurl}/v1/vehicles/{vin}/departure-timers'                                 # 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=1970-01-01T00:00:00Z&to=2099-12-31T09:59:01Z' # Trip statistics (whole history) SHORT/LONG/CYCLIC (WEEK only with from)

{pycupra-0.0.4 → pycupra-0.0.6}/pycupra/dashboard.py

@@ -402,7 +402,7 @@ class RequestHonkAndFlash(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_honkandflash('honkandflash')
-        await self.vehicle.update()
+        #await self.vehicle.update()
         if self.callback is not None:
             self.callback()
 
@@ -428,7 +428,7 @@ class RequestFlash(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_honkandflash('flash')
-        await self.vehicle.update()
+        #await self.vehicle.update()
         if self.callback is not None:
             self.callback()
 
@@ -480,11 +480,11 @@ class ElectricClimatisation(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_climatisation(mode = 'electric')
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_climatisation(mode = 'off')
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -514,11 +514,11 @@ class AuxiliaryClimatisation(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_climatisation(mode = 'auxiliary', spin = self.spin)
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_climatisation(mode = 'off')
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -539,11 +539,11 @@ class Charging(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_charger('start')
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_charger('stop')
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -564,11 +564,11 @@ class WindowHeater(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_window_heating('start')
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_window_heating('stop')
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -617,11 +617,11 @@ class BatteryClimatisation(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_battery_climatisation(True)
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_battery_climatisation(False)
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -646,11 +646,11 @@ class PHeaterHeating(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_pheater(mode='heating', spin=self.spin)
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_pheater(mode='off', spin=self.spin)
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -675,11 +675,11 @@ class PHeaterVentilation(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_pheater(mode='ventilation', spin=self.spin)
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_pheater(mode='off', spin=self.spin)
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -719,11 +719,11 @@ class DepartureTimer1(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_timer_active(id=1, action="on")
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_timer_active(id=1, action="off")
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -751,11 +751,11 @@ class DepartureTimer2(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_timer_active(id=2, action="on")
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_timer_active(id=2, action="off")
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -782,11 +782,11 @@ class DepartureTimer3(Switch):
 
     async def turn_on(self):
         await self.vehicle.set_timer_active(id=3, action="on")
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     async def turn_off(self):
         await self.vehicle.set_timer_active(id=3, action="off")
-        await self.vehicle.update()
+        #await self.vehicle.update()
 
     @property
     def assumed_state(self):
@@ -796,6 +796,99 @@ class DepartureTimer3(Switch):
     def attributes(self):
         return dict(self.vehicle.departure3)
 
+class DepartureProfile1(Switch):
+    def __init__(self):
+        super().__init__(attr="departure_profile1", name="Departure profile 1", icon="mdi:radiator")
+
+    def configurate(self, **config):
+        self.spin = config.get('spin', '')
+
+    @property
+    def state(self):
+        status = self.vehicle.departure_profile1.get("enabled", "")
+        if status:
+            return True
+        else:
+            return False
+
+    async def turn_on(self):
+        await self.vehicle.set_departure_profile_active(id=1, action="on")
+        #await self.vehicle.update()
+
+    async def turn_off(self):
+        await self.vehicle.set_departure_profile_active(id=1, action="off")
+        #await self.vehicle.update()
+
+    @property
+    def assumed_state(self):
+        return False
+
+    @property
+    def attributes(self):
+        return dict(self.vehicle.departure_profile1)
+
+class DepartureProfile2(Switch):
+    def __init__(self):
+        super().__init__(attr="departure_profile2", name="Departure profile 2", icon="mdi:radiator")
+
+    def configurate(self, **config):
+        self.spin = config.get('spin', '')
+
+    @property
+    def state(self):
+        status = self.vehicle.departure_profile2.get("enabled", "")
+        if status:
+            return True
+        else:
+            return False
+
+    async def turn_on(self):
+        await self.vehicle.set_departure_profile_active(id=2, action="on")
+        #await self.vehicle.update()
+
+    async def turn_off(self):
+        await self.vehicle.set_departure_profile_active(id=2, action="off")
+        #await self.vehicle.update()
+
+    @property
+    def assumed_state(self):
+        return False
+
+    @property
+    def attributes(self):
+        return dict(self.vehicle.departure_profile2)
+
+class DepartureProfile3(Switch):
+    def __init__(self):
+        super().__init__(attr="departure_profile3", name="Departure profile 3", icon="mdi:radiator")
+
+    def configurate(self, **config):
+        self.spin = config.get('spin', '')
+
+    @property
+    def state(self):
+        status = self.vehicle.departure_profile3.get("enabled", "")
+        if status:
+            return True
+        else:
+            return False
+
+    async def turn_on(self):
+        await self.vehicle.set_departure_profile_active(id=3, action="on")
+        #await self.vehicle.update()
+
+    async def turn_off(self):
+        await self.vehicle.set_departure_profile_active(id=3, action="off")
+        #await self.vehicle.update()
+
+    @property
+    def assumed_state(self):
+        return False
+
+    @property
+    def attributes(self):
+        return dict(self.vehicle.departure_profile3)
+
 
 class RequestResults(Sensor):
     def __init__(self):
@@ -838,6 +931,9 @@ def create_instruments():
         DepartureTimer1(),
         DepartureTimer2(),
         DepartureTimer3(),
+        DepartureProfile1(),
+        DepartureProfile2(),
+        DepartureProfile3(),
         Sensor(
             attr="distance",
             name="Odometer",

{pycupra-0.0.4 → pycupra-0.0.6}/pycupra/vehicle.py

@@ -5,6 +5,7 @@ import re
 import logging
 import asyncio
 
+from copy import deepcopy
 from datetime import datetime, timedelta, timezone
 from json import dumps as to_json
 from collections import OrderedDict
@@ -43,6 +44,7 @@ class Vehicle:
 
         self._requests = {
             'departuretimer': {'status': '', 'timestamp': DATEZERO},
+            'departureprofile': {'status': '', 'timestamp': DATEZERO},
             'batterycharge': {'status': '', 'timestamp': DATEZERO},
             'climatisation': {'status': '', 'timestamp': DATEZERO},
             'refresh': {'status': '', 'timestamp': DATEZERO},
@@ -56,16 +58,18 @@ class Vehicle:
         self._climate_duration = 30
 
         self._relevantCapabilties = {
-            'measurements': {'active': False, 'reason': 'not supported'},
+            'measurements': {'active': False, 'reason': 'not supported', },
             'climatisation': {'active': False, 'reason': 'not supported'},
             #'parkingInformation': {'active': False, 'reason': 'not supported'},
-            'tripStatistics': {'active': False, 'reason': 'not supported'},
+            'tripStatistics': {'active': False, 'reason': 'not supported', 'supportsCyclicTrips': False},
+            'vehicleHealthInspection': {'active': False, 'reason': 'not supported'},
             'vehicleHealthWarnings': {'active': False, 'reason': 'not supported'},
             'state': {'active': False, 'reason': 'not supported'},
-            'charging': {'active': False, 'reason': 'not supported'},
+            'charging': {'active': False, 'reason': 'not supported', 'supportsTargetStateOfCharge': False},
             'honkAndFlash': {'active': False, 'reason': 'not supported'},
             'parkingPosition': {'active': False, 'reason': 'not supported'},
-            'departureTimers': {'active': False, 'reason': 'not supported'},
+            'departureTimers': {'active': False, 'reason': 'not supported', 'supportsSingleTimer': False},
+            'departureProfiles': {'active': False, 'reason': 'not supported', 'supportsSingleTimer': False},
             'transactionHistoryLockUnlock': {'active': False, 'reason': 'not supported'},
             'transactionHistoryHonkFlash': {'active': False, 'reason': 'not supported'},
         }
@@ -90,11 +94,19 @@ class Vehicle:
                     data['reason']=capa.get('user-enabled', False)
                 if capa.get('status', False):
                     data['reason']=capa.get('status', '')
+                if capa.get('parameters', False):
+                    if capa['parameters'].get('supportsCyclicTrips',False)==True or capa['parameters'].get('supportsCyclicTrips',False)=='true':
+                        data['supportsCyclicTrips']=True
+                    if capa['parameters'].get('supportsTargetStateOfCharge',False)==True or capa['parameters'].get('supportsTargetStateOfCharge',False)=='true':
+                        data['supportsTargetStateOfCharge']=True
+                    if capa['parameters'].get('supportsSingleTimer',False)==True or capa['parameters'].get('supportsSingleTimer',False)=='true':
+                        data['supportsSingleTimer']=True
                 self._relevantCapabilties[id].update(data)
                 
 
-         # Get URLs for model image
-        self._modelimages = await self.get_modelimageurl()
+        await self.get_trip_statistic(),
+        # Get URLs for model image
+        self._modelimages = await self.get_modelimageurl(),
 
         self._discovered = datetime.now()
 
@@ -104,11 +116,11 @@ class Vehicle:
         if not self._discovered:
             await self.discover()
         else:
-            # Rediscover if data is older than 1 hour
-            hourago = datetime.now() - timedelta(hours = 1)
+            # Rediscover if data is older than 2 hours
+            hourago = datetime.now() - timedelta(hours = 2)
             if self._discovered < hourago:
-                #await self.discover()
-                _LOGGER.debug('Achtung! self.discover() auskommentiert')
+                await self.discover()
+                #_LOGGER.debug('Achtung! self.discover() auskommentiert')
 
         # Fetch all data if car is not deactivated
         if not self.deactivated:
@@ -116,13 +128,15 @@ class Vehicle:
                 await asyncio.gather(
                     self.get_preheater(),
                     self.get_climater(),
-                    self.get_trip_statistic(),
+                    #self.get_trip_statistic(), # commented out, because getting the trip statistic in discover() should be sufficient
                     self.get_position(),
                     self.get_statusreport(),
+                    self.get_vehicleHealthWarnings(),
                     self.get_charger(),
-                    self.get_timerprogramming(),
+                    self.get_departure_timers(),
+                    self.get_departure_profiles(),
                     self.get_basiccardata(),
-                    self.get_modelimageurl(),
+                    #self.get_modelimageurl(), #commented out, because getting the images discover() should be sufficient
                     return_exceptions=True
                 )
             except:
@@ -147,16 +161,15 @@ class Vehicle:
     async def get_preheater(self):
         """Fetch pre-heater data if function is enabled."""
         _LOGGER.info('get_preheater() not implemented yet')
-        raise
-        if self._relevantCapabilties.get('#dont know the name for the preheater capability', {}).get('active', False):
-            if not await self.expired('rheating_v1'):
-                data = await self._connection.getPreHeater(self.vin, self._apibase)
-                if data:
-                    self._states.update(data)
-                else:
-                    _LOGGER.debug('Could not fetch preheater data')
-        else:
-            self._requests.pop('preheater', None)
+        #if self._relevantCapabilties.get('#dont know the name for the preheater capability', {}).get('active', False):
+        #    if not await self.expired('rheating_v1'):
+        #        data = await self._connection.getPreHeater(self.vin, self._apibase)
+        #        if data:
+        #            self._states.update(data)
+        #        else:
+        #            _LOGGER.debug('Could not fetch preheater data')
+        #else:
+        #    self._requests.pop('preheater', None)
 
     async def get_climater(self):
         """Fetch climater data if function is enabled."""
@@ -172,7 +185,7 @@ class Vehicle:
     async def get_trip_statistic(self):
         """Fetch trip data if function is enabled."""
         if self._relevantCapabilties.get('tripStatistics', {}).get('active', False):
-            data = await self._connection.getTripStatistics(self.vin, self._apibase)
+            data = await self._connection.getTripStatistics(self.vin, self._apibase, self._relevantCapabilties['tripStatistics'].get('supportsCyclicTrips', False))
             if data:
                 self._states.update(data)
             else:
@@ -196,6 +209,14 @@ class Vehicle:
             else:
                 _LOGGER.debug('Could not fetch any positional data')
 
+    async def get_vehicleHealthWarnings(self):
+        if self._relevantCapabilties.get('vehicleHealthWarnings', {}).get('active', False):
+            data = await self._connection.getVehicleHealthWarnings(self.vin, self._apibase)
+            if data:
+                self._states.update(data)
+            else:
+                _LOGGER.debug('Could not fetch vehicle health warnings')
+
     async def get_statusreport(self):
         """Fetch status data if function is enabled."""
         if self._relevantCapabilties.get('state', {}).get('active', False):
@@ -204,7 +225,7 @@ class Vehicle:
                 self._states.update(data)
             else:
                 _LOGGER.debug('Could not fetch status report')
-        if self._relevantCapabilties.get('vehicleHealthWarnings', {}).get('active', False):
+        if self._relevantCapabilties.get('vehicleHealthInspection', {}).get('active', False):
             data = await self._connection.getMaintenance(self.vin, self._apibase)
             if data:
                 self._states.update(data)
@@ -220,7 +241,7 @@ class Vehicle:
             else:
                 _LOGGER.debug('Could not fetch charger data')
 
-    async def get_timerprogramming(self):
+    async def get_departure_timers(self):
         """Fetch timer data if function is enabled."""
         if self._relevantCapabilties.get('departureTimers', {}).get('active', False):
             data = await self._connection.getDeparturetimer(self.vin, self._apibase)
@@ -229,6 +250,15 @@ class Vehicle:
             else:
                 _LOGGER.debug('Could not fetch timers')
 
+    async def get_departure_profiles(self):
+        """Fetch timer data if function is enabled."""
+        if self._relevantCapabilties.get('departureProfiles', {}).get('active', False):
+            data = await self._connection.getDepartureprofiles(self.vin, self._apibase)
+            if data:
+                self._states.update(data)
+            else:
+                _LOGGER.debug('Could not fetch timers')
+
     #async def wait_for_request(self, section, request, retryCount=36):
         """Update status of outstanding requests."""
         """retryCount -= 1
@@ -322,8 +352,8 @@ class Vehicle:
                 # Update the charger data and check, if they have changed as expected
                 retry = 0
                 actionSuccessful = False
-                while not actionSuccessful and retry < 3:
-                    await asyncio.sleep(5)
+                while not actionSuccessful and retry < 2:
+                    await asyncio.sleep(15)
                     await self.get_charger()
                     if mode == 'start':
                         if self.charging:
@@ -339,6 +369,7 @@ class Vehicle:
                         raise
                     retry = retry +1
                 if actionSuccessful:
+                    _LOGGER.debug('POST request for charger successful. New status as expected.')
                     self._requests.get('batterycharge', {}).pop('id')
                     return True
                 _LOGGER.error('Response to POST request seemed successful but the charging status did not change as expected.')
@@ -352,12 +383,15 @@ class Vehicle:
 
    # API endpoint departuretimer
     async def set_charge_limit(self, limit=50):
-        """ Set charging limit. """
-        if not self._relevantCapabilties.get('departureTimers', {}).get('active', False) and not self._relevantCapabilties.get('charging', {}).get('active', False):
+        """ Set minimum state of charge limit for departure timers or departure profiles. """
+        if (not self._relevantCapabilties.get('departureTimers', {}).get('active', False) and 
+            not self._relevantCapabilties.get('departureProfiles', {}).get('active', False) and 
+            not self._relevantCapabilties.get('charging', {}).get('active', False)):
             _LOGGER.info('Set charging limit is not supported.')
             raise SeatInvalidRequestException('Set charging limit is not supported.')
-        data = {}
-        if self._relevantCapabilties.get('departureTimers', {}).get('active', False):
+        if self._relevantCapabilties.get('departureTimers', {}).get('active', False) :
+            # Vehicle has departure timers
+            data = {}
             if isinstance(limit, int):
                 if limit in [0, 10, 20, 30, 40, 50]:
                     data['minSocPercentage'] = limit
@@ -366,13 +400,24 @@ class Vehicle:
             else:
                 raise SeatInvalidRequestException(f'Charge limit "{limit}" is not supported.')
             return await self._set_timers(data)
+        elif self._relevantCapabilties.get('departureProfiles', {}).get('active', False):
+            # Vehicle has departure profiles
+            data= deepcopy(self.attrs.get('departureProfiles'))
+            if isinstance(limit, int):
+                if limit in [0, 10, 20, 30, 40, 50]:
+                    data['minSocPercentage'] = limit
+                else:
+                    raise SeatInvalidRequestException(f'Charge limit must be one of 0, 10, 20, 30, 40 or 50.')
+            else:
+                raise SeatInvalidRequestException(f'Charge limit "{limit}" is not supported.')
+            return await self._set_departure_profiles(data, action='minSocPercentage')
 
     async def set_timer_active(self, id=1, action='off'):
         """ Activate/deactivate departure timers. """
         data = {}
-        supported = 'is_departure' + str(id) + "_supported"
+        supported = "is_departure" + str(id) + "_supported"
         if getattr(self, supported) is not True:
-            raise SeatConfigException(f'This vehicle does not support timer id "{id}".')
+            raise SeatConfigException(f'This vehicle does not support timer id {id}.')
         if self._relevantCapabilties.get('departureTimers', {}).get('active', False):
             allTimers= self.attrs.get('departureTimers').get('timers', [])
             for singleTimer in allTimers:
@@ -390,7 +435,7 @@ class Vehicle:
                     else:
                         raise SeatInvalidRequestException(f'Timer action "{action}" is not supported.')
                     return await self._set_timers(data)
-            raise SeatInvalidRequestException(f'Departure timers id {id} not found.')
+            raise SeatInvalidRequestException(f'Departure timer id {id} not found.')
         else:
             raise SeatInvalidRequestException('Departure timers are not supported.')
 
@@ -398,9 +443,9 @@ class Vehicle:
         """ Set departure schedules. """
         data = {}
         # Validate required user inputs
-        supported = 'is_departure' + str(id) + "_supported"
+        supported = "is_departure" + str(id) + "_supported"
         if getattr(self, supported) is not True:
-            raise SeatConfigException(f'Timer id "{id}" is not supported for this vehicle.')
+            raise SeatConfigException(f'Timer id {id} is not supported for this vehicle.')
         else:
             _LOGGER.debug(f'Timer id {id} is supported')
         if not schedule:
@@ -462,6 +507,8 @@ class Vehicle:
                 else:
                     raise SeatInvalidRequestException('Invalid type for charge max current variable')
             
+            # Prepare data and execute
+            data['id'] = id
             # Converting schedule to data map
             if schedule.get("enabled",False):
                 data['enabled']=True
@@ -485,7 +532,7 @@ class Vehicle:
             else:
                 preferedChargingTimes= [{
                     "id" : 1,
-                    "enabled" : True,
+                    "enabled" : False,
                     "startTimeLocal" : "00:00",
                     "endTimeLocal" : "00:00"
                     }]
@@ -500,7 +547,7 @@ class Vehicle:
                         "fridays":(schedule.get('days',"nnnnnnn")[4]=='y'),
                         "saturdays":(schedule.get('days',"nnnnnnn")[5]=='y'),
                         "sundays":(schedule.get('days',"nnnnnnn")[6]=='y'),
-                        "preferredChargingTimes": preferedChargingTimes
+                        #"preferredChargingTimes": preferedChargingTimes
                     }
                 }
             else:
@@ -508,11 +555,10 @@ class Vehicle:
                 _LOGGER.info(f'startDateTime={startDateTime.isoformat()}')
                 data['singleTimer']= {
                     "startDateTimeLocal": startDateTime.isoformat(),
-                    "preferredChargingTimes": preferedChargingTimes
+                    #"preferredChargingTimes": preferedChargingTimes
                     }
+            data["preferredChargingTimes"]= preferedChargingTimes
                 
-            # Prepare data and execute
-            data['id'] = id
             # Now we have to embed the data for the timer 'id' in timers[]
             data={
                 'timers' : [data]
@@ -551,24 +597,33 @@ class Vehicle:
                 # Update the departure timers data and check, if they have changed as expected
                 retry = 0
                 actionSuccessful = False
-                while not actionSuccessful and retry < 3:
-                    await asyncio.sleep(5)
-                    await self.get_timerprogramming()
+                while not actionSuccessful and retry < 2:
+                    await asyncio.sleep(15)
+                    await self.get_departure_timers()
                     if data.get('minSocPercentage',False):
                         if data.get('minSocPercentage',-2)==self.attrs.get('departureTimers',{}).get('minSocPercentage',-1):
                             actionSuccessful=True
                     else:
+                        _LOGGER.debug('Checking if new departure timer is as expected:')
                         timerData = data.get('timers',[])[0]
                         timerDataId = timerData.get('id',False)
+                        timerDataCopy = deepcopy(timerData)
+                        timerDataCopy['enabled']=True
                         if timerDataId:
                             newTimers = self.attrs.get('departureTimers',{}).get('timers',[])
                             for newTimer in newTimers:
                                 if newTimer.get('id',-1)==timerDataId:
-                                    if timerData==newTimer:
+                                    _LOGGER.debug(f'Value of timer sent:{timerData}')
+                                    _LOGGER.debug(f'Value of timer read:{newTimer}')
+                                    if timerData==newTimer: 
+                                        actionSuccessful=True
+                                    elif timerDataCopy==newTimer: 
+                                        _LOGGER.debug('Data written and data read are the same, but the timer is activated.')
                                         actionSuccessful=True
                                     break
                     retry = retry +1
-                if actionSuccessful:
+                if True: #actionSuccessful:
+                    #_LOGGER.debug('POST request for departure timers successful. New status as expected.')
                     self._requests.get('departuretimer', {}).pop('id')
                     return True
                 _LOGGER.error('Response to POST request seemed successful but the departure timers status did not change as expected.')
@@ -580,6 +635,94 @@ class Vehicle:
             self._requests['departuretimer'] = {'status': 'Exception'}
         raise SeatException('Failed to set departure timer schedule')
 
+    async def set_departure_profile_active(self, id=1, action='off'):
+        """ Activate/deactivate departure profiles. """
+        data = {}
+        supported = "is_departure_profile" + str(id) + "_supported"
+        if getattr(self, supported) is not True:
+            raise SeatConfigException(f'This vehicle does not support departure profile id "{id}".')
+        if self._relevantCapabilties.get('departureProfiles', {}).get('active', False):
+            data= deepcopy(self.attrs.get('departureProfiles'))
+            if len(data.get('timers', []))<1:
+                raise SeatInvalidRequestException(f'No timers found in departure profile: {data}.')
+            idFound=False
+            for e in range(len(data.get('timers', []))):
+                if data['timers'][e].get('id',-1)==id:
+                    if action in ['on', 'off']:
+                        if action=='on':
+                            enabled=True
+                        else:
+                            enabled=False
+                        data['timers'][e]['enabled'] = enabled
+                        idFound=True
+                        _LOGGER.debug(f'Changing departure profile {id} to {action}.')
+                    else:
+                        raise SeatInvalidRequestException(f'Profile action "{action}" is not supported.')
+            if idFound:
+                return await self._set_departure_profiles(data, action=action)
+            raise SeatInvalidRequestException(f'Departure profile id {id} not found in {data.get('timers',[])}.')
+        else:
+            raise SeatInvalidRequestException('Departure profiles are not supported.')
+
+    async def _set_departure_profiles(self, data=None, action=None):
+        """ Set departure profiles. """
+        if not self._relevantCapabilties.get('departureProfiles', {}).get('active', False):
+            raise SeatInvalidRequestException('Departure profiles are not supported.')
+        if self._requests['departureprofile'].get('id', False):
+            timestamp = self._requests.get('departureprofile', {}).get('timestamp', datetime.now())
+            expired = datetime.now() - timedelta(minutes=1)
+            if expired > timestamp:
+                self._requests.get('departureprofile', {}).pop('id')
+            else:
+                raise SeatRequestInProgressException('Scheduling of departure profile is already in progress')
+        try:
+            self._requests['latest'] = 'Departureprofile'
+            response = await self._connection.setDepartureprofile(self.vin, self._apibase, data, spin=False)
+            if not response:
+                self._requests['departureprofile'] = {'status': 'Failed'}
+                _LOGGER.error('Failed to execute departure profile request')
+                raise SeatException('Failed to execute departure profile request')
+            else:
+                self._requests['remaining'] = response.get('rate_limit_remaining', -1)
+                self._requests['departureprofile'] = {
+                    'timestamp': datetime.now(),
+                    'status': response.get('state', 'Unknown'),
+                    'id': response.get('id', 0),
+                }
+                # Update the departure profile 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_departure_profiles()
+                    if action=='minSocPercentage':
+                        _LOGGER.debug('Checking if new minSocPercentage is as expected:')
+                        _LOGGER.debug(f'Value of minSocPercentage sent:{data.get('minSocPercentage',-2)}')
+                        _LOGGER.debug(f'Value of minSocPercentage read:{self.attrs.get('departureTimers',{}).get('minSocPercentage',-1)}')
+                        if data.get('minSocPercentage',-2)==self.attrs.get('departureTimers',{}).get('minSocPercentage',-1):
+                            actionSuccessful=True
+                    else:
+                        sendData = data.get('timers',[])
+                        newData = self.attrs.get('departureProfiles',{}).get('timers',[])
+                        _LOGGER.debug('Checking if new departure profiles are as expected:')
+                        _LOGGER.debug(f'Value of data sent:{sendData}')
+                        _LOGGER.debug(f'Value of data read:{newData}')
+                        if sendData==newData:
+                            actionSuccessful=True
+                    retry = retry +1
+                if actionSuccessful:
+                    self._requests.get('departureprofile', {}).pop('id')
+                    return True
+                _LOGGER.error('Response to PUT request seemed successful but the departure profiles status did not change as expected.')
+                return False
+        except (SeatInvalidRequestException, SeatException):
+            raise
+        except Exception as error:
+            _LOGGER.warning(f'Failed to execute departure profile request - {error}')
+            self._requests['departureprofile'] = {'status': 'Exception'}
+        raise SeatException('Failed to set departure profile schedule')
+
+
     # Send a destination to vehicle
     async def send_destination(self, destination=None):
         """ Send destination to vehicle. """
@@ -727,8 +870,8 @@ class Vehicle:
                 # Update the climater data and check, if they have changed as expected
                 retry = 0
                 actionSuccessful = False
-                while not actionSuccessful and retry < 3:
-                    await asyncio.sleep(5)
+                while not actionSuccessful and retry < 2:
+                    await asyncio.sleep(15)
                     await self.get_climater()
                     if mode == 'start':
                         if self.electric_climatisation:
@@ -750,6 +893,7 @@ class Vehicle:
                         raise
                     retry = retry +1
                 if actionSuccessful:
+                    _LOGGER.debug('POST request for climater successful. New status as expected.')
                     self._requests.get('climatisation', {}).pop('id')
                     return True
                 _LOGGER.error('Response to POST request seemed successful but the climater status did not change as expected.')
@@ -913,7 +1057,7 @@ class Vehicle:
             if expired > timestamp:
                 self._requests.get('refresh', {}).pop('id')
             else:
-                raise SeatRequestInProgressException('A data refresh request is already in progress')
+                raise SeatRequestInProgressException('Last data refresh request less than 3 minutes ago')
         try:
             self._requests['latest'] = 'Refresh'
             response = await self._connection.setRefresh(self.vin, self._apibase)
@@ -1028,18 +1172,19 @@ class Vehicle:
     @property
     def model_image_small(self):
         """Return URL for model image"""
-        return self._modelimages.get('images','').get('front','')
+        return self._modelimages.get('images','').get('front_cropped','')
 
     @property
     def is_model_image_small_supported(self):
         """Return true if model image url is not None."""
         if self._modelimages is not None:
-            return True
+            if self._modelimages.get('images','').get('front_cropped','')!='':
+                return True
 
     @property
     def model_image_large(self):
         """Return URL for model image"""
-        return self._modelimages.get('images','').get('side', '')
+        return self._modelimages.get('images','').get('front', '')
 
     @property
     def is_model_image_large_supported(self):
@@ -1052,7 +1197,7 @@ class Vehicle:
     def parking_light(self):
         """Return true if parking light is on"""
         response = self.attrs.get('status').get('lights', 0)
-        if response == 'On':
+        if response == 'on':
             return True
         else:
             return False
@@ -2034,7 +2179,6 @@ class Vehicle:
         return True if response != 0 else False
 
   # Departure timers
-   # Under development
     @property
     def departure1(self):
         """Return timer status and attributes."""
@@ -2146,6 +2290,79 @@ class Vehicle:
             return True
         return False
 
+  # Departure profiles
+    @property
+    def departure_profile1(self):
+        """Return profile status and attributes."""
+        if self.attrs.get('departureProfiles', False):
+            try:
+                data = {}
+                timerdata = self.attrs.get('departureProfiles', {}).get('timers', [])
+                timer = timerdata[0]
+                #timer.pop('timestamp', None)
+                #timer.pop('timerID', None)
+                #timer.pop('profileID', None)
+                data.update(timer)
+                return data
+            except:
+                pass
+        return None
+
+    @property
+    def is_departure_profile1_supported(self):
+        """Return true if profile 1 is supported."""
+        if len(self.attrs.get('departureProfiles', {}).get('timers', [])) >= 1:
+            return True
+        return False
+
+    @property
+    def departure_profile2(self):
+        """Return profile status and attributes."""
+        if self.attrs.get('departureProfiles', False):
+            try:
+                data = {}
+                timerdata = self.attrs.get('departureProfiles', {}).get('timers', [])
+                timer = timerdata[1]
+                #timer.pop('timestamp', None)
+                #timer.pop('timerID', None)
+                #timer.pop('profileID', None)
+                data.update(timer)
+                return data
+            except:
+                pass
+        return None
+
+    @property
+    def is_departure_profile2_supported(self):
+        """Return true if profile 2 is supported."""
+        if len(self.attrs.get('departureProfiles', {}).get('timers', [])) >= 2:
+            return True
+        return False
+
+    @property
+    def departure_profile3(self):
+        """Return profile status and attributes."""
+        if self.attrs.get('departureProfiles', False):
+            try:
+                data = {}
+                timerdata = self.attrs.get('departureProfiles', {}).get('timers', [])
+                timer = timerdata[2]
+                #timer.pop('timestamp', None)
+                #timer.pop('timerID', None)
+                #timer.pop('profileID', None)
+                data.update(timer)
+                return data
+            except:
+                pass
+        return None
+
+    @property
+    def is_departure_profile3_supported(self):
+        """Return true if profile 3 is supported."""
+        if len(self.attrs.get('departureProfiles', {}).get('timers', [])) >= 3:
+            return True
+        return False
+
   # Trip data
     @property
     def trip_last_entry(self):
@@ -2452,11 +2669,12 @@ class Vehicle:
     @property
     def refresh_data(self):
         """Get state of data refresh"""
-        if self._requests.get('refresh', {}).get('id', False):
-            timestamp = self._requests.get('refresh', {}).get('timestamp', DATEZERO)
-            expired = datetime.now() - timedelta(minutes=2)
-            if expired < timestamp:
-                return True
+        #if self._requests.get('refresh', {}).get('id', False):
+        #    timestamp = self._requests.get('refresh', {}).get('timestamp', DATEZERO)
+        #    expired = datetime.now() - timedelta(minutes=2)
+        #    if expired < timestamp:
+        #        return True
+        #State is always false
         return False
 
     @property

{pycupra-0.0.4 → pycupra-0.0.6/pycupra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycupra
-Version: 0.0.4
+Version: 0.0.6
 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