carconnectivity-connector-seatcupra 0.1a17__py3-none-any.whl → 0.1.1__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.1a17.dist-info → carconnectivity_connector_seatcupra-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a17
+Version: 0.1.1
 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.4a11
+Requires-Dist: carconnectivity>=0.4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1
@@ -54,9 +54,6 @@ Requires-Dist: jwt~=1.3.1
 [![Donate at PayPal](https://img.shields.io/badge/Donate-PayPal-2997d8)](https://www.paypal.com/donate?hosted_button_id=2BVFF5GJ9SXAJ)
 [![Sponsor at Github](https://img.shields.io/badge/Sponsor-GitHub-28a745)](https://github.com/sponsors/tillsteinbach)
 
-
-## Due to lack of access to a Cupra car the development of this conenctor is currently stuck. If you want to help me with access to your account, please contact me!
-
 [CarConnectivity](https://github.com/tillsteinbach/CarConnectivity) is a python API to connect to various car services. This connector enables the integration of seat and cupra vehicles through the MyCupra API. Look at [CarConnectivity](https://github.com/tillsteinbach/CarConnectivity) for other supported brands.
 
 ## Configuration

{carconnectivity_connector_seatcupra-0.1a17.dist-info → carconnectivity_connector_seatcupra-0.1.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=h6qKff23EXoCChHlB_Nct7DIvHThmGCDSsQuZQK2zzA,509
-carconnectivity_connectors/seatcupra/capability.py,sha256=Oe9tC_u69bj6VmOuNJ21RKoETe2j3QyZCoz-VgcZPQ0,4523
+carconnectivity_connectors/seatcupra/_version.py,sha256=Mmxse1R0ki5tjz9qzU8AQyqUsLt8nTyCAbYQp8R87PU,511
+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=cOuQOlnImZlVMOjHbRrm2vo02zlNB4m87uO88subqZk,102253
+carconnectivity_connectors/seatcupra/connector.py,sha256=llxFhVdpnL5MxmHbOej1wMio5tareY3zha0qaFhnPgs,107680
 carconnectivity_connectors/seatcupra/vehicle.py,sha256=s0G-HqG5qcwStDxD3649KgLMa3lKPZ4TOGWRJEuQzsQ,3403
 carconnectivity_connectors/seatcupra/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/seatcupra/auth/auth_util.py,sha256=Y81h8fGOMSMgPtE4wI_TI9WgE_s43uaPjRLBBINhj4g,4433
@@ -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.1a17.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.1a17.dist-info/METADATA,sha256=Dat_Q7Tw4hiyrVptq1LiL5xLSAGzj2RH56jSJFyxR0c,5642
-carconnectivity_connector_seatcupra-0.1a17.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-carconnectivity_connector_seatcupra-0.1a17.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.1a17.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.1.1.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.1.1.dist-info/METADATA,sha256=Vh1baAcurqTyzfkXNO_Ts4GNO8nbFwXgpDS3r8kK2xs,5471
+carconnectivity_connector_seatcupra-0.1.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+carconnectivity_connector_seatcupra-0.1.1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.1.1.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.1a17'
-__version_tuple__ = version_tuple = (0, 1)
+__version__ = version = '0.1.1'
+__version_tuple__ = version_tuple = (0, 1, 1)

carconnectivity_connectors/seatcupra/capability.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from enum import IntEnum
 
 from carconnectivity.objects import GenericObject
-from carconnectivity.attributes import StringAttribute, BooleanAttribute, DateAttribute
+from carconnectivity.attributes import StringAttribute, BooleanAttribute, DateAttribute, GenericAttribute
 
 if TYPE_CHECKING:
     from typing import Dict, Optional, List
@@ -77,7 +77,7 @@ class Capabilities(GenericObject):
         """
         return self.__capabilities.get(capability_id)
 
-    def has_capability(self, capability_id: str) -> bool:
+    def has_capability(self, capability_id: str, check_status_ok=False) -> bool:
         """
         Check if the Capabilities contains a capability with the specified ID.
 
@@ -87,7 +87,14 @@ class Capabilities(GenericObject):
         Returns:
             bool: True if the capability exists, otherwise False.
         """
-        return capability_id in self.__capabilities
+        if check_status_ok:
+            if capability_id in self.__capabilities and self.__capabilities[capability_id].enabled:
+                capability: Capability = self.__capabilities[capability_id]
+                if capability.status.enabled and capability.status.value is not None and len(capability.status.value) > 0:
+                    return False
+                return True
+            return False
+        return capability_id in self.__capabilities and self.__capabilities[capability_id].enabled
 
 
 class Capability(GenericObject):
@@ -105,7 +112,7 @@ class Capability(GenericObject):
         self.capability_id = StringAttribute("id", self, capability_id, tags={'connector_custom'})
         self.expiration_date = DateAttribute("expiration_date", self, tags={'connector_custom'})
         self.editable = BooleanAttribute("editable", self, tags={'connector_custom'})
-        self.statuses: List[Capability.Status] = []
+        self.status = GenericAttribute("status", self, value=[], tags={'connector_custom'})
         self.parameters: Dict[str, bool] = {}
         self.enabled = True
         self.delay_notifications = False

carconnectivity_connectors/seatcupra/connector.py

@@ -191,25 +191,34 @@ class Connector(BaseConnector):
                     raise
             except TooManyRequestsError as err:
                 LOG.error('Retrieval error during update. Too many requests from your account (%s). Will try again after 15 minutes', str(err))
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
                 self._stop_event.wait(900)
             except RetrievalError as err:
                 LOG.error('Retrieval error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
                 self._stop_event.wait(interval)
             except APIError as err:
                 LOG.error('API error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
                 self._stop_event.wait(interval)
             except APICompatibilityError as err:
                 LOG.error('API compatability error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
                 self._stop_event.wait(interval)
             except TemporaryAuthenticationError as err:
                 LOG.error('Temporary authentification error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
                 self._stop_event.wait(interval)
             except Exception as err:
                 LOG.critical('Critical error during update: %s', traceback.format_exc())
+                self.connection_state._set_value(value=ConnectionState.ERROR)  # pylint: disable=protected-access
                 self.healthy._set_value(value=False)  # pylint: disable=protected-access
                 raise err
             else:
+                self.connection_state._set_value(value=ConnectionState.CONNECTED)  # pylint: disable=protected-access
                 self._stop_event.wait(interval)
+        # When leaving the loop, set the connection state to disconnected
+        self.connection_state._set_value(value=ConnectionState.DISCONNECTED)  # pylint: disable=protected-access
 
     def persist(self) -> None:
         """
@@ -279,16 +288,32 @@ class Connector(BaseConnector):
                 vehicle_to_update = self.fetch_vehicle_status(vehicle_to_update)
                 vehicle_to_update = self.fetch_vehicle_mycar_status(vehicle_to_update)
                 vehicle_to_update = self.fetch_mileage(vehicle_to_update)
-                if vehicle_to_update.capabilities.has_capability('climatisation'):
+                if vehicle_to_update.capabilities.has_capability('climatisation', check_status_ok=True):
                     vehicle_to_update = self.fetch_climatisation(vehicle_to_update)
-                if vehicle_to_update.capabilities.has_capability('charging'):
+                if vehicle_to_update.capabilities.has_capability('charging', check_status_ok=True):
                     vehicle_to_update = self.fetch_charging(vehicle_to_update)
-                if vehicle_to_update.capabilities.has_capability('parkingPosition'):
+                if vehicle_to_update.capabilities.has_capability('parkingPosition', check_status_ok=True):
                     vehicle_to_update = self.fetch_parking_position(vehicle_to_update)
-                if vehicle_to_update.capabilities.has_capability('vehicleHealthInspection'):
+                if vehicle_to_update.capabilities.has_capability('vehicleHealthInspection', check_status_ok=True):
                     vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
+                vehicle_to_update = self.fetch_connection_status(vehicle_to_update)
+                self.decide_state(vehicle_to_update)
         self.car_connectivity.transaction_end()
 
+    def decide_state(self, vehicle: SeatCupraVehicle) -> None:
+        """
+        Decides the state of the vehicle based on the current data.
+
+        Args:
+            vehicle (SeatCupraVehicle): The SeatCupra vehicle object.
+        """
+        if vehicle is not None:
+            if vehicle.position is not None and vehicle.position.enabled and vehicle.position.position_type is not None \
+                    and vehicle.position.position_type.enabled and vehicle.position.position_type.value == Position.PositionType.PARKING:
+                vehicle.state._set_value(GenericVehicle.State.PARKED)  # pylint: disable=protected-access
+            else:
+                vehicle.state._set_value(None)  # pylint: disable=protected-access
+
     def fetch_vehicles(self) -> None:
         """
         Fetches the list of vehicles from the Seat/Cupra Connect API and updates the garage with new vehicles.
@@ -360,6 +385,19 @@ class Connector(BaseConnector):
                                         else:
                                             capability = Capability(capability_id=capability_id, capabilities=vehicle.capabilities)
                                             vehicle.capabilities.add_capability(capability_id, capability)
+                                        if 'status' in capability_dict and capability_dict['status'] is not None:
+                                            statuses = capability_dict['status']
+                                            if isinstance(statuses, list):
+                                                for status in statuses:
+                                                    if status in [item.value for item in Capability.Status]:
+                                                        capability.status.value.append(Capability.Status(status))
+                                                    else:
+                                                        LOG_API.warning('Capability status unkown %s', status)
+                                                        capability.status.value.append(Capability.Status.UNKNOWN)
+                                            else:
+                                                LOG_API.warning('Capability status not a list in %s', statuses)
+                                        else:
+                                            capability.status.value.clear()                                  
                                         if 'expirationDate' in capability_dict and capability_dict['expirationDate'] is not None \
                                                 and capability_dict['expirationDate'] != '':
                                             expiration_date: datetime = robust_time_parse(capability_dict['expirationDate'])
@@ -381,7 +419,7 @@ class Connector(BaseConnector):
                                 for capability_id in vehicle.capabilities.capabilities.keys() - found_capabilities:
                                     vehicle.capabilities.remove_capability(capability_id)
 
-                                if vehicle.capabilities.has_capability('charging'):
+                                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)
@@ -392,7 +430,7 @@ class Connector(BaseConnector):
                                         charging_start_stop_command.enabled = True
                                         vehicle.charging.commands.add_command(charging_start_stop_command)
 
-                                if vehicle.capabilities.has_capability('climatisation'):
+                                if vehicle.capabilities.has_capability('climatisation', check_status_ok=True):
                                     if vehicle.climatization is not None and vehicle.climatization.commands is not None \
                                             and not vehicle.climatization.commands.contains_command('start-stop'):
                                         climatisation_start_stop_command: ClimatizationStartStopCommand = \
@@ -402,7 +440,7 @@ class Connector(BaseConnector):
                                         climatisation_start_stop_command.enabled = True
                                         vehicle.climatization.commands.add_command(climatisation_start_stop_command)
 
-                                if vehicle.capabilities.has_capability('vehicleWakeUpTrigger'):
+                                if vehicle.capabilities.has_capability('vehicleWakeUpTrigger', check_status_ok=True):
                                     if vehicle.commands is not None and vehicle.commands.commands is not None \
                                             and not vehicle.commands.contains_command('wake-sleep'):
                                         wake_sleep_command = WakeSleepCommand(parent=vehicle.commands)
@@ -411,7 +449,7 @@ class Connector(BaseConnector):
                                         vehicle.commands.add_command(wake_sleep_command)
 
                                 # Add honkAndFlash command if necessary capabilities are available
-                                if vehicle.capabilities.has_capability('honkAndFlash'):
+                                if vehicle.capabilities.has_capability('honkAndFlash', check_status_ok=True):
                                     if vehicle.commands is not None and vehicle.commands.commands is not None \
                                             and not vehicle.commands.contains_command('honk-flash'):
                                         honk_flash_command = HonkAndFlashCommand(parent=vehicle.commands, with_duration=True)
@@ -420,7 +458,7 @@ class Connector(BaseConnector):
                                         vehicle.commands.add_command(honk_flash_command)
 
                                 # Add lock and unlock command
-                                if vehicle.capabilities.has_capability('access'):
+                                if vehicle.capabilities.has_capability('access', check_status_ok=True):
                                     if vehicle.doors is not None and vehicle.doors.commands is not None and vehicle.doors.commands.commands is not None \
                                             and not vehicle.doors.commands.contains_command('lock-unlock'):
                                         lock_unlock_command = LockUnlockCommand(parent=vehicle.doors.commands)
@@ -701,6 +739,43 @@ class Connector(BaseConnector):
                                                                                     'remainingTime'})
         return vehicle
 
+    def fetch_connection_status(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
+        """
+        Fetches the connection status of the given Seat/Cupra vehicle and updates its connection attributes.
+
+        Args:
+            vehicle (SeatCupraVehicle): The Seat/Cupra vehicle object containing the VIN and connection attributes.
+
+        Returns:
+            SeatCupraVehicle: The updated Seat/Cupra vehicle object with the fetched connection data.
+
+        Raises:
+            APIError: If the VIN is missing.
+            ValueError: If the vehicle has no connection object.
+        """
+        vin = vehicle.vin.value
+        if vin is None:
+            raise APIError('VIN is missing')
+        url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/connection'
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        #  {'connection': {'mode': 'online'}
+        if data is not None:
+            if 'connection' in data and data['connection'] is not None:
+                if 'mode' in data['connection'] and data['connection']['mode'] is not None:
+                    if data['connection']['mode'] in [item.value for item in GenericVehicle.ConnectionState]:
+                        connection_state: GenericVehicle.ConnectionState = GenericVehicle.ConnectionState(data['connection']['mode'])
+                        vehicle.connection_state._set_value(connection_state)  # pylint: disable=protected-access
+                    else:
+                        vehicle.connection_state._set_value(GenericVehicle.ConnectionState.UNKNOWN)  # pylint: disable=protected-access
+                        LOG_API.info('Unknown connection state %s', data['connection']['mode'])
+                else:
+                    vehicle.connection_state._set_value(None)  # pylint: disable=protected-access
+                log_extra_keys(LOG_API, 'connection status', data['connection'],  {'mode'})
+            else:
+                vehicle.connection_state._set_value(None)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, 'connection status', data,  {'connection'})
+        return vehicle
+
     def fetch_parking_position(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
         """
         Fetches the position of the given vehicle and updates its position attributes.