carconnectivity-connector-skoda 0.4a4__tar.gz → 0.4a6__tar.gz

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.4a4
+Version: 0.4a6
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -37,7 +37,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.4a6
+Requires-Dist: carconnectivity>=0.4a10
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/pyproject.toml

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

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.4a4
+Version: 0.4a6
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -37,7 +37,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.4a6
+Requires-Dist: carconnectivity>=0.4a10
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/src/carconnectivity_connector_skoda.egg-info/requires.txt

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

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/src/carconnectivity_connectors/skoda/_version.py

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

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/src/carconnectivity_connectors/skoda/command_impl.py

@@ -31,6 +31,8 @@ class SpinCommand(GenericCommand):
 
     @value.setter
     def value(self, new_value: Optional[Union[str, Dict]]) -> None:
+        # Execute early hooks before parsing the value
+        new_value = self._execute_on_set_hook(new_value, early_hook=True)
         if isinstance(new_value, str):
             parser = ThrowingArgumentParser(prog='', add_help=False, exit_on_error=False)
             parser.add_argument('command', help='Command to execute', type=SpinCommand.Command,
@@ -55,8 +57,8 @@ class SpinCommand(GenericCommand):
                     raise ValueError('Invalid value for SpinCommand. '
                                      f'Command must be one of {SpinCommand.Command}')
         if self._is_changeable:
-            for hook in self._on_set_hooks:
-                new_value = hook(self, new_value)
+            # Execute late hooks before setting the value
+            new_value = self._execute_on_set_hook(new_value, early_hook=False)
             self._set_value(new_value)
         else:
             raise TypeError('You cannot set this attribute. Attribute is not mutable.')

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/src/carconnectivity_connectors/skoda/connector.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING
 
 import threading
 import os
+import traceback
 import logging
 import netrc
 from datetime import datetime, timedelta, timezone
@@ -72,6 +73,7 @@ class Connector(BaseConnector):
     """
     def __init__(self, connector_id: str, car_connectivity: CarConnectivity, config: Dict) -> None:
         BaseConnector.__init__(self, connector_id=connector_id, car_connectivity=car_connectivity, config=config, log=LOG, api_log=LOG_API)
+        self._healthy = False
 
         self._mqtt_client: SkodaMQTTClient = SkodaMQTTClient(skoda_connector=self)
 
@@ -81,15 +83,8 @@ class Connector(BaseConnector):
 
         self.connected: BooleanAttribute = BooleanAttribute(name="connected", parent=self, tags={'connector_custom'})
         self.interval: DurationAttribute = DurationAttribute(name="interval", parent=self, tags={'connector_custom'})
-
-        def __check_interval(attribute: GenericAttribute, value: Any) -> Any:
-            del attribute
-            if value is not None and value < timedelta(seconds=180):
-                raise ValueError('Intervall must be at least 180 seconds')
-            return value
-
+        self.interval.minimum = timedelta(seconds=180)
         self.interval._is_changeable = True  # pylint: disable=protected-access
-        self.interval._add_on_set_hook(__check_interval)  # pylint: disable=protected-access
 
         self.commands: Commands = Commands(parent=self)
 
@@ -172,6 +167,7 @@ class Connector(BaseConnector):
         self._background_connect_thread.start()
         # Start MQTT thread
         self._mqtt_client.loop_start()
+        self._healthy = True
 
     def _background_connect_loop(self) -> None:
         while not self._stop_event.is_set():
@@ -216,6 +212,10 @@ class Connector(BaseConnector):
             except TemporaryAuthenticationError as err:
                 LOG.error('Temporary authentification error during update (%s). Will try again after configured interval of %ss', str(err), interval)
                 self._stop_event.wait(interval)
+            except Exception as err:
+                LOG.critical('Critical error during update: %s', traceback.format_exc())
+                self._healthy = False
+                raise err
             else:
                 self._stop_event.wait(interval)
 
@@ -362,6 +362,7 @@ class Connector(BaseConnector):
                     if vehicle_to_update.capabilities.has_capability('VEHICLE_HEALTH_INSPECTION'):
                         vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
                 vehicle_to_update = self.decide_state(vehicle_to_update)
+        self.car_connectivity.transaction_end()
 
     def decide_state(self, vehicle: SkodaVehicle) -> SkodaVehicle:
         """
@@ -786,12 +787,19 @@ class Connector(BaseConnector):
                 # pylint: disable-next=protected-access
                 vehicle.climatization.settings.target_temperature._add_on_set_hook(self.__on_air_conditioning_target_temperature_change)
                 vehicle.climatization.settings.target_temperature._is_changeable = True  # pylint: disable=protected-access
+                precision: float = 0.5
+                min_temperature: Optional[float] = None
+                max_temperature: Optional[float] = None
                 unit: Temperature = Temperature.UNKNOWN
                 if 'unitInCar' in data['targetTemperature'] and data['targetTemperature']['unitInCar'] is not None:
                     if data['targetTemperature']['unitInCar'] == 'CELSIUS':
                         unit = Temperature.C
+                        min_temperature: Optional[float] = 16
+                        max_temperature: Optional[float] = 29.5
                     elif data['targetTemperature']['unitInCar'] == 'FAHRENHEIT':
                         unit = Temperature.F
+                        min_temperature: Optional[float] = 61
+                        max_temperature: Optional[float] = 85
                     elif data['targetTemperature']['unitInCar'] == 'KELVIN':
                         unit = Temperature.K
                     else:
@@ -801,6 +809,10 @@ class Connector(BaseConnector):
                     vehicle.climatization.settings.target_temperature._set_value(value=data['targetTemperature']['temperatureValue'],
                                                                                  measured=captured_at,
                                                                                  unit=unit)
+                    vehicle.climatization.settings.target_temperature.precision = precision
+                    vehicle.climatization.settings.target_temperature.minimum = min_temperature
+                    vehicle.climatization.settings.target_temperature.maximum = max_temperature
+
                 else:
                     # pylint: disable-next=protected-access
                     vehicle.climatization.settings.target_temperature._set_value(value=None, measured=captured_at, unit=unit)
@@ -1498,9 +1510,10 @@ class Connector(BaseConnector):
             if command_arguments['command'] == ClimatizationStartStopCommand.Command.START:
                 command_dict['heaterSource'] = 'ELECTRIC'
                 command_dict['targetTemperature'] = {}
+                precision: float = 0.5
                 if 'target_temperature' in command_arguments:
                     # Round target temperature to nearest 0.5
-                    command_dict['targetTemperature']['temperatureValue'] = round(command_arguments['target_temperature'] * 2) / 2
+                    command_dict['targetTemperature']['temperatureValue'] = round(command_arguments['target_temperature'] / precision) * precision
                     if 'target_temperature_unit' in command_arguments:
                         if not isinstance(command_arguments['target_temperature_unit'], Temperature):
                             raise CommandError('Temperature unit is not of type Temperature')
@@ -1518,8 +1531,10 @@ class Connector(BaseConnector):
                         and isinstance(climatization, Climatization) and climatization.settings is not None \
                         and climatization.settings.target_temperature is not None and climatization.settings.target_temperature.enabled \
                         and climatization.settings.target_temperature.value is not None:  # pylint: disable=too-many-boolean-expressions
+                    if climatization.settings.target_temperature.precision is not None:
+                        precision = climatization.settings.target_temperature.precision
                     # Round target temperature to nearest 0.5
-                    command_dict['targetTemperature']['temperatureValue'] = round(climatization.settings.target_temperature.value * 2) / 2
+                    command_dict['targetTemperature']['temperatureValue'] = round(climatization.settings.target_temperature.value / precision) * precision
                     if climatization.settings.target_temperature.unit == Temperature.C:
                         command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
                     elif climatization.settings.target_temperature.unit == Temperature.F:
@@ -1751,3 +1766,6 @@ class Connector(BaseConnector):
         except requests.exceptions.RetryError as retry_error:
             raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         return command_arguments
+
+    def is_healthy(self) -> bool:
+        return self._healthy and super().is_healthy()

{carconnectivity_connector_skoda-0.4a4 → carconnectivity_connector_skoda-0.4a6}/src/carconnectivity_connectors/skoda/mqtt_client.py

@@ -469,7 +469,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                         if 'data' in data and data['data'] is not None:
                             vehicle: Optional[GenericVehicle] = self._skoda_connector.car_connectivity.garage.get_vehicle(vin)
                             if isinstance(vehicle, SkodaElectricVehicle):
-                                electric_drive: ElectricDrive = vehicle.get_electric_drive()
+                                electric_drive: Optional[ElectricDrive] = vehicle.get_electric_drive()
                                 if electric_drive is not None:
                                     charging_state: Optional[Charging.ChargingState] = vehicle.charging.state.value
                                     old_charging_state: Optional[Charging.ChargingState] = charging_state
@@ -509,6 +509,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                     if old_charging_state != charging_state:
                                         try:
                                             self._skoda_connector.fetch_charging(vehicle, no_cache=True)
+                                            self._skoda_connector.car_connectivity.transaction_end()
                                         except CarConnectivityError as e:
                                             LOG.error('Error while fetching charging: %s', e)
                                 if 'timeToFinish' in data['data'] and data['data']['timeToFinish'] is not None \
@@ -536,6 +537,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                             if isinstance(vehicle, SkodaVehicle):
                                 try:
                                     self._skoda_connector.fetch_air_conditioning(vehicle, no_cache=True)
+                                    self._skoda_connector.car_connectivity.transaction_end()
                                 except CarConnectivityError as e:
                                     LOG.error('Error while fetching air conditioning: %s', e)
                     elif 'name' in data and data['name'] == 'climatisation-completed':
@@ -582,6 +584,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                             self._skoda_connector.fetch_air_conditioning(vehicle, no_cache=True)
                                         except CarConnectivityError as e:
                                             LOG.error('Error while fetching air conditioning: %s', e)
+                                    self._skoda_connector.car_connectivity.transaction_end()
 
                                 if vin in self.delayed_access_function_timers:
                                     self.delayed_access_function_timers[vin].cancel()
@@ -598,6 +601,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                             if isinstance(vehicle, SkodaVehicle):
                                 try:
                                     self._skoda_connector.fetch_vehicle_status(vehicle, no_cache=True)
+                                    self._skoda_connector.car_connectivity.transaction_end()
                                 except CarConnectivityError as e:
                                     LOG.error('Error while fetching vehicle status: %s', e)
 
@@ -629,6 +633,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                 LOG.debug('Received %s operation request for vehicle %s from user %s', operation_request, vin, user_id)
                                 try:
                                     self._skoda_connector.fetch_air_conditioning(vehicle, no_cache=True)
+                                    self._skoda_connector.car_connectivity.transaction_end()
                                 except CarConnectivityError as e:
                                     LOG.error('Error while fetching air-conditioning: %s', e)
                                 return
@@ -649,6 +654,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                 LOG.debug('Received %s operation request for vehicle %s from user %s', operation_request, vin, user_id)
                                 try:
                                     self._skoda_connector.fetch_charging(vehicle, no_cache=True)
+                                    self._skoda_connector.car_connectivity.transaction_end()
                                 except CarConnectivityError as e:
                                     LOG.error('Error while fetching charging: %s', e)
                                 return