pycupra 0.0.12__tar.gz → 0.0.14__tar.gz

{pycupra-0.0.12/pycupra.egg-info → pycupra-0.0.14}/PKG-INFO

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

@@ -46,6 +46,7 @@ RESOURCES = [
 		"charge_max_ampere",
 		"charger_action_status",
 		"charging",
+        "charge_max_ampere",
         "charge_rate",
         "charging_power",
         "charging_state",
@@ -71,7 +72,7 @@ RESOURCES = [
 		"door_locked",
 		"electric_climatisation",
 		"electric_range",
-		#"energy_flow",
+		"energy_flow",
 		"external_power",
 		"fuel_level",
 		"hood_closed",
@@ -522,7 +523,7 @@ async def main():
             # Examples for using set functions:
 
             #await demo_set_charger(vehicle, action = "start")                        # action = "start" or "stop"
-            #await demo_set_charger_current(value='reduced')                          # value = 1-255/Maximum/Reduced (PHEV: 252 for reduced and 254 for max, EV: Maximum/Reduced)
+            #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_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

{pycupra-0.0.12 → pycupra-0.0.14}/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.12"
+__version__ = "0.0.14"

{pycupra-0.0.12 → pycupra-0.0.14}/pycupra/connection.py

@@ -108,11 +108,12 @@ TIMEOUT = timedelta(seconds=90)
 class Connection:
     """ Connection to Connect services """
   # Init connection class
-    def __init__(self, session, brand='cupra', username='', password='', fulldebug=False, **optional):
+    def __init__(self, session, brand='cupra', username='', password='', fulldebug=False, nightlyUpdateReduction=False, **optional):
         """ Initialize """
         self._session = session
         self._lock = asyncio.Lock()
         self._session_fulldebug = fulldebug
+        self._session_nightlyUpdateReduction = nightlyUpdateReduction
         self._session_headers = HEADERS_SESSION.get(brand).copy()
         self._session_base = BASE_SESSION
         self._session_auth_headers = HEADERS_AUTH.copy()
@@ -1369,6 +1370,8 @@ class Connection:
         if mode in {'start', 'stop'}:
             capability='charging'
             return await self._setViaAPI(eval(f"f'{API_REQUESTS}/{mode}'"))
+        elif mode=='settings':
+            return await self._setViaAPI(eval(f"f'{API_CHARGING}/{mode}'"), json=data)
         else:
             _LOGGER.error(f'Not yet implemented. Mode: {mode}. Command ignored')
             raise

{pycupra-0.0.12 → pycupra-0.0.14}/pycupra/const.py

@@ -125,6 +125,8 @@ AUTH_TOKENKEYS = 'https://identity.vwgroup.io/oidc/v1/keys'
 # API endpoints
 API_MBB_STATUSDATA = 'https://customer-profile.vwgroup.io/v3/customers/{self._user_id}/mbbStatusData'
 API_PERSONAL_DATA= 'https://customer-profile.vwgroup.io/v3/customers/{self._user_id}/personalData'
+#Other option for personal data is '{baseurl}/v1/users/{self._user_id}'
+
 API_VEHICLES = '{APP_URI}/v2/users/{self._user_id}/garage/vehicles'                                  # Garage info
 API_MYCAR = '{baseurl}/v5/users/{self._user_id}/vehicles/{vin}/mycar'                                # Vehicle status report
 API_CHARGING = '{baseurl}/v1/vehicles/{vin}/charging'                                                # Vehicle charging information 

{pycupra-0.0.12 → pycupra-0.0.14}/pycupra/dashboard.py

@@ -933,6 +933,34 @@ class RequestResults(Sensor):
     def attributes(self):
         return dict(self.vehicle.request_results)
 
+class ChargingState(BinarySensor):
+    def __init__(self):
+        super().__init__(attr="charging_state", name="Charging state", icon="mdi:battery-charging", device_class='power')
+
+    @property
+    def state(self):
+        return self.vehicle.charging_state
+
+    @property
+    def assumed_state(self):
+        return False
+
+    @property
+    def attributes(self):
+        attr = {}
+        #state = self.vehicle.attrs.get('charging', {}).get('status', {}).get('state', '')
+        #type = self.vehicle.attrs.get('charging', {}).get('status', {}).get('charging', {}).get('type', '')
+        #mode = self.vehicle.attrs.get('charging', {}).get('status', {}).get('charging', {}).get('mode', '')
+        state = self.vehicle.attrs.get('mycar', {}).get('services', {}).get('charging', {}).get('status', '')
+        type = self.vehicle.attrs.get('charging', {}).get('status', {}).get('charging', {}).get('type', '')
+        mode = self.vehicle.attrs.get('mycar', {}).get('services', {}).get('charging', {}).get('chargeMode', '')
+        if state in {'charging','Charging', 'conservation','Conservation'}:
+            attr['state']=state.lower()
+            if type != '':
+                attr['type']=type
+            if mode != '':
+                attr['mode']=mode
+        return attr
 
 def create_instruments():
     return [
@@ -960,6 +988,7 @@ def create_instruments():
         DepartureProfile1(),
         DepartureProfile2(),
         DepartureProfile3(),
+        ChargingState(),
         Sensor(
             attr="distance",
             name="Odometer",
@@ -1084,8 +1113,8 @@ def create_instruments():
             attr="charge_max_ampere",
             name="Charger max ampere",
             icon="mdi:flash",
-            unit="A",
-            device_class="current"
+            #unit="A",
+            #device_class="current"
         ),
         Sensor(
             attr="climatisation_target_temperature",
@@ -1284,11 +1313,11 @@ def create_instruments():
             name="Energy flow",
             device_class="power"
         ),
-        BinarySensor(
-            attr="charging_state",
-            name="Charging state",
-            device_class="power"
-        ),
+        #BinarySensor(
+        #    attr="charging_state",
+        #    name="Charging state",
+        #    device_class="power"
+        #),
         BinarySensor(
             attr="parking_light",
             name="Parking light",

{pycupra-0.0.12 → pycupra-0.0.14}/pycupra/vehicle.py

@@ -129,9 +129,20 @@ class Vehicle:
         # Fetch all data if car is not deactivated
         if not self.deactivated:
             try:
+                if self._connection._session_nightlyUpdateReduction:
+                    # nightlyUpdateReduction is activated
+                    if datetime.now(tz=None).hour<5 or datetime.now(tz=None).hour>=22:
+                        # current time is within the night interval
+                        fullUpdateExpired = datetime.now(tz=None) - timedelta(seconds= 1100)
+                        if hasattr(self, '_last_full_update'):
+                            _LOGGER.debug(f'last_full_update= {self._last_full_update}, fullUpdateExpired= {fullUpdateExpired}.')
+                        if updateType!=1 and (hasattr(self, '_last_full_update') and self._last_full_update>fullUpdateExpired):
+                            _LOGGER.debug('Nightly update reduction is active and current time within 22:00 and 5:00. So we skip small update.')
+                            return True
+
                 # Data to be updated most often
                 await asyncio.gather(
-                    self.get_charger(),
+                    #self.get_charger(),
                     self.get_basiccardata(),
                     self.get_statusreport(),
                     return_exceptions=True
@@ -146,6 +157,8 @@ class Vehicle:
                 
                 # Data to be updated less often
                 await asyncio.gather(
+                    #self.get_statusreport(),
+                    self.get_charger(),
                     self.get_preheater(),
                     self.get_climater(),
                     self.get_trip_statistic(), 
@@ -320,7 +333,11 @@ class Vehicle:
                 if 1 <= int(value) <= 255:
                     # VW-Group API charger current request
                     if self._relevantCapabilties.get('charging', {}).get('active', False):
-                        data = {'action': {'settings': {'maxChargeCurrentAC': int(value)}, 'type': 'setSettings'}}
+                        data = {'maxChargeCurrentAc': int(value)}
+                        if int(value)==252:
+                            data = {'maxChargeCurrentAc': 'reduced'}
+                        if int(value)==254:
+                            data = {'maxChargeCurrentAc': 'maximum'}
                 else:
                     _LOGGER.error(f'Set charger maximum current to {value} is not supported.')
                     raise SeatInvalidRequestException(f'Set charger maximum current to {value} is not supported.')
@@ -330,9 +347,7 @@ class Vehicle:
                     # VW-Group API charger current request
                     if self._relevantCapabilties.get('charging', {}).get('active', False):
                         value = 'maximum' if value in ['Maximum', 'maximum', 'Max', 'max'] else 'reduced'
-                        data = {'settings': 
-                                {'maxChargeCurrentAC': value}
-                                }
+                        data = {'maxChargeCurrentAc': value}
                 else:
                     _LOGGER.error(f'Set charger maximum current to {value} is not supported.')
                     raise SeatInvalidRequestException(f'Set charger maximum current to {value} is not supported.')
@@ -344,7 +359,7 @@ class Vehicle:
             _LOGGER.error('No charger support.')
             raise SeatInvalidRequestException('No charger support.')
 
-    async def set_charger(self, action, **data):
+    async def set_charger(self, action, data=None):
         """Charging actions."""
         if not self._relevantCapabilties.get('charging', {}).get('active', False):
             _LOGGER.info('Remote start/stop of charger is not supported.')
@@ -361,7 +376,7 @@ class Vehicle:
                 mode='start'
             elif action in ['stop', 'Stop', 'Off', 'off']:
                 mode='stop'
-            elif isinstance(action.get('action', None), dict):
+            elif action=='settings':
                 mode=action
             else:
                 _LOGGER.error(f'Invalid charger action: {action}. Must be either start, stop or setSettings')
@@ -386,6 +401,7 @@ class Vehicle:
                 while not actionSuccessful and retry < 2:
                     await asyncio.sleep(15)
                     await self.get_charger()
+                    await self.get_basiccardata() # We get both, get_charger() and get_basiccardata()
                     if mode == 'start':
                         if self.charging:
                             actionSuccessful = True
@@ -393,7 +409,7 @@ class Vehicle:
                         if not self.charging:
                             actionSuccessful = True
                     elif mode == 'settings':
-                        if data.get('settings',0).get('maxChargeCurrentAC','') ==  self.charge_max_ampere:
+                        if data.get('maxChargeCurrentAc','') ==  self.charge_max_ampere:
                             actionSuccessful = True
                     else:
                         _LOGGER.error(f'Missing code in vehicle._set_charger() for mode {mode}')
@@ -1473,16 +1489,22 @@ class Vehicle:
     @property
     def charging(self):
         """Return battery level"""
-        cstate = self.attrs.get('charging').get('status').get('charging').get('state','')
+        #cstate = self.attrs.get('charging').get('status').get('charging').get('state','')
+        cstate = self.attrs.get('mycar',{}).get('services',{}).get('charging',{}).get('status','')
         return 1 if cstate in ['charging', 'Charging'] else 0
 
     @property
     def is_charging_supported(self):
         """Return true if charging is supported"""
-        if self.attrs.get('charging', False):
-            if 'status' in self.attrs.get('charging', {}):
-                if 'charging' in self.attrs.get('charging')['status']:
-                    if 'state' in self.attrs.get('charging')['status']['charging']:
+        #if self.attrs.get('charging', False):
+        #    if 'status' in self.attrs.get('charging', {}):
+        #        if 'charging' in self.attrs.get('charging')['status']:
+        #            if 'state' in self.attrs.get('charging')['status']['charging']:
+        #                return True
+        if self.attrs.get('mycar', False):
+            if 'services' in self.attrs.get('mycar', {}):
+                if 'charging' in self.attrs.get('mycar')['services']:
+                    if 'status' in self.attrs.get('mycar')['services']['charging']:
                         return True
         return False
 
@@ -1504,26 +1526,33 @@ class Vehicle:
     @property
     def battery_level(self):
         """Return battery level"""
-        if self.attrs.get('charging', False):
-            return int(self.attrs.get('charging').get('status', {}).get('battery', {}).get('currentSocPercentage', 0))
+        #if self.attrs.get('charging', False):
+        #    return int(self.attrs.get('charging').get('status', {}).get('battery', {}).get('currentSocPercentage', 0))
+        if self.attrs.get('mycar', False):
+            return int(self.attrs.get('mycar',{}).get('services', {}).get('charging', {}).get('currentPct', 0))
         else:
             return 0
 
     @property
     def is_battery_level_supported(self):
         """Return true if battery level is supported"""
-        if self.attrs.get('charging', False):
-            if 'status' in self.attrs.get('charging'):
-                if 'battery' in self.attrs.get('charging')['status']:
-                    if 'currentSocPercentage' in self.attrs.get('charging')['status']['battery']:
+        #if self.attrs.get('charging', False):
+        #    if 'status' in self.attrs.get('charging'):
+        #        if 'battery' in self.attrs.get('charging')['status']:
+        #            if 'currentSocPercentage' in self.attrs.get('charging')['status']['battery']:
+        #                return True
+        if self.attrs.get('mycar', False):
+            if 'services' in self.attrs.get('mycar'):
+                if 'charging' in self.attrs.get('mycar')['services']:
+                    if 'currentPct' in self.attrs.get('mycar')['services']['charging']:
                         return True
         return False
 
     @property
     def charge_max_ampere(self):
         """Return charger max ampere setting."""
-        if self.attrs.get('charger', False):
-            return self.attrs.get('charger').get('info').get('settings').get('maxChargeCurrentAC')
+        if self.attrs.get('charging', False):
+            return self.attrs.get('charging').get('info').get('settings').get('maxChargeCurrentAc')
         return 0
 
     @property
@@ -1532,7 +1561,7 @@ class Vehicle:
         if self.attrs.get('charging', False):
             if 'info' in self.attrs.get('charging', {}):
                 if 'settings' in self.attrs.get('charging')['info']:
-                    if 'maxChargeCurrentAC' in self.attrs.get('charging', {})['info']['settings']:
+                    if 'maxChargeCurrentAc' in self.attrs.get('charging', {})['info']['settings']:
                         return True
         return False
 
@@ -1575,9 +1604,12 @@ class Vehicle:
     @property
     def charging_time_left(self):
         """Return minutes to charging complete"""
-        if self.external_power:
-            if self.attrs.get('charging', {}).get('status', {}).get('charging', {}).get('remainingTimeInMinutes', False):
-                minutes = int(self.attrs.get('charging', {}).get('status', {}).get('charging', {}).get('remainingTimeInMinutes', 0))
+        #if self.external_power:
+        if self.charging:
+            #if self.attrs.get('charging', {}).get('status', {}).get('charging', {}).get('remainingTimeInMinutes', False):
+            #    minutes = int(self.attrs.get('charging', {}).get('status', {}).get('charging', {}).get('remainingTimeInMinutes', 0))
+            if self.attrs.get('mycar', {}).get('services', {}).get('charging', {}).get('remainingTime', False):
+                minutes = int(self.attrs.get('mycar', {}).get('services', {}).get('charging', {}).get('remainingTime', 0))
             else:
                 minutes = 0
             return minutes
@@ -1644,22 +1676,43 @@ class Vehicle:
             return True
 
     @property
-    #def energy_flow(self):
-    #    """Return true if energy is flowing through charging port."""
     def charging_state(self):
         """Return true if vehicle is charging."""
-        check = self.attrs.get('charging', {}).get('status', {}).get('state', '')
-        if check == 'charging':
+        #check = self.attrs.get('charging', {}).get('status', {}).get('state', '')
+        check = self.attrs.get('mycar',{}).get('services',{}).get('charging',{}).get('status','')
+        if check in ('charging','Charging'):
             return True
         else:
             return False
 
     @property
-    #def is_energy_flow_supported(self):
-    #    """Energy flow supported."""
     def is_charging_state_supported(self):
         """Charging state supported."""
-        if self.attrs.get('charging', {}).get('status', {}).get('state', False):
+        #if self.attrs.get('charging', {}).get('status', {}).get('state', False):
+        #    return True
+        if self.attrs.get('mycar', False):
+            if 'services' in self.attrs.get('mycar', {}):
+                if 'charging' in self.attrs.get('mycar')['services']:
+                    if 'status' in self.attrs.get('mycar')['services']['charging']:
+                        return True
+
+    @property
+    def energy_flow(self):
+        """Return true if energy is flowing to (i.e. charging) or from (i.e. climating with battery power) the battery."""
+        if self.charging_state:
+            return True
+        #check = self.attrs.get('charging', {}).get('status', {}).get('state', '')
+        check = self.attrs.get('mycar',{}).get('services',{}).get('charging',{}).get('status','')
+        if self.is_electric_climatisation_supported:
+            if self.electric_climatisation and check not in {'charging','Charging', 'conservation','Conservation'}:
+                # electric climatisation is on and car is not charging or conserving power 
+                return True
+        return False
+
+    @property
+    def is_energy_flow_supported(self):
+        """Energy flow supported."""
+        if self.is_charging_state_supported:
             return True
 
   # Vehicle location states
@@ -2907,7 +2960,8 @@ class Vehicle:
     @property
     def is_request_results_supported(self):
         """Request results is supported if in progress is supported."""
-        return self.is_request_in_progress_supported
+        return False # deactivated because it provides no usefull information
+        #return self.is_request_in_progress_supported
 
     @property
     def requests_remaining(self):
@@ -2923,8 +2977,9 @@ class Vehicle:
 
     @property
     def is_requests_remaining_supported(self):
-        if self.is_request_in_progress_supported:
-            return True if self._requests.get('remaining', False) else False
+        return False # deactivated because it provides no usefull information
+        #if self.is_request_in_progress_supported:
+        #    return True if self._requests.get('remaining', False) else False
 
  #### Helper functions ####
     def __str__(self):

{pycupra-0.0.12 → pycupra-0.0.14/pycupra.egg-info}/PKG-INFO

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