pycupra 0.1.4__py3-none-any.whl → 0.1.5__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.4"
+__version__ = "0.1.5"

pycupra/connection.py

@@ -1151,10 +1151,11 @@ class Connection:
             _LOGGER.warning(f'Could not fetch departure profiles, error: {error}')
         return False
 
-    async def getClimater(self, vin, baseurl):
+    async def getClimater(self, vin, baseurl, oldClimatingData):
         """Get climatisation data."""
-        data={}
-        data['climater']={}
+        #data={}
+        #data['climater']={}
+        data = {'climater': oldClimatingData}
         await self.set_token(self._session_auth_brand)
         try:
             response = await self.get(eval(f"f'{API_CLIMATER_STATUS}'"))
@@ -1180,12 +1181,14 @@ class Connection:
             return False
         return data
 
-    async def getCharger(self, vin, baseurl):
+    async def getCharger(self, vin, baseurl, oldChargingData):
         """Get charger data."""
         await self.set_token(self._session_auth_brand)
         try:
             chargingStatus = {}
             chargingInfo = {}
+            #chargingModes = {}
+            #chargingProfiles = {}
             response = await self.get(eval(f"f'{API_CHARGING}/status'"))
             if response.get('battery', {}):
                 chargingStatus = response
@@ -1207,16 +1210,30 @@ class Connection:
                 _LOGGER.warning(f'Could not fetch charging modes, HTTP status code: {response.get("status_code")}')
             else:
                 _LOGGER.info('Unhandled error while trying to fetch charging modes')"""
-            if chargingStatus != {} and chargingInfo != {}:
-                data = {'charging': {
-                    'status': chargingStatus,
-                    'info' :  chargingInfo,
-                    #'modes' :  chargingModes,
-                    }
-                }
+            """response = await self.get(eval(f"f'{API_CHARGING}/profiles'"))
+            if response.get('profiles', {}):
+                chargingProfiles = response
+            elif response.get('status_code', {}):
+                _LOGGER.warning(f'Could not fetch charging profiles, HTTP status code: {response.get("status_code")}')
+            else:
+                _LOGGER.info('Unhandled error while trying to fetch charging profiles')"""
+            data = {'charging': oldChargingData}
+            if chargingStatus != {}:
+                data['charging']['status'] = chargingStatus
+            else:
+                _LOGGER.warning(f'getCharger() got no valid data for charging status')
+            if chargingInfo != {}:
+                data['charging']['info'] = chargingInfo
             else:
-                _LOGGER.warning(f'getCharger() got no valid data. Returning None')
-                return None
+                _LOGGER.warning(f'getCharger() got no valid data for charging info')
+            #if chargingModes != {}:
+            #    data['charging']['modes'] = chargingModes
+            #else:
+            #    _LOGGER.warning(f'getCharger() got no valid data for charging modes')
+            #if chargingProfiles != {}:
+            #    data['charging']['profiles'] = chargingProfiles
+            #else:
+            #    _LOGGER.warning(f'getCharger() got no valid data for charging profiles')
             return data
         except Exception as error:
             _LOGGER.warning(f'Could not fetch charger, error: {error}')

pycupra/dashboard.py

@@ -453,6 +453,7 @@ class RequestRefresh(Switch):
         return self.vehicle.refresh_data
 
     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
         if self.callback is not None:
@@ -479,6 +480,7 @@ class RequestUpdate(Switch):
         return False #self.vehicle.update
 
     async def turn_on(self):
+        _LOGGER.debug('User has called RequestUpdate().')
         await self.vehicle.update(updateType=1) #full update after set_refresh
         if self.callback is not None:
             self.callback()

pycupra/vehicle.py

@@ -76,6 +76,7 @@ class Vehicle:
             'vehicleHealthWarnings': {'active': False, 'reason': 'not supported'},
             'state': {'active': False, 'reason': 'not supported'},
             'charging': {'active': False, 'reason': 'not supported', 'supportsTargetStateOfCharge': False},
+            'chargingProfiles': {'active': False, 'reason': 'not supported', "supportsTimerClimatisation": False,"supportsVehiclePositionedInProfileID": False,"supportsSingleTimer": False},
             'honkAndFlash': {'active': False, 'reason': 'not supported'},
             'parkingPosition': {'active': False, 'reason': 'not supported'},
             'departureTimers': {'active': False, 'reason': 'not supported', 'supportsSingleTimer': False},
@@ -121,6 +122,10 @@ class Vehicle:
                         data['supportsTargetStateOfCharge']=True
                     if capa['parameters'].get('supportsSingleTimer',False)==True or capa['parameters'].get('supportsSingleTimer',False)=='true':
                         data['supportsSingleTimer']=True
+                    if capa['parameters'].get('supportsVehiclePositionedInProfileID',False)==True or capa['parameters'].get('supportsVehiclePositionedInProfileID',False)=='true':
+                        data['supportsVehiclePositionedInProfileID']=True
+                    if capa['parameters'].get('supportsTimerClimatisation',False)==True or capa['parameters'].get('supportsTimerClimatisation',False)=='true':
+                        data['supportsTimerClimatisation']=True
                 self._relevantCapabilties[id].update(data)
                 
 
@@ -245,7 +250,7 @@ class Vehicle:
     async def get_climater(self):
         """Fetch climater data if function is enabled."""
         if self._relevantCapabilties.get('climatisation', {}).get('active', False):
-            data = await self._connection.getClimater(self.vin, self._apibase)
+            data = await self._connection.getClimater(self.vin, self._apibase, deepcopy(self.attrs.get('climater',{})))
             if data:
                 self._states.update(data)
                 self._last_get_climater = datetime.now(tz=None)
@@ -311,7 +316,7 @@ class Vehicle:
     async def get_charger(self):
         """Fetch charger data if function is enabled."""
         if self._relevantCapabilties.get('charging', {}).get('active', False):
-            data = await self._connection.getCharger(self.vin, self._apibase)
+            data = await self._connection.getCharger(self.vin, self._apibase, deepcopy(self.attrs.get('charging',{})))
             if data:
                 self._states.update(data)
                 self._last_get_charger = datetime.now(tz=None)
@@ -396,6 +401,33 @@ class Vehicle:
             _LOGGER.error('No charger support.')
             raise SeatInvalidRequestException('No charger support.')
 
+    async def set_charger_target_soc(self, value):
+        """Set target state of charge"""
+        if self.is_charging_supported:
+            if isinstance(value, int):
+                if 1 <= int(value) <= 100:
+                    # VW-Group API charger current request
+                    if self._relevantCapabilties.get('charging', {}).get('active', False) and self._relevantCapabilties.get('charging', {}).get('supportsTargetStateOfCharge', False):
+                        data= deepcopy(self.attrs.get('charging',{}).get('info',{}).get('settings',{}))
+                        if data=={}:
+                            _LOGGER.error(f'Can not set target soc, because currently no charging settings are present.')
+                            raise SeatInvalidRequestException(f'Set target soc not possible. Charging settings not present.')
+                        data['targetSoc'] = int(value)
+                    else: 
+                        _LOGGER.warning(f'Can not set target soc, because vehicle does not support this feature.')
+                        return False
+                else:
+                    _LOGGER.error(f'Set target soc to {value} is not supported.')
+                    raise SeatInvalidRequestException(f'Set target soc to {value} is not supported.')
+            # Mimick app and set charger max ampere to Maximum/Reduced
+            else:
+                _LOGGER.error(f'Data type passed is invalid.')
+                raise SeatInvalidRequestException(f'Invalid data type.')
+            return await self.set_charger('settings', data)
+        else:
+            _LOGGER.error('No charger support.')
+            raise SeatInvalidRequestException('No charger support.')
+
     async def set_charger(self, action, data=None):
         """Charging actions."""
         if not self._relevantCapabilties.get('charging', {}).get('active', False):
@@ -450,9 +482,11 @@ class Vehicle:
                         if not self.charging:
                             actionSuccessful = True
                     elif mode == 'settings':
+                        if data.get('targetSoc',0) ==  self.target_soc: # In case targetSoc is changed
+                            actionSuccessful = True
                         if data.get('maxChargeCurrentAc','') ==  self.charge_max_ampere: # In case 'maximum', 'reduced'
                             actionSuccessful = True
-                        if data.get('maxChargeCurrentAcInAmperes',0) ==  self.charge_max_ampere: # In case of a numerical value
+                        if data.get('maxChargeCurrentAcInAmperes',0) ==  self.charge_max_ampere: # In case of a numerical value for charge current
                             actionSuccessful = True
                     else:
                         _LOGGER.error(f'Missing code in vehicle._set_charger() for mode {mode}')
@@ -3150,7 +3184,7 @@ class Vehicle:
             self.storeFirebaseNotifications(obj, notification, data_message)
 
         if self.firebaseStatus != FIREBASE_STATUS_ACTIVATED:
-            _LOGGER.info(f'While firebase is not fully activated, received notifications are just acknoledged.')
+            _LOGGER.info(f'While firebase is not fully activated, received notifications are just acknowledged.')
             # As long as the firebase status is not set to activated, ignore the notifications
             return False 
  
@@ -3200,7 +3234,7 @@ class Vehicle:
                 await self.get_departure_profiles()
                 if self.updateCallback:
                     await self.updateCallback(2)
-        elif type in ('charging-status-changed', 'charging-started', 'charging-stopped'):
+        elif type in ('charging-status-changed', 'charging-started', 'charging-stopped', 'charging-settings-updated'):
             if self._requests.get('batterycharge', {}).get('id', None):
                 openRequest= self._requests.get('batterycharge', {}).get('id', None)
                 if openRequest == requestId:

{pycupra-0.1.4.dist-info → pycupra-0.1.5.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
 pycupra/__init__.py,sha256=p0880jPkLqOErX3u3qaLboBLOsEHFpe44axApdaGeqI,231
-pycupra/__version__.py,sha256=eKzk7G69_LtPVYjNt3lX5LnPJXkUoj0G0EKvXxByrlA,207
-pycupra/connection.py,sha256=r02CHAhRrZwu90AIsfTnzAhRn9dZjK8WuZvhUa6_DcA,85314
+pycupra/__version__.py,sha256=y2dos0x1TDMyh80ZOW3YvhHvw1DWdxYSgYNyRSzioPY,207
+pycupra/connection.py,sha256=VPyLBfcmWPm4L8cL5HXvFT179PhNmiDn3yvWiNtu3Pw,86366
 pycupra/const.py,sha256=cJJ9xrof6HZ7ZE7nXnB6tU4qMbSadlN8mgs43Igy7Mo,10591
-pycupra/dashboard.py,sha256=hFHhCDrCNufQR1I85AlR4kPgSlFSinCegZ0w8F4FvUk,43703
+pycupra/dashboard.py,sha256=RlJPdTvJV7Urog5gCz_4pYWNd5_ApQIVJUCwJIi_7L8,43822
 pycupra/exceptions.py,sha256=Nq_F79GP8wjHf5lpvPy9TbSIrRHAJrFMo0T1N9TcgSQ,2917
 pycupra/firebase.py,sha256=V3Ico6FZzEn0-5-CnqaDP9Mg9LpVU-_qLyZQwiRBbD0,2725
 pycupra/utilities.py,sha256=cH4MiIzT2WlHgmnl_E7rR0R5LvCXfDNvirJolct50V8,2563
-pycupra/vehicle.py,sha256=armeMQHxOZyyQJ9Iu7G26pq_BNc8oahPFxOe7daEip8,151994
+pycupra/vehicle.py,sha256=yMaO-6lquak8821usCen6LWEM7rn0EZjiEOzK9jp6e4,154682
 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.4.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-pycupra-0.1.4.dist-info/METADATA,sha256=zuQir0nJmXg_oS0xpQKEhyjL1Ub7rghOayNvNPSZvpU,3757
-pycupra-0.1.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pycupra-0.1.4.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
-pycupra-0.1.4.dist-info/RECORD,,
+pycupra-0.1.5.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+pycupra-0.1.5.dist-info/METADATA,sha256=upt06crj4Naaogz_wPgfmLUDZ8VXdwDlZLzP9bthKpM,3757
+pycupra-0.1.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pycupra-0.1.5.dist-info/top_level.txt,sha256=9Lbj_jG4JvpGwt6K3AwhWFc0XieDnuHFOP4x44wSXSQ,8
+pycupra-0.1.5.dist-info/RECORD,,