carconnectivity-connector-seatcupra 0.2a4__py3-none-any.whl → 0.2a5__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.2a4.dist-info → carconnectivity_connector_seatcupra-0.2a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: carconnectivity-connector-seatcupra
-Version: 0.2a4
+Version: 0.2a5
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License
@@ -41,6 +41,7 @@ Requires-Dist: carconnectivity>=0.5a4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1
+Dynamic: license-file
 
 
 

{carconnectivity_connector_seatcupra-0.2a4.dist-info → carconnectivity_connector_seatcupra-0.2a5.dist-info}/RECORD

@@ -1,11 +1,12 @@
+carconnectivity_connector_seatcupra-0.2a5.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=tfKjOgkysWzsCAchrdls12fBGPdso8aTKDZv71JrhH4,508
+carconnectivity_connectors/seatcupra/_version.py,sha256=gBBVklnLddS1IBpDXSdeUYTr2XaGy46iAMvj39V3VYo,514
 carconnectivity_connectors/seatcupra/capability.py,sha256=936V06hOX8AuAMxL_S9wVyVa36Xw1bo9081X0xf5f94,5064
-carconnectivity_connectors/seatcupra/charging.py,sha256=BJe_5GEB0JkP78tpU6kyKpwuwjDZHvm-kt3PTlpQHeU,3336
+carconnectivity_connectors/seatcupra/charging.py,sha256=mayvseay5x2r2qjWqol0ijlgoBL2L2A0A96T44FOiHg,4076
 carconnectivity_connectors/seatcupra/climatization.py,sha256=0xxWlxrheAPzkVT8WRQtbm6ExZmVdgW7lUdOXyS_qWY,1695
 carconnectivity_connectors/seatcupra/command_impl.py,sha256=LmBOCWGZPfJCG_4-5449xvO6NAvnPDsAWEBKlsG4WoI,3051
-carconnectivity_connectors/seatcupra/connector.py,sha256=PoTAAWKbToQ_a7VTLnfS2vDyxdj_mZ_dNZjs0YK7xYk,118807
-carconnectivity_connectors/seatcupra/vehicle.py,sha256=-M_d1Boly5DLJSQT_Zc8R3JJ7Csi_M4kktgGqjTrPAQ,3463
+carconnectivity_connectors/seatcupra/connector.py,sha256=_8Lvg1yqHHbH4mkhThwq0KZZL64rzKoFYurQCQurqY4,130482
+carconnectivity_connectors/seatcupra/vehicle.py,sha256=LHkAlVD_C8xOX81wCGFZbZqyhctpKx-CN0T3NZJ2jFk,3946
 carconnectivity_connectors/seatcupra/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/seatcupra/auth/auth_util.py,sha256=Y81h8fGOMSMgPtE4wI_TI9WgE_s43uaPjRLBBINhj4g,4433
 carconnectivity_connectors/seatcupra/auth/my_cupra_session.py,sha256=VF_9U8fESLkndVaPn2W1ZxZwNr9-ndeaegeTVT5FyYk,13904
@@ -14,8 +15,7 @@ carconnectivity_connectors/seatcupra/auth/session_manager.py,sha256=ZIDvC848T3fy
 carconnectivity_connectors/seatcupra/auth/vw_web_session.py,sha256=CcI6m68IyRs6WsMDu-IsW3Dj85vyGiMmxvFqNETMHO0,10929
 carconnectivity_connectors/seatcupra/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
 carconnectivity_connectors/seatcupra/ui/connector_ui.py,sha256=SNYnlcGJpbWhuLiIHD2l6H9IfSiMz3IgmvXsdossDnE,1412
-carconnectivity_connector_seatcupra-0.2a4.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.2a4.dist-info/METADATA,sha256=6DlLIQCvCZlpR_8QEC6_ksBczkiLvjIUm_097x-95mY,5473
-carconnectivity_connector_seatcupra-0.2a4.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-carconnectivity_connector_seatcupra-0.2a4.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.2a4.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.2a5.dist-info/METADATA,sha256=GNrJzfeFo_OxXxnlEzUuZWQZlOrczneqpa-tD_iqPRk,5495
+carconnectivity_connector_seatcupra-0.2a5.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
+carconnectivity_connector_seatcupra-0.2a5.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.2a5.dist-info/RECORD,,

{carconnectivity_connector_seatcupra-0.2a4.dist-info → carconnectivity_connector_seatcupra-0.2a5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (77.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

carconnectivity_connectors/seatcupra/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2a4'
-__version_tuple__ = version_tuple = (0, 2)
+__version__ = version = '0.2a5'
+__version_tuple__ = version_tuple = (0, 2, 'a5')

carconnectivity_connectors/seatcupra/charging.py

@@ -12,6 +12,8 @@ from carconnectivity.vehicle import ElectricVehicle
 if TYPE_CHECKING:
     from typing import Optional, Dict
 
+    from carconnectivity.objects import GenericObject
+
 
 class SeatCupraCharging(Charging):  # pylint: disable=too-many-instance-attributes
     """
@@ -22,9 +24,22 @@ class SeatCupraCharging(Charging):  # pylint: disable=too-many-instance-attribut
     """
     def __init__(self, vehicle: ElectricVehicle | None = None, origin: Optional[Charging] = None) -> None:
         if origin is not None:
-            super().__init__(origin=origin)
+            super().__init__(vehicle=vehicle, origin=origin)
+            self.settings = SeatCupraCharging.Settings(parent=self, origin=origin.settings)
         else:
             super().__init__(vehicle=vehicle)
+            self.settings = SeatCupraCharging.Settings(parent=self, origin=self.settings)
+
+    class Settings(Charging.Settings):
+        """
+        This class represents the settings for car volkswagen car charging.
+        """
+        def __init__(self, parent: Optional[GenericObject] = None, origin: Optional[Charging.Settings] = None) -> None:
+            if origin is not None:
+                super().__init__(parent=parent, origin=origin)
+            else:
+                super().__init__(parent=parent)
+            self.max_current_in_ampere: Optional[bool] = None
 
     class SeatCupraChargingState(Enum,):
         """

carconnectivity_connectors/seatcupra/connector.py

@@ -22,7 +22,8 @@ from carconnectivity.windows import Windows
 from carconnectivity.lights import Lights
 from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive, DieselDrive
 from carconnectivity.vehicle import GenericVehicle, ElectricVehicle
-from carconnectivity.attributes import BooleanAttribute, DurationAttribute, GenericAttribute, TemperatureAttribute, EnumAttribute
+from carconnectivity.attributes import BooleanAttribute, DurationAttribute, GenericAttribute, TemperatureAttribute, EnumAttribute, CurrentAttribute, \
+    LevelAttribute
 from carconnectivity.units import Temperature
 from carconnectivity.command_impl import ClimatizationStartStopCommand, WakeSleepCommand, HonkAndFlashCommand, LockUnlockCommand, ChargingStartStopCommand, \
     WindowHeatingStartStopCommand
@@ -1132,22 +1133,84 @@ class Connector(BaseConnector):
                 log_extra_keys(LOG_API, f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/charging/status', data,
                                {'state', 'battery', 'charging', 'plug'})
 
-            url = f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/charging/settings'
+            url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/settings'
             data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
             if data is not None:
-                if 'maxChargeCurrentAc' in data and data['maxChargeCurrentAc'] is not None:
-                    if data['maxChargeCurrentAc']:
-                        vehicle.charging.settings.maximum_current._set_value(value=16,  # pylint: disable=protected-access
-                                                                             unit=Current.A)
+                # {'settings': {'maxChargeCurrentAC': 'reduced', 'carCapturedTimestamp': '2025-03-18T16:50:33Z', 'autoUnlockPlugWhenCharged': None, 'targetSoc_pct': 100, 'batteryCareTargetSocPercentage': 80}}
+                if 'settings' in data and data['settings'] is not None:
+                    if 'carCapturedTimestamp' not in data['settings'] or data['settings']['carCapturedTimestamp'] is None:
+                        raise APIError('Could not fetch vehicle status, carCapturedTimestamp missing')
+                    captured_at: datetime = robust_time_parse(data['settings']['carCapturedTimestamp'])
+                    if 'maxChargeCurrentAC_A' in data['settings'] and data['settings']['maxChargeCurrentAC_A'] is not None:
+                        if isinstance(vehicle.charging.settings, SeatCupraCharging.Settings):
+                            vehicle.charging.settings.max_current_in_ampere = True
+                        else:
+                            raise ValueError('Charging settings not of type VolkswagenCharging.Settings')
+                        vehicle.charging.settings.maximum_current.minimum = 6.0
+                        vehicle.charging.settings.maximum_current.maximum = 16.0
+                        vehicle.charging.settings.maximum_current.precision = 1.0
+                        # pylint: disable-next=protected-access
+                        vehicle.charging.settings.maximum_current._add_on_set_hook(self.__on_charging_settings_change)
+                        vehicle.charging.settings.maximum_current._is_changeable = True  # pylint: disable=protected-access
+                        vehicle.charging.settings.maximum_current._set_value(data['settings']['maxChargeCurrentAC_A'],  # pylint: disable=protected-access
+                                                                             measured=captured_at)
+                    elif 'maxChargeCurrentAC' in data['settings'] and data['settings']['maxChargeCurrentAC'] is not None:
+                        if isinstance(vehicle.charging.settings, SeatCupraCharging.Settings):
+                            vehicle.charging.settings.max_current_in_ampere = False
+                        else:
+                            raise ValueError('Charging settings not of type VolkswagenCharging.Settings')
+                        vehicle.charging.settings.maximum_current.minimum = 6.0
+                        vehicle.charging.settings.maximum_current.maximum = 16.0
+                        vehicle.charging.settings.maximum_current.precision = 1.0
+                        # pylint: disable-next=protected-access
+                        vehicle.charging.settings.maximum_current._add_on_set_hook(self.__on_charging_settings_change)
+                        vehicle.charging.settings.maximum_current._is_changeable = True  # pylint: disable=protected-access
+                        if data['settings']['maxChargeCurrentAC'] == 'maximum':
+                            vehicle.charging.settings.maximum_current._set_value(16.0,  # pylint: disable=protected-access
+                                                                                 measured=captured_at)
+                        elif data['settings']['maxChargeCurrentAC'] == 'reduced':
+                            vehicle.charging.settings.maximum_current._set_value(6.0,  # pylint: disable=protected-access
+                                                                                 measured=captured_at)
+                        else:
+                            LOG_API.info('Unknown max charge current %s', data['settings']['maxChargeCurrentAC'])
+                            vehicle.charging.settings.maximum_current._set_value(None, measured=captured_at)  # pylint: disable=protected-access
                     else:
-                        vehicle.charging.settings.maximum_current._set_value(value=6,  # pylint: disable=protected-access
-                                                                             unit=Current.A)
-                else:
-                    vehicle.charging.settings.maximum_current._set_value(None)  # pylint: disable=protected-access
-                if 'defaultMaxTargetSocPercentage' in data and data['defaultMaxTargetSocPercentage'] is not None:
-                    vehicle.charging.settings.target_level._set_value(data['defaultMaxTargetSocPercentage'])  # pylint: disable=protected-access
-                else:
-                    vehicle.charging.settings.target_level._set_value(None)  # pylint: disable=protected-access
+                        vehicle.charging.settings.maximum_current._set_value(None, measured=captured_at)  # pylint: disable=protected-access
+                    if 'autoUnlockPlugWhenCharged' in data['settings'] and data['settings']['autoUnlockPlugWhenCharged'] is not None:
+                        # pylint: disable-next=protected-access
+                        vehicle.charging.settings.auto_unlock._add_on_set_hook(self.__on_charging_settings_change)
+                        vehicle.charging.settings.auto_unlock._is_changeable = True  # pylint: disable=protected-access
+                        if data['settings']['autoUnlockPlugWhenCharged'] == 'on':
+                            vehicle.charging.settings.auto_unlock._set_value(True,  # pylint: disable=protected-access
+                                                                             measured=captured_at)
+                        elif data['settings']['autoUnlockPlugWhenCharged'] == 'off':
+                            vehicle.charging.settings.auto_unlock._set_value(False,  # pylint: disable=protected-access
+                                                                             measured=captured_at)
+                        else:
+                            LOG_API.info('Unknown auto unlock plug when charged %s', data['settings']['autoUnlockPlugWhenCharged'])
+                            vehicle.charging.settings.auto_unlock._set_value(None, measured=captured_at)  # pylint: disable=protected-access
+                    else:
+                        vehicle.charging.settings.auto_unlock._set_value(None, measured=captured_at)  # pylint: disable=protected-access
+                    if 'targetSoc_pct' in data['settings'] and data['settings']['targetSoc_pct'] is not None:
+                        charging_capability: Optional[Capability] = vehicle.capabilities.get_capability('charging')
+                        if charging_capability is not None and ('supportsTargetStateOfCharge' not in charging_capability.parameters
+                                                                or charging_capability.parameters['supportsTargetStateOfCharge'] != 'false'):
+                            vehicle.charging.settings.target_level.minimum = 50.0
+                            vehicle.charging.settings.target_level.maximum = 100.0
+                            vehicle.charging.settings.target_level.precision = 10.0
+                            # pylint: disable-next=protected-access
+                            vehicle.charging.settings.target_level._add_on_set_hook(self.__on_charging_settings_change)
+                            vehicle.charging.settings.target_level._is_changeable = True  # pylint: disable=protected-access
+                        vehicle.charging.settings.target_level._set_value(data['settings']['targetSoc_pct'],  # pylint: disable=protected-access
+                                                                          measured=captured_at)
+                    else:
+                        vehicle.charging.settings.target_level._set_value(None, measured=captured_at)  # pylint: disable=protected-access
+                    log_extra_keys(LOG_API, 'chargingSettings', data['settings'], {'carCapturedTimestamp', 'maxChargeCurrentAC_A', 'maxChargeCurrentAC',
+                                                                                   'autoUnlockPlugWhenCharged', 'targetSoc_pct'})
+            else:
+                vehicle.charging.settings.maximum_current._set_value(None)  # pylint: disable=protected-access
+                vehicle.charging.settings.auto_unlock._set_value(None)  # pylint: disable=protected-access
+                vehicle.charging.settings.target_level._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
     def fetch_image(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
@@ -1594,10 +1657,13 @@ class Connector(BaseConnector):
                 setting_dict['targetTemperatureUnit'] = 'farenheit'
             else:
                 setting_dict['targetTemperatureUnit'] = 'celsius'
-        if isinstance(attribute, BooleanAttribute) and attribute.id == 'climatisation_without_external_power':
-            setting_dict['climatisationWithoutExternalPower'] = value
-        elif settings.climatization_without_external_power.enabled and settings.climatization_without_external_power.value is not None:
-            setting_dict['climatisationWithoutExternalPower'] = settings.climatization_without_external_power.value
+        climatization_capability: Optional[Capability] = vehicle.capabilities.get_capability('climatisation')
+        if climatization_capability is not None and ('supportsOffGridClimatisation' not in climatization_capability.parameters
+                                                     or climatization_capability.parameters['supportsOffGridClimatisation'] != 'false'):
+            if isinstance(attribute, BooleanAttribute) and attribute.id == 'climatisation_without_external_power':
+                setting_dict['climatisationWithoutExternalPower'] = value
+            elif settings.climatization_without_external_power.enabled and settings.climatization_without_external_power.value is not None:
+                setting_dict['climatisationWithoutExternalPower'] = settings.climatization_without_external_power.value
 
         url: str = f'https://ola.prod.code.seat.cloud.vwgroup.com/v2/vehicles/{vin}/climatisation/settings'
         try:
@@ -1653,6 +1719,77 @@ class Connector(BaseConnector):
             raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         return command_arguments
 
+    def __on_charging_settings_change(self, attribute: GenericAttribute, value: Any) -> Any:
+        """
+        Callback for the charging setting change.
+        """
+        if attribute.parent is None or not isinstance(attribute.parent, SeatCupraCharging.Settings) \
+                or attribute.parent.parent is None \
+                or attribute.parent.parent.parent is None or not isinstance(attribute.parent.parent.parent, SeatCupraVehicle):
+            raise SetterError('Object hierarchy is not as expected')
+        settings: SeatCupraCharging.Settings = attribute.parent
+        vehicle: SeatCupraVehicle = attribute.parent.parent.parent
+        vin: Optional[str] = vehicle.vin.value
+        if vin is None:
+            raise SetterError('VIN in object hierarchy missing')
+        setting_dict = {}
+        precision: float = settings.maximum_current.precision if settings.maximum_current.precision is not None else 1.0
+        if isinstance(attribute, CurrentAttribute) and attribute.id == 'maximum_current':
+            value = round(value / precision) * precision
+            if settings.max_current_in_ampere:
+                setting_dict['maxChargeCurrentAcInAmperes'] = value
+            else:
+                if value < 6:
+                    raise SetterError('Maximum current must be greater than 6 amps')
+                if value < 16:
+                    setting_dict['maxChargeCurrentAc'] = 'reduced'
+                    value = 6.0
+                else:
+                    setting_dict['maxChargeCurrentAc'] = 'maximum'
+                    value = 16.0
+        elif settings.maximum_current.enabled and settings.maximum_current.value is not None:
+            if settings.max_current_in_ampere:
+                setting_dict['maxChargeCurrentAc_A'] = round(settings.maximum_current.value / precision) * precision
+            else:
+                if settings.maximum_current.value < 6:
+                    raise SetterError('Maximum current must be greater than 6 amps')
+                if settings.maximum_current.value < 16:
+                    setting_dict['maxChargeCurrentAc'] = 'reduced'
+                    settings.maximum_current.value = 6.0
+                else:
+                    setting_dict['maxChargeCurrentAc'] = 'maximum'
+                    settings.maximum_current.value = 16.0
+        if isinstance(attribute, BooleanAttribute) and attribute.id == 'auto_unlock':
+            setting_dict['autoUnlockPlugWhenChargedAc'] = 'on' if value else 'off'
+        elif settings.auto_unlock.enabled and settings.auto_unlock.value is not None:
+            setting_dict['autoUnlockPlugWhenChargedAc'] = 'on' if settings.auto_unlock.value else 'off'
+        charging_capability: Optional[Capability] = vehicle.capabilities.get_capability('charging')
+        if charging_capability is not None and ('supportsTargetStateOfCharge' not in charging_capability.parameters
+                                                or charging_capability.parameters['supportsTargetStateOfCharge'] != 'false'):
+            precision: float = settings.target_level.precision if settings.target_level.precision is not None else 10.0
+            if isinstance(attribute, LevelAttribute) and attribute.id == 'target_level':
+                value = round(value / precision) * precision
+                setting_dict['targetSoc'] = value
+            elif settings.target_level.enabled and settings.target_level.value is not None:
+                setting_dict['targetSoc'] = round(settings.target_level.value / precision) * precision
+
+        url: str = f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/charging/settings'
+        try:
+            settings_response: requests.Response = self.session.post(url, data=json.dumps(setting_dict), allow_redirects=True)
+            if settings_response.status_code not in [requests.codes['ok'], requests.codes['created']]:
+                LOG.error('Could not set charging settings (%s)', settings_response.status_code)
+                raise SetterError(f'Could not set value ({settings_response.status_code})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise SetterError(f'Connection error: {connection_error}.'
+                              ' If this happens frequently, please check if other applications communicate with the Volkswagen server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise SetterError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise SetterError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise SetterError(f'Retrying failed: {retry_error}') from retry_error
+        return value
+
     def get_version(self) -> str:
         return __version__
 

carconnectivity_connectors/seatcupra/vehicle.py

@@ -6,6 +6,7 @@ from carconnectivity.vehicle import GenericVehicle, ElectricVehicle, CombustionV
 
 from carconnectivity_connectors.seatcupra.capability import Capabilities
 from carconnectivity_connectors.seatcupra.climatization import SeatCupraClimatization
+from carconnectivity_connectors.seatcupra.charging import SeatCupraCharging
 
 SUPPORT_IMAGES = False
 try:
@@ -17,6 +18,8 @@ except ImportError:
 if TYPE_CHECKING:
     from typing import Optional, Dict
     from carconnectivity.garage import Garage
+    from carconnectivity.charging import Charging
+
     from carconnectivity_connectors.base.connector import BaseConnector
 
 
@@ -55,8 +58,13 @@ class SeatCupraElectricVehicle(ElectricVehicle, SeatCupraVehicle):
                  origin: Optional[SeatCupraVehicle] = None) -> None:
         if origin is not None:
             super().__init__(garage=garage, origin=origin)
+            if isinstance(origin, ElectricVehicle):
+                self.charging: Charging = SeatCupraCharging(vehicle=self, origin=origin.charging)
+            else:
+                self.charging: Charging = SeatCupraCharging(vehicle=self, origin=self.charging)
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)
+            self.charging: Charging = SeatCupraCharging(vehicle=self, origin=self.charging)
 
 
 class SeatCupraCombustionVehicle(CombustionVehicle, SeatCupraVehicle):