carconnectivity-connector-seatcupra 0.1a18__tar.gz → 0.1.2__tar.gz

carconnectivity_connector_seatcupra-0.1.2/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [Unreleased]
+- No unreleased changes so far
+
+## [0.1.1] - 2025-03-04
+### Fixed
+- Fixed potential http error when parking position was fetched but due to error not available
+
+### Added
+- Added connection state and vehicle state to the public API
+
+## [0.1] - 2025-03-02
+Initial release, let's go and give this to the public to try out...
+
+[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/compare/v0.1.1...HEAD
+[0.1.1]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1.1
+[0.1]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1

{carconnectivity_connector_seatcupra-0.1a18 → carconnectivity_connector_seatcupra-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a18
+Version: 0.1.2
 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.1a18 → carconnectivity_connector_seatcupra-0.1.2}/README.md

@@ -10,9 +10,6 @@
 [![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.1a18 → carconnectivity_connector_seatcupra-0.1.2}/pyproject.toml

@@ -14,7 +14,7 @@ authors = [
     { name = "Till Steinbach" }
 ]
 dependencies = [
-    "carconnectivity>=0.4a11",
+    "carconnectivity>=0.4",
     "oauthlib~=3.2.2",
     "requests~=2.32.3",
     "jwt~=1.3.1"

{carconnectivity_connector_seatcupra-0.1a18 → carconnectivity_connector_seatcupra-0.1.2}/src/carconnectivity_connector_seatcupra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a18
+Version: 0.1.2
 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.1a18 → carconnectivity_connector_seatcupra-0.1.2}/src/carconnectivity_connector_seatcupra.egg-info/requires.txt

@@ -1,4 +1,4 @@
-carconnectivity>=0.4a11
+carconnectivity>=0.4
 oauthlib~=3.2.2
 requests~=2.32.3
 jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.1a18 → carconnectivity_connector_seatcupra-0.1.2}/src/carconnectivity_connectors/seatcupra/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1a18'
-__version_tuple__ = version_tuple = (0, 1)
+__version__ = version = '0.1.2'
+__version_tuple__ = version_tuple = (0, 1, 2)

{carconnectivity_connector_seatcupra-0.1a18 → carconnectivity_connector_seatcupra-0.1.2}/src/carconnectivity_connectors/seatcupra/auth/my_cupra_session.py

@@ -46,6 +46,7 @@ class MyCupraSession(VWWebSession):
 
             self.headers = CaseInsensitiveDict({
                 'accept': '*/*',
+                'connection': 'keep-alive',
                 'content-type': 'application/json',
                 'user-agent': 'SEATApp/2.5.0 (com.seat.myseat.ola; build:202410171614; iOS 15.8.3) Alamofire/5.7.0 Mobile',
                 'accept-language': 'de-de',
@@ -62,6 +63,7 @@ class MyCupraSession(VWWebSession):
 
             self.headers = CaseInsensitiveDict({
                 'accept': '*/*',
+                'connection': 'keep-alive',
                 'content-type': 'application/json',
                 'user-agent': 'CUPRAApp%20-%20Store/20220503 CFNetwork/1333.0.4 Darwin/21.5.0',
                 'accept-language': 'de-de',
@@ -72,12 +74,15 @@ class MyCupraSession(VWWebSession):
         super(MyCupraSession, self).login()
         # retrieve authorization URL
         authorization_url_str: str = self.authorization_url(url='https://identity.vwgroup.io/oidc/v1/authorize')
-        # perform web authentication
-        response = self.do_web_auth(authorization_url_str)
+        if self.redirect_uri is not None and authorization_url_str.startswith(self.redirect_uri):
+            response = authorization_url_str.replace(self.redirect_uri + '#', 'https://egal?')
+        else:
+            # perform web authentication
+            response = self.do_web_auth(authorization_url_str)
         # fetch tokens from web authentication response
         if self.is_seat:
-            return self.fetch_tokens('https://ola.prod.code.seat.cloud.vwgroup.com/authorization/api/v1/token',
-                                     authorization_response=response)
+            self.fetch_tokens('https://ola.prod.code.seat.cloud.vwgroup.com/authorization/api/v1/token',
+                              authorization_response=response)
         else:
             self.fetch_tokens('https://identity.vwgroup.io/oidc/v1/token',
                               authorization_response=response)
@@ -217,27 +222,43 @@ class MyCupraSession(VWWebSession):
         if headers is None:
             headers = dict(self.headers)
 
-        body: Dict[str, str] = {
-            'client_id': self.client_id,
-            'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
-            'grant_type': 'refresh_token',
-            'refresh_token': self.refresh_token
-        }
+        if self.is_seat:
+            body: Dict[str, str] = {
+                'client_id': self.client_id,
+                'grant_type': 'refresh_token',
+                'refresh_token': self.refresh_token
+            }
+        else:
+            body: Dict[str, str] = {
+                'client_id': self.client_id,
+                'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
+                'grant_type': 'refresh_token',
+                'refresh_token': self.refresh_token
+            }
 
         headers['content-type'] = 'application/x-www-form-urlencoded; charset=utf-8'
 
-        # Request new tokens using the refresh token
-        token_response = self.post(
-            token_url,
-            data=body,
-            auth=auth,
-            timeout=timeout,
-            headers=headers,
-            verify=verify,
-            withhold_token=False,  # pyright: ignore reportCallIssue
-            proxies=proxies,
-            access_type=AccessType.NONE  # pyright: ignore reportCallIssue
-        )
+        tries = 0
+        while True:
+            try:
+                # Request new tokens using the refresh token
+                token_response = self.post(
+                    token_url,
+                    data=body,
+                    auth=auth,
+                    timeout=timeout,
+                    headers=headers,
+                    verify=verify,
+                    withhold_token=False,  # pyright: ignore reportCallIssue
+                    proxies=proxies,
+                    access_type=AccessType.NONE  # pyright: ignore reportCallIssue
+                )
+            except requests.exceptions.RequestException as err:
+                tries += 1
+                if tries >= 3:
+                    raise TemporaryAuthenticationError('Token could not be refreshed due to temporary MyCupra failure') from err
+            else:
+                break
         if token_response.status_code == requests.codes['unauthorized']:
             raise AuthenticationError('Refreshing tokens failed: Server requests new authorization')
         elif token_response.status_code in (requests.codes['internal_server_error'], requests.codes['service_unavailable'], requests.codes['gateway_timeout']):
@@ -263,7 +284,7 @@ class MyCupraSession(VWWebSession):
         token=None,
         timeout=None,
         **kwargs
-    ):
+    ) -> requests.Response:
         """Intercept all requests and add userId if present."""
         if not is_secure_transport(url):
             raise InsecureTransportError()

{carconnectivity_connector_seatcupra-0.1a18 → carconnectivity_connector_seatcupra-0.1.2}/src/carconnectivity_connectors/seatcupra/auth/openid_session.py

@@ -116,7 +116,8 @@ class OpenIDSession(requests.Session):
                                      backoff_factor=0.1,
                                      status_forcelist=[500],
                                      status_blacklist=[429],
-                                     raise_on_status=False)
+                                     raise_on_status=False,
+                                     allowed_methods=None)  # set allowed_methods to None to retry on all methods
             self.mount('https://', HTTPAdapter(max_retries=retries))
 
     @property

{carconnectivity_connector_seatcupra-0.1a18 → carconnectivity_connector_seatcupra-0.1.2}/src/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_connector_seatcupra-0.1a18 → carconnectivity_connector_seatcupra-0.1.2}/src/carconnectivity_connectors/seatcupra/connector.py

@@ -288,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.
@@ -369,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'])
@@ -390,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)
@@ -401,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 = \
@@ -411,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)
@@ -420,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)
@@ -429,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)
@@ -710,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.

carconnectivity_connector_seatcupra-0.1a18/CHANGELOG.md

@@ -1,12 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-## [Unreleased]
-- No unreleased changes so far
-
-## [0.1] - XXXX-XX-XX
-Initial release, let's go and give this to the public to try out...
-
-[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/compare/v0.1...HEAD
-[0.1]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1