carconnectivity-connector-seatcupra 0.1a4__tar.gz → 0.1a6__tar.gz

{carconnectivity_connector_seatcupra-0.1a4 → carconnectivity_connector_seatcupra-0.1a6}/PKG-INFO

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

{carconnectivity_connector_seatcupra-0.1a4 → carconnectivity_connector_seatcupra-0.1a6}/pyproject.toml

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

{carconnectivity_connector_seatcupra-0.1a4 → carconnectivity_connector_seatcupra-0.1a6}/src/carconnectivity_connector_seatcupra.egg-info/PKG-INFO

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

{carconnectivity_connector_seatcupra-0.1a4 → carconnectivity_connector_seatcupra-0.1a6}/src/carconnectivity_connector_seatcupra.egg-info/requires.txt

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

{carconnectivity_connector_seatcupra-0.1a4 → carconnectivity_connector_seatcupra-0.1a6}/src/carconnectivity_connectors/seatcupra/_version.py

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

{carconnectivity_connector_seatcupra-0.1a4 → carconnectivity_connector_seatcupra-0.1a6}/src/carconnectivity_connectors/seatcupra/connector.py

@@ -259,6 +259,8 @@ class Connector(BaseConnector):
                     vehicle_to_update = self.fetch_charging(vehicle_to_update)
                 if vehicle_to_update.capabilities.has_capability('parkingPosition'):
                     vehicle_to_update = self.fetch_parking_position(vehicle_to_update)
+                if vehicle_to_update.capabilities.has_capability('vehicleHealthInspection'):
+                    vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
 
     def fetch_vehicles(self) -> None:
         """
@@ -737,6 +739,42 @@ class Connector(BaseConnector):
             vehicle.odometer._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
+    def fetch_maintenance(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}/maintenance'
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        if data is not None:
+            if 'inspectionDueDays' in data and data['inspectionDueDays'] is not None:
+                inspection_due: timedelta = timedelta(days=data['inspectionDueDays'])
+                inspection_date: datetime = datetime.now(tz=timezone.utc) + inspection_due
+                inspection_date = inspection_date.replace(hour=0, minute=0, second=0, microsecond=0)
+                # pylint: disable-next=protected-access
+                vehicle.maintenance.inspection_due_at._set_value(value=inspection_date)
+            else:
+                vehicle.maintenance.inspection_due_at._set_value(None)  # pylint: disable=protected-access
+            if 'inspectionDueKm' in data and data['inspectionDueKm'] is not None:
+                vehicle.maintenance.inspection_due_after._set_value(data['inspectionDueKm'], unit=Length.KM)  # pylint: disable=protected-access
+            else:
+                vehicle.maintenance.inspection_due_after._set_value(None)  # pylint: disable=protected-access
+            if 'oilServiceDueDays' in data and data['oilServiceDueDays'] is not None:
+                oil_service_due: timedelta = timedelta(days=data['oilServiceDueDays'])
+                oil_service_date: datetime = datetime.now(tz=timezone.utc) + oil_service_due
+                oil_service_date = oil_service_date.replace(hour=0, minute=0, second=0, microsecond=0)
+                # pylint: disable-next=protected-access
+                vehicle.maintenance.oil_service_due_at._set_value(value=oil_service_date)
+            else:
+                vehicle.maintenance.oil_service_due_at._set_value(None)  # pylint: disable=protected-access
+            if 'oilServiceDueKm' in data and data['oilServiceDueKm'] is not None:
+                vehicle.maintenance.oil_service_due_after._set_value(data['oilServiceDueKm'], unit=Length.KM)  # pylint: disable=protected-access
+            else:
+                vehicle.maintenance.oil_service_due_after._set_value(None)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, f'/v1/vehicles/{vin}/maintenance', data,  {'inspectionDueDays', 'inspectionDueKm', 'oilServiceDueDays', 'oilServiceDueKm'})
+        else:
+            vehicle.odometer._set_value(None)  # pylint: disable=protected-access
+        return vehicle
+
     def fetch_climatisation(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
         """
         Fetches the mileage of the given vehicle and updates its mileage attributes.
@@ -1050,9 +1088,19 @@ class Connector(BaseConnector):
             raise CommandError('VIN in object hierarchy missing')
         if 'command' not in command_arguments:
             raise CommandError('Command argument missing')
+        command_dict: Dict = {}
         if command_arguments['command'] == ChargingStartStopCommand.Command.START:
             url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/requests/start'
-            command_response: requests.Response = self.session.post(url, data='{}', allow_redirects=True)
+            if isinstance(vehicle, SeatCupraElectricVehicle) and vehicle.charging is not None and vehicle.charging.settings is not None \
+                    and vehicle.charging.settings.maximum_current is not None and vehicle.charging.settings.maximum_current.enabled \
+                    and vehicle.charging.settings.maximum_current.value is not None:
+                if vehicle.charging.settings.maximum_current.value <= 6:
+                    command_dict['maxChargeCurrentAC'] = 'reduced'
+                else:
+                    command_dict['maxChargeCurrentAC'] = 'maximum'
+            else:
+                command_dict['maxChargeCurrentAC'] = 'maximum'
+            command_response: requests.Response = self.session.post(url, json=command_dict, allow_redirects=True)
         elif command_arguments['command'] == ChargingStartStopCommand.Command.STOP:
             url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/requests/stop'
             command_response: requests.Response = self.session.post(url, data='{}', allow_redirects=True)
@@ -1078,15 +1126,35 @@ class Connector(BaseConnector):
         if 'command' not in command_arguments:
             raise CommandError('Command argument missing')
         command_dict = {}
-        command_str: Optional[str] = None
         if command_arguments['command'] == ClimatizationStartStopCommand.Command.START:
-            command_str = 'start'
+            url = f'https://ola.prod.code.seat.cloud.vwgroup.com/v2/vehicles/{vin}/climatisation/start'
+            if vehicle.climatization.settings is None:
+                raise CommandError('Could not control climatisation, there are no climatisation settings for the vehicle available.')
+            if 'target_temperature' in command_arguments:
+                # Round target temperature to nearest 0.5
+                command_dict['targetTemperature'] = round(command_arguments['target_temperature'] * 2) / 2
+            elif vehicle.climatization.settings.target_temperature is not None and vehicle.climatization.settings.target_temperature.enabled \
+                    and vehicle.climatization.settings.target_temperature.value is not None:
+                temperature_value = vehicle.climatization.settings.target_temperature.value
+                if vehicle.climatization.settings.target_temperature.unit == Temperature.C:
+                    command_dict['targetTemperatureUnit'] = 'celsius'
+                elif vehicle.climatization.settings.target_temperature.unit == Temperature.F:
+                    command_dict['targetTemperatureUnit'] = 'farenheit'
+                else:
+                    command_dict['targetTemperatureUnit'] = 'celsius'
+                if temperature_value is not None:
+                    command_dict['targetTemperature'] = round(temperature_value * 2) / 2
+            if 'target_temperature_unit' in command_arguments:
+                if command_arguments['target_temperature_unit'] == Temperature.C:
+                    command_dict['targetTemperatureUnit'] = 'celsius'
+                elif command_arguments['target_temperature_unit'] == Temperature.F:
+                    command_dict['targetTemperatureUnit'] = 'farenheit'
+                else:
+                    command_dict['targetTemperatureUnit'] = 'celsius'
         elif command_arguments['command'] == ClimatizationStartStopCommand.Command.STOP:
-            command_str = 'stop'
+            url: str = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/climatisation/requests/stop'
         else:
             raise CommandError(f'Unknown command {command_arguments["command"]}')
-
-        url: str = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/climatisation/requests/{command_str}'
         command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
         if command_response.status_code not in [requests.codes['ok'], requests.codes['created']]:
             LOG.error('Could not start/stop air conditioning (%s: %s)', command_response.status_code, command_response.text)
@@ -1104,7 +1172,7 @@ class Connector(BaseConnector):
         if self.active_config['spin'] is None:
             raise CommandError('S-PIN is missing, please add S-PIN to your configuration or .netrc file')
         if 'spin' in command_arguments:
-            command_dict['currentSpin'] = command_arguments['spin']
+            command_dict['spin'] = command_arguments['spin']
         else:
             if self.active_config['spin'] is None or self.active_config['spin'] == '':
                 raise CommandError('S-PIN is missing, please add S-PIN to your configuration or .netrc file')

{carconnectivity_connector_seatcupra-0.1a4 → carconnectivity_connector_seatcupra-0.1a6}/src/carconnectivity_connectors/seatcupra/vehicle.py

@@ -41,7 +41,7 @@ class SeatCupraVehicle(GenericVehicle):  # pylint: disable=too-many-instance-att
                 self._car_images = origin._car_images
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)
-            self.climatization = SeatCupraClimatization(origin=self.climatization)
+            self.climatization = SeatCupraClimatization(vehicle=self, origin=self.climatization)
             self.capabilities: Capabilities = Capabilities(vehicle=self)
             if SUPPORT_IMAGES:
                 self._car_images: Dict[str, Image.Image] = {}