carconnectivity-connector-seatcupra 0.1.2a2__tar.gz → 0.2a2__tar.gz

{carconnectivity_connector_seatcupra-0.1.2a2 → carconnectivity_connector_seatcupra-0.2a2}/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 - No unreleased changes so far
 
+## [0.1.2] - 2025-03-07
+### Fixed
+- Fixed bug during refreshing tokens due to connection being reset on server side and client session timing out.
+
 ## [0.1.1] - 2025-03-04
 ### Fixed
 - Fixed potential http error when parking position was fetched but due to error not available
@@ -15,6 +19,7 @@ All notable changes to this project will be documented in this file.
 ## [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
+[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/compare/v0.1.2...HEAD
+[0.1.2]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1.2
 [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.1.2a2 → carconnectivity_connector_seatcupra-0.2a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1.2a2
+Version: 0.2a2
 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.4
+Requires-Dist: carconnectivity>=0.5a1
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.1.2a2 → carconnectivity_connector_seatcupra-0.2a2}/pyproject.toml

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

{carconnectivity_connector_seatcupra-0.1.2a2 → carconnectivity_connector_seatcupra-0.2a2}/src/carconnectivity_connector_seatcupra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1.2a2
+Version: 0.2a2
 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.4
+Requires-Dist: carconnectivity>=0.5a1
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.1.2a2 → carconnectivity_connector_seatcupra-0.2a2}/src/carconnectivity_connector_seatcupra.egg-info/requires.txt

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

{carconnectivity_connector_seatcupra-0.1.2a2 → carconnectivity_connector_seatcupra-0.2a2}/src/carconnectivity_connectors/seatcupra/_version.py

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

{carconnectivity_connector_seatcupra-0.1.2a2 → carconnectivity_connector_seatcupra-0.2a2}/src/carconnectivity_connectors/seatcupra/connector.py

@@ -20,7 +20,7 @@ from carconnectivity.units import Length, Current
 from carconnectivity.doors import Doors
 from carconnectivity.windows import Windows
 from carconnectivity.lights import Lights
-from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive
+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.units import Temperature
@@ -288,6 +288,7 @@ 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)
+                vehicle_to_update = self.fetch_ranges(vehicle_to_update)
                 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', check_status_ok=True):
@@ -414,7 +415,7 @@ class Connector(BaseConnector):
                                                 capability.parameters[parameter] = value
                                     else:
                                         raise APIError('Could not fetch capabilities, capability ID missing')
-                                    log_extra_keys(LOG_API, 'capability', capability_dict,  {'id', 'expirationDate', 'editable', 'parameters'})
+                                    log_extra_keys(LOG_API, 'capability', capability_dict,  {'id', 'expirationDate', 'editable', 'parameters', 'status'})
 
                                 for capability_id in vehicle.capabilities.capabilities.keys() - found_capabilities:
                                     vehicle.capabilities.remove_capability(capability_id)
@@ -646,6 +647,8 @@ class Connector(BaseConnector):
                         else:
                             if engine_type == GenericDrive.Type.ELECTRIC:
                                 drive = ElectricDrive(drive_id=drive_id, drives=vehicle.drives)
+                            elif engine_type == GenericDrive.Type.DIESEL:
+                                drive = DieselDrive(drive_id=drive_id, drives=vehicle.drives)
                             elif engine_type in [GenericDrive.Type.FUEL,
                                                  GenericDrive.Type.GASOLINE,
                                                  GenericDrive.Type.PETROL,
@@ -845,6 +848,40 @@ class Connector(BaseConnector):
             vehicle.odometer._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
+    def fetch_ranges(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
+        vin = vehicle.vin.value
+        if vin is None:
+            raise APIError('VIN is missing')
+        url = f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/ranges'
+        # {'ranges': [{'rangeName': 'gasolineRangeKm', 'value': 100.0}, {'rangeName': 'electricRangeKm', 'value': 28.0}]}
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        if data is not None:
+            if 'ranges' in data and data['ranges'] is not None:
+                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 '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 '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 '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['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
+
     def fetch_maintenance(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
         vin = vehicle.vin.value
         if vin is None: