pycupra 0.1.3__tar.gz → 0.1.5__tar.gz

{pycupra-0.1.3/pycupra.egg-info → pycupra-0.1.5}/PKG-INFO

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

@@ -177,7 +177,18 @@ async def demo_set_charger_current(vehicle, value="reduced"):
     print('########################################')
     print('#       Change charging current        #')
     print('########################################')
-    success= await vehicle.set_charger_current(value)              # value = "max" or "reduced". 
+    success= await vehicle.set_charger_current(value)   
+    if success:
+        print("   Request completed successfully.")
+    else:
+        print("   Request failed.")
+    return success
+
+async def demo_set_charger_target_soc(vehicle, value=80):
+    print('########################################')
+    print('#     Change target state of charge    #')
+    print('########################################')
+    success= await vehicle.set_charger_target_soc(value)
     if success:
         print("   Request completed successfully.")
     else:
@@ -532,35 +543,36 @@ async def main():
 
             # Examples for using set functions:
 
-            #await demo_set_charger(vehicle, action = "start")                        # action = "start" or "stop"
-            #await demo_set_charger_current(vehicle, value='reduced')                 # value = 1-255/Maximum/Reduced (PHEV: 252 for reduced and 254 for max, EV: Maximum/Reduced)
+            #await demo_set_charger(vehicle, action = "start")                         # action = "start" or "stop"
+            #await demo_set_charger_current(vehicle, value='reduced')                  # value = 1-255/Maximum/Reduced (PHEV: 252 for reduced and 254 for max, EV: Maximum/Reduced)
+            #await demo_set_charger_target_soc(vehicle, value=70)                      # value = 1-100
 
-            #await demo_set_climatisation(vehicle, action = "start", temp=18.0)         # action = "auxilliary", "electric" or "off". spin is S-PIN and only needed for aux heating
-            #await demo_set_climatisation_temp(vehicle, temp = 18.0)                  # temp = integer from 16 to 30
+            #await demo_set_climatisation(vehicle, action = "start", temp=18.0)        # action = "auxilliary", "electric" or "off". spin is S-PIN and only needed for aux heating
+            #await demo_set_climatisation_temp(vehicle, temp = 18.0)                   # temp = integer from 16 to 30
             #await demo_set_battery_climatisation(vehicle, mode=False)                 # mode = False or True
-            #await demo_set_windowheating(vehicle, action = "stop")                   # action = "start" or "stop"
+            #await demo_set_windowheating(vehicle, action = "stop")                    # action = "start" or "stop"
 
-            #await demo_set_timer_schedule(vehicle)                                   # arguments id and schedule can be found in the demo function
-            #await demo_set_timer_active(vehicle, id=3, action="off")                 # id = 1, 2, 3, action = "on" or "off".
-            #await demo_set_charge_limit(vehicle, 30)                                 # limit = PHEV: 0/10/20/30/40/50, EV: 50/60/70/80/90/100
+            #await demo_set_timer_schedule(vehicle)                                    # arguments id and schedule can be found in the demo function
+            #await demo_set_timer_active(vehicle, id=3, action="off")                  # id = 1, 2, 3, action = "on" or "off".
+            #await demo_set_charge_limit(vehicle, 30)                                  # limit = PHEV: 0/10/20/30/40/50, EV: 50/60/70/80/90/100
             
-            #await demo_set_departure_profile_schedule(vehicle)                       # arguments id and schedule can be found in the demo function
+            #await demo_set_departure_profile_schedule(vehicle)                        # arguments id and schedule can be found in the demo function
             #await demo_set_departure_profile_active(vehicle, id=3, action="off")                 # id = 1, 2, 3, action = "on" or "off".
 
             #await demo_set_lock(vehicle,action = "lock", 
             #                    spin = credentials.get('spin',''))                    # action = "unlock" or "lock". spin = SPIN, needed for both
 
-            #await vehicle.set_pheater(mode = "heating", spin = "1234")                 # action = "heating", "ventilation" or "off". spin = SPIN, not needed for off
+            #await vehicle.set_pheater(mode = "heating", spin = "1234")                # action = "heating", "ventilation" or "off". spin = SPIN, not needed for off
 
-            #await demo_set_honkandflash(vehicle, action="flash")                     # action = "honkandflash" or "flash"
+            #await demo_set_honkandflash(vehicle, action="flash")                      # action = "honkandflash" or "flash"
 
-            #await vehicle.set_refresh()                                              # Takes no arguments, will trigger forced update
+            #await vehicle.set_refresh()                                               # Takes no arguments, will trigger forced update
 
             #print(f"Sleeping for {2*INTERVAL} seconds")
             #await asyncio.sleep(2*INTERVAL)
             #await demo_show_last_honkandflash_info(vehicle)                           # Returns the info of the last honkandflash_action
 
-            #await demo_send_destination(vehicle)                                       # arguments can be found in the demo function
+            #await demo_send_destination(vehicle)                                      # arguments can be found in the demo function
 
             print('########################################')
             print('#    Export all attributes to file    #')

{pycupra-0.1.3 → pycupra-0.1.5}/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.3"
+__version__ = "0.1.5"

{pycupra-0.1.3 → pycupra-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-0.1.3 → pycupra-0.1.5}/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-0.1.3 → pycupra-0.1.5}/pycupra/firebase_messaging/__init__.py

@@ -1,6 +1,6 @@
 from .fcmpushclient import FcmPushClient, FcmPushClientConfig, FcmPushClientRunState
 from .fcmregister import FcmRegisterConfig
-from .proto.mcs_pb2 import (  # pylint: disable=no-name-in-module
+from .mcs_pb2 import (  # pylint: disable=no-name-in-module
     Close,
     DataMessageStanza,
     HeartbeatAck,
@@ -12,8 +12,15 @@ from .proto.mcs_pb2 import (  # pylint: disable=no-name-in-module
     StreamErrorStanza,
 )
 
-from .proto import android_checkin_pb2 
-from .proto import checkin_pb2
+from .android_checkin_pb2 import (
+    DEVICE_CHROME_BROWSER,
+    AndroidCheckinProto,
+    ChromeBuildProto,
+)
+from .checkin_pb2 import (
+    AndroidCheckinRequest,
+    AndroidCheckinResponse,
+)
 
 __all__ = [
     "FcmPushClientConfig",

{pycupra-0.1.3 → pycupra-0.1.5}/pycupra/firebase_messaging/fcmpushclient.py

@@ -31,7 +31,7 @@ from .const import (
     MCS_VERSION,
 )
 from .fcmregister import FcmRegister, FcmRegisterConfig
-from .proto.mcs_pb2 import (  # pylint: disable=no-name-in-module
+from .mcs_pb2 import (  # pylint: disable=no-name-in-module
     Close,
     DataMessageStanza,
     HeartbeatAck,

{pycupra-0.1.3 → pycupra-0.1.5}/pycupra/firebase_messaging/fcmregister.py

@@ -26,12 +26,12 @@ from .const import (
     GCM_SERVER_KEY_B64,
     SDK_VERSION,
 )
-from .proto.android_checkin_pb2 import (
+from .android_checkin_pb2 import (
     DEVICE_CHROME_BROWSER,
     AndroidCheckinProto,
     ChromeBuildProto,
 )
-from .proto.checkin_pb2 import (
+from .checkin_pb2 import (
     AndroidCheckinRequest,
     AndroidCheckinResponse,
 )

{pycupra-0.1.3 → pycupra-0.1.5}/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.3 → pycupra-0.1.5/pycupra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycupra
-Version: 0.1.3
+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.3 → pycupra-0.1.5}/pycupra.egg-info/SOURCES.txt

@@ -21,16 +21,16 @@ pycupra.egg-info/dependency_links.txt
 pycupra.egg-info/requires.txt
 pycupra.egg-info/top_level.txt
 pycupra/firebase_messaging/__init__.py
+pycupra/firebase_messaging/android_checkin.proto
+pycupra/firebase_messaging/android_checkin_pb2.py
+pycupra/firebase_messaging/android_checkin_pb2.pyi
+pycupra/firebase_messaging/checkin.proto
+pycupra/firebase_messaging/checkin_pb2.py
+pycupra/firebase_messaging/checkin_pb2.pyi
 pycupra/firebase_messaging/const.py
 pycupra/firebase_messaging/fcmpushclient.py
 pycupra/firebase_messaging/fcmregister.py
-pycupra/firebase_messaging/py.typed
-pycupra/firebase_messaging/proto/android_checkin.proto
-pycupra/firebase_messaging/proto/android_checkin_pb2.py
-pycupra/firebase_messaging/proto/android_checkin_pb2.pyi
-pycupra/firebase_messaging/proto/checkin.proto
-pycupra/firebase_messaging/proto/checkin_pb2.py
-pycupra/firebase_messaging/proto/checkin_pb2.pyi
-pycupra/firebase_messaging/proto/mcs.proto
-pycupra/firebase_messaging/proto/mcs_pb2.py
-pycupra/firebase_messaging/proto/mcs_pb2.pyi
+pycupra/firebase_messaging/mcs.proto
+pycupra/firebase_messaging/mcs_pb2.py
+pycupra/firebase_messaging/mcs_pb2.pyi
+pycupra/firebase_messaging/py.typed