carconnectivity-connector-seatcupra 0.2a1__py3-none-any.whl → 0.2a3__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.2a1.dist-info → carconnectivity_connector_seatcupra-0.2a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.2a1
+Version: 0.2a3
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License
@@ -37,7 +37,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.5a1
+Requires-Dist: carconnectivity>=0.5a4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.2a1.dist-info → carconnectivity_connector_seatcupra-0.2a3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=nv-ayVPlh7g8avzeIuoqWWMLTrpQh-Tk42DRZnMODN4,508
+carconnectivity_connectors/seatcupra/_version.py,sha256=p4Js672VV1iTEpV8FJbTUFuZfQ85fDWLAcrDlOGj1Is,508
 carconnectivity_connectors/seatcupra/capability.py,sha256=936V06hOX8AuAMxL_S9wVyVa36Xw1bo9081X0xf5f94,5064
 carconnectivity_connectors/seatcupra/charging.py,sha256=BJe_5GEB0JkP78tpU6kyKpwuwjDZHvm-kt3PTlpQHeU,3336
 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=N2uFvzuxRj1se3157TWtQ80WSkjwh7w462D4E8c4ZlM,110344
-carconnectivity_connectors/seatcupra/vehicle.py,sha256=s0G-HqG5qcwStDxD3649KgLMa3lKPZ4TOGWRJEuQzsQ,3403
+carconnectivity_connectors/seatcupra/connector.py,sha256=h2sJEET4S91zgNUTGXW1FcTB22kOW2Gy1FxV9RRpn1I,118558
+carconnectivity_connectors/seatcupra/vehicle.py,sha256=-M_d1Boly5DLJSQT_Zc8R3JJ7Csi_M4kktgGqjTrPAQ,3463
 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 +14,8 @@ 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.2a1.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.2a1.dist-info/METADATA,sha256=-evGY15ib_P4dy75Cnjmm-Q_u8GOqFK6Nk_XGHNMbAs,5473
-carconnectivity_connector_seatcupra-0.2a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-carconnectivity_connector_seatcupra-0.2a1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.2a1.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.2a3.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.2a3.dist-info/METADATA,sha256=N3SPjIWL2Wq3WePfjThTnotIRhaEtEySwiajDaQFGhU,5473
+carconnectivity_connector_seatcupra-0.2a3.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+carconnectivity_connector_seatcupra-0.2a3.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.2a3.dist-info/RECORD,,

carconnectivity_connectors/seatcupra/_version.py

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

carconnectivity_connectors/seatcupra/connector.py

@@ -24,13 +24,15 @@ from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive,
 from carconnectivity.vehicle import GenericVehicle, ElectricVehicle
 from carconnectivity.attributes import BooleanAttribute, DurationAttribute, GenericAttribute, TemperatureAttribute, EnumAttribute
 from carconnectivity.units import Temperature
-from carconnectivity.command_impl import ClimatizationStartStopCommand, WakeSleepCommand, HonkAndFlashCommand, LockUnlockCommand, ChargingStartStopCommand
+from carconnectivity.command_impl import ClimatizationStartStopCommand, WakeSleepCommand, HonkAndFlashCommand, LockUnlockCommand, ChargingStartStopCommand, \
+    WindowHeatingStartStopCommand
 from carconnectivity.climatization import Climatization
 from carconnectivity.commands import Commands
 from carconnectivity.charging import Charging
 from carconnectivity.charging_connector import ChargingConnector
 from carconnectivity.position import Position
 from carconnectivity.enums import ConnectionState
+from carconnectivity.window_heating import WindowHeatings
 
 from carconnectivity_connectors.base.connector import BaseConnector
 from carconnectivity_connectors.seatcupra.auth.session_manager import SessionManager, SessionUser, Service
@@ -423,7 +425,7 @@ class Connector(BaseConnector):
                                 if vehicle.capabilities.has_capability('charging', check_status_ok=True):
                                     if not isinstance(vehicle, SeatCupraElectricVehicle):
                                         LOG.debug('Promoting %s to SeatCupraElectricVehicle object for %s', vehicle.__class__.__name__, vin)
-                                        vehicle = SeatCupraElectricVehicle(origin=vehicle)
+                                        vehicle = SeatCupraElectricVehicle(garage=self.car_connectivity.garage, origin=vehicle)
                                         self.car_connectivity.garage.replace_vehicle(vin, vehicle)
                                     if not vehicle.charging.commands.contains_command('start-stop'):
                                         charging_start_stop_command: ChargingStartStopCommand = ChargingStartStopCommand(parent=vehicle.charging.commands)
@@ -687,15 +689,15 @@ class Connector(BaseConnector):
                         has_combustion = True
                 if has_electric and not has_combustion and not isinstance(vehicle, SeatCupraElectricVehicle):
                     LOG.debug('Promoting %s to SeatCupraElectricVehicle object for %s', vehicle.__class__.__name__, vin)
-                    vehicle = SeatCupraElectricVehicle(origin=vehicle)
+                    vehicle = SeatCupraElectricVehicle(garage=self.car_connectivity.garage, origin=vehicle)
                     self.car_connectivity.garage.replace_vehicle(vin, vehicle)
                 elif has_combustion and not has_electric and not isinstance(vehicle, SeatCupraCombustionVehicle):
                     LOG.debug('Promoting %s to SeatCupraCombustionVehicle object for %s', vehicle.__class__.__name__, vin)
-                    vehicle = SeatCupraCombustionVehicle(origin=vehicle)
+                    vehicle = SeatCupraCombustionVehicle(garage=self.car_connectivity.garage, origin=vehicle)
                     self.car_connectivity.garage.replace_vehicle(vin, vehicle)
                 elif has_combustion and has_electric and not isinstance(vehicle, SeatCupraHybridVehicle):
                     LOG.debug('Promoting %s to SeatCupraHybridVehicle object for %s', vehicle.__class__.__name__, vin)
-                    vehicle = SeatCupraHybridVehicle(origin=vehicle)
+                    vehicle = SeatCupraHybridVehicle(garage=self.car_connectivity.garage, origin=vehicle)
                     self.car_connectivity.garage.replace_vehicle(vin, vehicle)
             if 'services' in vehicle_status_data and vehicle_status_data['services'] is not None:
                 if 'charging' in vehicle_status_data['services'] and vehicle_status_data['services']['charging'] is not None:
@@ -860,21 +862,25 @@ class Connector(BaseConnector):
                 for drive in vehicle.drives.drives.values():
                     if drive.type.enabled and drive.type.value == GenericDrive.Type.ELECTRIC:
                         for range_dict in data['ranges']:
-                            if 'electricRangeKm' in range_dict and range_dict['electricRangeKm'] is not None:
-                                drive.range._set_value(range_dict['electricRangeKm'], unit=Length.KM)  # pylint: disable=protected-access
+                            if 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'electricRangeKm' \
+                                    and 'value' in range_dict and range_dict['value'] is not None:
+                                drive.range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
                                 break
                     elif drive.type.enabled and drive.type.value == GenericDrive.Type.GASOLINE:
                         for range_dict in data['ranges']:
-                            if 'gasolineRangeKm' in range_dict and range_dict['gasolineRangeKm'] is not None:
-                                drive.range._set_value(range_dict['gasolineRangeKm'], unit=Length.KM)  # pylint: disable=protected-access
+                            if 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'gasolineRangeKm' \
+                                    and 'value' in range_dict and range_dict['value'] is not None:
+                                drive.range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
                                 break
                     elif drive.type.enabled and drive.type.value == GenericDrive.Type.DIESEL:
                         for range_dict in data['ranges']:
-                            if 'dieselRangeKm' in range_dict and range_dict['dieselRangeKm'] is not None:
-                                drive.range._set_value(range_dict['dieselRangeKm'], unit=Length.KM)  # pylint: disable=protected-access
-                            elif 'adBlueKm' in range_dict and range_dict['adBlueKm'] is not None:
+                            if 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'dieselRangeKm' \
+                                    and 'value' in range_dict and range_dict['value'] is not None:
+                                drive.range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
+                            elif 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'adBlueKm' \
+                                    and 'value' in range_dict and range_dict['value'] is not None:
                                 if isinstance(drive, DieselDrive):
-                                    drive.adblue_range._set_value(range_dict['adBlueKm'], unit=Length.KM)  # pylint: disable=protected-access
+                                    drive.adblue_range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
             log_extra_keys(LOG_API, f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/ranges', data,  {'ranges'})
         return vehicle
 
@@ -954,7 +960,57 @@ class Connector(BaseConnector):
                 log_extra_keys(LOG_API, 'climatisationStatus', data['climatisationStatus'], {'carCapturedTimestamp', 'climatisationState'})
             else:
                 vehicle.climatization.state._set_value(None)  # pylint: disable=protected-access
-            log_extra_keys(LOG_API, 'climatisation', data, {'climatisationStatus'})
+            if 'windowHeatingStatus' in data and data['windowHeatingStatus'] is not None:
+                window_heating_status: Dict = data['windowHeatingStatus']
+                if 'carCapturedTimestamp' not in window_heating_status or window_heating_status['carCapturedTimestamp'] is None:
+                    raise APIError('Could not fetch vehicle status, carCapturedTimestamp missing')
+                captured_at: datetime = robust_time_parse(window_heating_status['carCapturedTimestamp'])
+                if 'windowHeatingStatus' in window_heating_status and window_heating_status['windowHeatingStatus'] is not None:
+                    heating_on: bool = False
+                    all_heating_invalid: bool = True
+                    for window_heating in window_heating_status['windowHeatingStatus']:
+                        if 'windowLocation' in window_heating and window_heating['windowLocation'] is not None:
+                            window_id = window_heating['windowLocation']
+                            if window_id in vehicle.window_heatings.windows:
+                                window: WindowHeatings.WindowHeating = vehicle.window_heatings.windows[window_id]
+                            else:
+                                window = WindowHeatings.WindowHeating(window_id=window_id, window_heatings=vehicle.window_heatings)
+                                vehicle.window_heatings.windows[window_id] = window
+                            if 'windowHeatingState' in window_heating and window_heating['windowHeatingState'] is not None:
+                                if window_heating['windowHeatingState'] in [item.value for item in WindowHeatings.HeatingState]:
+                                    window_heating_state: WindowHeatings.HeatingState = WindowHeatings.HeatingState(window_heating['windowHeatingState'])
+                                    if window_heating_state == WindowHeatings.HeatingState.ON:
+                                        heating_on = True
+                                    if window_heating_state in [WindowHeatings.HeatingState.ON,
+                                                                WindowHeatings.HeatingState.OFF]:
+                                        all_heating_invalid = False
+                                    window.heating_state._set_value(window_heating_state, measured=captured_at)  # pylint: disable=protected-access
+                                else:
+                                    LOG_API.info('Unknown window heating state %s not in %s', window_heating['windowHeatingState'],
+                                                    str(WindowHeatings.HeatingState))
+                                    # pylint: disable-next=protected-access
+                                    window.heating_state._set_value(WindowHeatings.HeatingState.UNKNOWN, measured=captured_at)
+                            else:
+                                window.heating_state._set_value(None, measured=captured_at)  # pylint: disable=protected-access
+                        log_extra_keys(LOG_API, 'windowHeatingStatus', window_heating, {'windowLocation', 'windowHeatingState'})
+                    if all_heating_invalid:
+                        # pylint: disable-next=protected-access
+                        vehicle.window_heatings.heating_state._set_value(WindowHeatings.HeatingState.INVALID, measured=captured_at)
+                    else:
+                        if heating_on:
+                            # pylint: disable-next=protected-access
+                            vehicle.window_heatings.heating_state._set_value(WindowHeatings.HeatingState.ON, measured=captured_at)
+                        else:
+                            # pylint: disable-next=protected-access
+                            vehicle.window_heatings.heating_state._set_value(WindowHeatings.HeatingState.OFF, measured=captured_at)
+                if vehicle.window_heatings is not None and vehicle.window_heatings.commands is not None \
+                        and not vehicle.window_heatings.commands.contains_command('start-stop'):
+                    start_stop_command = WindowHeatingStartStopCommand(parent=vehicle.window_heatings.commands)
+                    start_stop_command._add_on_set_hook(self.__on_window_heating_start_stop)  # pylint: disable=protected-access
+                    start_stop_command.enabled = True
+                    vehicle.window_heatings.commands.add_command(start_stop_command)
+                log_extra_keys(LOG_API, 'windowHeatingStatus', window_heating_status, {'carCapturedTimestamp', 'windowHeatingStatus'})
+            log_extra_keys(LOG_API, 'climatisation', data, {'climatisationStatus', 'windowHeatingStatus'})
         url = f'https://ola.prod.code.seat.cloud.vwgroup.com/v2/vehicles/{vin}/climatisation/settings'
         data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if data is not None:
@@ -1238,7 +1294,6 @@ class Connector(BaseConnector):
             raise CommandError('VIN in object hierarchy missing')
         if 'command' not in command_arguments:
             raise CommandError('Command argument missing')
-        command_dict: Dict = {}
         try:
             if command_arguments['command'] == ChargingStartStopCommand.Command.START:
                 url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/requests/start'
@@ -1559,6 +1614,43 @@ class Connector(BaseConnector):
             raise SetterError(f'Retrying failed: {retry_error}') from retry_error
         return value
 
+    def __on_window_heating_start_stop(self, start_stop_command: WindowHeatingStartStopCommand, command_arguments: Union[str, Dict[str, Any]]) \
+            -> Union[str, Dict[str, Any]]:
+        if start_stop_command.parent is None or start_stop_command.parent.parent is None \
+                or start_stop_command.parent.parent.parent is None or not isinstance(start_stop_command.parent.parent.parent, SeatCupraVehicle):
+            raise CommandError('Object hierarchy is not as expected')
+        if not isinstance(command_arguments, dict):
+            raise CommandError('Command arguments are not a dictionary')
+        vehicle: SeatCupraVehicle = start_stop_command.parent.parent.parent
+        vin: Optional[str] = vehicle.vin.value
+        if vin is None:
+            raise CommandError('VIN in object hierarchy missing')
+        if 'command' not in command_arguments:
+            raise CommandError('Command argument missing')
+        try:
+            if command_arguments['command'] == WindowHeatingStartStopCommand.Command.START:
+                url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/windowheating/requests/start'
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
+            elif command_arguments['command'] == WindowHeatingStartStopCommand.Command.STOP:
+                url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/windowheating/requests/stop'
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
+            else:
+                raise CommandError(f'Unknown command {command_arguments["command"]}')
+
+            if command_response.status_code not in [requests.codes['ok'], requests.codes['created']]:
+                LOG.error('Could not start/stop window heating (%s: %s)', command_response.status_code, command_response.text)
+                raise CommandError(f'Could not start/stop window heating ({command_response.status_code}: {command_response.text})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise CommandError(f'Connection error: {connection_error}.'
+                               ' If this happens frequently, please check if other applications communicate with the Seat/Cupra server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise CommandError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise CommandError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise CommandError(f'Retrying failed: {retry_error}') from retry_error
+        return command_arguments
+
     def get_version(self) -> str:
         return __version__
 

carconnectivity_connectors/seatcupra/vehicle.py

@@ -34,7 +34,7 @@ class SeatCupraVehicle(GenericVehicle):  # pylint: disable=too-many-instance-att
     def __init__(self, vin: Optional[str] = None, garage: Optional[Garage] = None, managing_connector: Optional[BaseConnector] = None,
                  origin: Optional[SeatCupraVehicle] = None) -> None:
         if origin is not None:
-            super().__init__(origin=origin)
+            super().__init__(garage=garage, origin=origin)
             self.capabilities: Capabilities = origin.capabilities
             self.capabilities.parent = self
             if SUPPORT_IMAGES:
@@ -54,7 +54,7 @@ class SeatCupraElectricVehicle(ElectricVehicle, SeatCupraVehicle):
     def __init__(self, vin: Optional[str] = None, garage: Optional[Garage] = None, managing_connector: Optional[BaseConnector] = None,
                  origin: Optional[SeatCupraVehicle] = None) -> None:
         if origin is not None:
-            super().__init__(origin=origin)
+            super().__init__(garage=garage, origin=origin)
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)
 
@@ -66,7 +66,7 @@ class SeatCupraCombustionVehicle(CombustionVehicle, SeatCupraVehicle):
     def __init__(self, vin: Optional[str] = None, garage: Optional[Garage] = None, managing_connector: Optional[BaseConnector] = None,
                  origin: Optional[SeatCupraVehicle] = None) -> None:
         if origin is not None:
-            super().__init__(origin=origin)
+            super().__init__(garage=garage, origin=origin)
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)
 
@@ -78,6 +78,6 @@ class SeatCupraHybridVehicle(HybridVehicle, SeatCupraVehicle):
     def __init__(self, vin: Optional[str] = None, garage: Optional[Garage] = None, managing_connector: Optional[BaseConnector] = None,
                  origin: Optional[SeatCupraVehicle] = None) -> None:
         if origin is not None:
-            super().__init__(origin=origin)
+            super().__init__(garage=garage, origin=origin)
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)