carconnectivity-connector-skoda 0.3__tar.gz → 0.4__tar.gz

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4}/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 - No unreleased changes so far
 
+## [0.4] - 2025-03-02
+### Added
+- Added better feedback when consent is needed
+- added better access to connection state
+- added better access to health state
+- added attribute for vehicle in_motion
+- added possibility to online change interval
+- added named threads for better debugging
+- added vehcile connection state
+- added global vehicle state
+- added maintainance objects
+- added checks for min/max values with climatization temperatures
+- improved error handling with commands
+
 ## [0.3] - 2025-02-19
 ### Added
 - Added support for images
@@ -19,7 +33,8 @@ All notable changes to this project will be documented in this file.
 Initial release, let's go and give this to the public to try out...
 The API is not yet implemented completely but most functions already work
 
-[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/compare/v0.3...HEAD
+[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/compare/v0.4...HEAD
+[0.4]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.4
 [0.3]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.3
 [0.2]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.2
 [0.1]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.1

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.3
+Version: 0.4
 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.3
+Requires-Dist: carconnectivity>=0.4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4}/pyproject.toml

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.3
+Version: 0.4
 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.3
+Requires-Dist: carconnectivity>=0.4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

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

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

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

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3'
-__version_tuple__ = version_tuple = (0, 3)
+__version__ = version = '0.4'
+__version_tuple__ = version_tuple = (0, 4)

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4}/src/carconnectivity_connectors/skoda/auth/skoda_web_session.py

@@ -121,6 +121,8 @@ class SkodaWebSession(OpenIDSession):
                 raise RetrievalError('Temporary server error during login')
 
             if 'Location' not in response.headers:
+                if 'consent' in url:
+                    raise AuthenticationError('Could not find Location in headers, probably due to missing consent. Try visiting: ' + url)
                 raise APICompatibilityError('Forwarding without Location in headers')
 
             url = response.headers['Location']

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4}/src/carconnectivity_connectors/skoda/climatization.py

@@ -1,12 +1,12 @@
 """
-Module for charging for skoda vehicles.
+Module for climatization for skoda vehicles.
 """
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from carconnectivity.climatization import Climatization
 from carconnectivity.objects import GenericObject
-from carconnectivity.vehicle import ElectricVehicle
+from carconnectivity.vehicle import GenericVehicle
 
 from carconnectivity_connectors.skoda.error import Error
 
@@ -21,13 +21,15 @@ class SkodaClimatization(Climatization):  # pylint: disable=too-many-instance-at
     This class extends the Climatization class and includes an enumeration of various
     charging states specific to Skoda vehicles.
     """
-    def __init__(self, vehicle: ElectricVehicle | None = None, origin: Optional[Climatization] = None) -> None:
+    def __init__(self, vehicle: GenericVehicle | None = None, origin: Optional[Climatization] = None) -> None:
         if origin is not None:
             super().__init__(origin=origin)
-            self.settings: Climatization.Settings = SkodaClimatization.Settings(origin=origin.settings)
+            if not isinstance(self.settings, SkodaClimatization.Settings):
+                self.settings: Climatization.Settings = SkodaClimatization.Settings(parent=self, origin=origin.settings)
+            self.settings.parent = self
         else:
             super().__init__(vehicle=vehicle)
-            self.settings: Climatization.Settings = SkodaClimatization.Settings(origin=self.settings)
+            self.settings: Climatization.Settings = SkodaClimatization.Settings(parent=self)
         self.errors: Dict[str, Error] = {}
 
     class Settings(Climatization.Settings):
@@ -36,6 +38,6 @@ class SkodaClimatization(Climatization):  # pylint: disable=too-many-instance-at
         """
         def __init__(self, parent: Optional[GenericObject] = None, origin: Optional[Climatization.Settings] = None) -> None:
             if origin is not None:
-                super().__init__(origin=origin)
+                super().__init__(parent=parent, origin=origin)
             else:
                 super().__init__(parent=parent)

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4}/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.3 → carconnectivity_connector_skoda-0.4}/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
@@ -22,13 +23,14 @@ from carconnectivity.doors import Doors
 from carconnectivity.windows import Windows
 from carconnectivity.lights import Lights
 from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive
-from carconnectivity.attributes import BooleanAttribute, DurationAttribute, TemperatureAttribute
+from carconnectivity.attributes import GenericAttribute, BooleanAttribute, DurationAttribute, TemperatureAttribute, EnumAttribute
 from carconnectivity.charging import Charging
 from carconnectivity.position import Position
 from carconnectivity.climatization import Climatization
 from carconnectivity.charging_connector import ChargingConnector
 from carconnectivity.commands import Commands
 from carconnectivity.command_impl import ClimatizationStartStopCommand, ChargingStartStopCommand, HonkAndFlashCommand, LockUnlockCommand, WakeSleepCommand
+from carconnectivity.enums import ConnectionState
 
 from carconnectivity_connectors.base.connector import BaseConnector
 from carconnectivity_connectors.skoda.auth.session_manager import SessionManager, SessionUser, Service
@@ -79,8 +81,14 @@ class Connector(BaseConnector):
         self._background_connect_thread: Optional[threading.Thread] = None
         self._stop_event = threading.Event()
 
-        self.connected: BooleanAttribute = BooleanAttribute(name="connected", parent=self, tags={'connector_custom'})
+        self.connection_state: EnumAttribute = EnumAttribute(name="connection_state", parent=self, value_type=ConnectionState,
+                                                             value=ConnectionState.DISCONNECTED, tags={'connector_custom'})
+        self.rest_connected: bool = False
+        self.mqtt_connected: bool = False
         self.interval: DurationAttribute = DurationAttribute(name="interval", parent=self, tags={'connector_custom'})
+        self.interval.minimum = timedelta(seconds=180)
+        self.interval._is_changeable = True  # pylint: disable=protected-access
+
         self.commands: Commands = Commands(parent=self)
 
         self.user_id: Optional[str] = None
@@ -154,12 +162,15 @@ class Connector(BaseConnector):
         self._stop_event.clear()
         # Start background thread for Rest API polling
         self._background_thread = threading.Thread(target=self._background_loop, daemon=False)
+        self._background_thread.name = 'carconnectivity.connectors.skoda-background'
         self._background_thread.start()
         # Start background thread for MQTT connection
         self._background_connect_thread = threading.Thread(target=self._background_connect_loop, daemon=False)
+        self._background_connect_thread.name = 'carconnectivity.connectors.skoda-background_connect'
         self._background_connect_thread.start()
         # Start MQTT thread
         self._mqtt_client.loop_start()
+        self.healthy._set_value(value=True)  # pylint: disable=protected-access
 
     def _background_connect_loop(self) -> None:
         while not self._stop_event.is_set():
@@ -173,6 +184,7 @@ class Connector(BaseConnector):
     def _background_loop(self) -> None:
         self._stop_event.clear()
         fetch: bool = True
+        self.connection_state._set_value(value=ConnectionState.CONNECTING)  # pylint: disable=protected-access
         while not self._stop_event.is_set():
             interval = 300
             try:
@@ -191,21 +203,43 @@ 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.rest_connected = False
                 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.rest_connected = False
                 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.rest_connected = False
                 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.rest_connected = False
                 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.rest_connected = False
                 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.rest_connected = False
+                self.healthy._set_value(value=False)  # pylint: disable=protected-access
+                raise err
             else:
+                self.rest_connected = True
+                if self.mqtt_connected:
+                    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
+        self.rest_connected = False
 
     def persist(self) -> None:
         """
@@ -236,12 +270,12 @@ class Connector(BaseConnector):
                 self.car_connectivity.garage.remove_vehicle(vehicle.id)
                 vehicle.enabled = False
         self._stop_event.set()
+        self.session.close()
         if self._background_thread is not None:
             self._background_thread.join()
         if self._background_connect_thread is not None:
             self._background_connect_thread.join()
         self.persist()
-        self.session.close()
         return super().shutdown()
 
     def fetch_all(self) -> None:
@@ -339,12 +373,38 @@ class Connector(BaseConnector):
                 vehicle_to_update = self.fetch_vehicle_status(vehicle_to_update)
                 vehicle_to_update = self.fetch_driving_range(vehicle_to_update)
                 if vehicle_to_update.capabilities is not None and vehicle_to_update.capabilities.enabled:
+                    if vehicle_to_update.capabilities.has_capability('READINESS'):
+                        vehicle_to_update = self.fetch_connection_status(vehicle_to_update)
                     if vehicle_to_update.capabilities.has_capability('PARKING_POSITION'):
                         vehicle_to_update = self.fetch_position(vehicle_to_update)
                     if vehicle_to_update.capabilities.has_capability('CHARGING') and isinstance(vehicle_to_update, SkodaElectricVehicle):
                         vehicle_to_update = self.fetch_charging(vehicle_to_update)
                     if vehicle_to_update.capabilities.has_capability('AIR_CONDITIONING'):
                         vehicle_to_update = self.fetch_air_conditioning(vehicle_to_update)
+                    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:
+        """
+        Decides the state of the vehicle based on the current data.
+
+        Args:
+            vehicle (SkodaVehicle): The Skoda vehicle object.
+
+        Returns:
+            SkodaVehicle: The Skoda vehicle object with the updated state.
+        """
+        if vehicle is not None:
+            if vehicle.in_motion is not None and vehicle.in_motion.enabled and vehicle.in_motion.value:
+                vehicle.state._set_value(GenericVehicle.State.IGNITION_ON)  # pylint: disable=protected-access
+            elif 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
+        return vehicle
 
     def fetch_charging(self, vehicle: SkodaElectricVehicle, no_cache: bool = False) -> SkodaElectricVehicle:
         """
@@ -553,6 +613,41 @@ class Connector(BaseConnector):
                     vehicle.charging.errors.clear()
             log_extra_keys(LOG_API, 'charging data', data,  {'carCapturedTimestamp', 'status', 'isVehicleInSavedLocation', 'errors', 'settings'})
         return vehicle
+    
+    def fetch_connection_status(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
+        """
+        Fetches the connection status of the given Skoda vehicle and updates its connection attributes.
+
+        Args:
+            vehicle (SkodaVehicle): The Skoda vehicle object containing the VIN and connection attributes.
+
+        Returns:
+            SkodaVehicle: The updated Skoda 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://mysmob.api.connect.skoda-auto.cz/api/v2/connection-status/{vin}/readiness'
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        #  {'unreachable': False, 'inMotion': False, 'batteryProtectionLimitOn': False}
+        if data is not None:
+            if 'unreachable' in data and data['unreachable'] is not None:
+                if data['unreachable']:
+                    vehicle.connection_state._set_value(vehicle.ConnectionState.OFFLINE)  # pylint: disable=protected-access
+                else:
+                    vehicle.connection_state._set_value(vehicle.ConnectionState.REACHABLE)  # pylint: disable=protected-access
+            else:
+                vehicle.connection_state._set_value(None)  # pylint: disable=protected-access
+            if 'inMotion' in data and data['inMotion'] is not None:
+                vehicle.in_motion._set_value(data['inMotion'])  # pylint: disable=protected-access
+            else:
+                vehicle.in_motion._set_value(None)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, 'connection status', data,  {'unreachable'})
+        return vehicle
 
     def fetch_position(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
         """
@@ -574,7 +669,7 @@ class Connector(BaseConnector):
         if vehicle.position is None:
             raise ValueError('Vehicle has no charging object')
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/maps/positions?vin={vin}'
-        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache, allow_empty=True)
         if data is not None:
             if 'positions' in data and data['positions'] is not None:
                 for position_dict in data['positions']:
@@ -608,6 +703,53 @@ class Connector(BaseConnector):
                 vehicle.position.position_type._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
+    def fetch_maintenance(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
+        """
+        Fetches the maintenance information for a given Skoda vehicle.
+
+        Args:
+            vehicle (SkodaVehicle): The vehicle object for which maintenance information is to be fetched.
+            no_cache (bool, optional): If True, bypasses the cache and fetches fresh data. Defaults to False.
+
+        Returns:
+            SkodaVehicle: The vehicle object with updated maintenance information.
+
+        Raises:
+            APIError: If the VIN is missing or if the 'capturedAt' field is missing in the fetched data.
+            ValueError: If the vehicle has no charging object.
+        """
+        vin = vehicle.vin.value
+        if vin is None:
+            raise APIError('VIN is missing')
+        if vehicle.position is None:
+            raise ValueError('Vehicle has no charging object')
+        url = f'https://mysmob.api.connect.skoda-auto.cz/api/v3/vehicle-maintenance/vehicles/{vin}/report'
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        #{'capturedAt': '2025-02-24T19:54:32.728Z', 'inspectionDueInDays': 620, 'mileageInKm': 2512}
+        if data is not None:
+            if 'capturedAt' in data and data['capturedAt'] is not None:
+                captured_at: datetime = robust_time_parse(data['capturedAt'])
+            else:
+                raise APIError('Could not fetch maintenance, capturedAt missing')
+            if 'mileageInKm' in data and data['mileageInKm'] is not None:
+                vehicle.odometer._set_value(value=data['mileageInKm'], measured=captured_at, unit=Length.KM)  # pylint: disable=protected-access
+            else:
+                vehicle.odometer._set_value(None)  # pylint: disable=protected-access
+            if 'inspectionDueInDays' in data and data['inspectionDueInDays'] is not None:
+                inspection_due: timedelta = timedelta(days=data['inspectionDueInDays'])
+                inspection_date: datetime = captured_at + 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, measured=captured_at)
+            else:
+                vehicle.maintenance.inspection_due_at._set_value(None)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, 'maintenance', data,  {'capturedAt', 'mileageInKm', 'inspectionDueInDays'})
+
+        #url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/vehicle-health-report/warning-lights/{vin}'
+        #data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        #{'capturedAt': '2025-02-24T15:32:35.032Z', 'mileageInKm': 2512, 'warningLights': [{'category': 'ASSISTANCE', 'defects': []}, {'category': 'COMFORT', 'defects': []}, {'category': 'BRAKE', 'defects': []}, {'category': 'ELECTRIC_ENGINE', 'defects': []}, {'category': 'LIGHTING', 'defects': []}, {'category': 'TIRE', 'defects': []}, {'category': 'OTHER', 'defects': []}]}
+        return vehicle
+
     def fetch_air_conditioning(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
         """
         Fetches the air conditioning data for a given Skoda vehicle and updates the vehicle object with the retrieved data.
@@ -667,12 +809,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:
@@ -682,6 +831,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)
@@ -1221,6 +1374,8 @@ class Connector(BaseConnector):
                     data = status_response.json()
                     if session.cache is not None:
                         session.cache[url] = (data, str(datetime.utcnow()))
+                elif status_response.status_code == requests.codes['no_content'] and allow_empty:
+                    data = None
                 elif status_response.status_code == requests.codes['too_many_requests']:
                     raise TooManyRequestsError('Could not fetch data due to too many requests from your account. '
                                                f'Status Code was: {status_response.status_code}')
@@ -1287,10 +1442,20 @@ class Connector(BaseConnector):
             raise SetterError(f'Unknown temperature unit {temperature_attribute.unit}')
 
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/settings/target-temperature'
-        settings_response: requests.Response = self.session.post(url, data=json.dumps(setting_dict), allow_redirects=True)
-        if settings_response.status_code != requests.codes['accepted']:
-            LOG.error('Could not set target temperature (%s)', settings_response.status_code)
-            raise SetterError(f'Could not set value ({settings_response.status_code})')
+        try:
+            settings_response: requests.Response = self.session.post(url, data=json.dumps(setting_dict), allow_redirects=True)
+            if settings_response.status_code != requests.codes['accepted']:
+                LOG.error('Could not set target temperature (%s)', settings_response.status_code)
+                raise SetterError(f'Could not set value ({settings_response.status_code})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise SetterError(f'Connection error: {connection_error}.'
+                              ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise SetterError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise SetterError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise SetterError(f'Retrying failed: {retry_error}') from retry_error
         return target_temperature
 
     def __on_air_conditioning_at_unlock_change(self, at_unlock_attribute: BooleanAttribute, at_unlock_value: bool) -> bool:
@@ -1306,10 +1471,20 @@ class Connector(BaseConnector):
         setting_dict['airConditioningAtUnlockEnabled'] = at_unlock_value
 
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/settings/ac-at-unlock'
-        settings_response: requests.Response = self.session.post(url, data=json.dumps(setting_dict), allow_redirects=True)
-        if settings_response.status_code != requests.codes['accepted']:
-            LOG.error('Could not set air conditioning at unlock (%s)', settings_response.status_code)
-            raise SetterError(f'Could not set value ({settings_response.status_code})')
+        try:
+            settings_response: requests.Response = self.session.post(url, data=json.dumps(setting_dict), allow_redirects=True)
+            if settings_response.status_code != requests.codes['accepted']:
+                LOG.error('Could not set air conditioning at unlock (%s)', settings_response.status_code)
+                raise SetterError(f'Could not set value ({settings_response.status_code})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise SetterError(f'Connection error: {connection_error}.'
+                                ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise SetterError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise SetterError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise SetterError(f'Retrying failed: {retry_error}') from retry_error
         return at_unlock_value
 
     def __on_air_conditioning_window_heating_change(self, window_heating_attribute: BooleanAttribute, window_heating_value: bool) -> bool:
@@ -1325,10 +1500,20 @@ class Connector(BaseConnector):
         setting_dict['windowHeatingEnabled'] = window_heating_value
 
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/settings/ac-at-unlock'
-        settings_response: requests.Response = self.session.post(url, data=json.dumps(setting_dict), allow_redirects=True)
-        if settings_response.status_code != requests.codes['accepted']:
-            LOG.error('Could not set air conditioning window heating (%s)', settings_response.status_code)
-            raise SetterError(f'Could not set value ({settings_response.status_code})')
+        try:
+            settings_response: requests.Response = self.session.post(url, data=json.dumps(setting_dict), allow_redirects=True)
+            if settings_response.status_code != requests.codes['accepted']:
+                LOG.error('Could not set air conditioning window heating (%s)', settings_response.status_code)
+                raise SetterError(f'Could not set value ({settings_response.status_code})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise SetterError(f'Connection error: {connection_error}.'
+                                ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise SetterError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise SetterError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise SetterError(f'Retrying failed: {retry_error}') from retry_error
         return window_heating_value
 
     def __on_air_conditioning_start_stop(self, start_stop_command: ClimatizationStartStopCommand, command_arguments: Union[str, Dict[str, Any]]) \
@@ -1345,53 +1530,66 @@ class Connector(BaseConnector):
         if 'command' not in command_arguments:
             raise CommandError('Command argument missing')
         command_dict = {}
-        if command_arguments['command'] == ClimatizationStartStopCommand.Command.START:
-            command_dict['heaterSource'] = 'ELECTRIC'
-            command_dict['targetTemperature'] = {}
-            if 'target_temperature' in command_arguments:
-                # Round target temperature to nearest 0.5
-                command_dict['targetTemperature']['temperatureValue'] = round(command_arguments['target_temperature'] * 2) / 2
-                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')
-                    if command_arguments['target_temperature_unit'] == Temperature.C:
+        try:
+            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'] / 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')
+                        if command_arguments['target_temperature_unit'] == Temperature.C:
+                            command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
+                        elif command_arguments['target_temperature_unit'] == Temperature.F:
+                            command_dict['targetTemperature']['unitInCar'] = 'FAHRENHEIT'
+                        elif command_arguments['target_temperature_unit'] == Temperature.K:
+                            command_dict['targetTemperature']['unitInCar'] = 'KELVIN'
+                        else:
+                            raise CommandError(f'Unknown temperature unit {command_arguments["target_temperature_unit"]}')
+                    else:
                         command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
-                    elif command_arguments['target_temperature_unit'] == Temperature.F:
+                elif start_stop_command.parent is not None and (climatization := start_stop_command.parent.parent) is not None \
+                        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 / precision) * precision
+                    if climatization.settings.target_temperature.unit == Temperature.C:
+                        command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
+                    elif climatization.settings.target_temperature.unit == Temperature.F:
                         command_dict['targetTemperature']['unitInCar'] = 'FAHRENHEIT'
-                    elif command_arguments['target_temperature_unit'] == Temperature.K:
+                    elif climatization.settings.target_temperature.unit == Temperature.K:
                         command_dict['targetTemperature']['unitInCar'] = 'KELVIN'
                     else:
-                        raise CommandError(f'Unknown temperature unit {command_arguments["target_temperature_unit"]}')
+                        raise CommandError(f'Unknown temperature unit {climatization.settings.target_temperature.unit}')
                 else:
+                    command_dict['targetTemperature']['temperatureValue'] = 25.0
                     command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
-            elif start_stop_command.parent is not None and (climatization := start_stop_command.parent.parent) is not None \
-                    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
-                # Round target temperature to nearest 0.5
-                command_dict['targetTemperature']['temperatureValue'] = round(climatization.settings.target_temperature.value * 2) / 2
-                if climatization.settings.target_temperature.unit == Temperature.C:
-                    command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
-                elif climatization.settings.target_temperature.unit == Temperature.F:
-                    command_dict['targetTemperature']['unitInCar'] = 'FAHRENHEIT'
-                elif climatization.settings.target_temperature.unit == Temperature.K:
-                    command_dict['targetTemperature']['unitInCar'] = 'KELVIN'
-                else:
-                    raise CommandError(f'Unknown temperature unit {climatization.settings.target_temperature.unit}')
+                url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/start'
+                command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
+            elif command_arguments['command'] == ClimatizationStartStopCommand.Command.STOP:
+                url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/stop'
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
             else:
-                command_dict['targetTemperature']['temperatureValue'] = 25.0
-                command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
-            url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/start'
-            command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
-        elif command_arguments['command'] == ClimatizationStartStopCommand.Command.STOP:
-            url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/stop'
-            command_response: requests.Response = self.session.post(url, allow_redirects=True)
-        else:
-            raise CommandError(f'Unknown command {command_arguments["command"]}')
+                raise CommandError(f'Unknown command {command_arguments["command"]}')
 
-        if command_response.status_code != requests.codes['accepted']:
-            LOG.error('Could not start/stop air conditioning (%s: %s)', command_response.status_code, command_response.text)
-            raise CommandError(f'Could not start/stop air conditioning ({command_response.status_code}: {command_response.text})')
+            if command_response.status_code != requests.codes['accepted']:
+                LOG.error('Could not start/stop air conditioning (%s: %s)', command_response.status_code, command_response.text)
+                raise CommandError(f'Could not start/stop air conditioning ({command_response.status_code}: {command_response.text})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise CommandError(f'Connection error: {connection_error}.'
+                               ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise CommandError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise CommandError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         return command_arguments
 
     def __on_charging_start_stop(self, start_stop_command: ChargingStartStopCommand, command_arguments: Union[str, Dict[str, Any]]) \
@@ -1407,18 +1605,29 @@ class Connector(BaseConnector):
             raise CommandError('VIN in object hierarchy missing')
         if 'command' not in command_arguments:
             raise CommandError('Command argument missing')
-        if command_arguments['command'] == ChargingStartStopCommand.Command.START:
-            url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}/start'
-            command_response: requests.Response = self.session.post(url, allow_redirects=True)
-        elif command_arguments['command'] == ChargingStartStopCommand.Command.STOP:
-            url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}/stop'
-            command_response: requests.Response = self.session.post(url, allow_redirects=True)
-        else:
-            raise CommandError(f'Unknown command {command_arguments["command"]}')
+        try:
+            if command_arguments['command'] == ChargingStartStopCommand.Command.START:
+                url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}/start'
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
+            elif command_arguments['command'] == ChargingStartStopCommand.Command.STOP:
+                url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}/stop'
+                
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
+            else:
+                raise CommandError(f'Unknown command {command_arguments["command"]}')
 
-        if command_response.status_code != requests.codes['accepted']:
-            LOG.error('Could not start/stop charging (%s: %s)', command_response.status_code, command_response.text)
-            raise CommandError(f'Could not start/stop charging ({command_response.status_code}: {command_response.text})')
+            if command_response.status_code != requests.codes['accepted']:
+                LOG.error('Could not start/stop charging (%s: %s)', command_response.status_code, command_response.text)
+                raise CommandError(f'Could not start/stop charging ({command_response.status_code}: {command_response.text})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise CommandError(f'Connection error: {connection_error}.'
+                               ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise CommandError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise CommandError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         return command_arguments
 
     def __on_honk_flash(self, honk_flash_command: HonkAndFlashCommand, command_arguments: Union[str, Dict[str, Any]]) \
@@ -1448,10 +1657,20 @@ class Connector(BaseConnector):
             command_dict['vehiclePosition']['longitude'] = vehicle.position.longitude.value
 
             url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/vehicle-access/{vin}/honk-and-flash'
-            command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
-            if command_response.status_code != requests.codes['accepted']:
-                LOG.error('Could not execute honk or flash command (%s: %s)', command_response.status_code, command_response.text)
-                raise CommandError(f'Could not execute honk or flash command ({command_response.status_code}: {command_response.text})')
+            try:
+                command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
+                if command_response.status_code != requests.codes['accepted']:
+                    LOG.error('Could not execute honk or flash command (%s: %s)', command_response.status_code, command_response.text)
+                    raise CommandError(f'Could not execute honk or flash command ({command_response.status_code}: {command_response.text})')
+            except requests.exceptions.ConnectionError as connection_error:
+                raise CommandError(f'Connection error: {connection_error}.'
+                                   ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+            except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+                raise SetterError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+            except requests.exceptions.ReadTimeout as timeout_error:
+                raise CommandError(f'Timeout during read: {timeout_error}') from timeout_error
+            except requests.exceptions.RetryError as retry_error:
+                raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         else:
             raise CommandError(f'Unknown command {command_arguments["command"]}')
         return command_arguments
@@ -1482,10 +1701,20 @@ class Connector(BaseConnector):
             url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/vehicle-access/{vin}/unlock'
         else:
             raise CommandError(f'Unknown command {command_arguments["command"]}')
-        command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
-        if command_response.status_code != requests.codes['accepted']:
-            LOG.error('Could not execute locking command (%s: %s)', command_response.status_code, command_response.text)
-            raise CommandError(f'Could not execute locking command ({command_response.status_code}: {command_response.text})')
+        try:
+            command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
+            if command_response.status_code != requests.codes['accepted']:
+                LOG.error('Could not execute locking command (%s: %s)', command_response.status_code, command_response.text)
+                raise CommandError(f'Could not execute locking command ({command_response.status_code}: {command_response.text})')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise CommandError(f'Connection error: {connection_error}.'
+                                ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise CommandError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise CommandError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         return command_arguments
 
     def __on_wake_sleep(self, wake_sleep_command: WakeSleepCommand, command_arguments: Union[str, Dict[str, Any]]) \
@@ -1504,10 +1733,20 @@ class Connector(BaseConnector):
         if command_arguments['command'] == WakeSleepCommand.Command.WAKE:
             url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/vehicle-wakeup/{vin}?applyRequestLimiter=true'
 
-            command_response: requests.Response = self.session.post(url, data='{}', allow_redirects=True)
-            if command_response.status_code != requests.codes['accepted']:
-                LOG.error('Could not execute wake command (%s: %s)', command_response.status_code, command_response.text)
-                raise CommandError(f'Could not execute wake command ({command_response.status_code}: {command_response.text})')
+            try:
+                command_response: requests.Response = self.session.post(url, data='{}', allow_redirects=True)
+                if command_response.status_code != requests.codes['accepted']:
+                    LOG.error('Could not execute wake command (%s: %s)', command_response.status_code, command_response.text)
+                    raise CommandError(f'Could not execute wake command ({command_response.status_code}: {command_response.text})')
+            except requests.exceptions.ConnectionError as connection_error:
+                raise CommandError(f'Connection error: {connection_error}.'
+                                   ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+            except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+                raise CommandError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+            except requests.exceptions.ReadTimeout as timeout_error:
+                raise CommandError(f'Timeout during read: {timeout_error}') from timeout_error
+            except requests.exceptions.RetryError as retry_error:
+                raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         elif command_arguments['command'] == WakeSleepCommand.Command.SLEEP:
             raise CommandError('Sleep command not supported by vehicle. Vehicle will put itself to sleep')
         else:
@@ -1534,10 +1773,23 @@ class Connector(BaseConnector):
             url = 'https://mysmob.api.connect.skoda-auto.cz/api/v1/spin/verify'
         else:
             raise CommandError(f'Unknown command {command_arguments["command"]}')
-        command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
-        if command_response.status_code != requests.codes['ok']:
-            LOG.error('Could not execute spin command (%s: %s)', command_response.status_code, command_response.text)
-            raise CommandError(f'Could not execute spin command ({command_response.status_code}: {command_response.text})')
-        else:
-            LOG.info('Spin verify command executed successfully')
+        try:
+            command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
+            if command_response.status_code != requests.codes['ok']:
+                LOG.error('Could not execute spin command (%s: %s)', command_response.status_code, command_response.text)
+                raise CommandError(f'Could not execute spin command ({command_response.status_code}: {command_response.text})')
+            else:
+                LOG.info('Spin verify command executed successfully')
+        except requests.exceptions.ConnectionError as connection_error:
+            raise CommandError(f'Connection error: {connection_error}.'
+                               ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error
+        except requests.exceptions.ChunkedEncodingError as chunked_encoding_error:
+            raise CommandError(f'Error: {chunked_encoding_error}') from chunked_encoding_error
+        except requests.exceptions.ReadTimeout as timeout_error:
+            raise CommandError(f'Timeout during read: {timeout_error}') from timeout_error
+        except requests.exceptions.RetryError as retry_error:
+            raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         return command_arguments
+
+    def get_name(self) -> str:
+        return "Skoda Connector"

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

@@ -22,6 +22,7 @@ from carconnectivity.util import robust_time_parse, log_extra_keys
 from carconnectivity.charging import Charging
 from carconnectivity.climatization import Climatization
 from carconnectivity.units import Speed, Power, Length
+from carconnectivity.enums import ConnectionState
 
 from carconnectivity_connectors.skoda.vehicle import SkodaVehicle, SkodaElectricVehicle
 from carconnectivity_connectors.skoda.charging import SkodaCharging, mapping_skoda_charging_state
@@ -77,6 +78,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         Returns:
             MQTTErrorCode: The result of the connection attempt.
         """
+        self._skoda_connector.connection_state._set_value(value=ConnectionState.CONNECTING)  # pylint: disable=protected-access
         return super().connect(*args, host='mqtt.messagehub.de', port=8883, keepalive=60, **kwargs)
 
     def _on_pre_connect_callback(self, client: Client, userdata: Any) -> None:
@@ -312,7 +314,9 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         # reason_code 0 means success
         if reason_code == 0:
             LOG.info('Connected to Skoda MQTT server')
-            self._skoda_connector.connected._set_value(value=True)  # pylint: disable=protected-access
+            if self._skoda_connector.rest_connected:
+                self._skoda_connector.connection_state._set_value(value=ConnectionState.CONNECTED)  # pylint: disable=protected-access
+            self._skoda_connector.mqtt_connected = True
             observer_flags: Observable.ObserverEvent = Observable.ObserverEvent.ENABLED | Observable.ObserverEvent.DISABLED
             self._skoda_connector.car_connectivity.garage.add_observer(observer=self._on_carconnectivity_vehicle_enabled,
                                                                        flag=observer_flags,
@@ -385,7 +389,8 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         del properties
         del flags
 
-        self._skoda_connector.connected._set_value(value=False)  # pylint: disable=protected-access
+        self._skoda_connector.connection_state._set_value(value=ConnectionState.DISCONNECTED)  # pylint: disable=protected-access
+        self._skoda_connector.mqtt_connected = False
         self._skoda_connector.car_connectivity.garage.remove_observer(observer=self._on_carconnectivity_vehicle_enabled)
 
         self.subscribed_topics.clear()
@@ -469,7 +474,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 +514,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 +542,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 +589,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 +606,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 +638,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 +659,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

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4}/src/carconnectivity_connectors/skoda/vehicle.py

@@ -4,9 +4,11 @@ from typing import TYPE_CHECKING
 
 from carconnectivity.vehicle import GenericVehicle, ElectricVehicle, CombustionVehicle, HybridVehicle
 from carconnectivity.charging import Charging
+from carconnectivity.attributes import BooleanAttribute
 
 from carconnectivity_connectors.skoda.capability import Capabilities
 from carconnectivity_connectors.skoda.charging import SkodaCharging
+from carconnectivity_connectors.skoda.climatization import SkodaClimatization
 
 SUPPORT_IMAGES = False
 try:
@@ -31,12 +33,16 @@ class SkodaVehicle(GenericVehicle):  # pylint: disable=too-many-instance-attribu
             super().__init__(origin=origin)
             self.capabilities: Capabilities = origin.capabilities
             self.capabilities.parent = self
+            self.in_motion: BooleanAttribute = origin.in_motion
+            self.in_motion.parent = self
             if SUPPORT_IMAGES:
                 self._car_images = origin._car_images
 
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)
+            self.climatization = SkodaClimatization(vehicle=self, origin=self.climatization)
             self.capabilities = Capabilities(vehicle=self)
+            self.in_motion = BooleanAttribute(name='in_motion', parent=self, tags={'connector_custom'})
             if SUPPORT_IMAGES:
                 self._car_images: Dict[str, Image.Image] = {}
         self.manufacturer._set_value(value='Škoda')  # pylint: disable=protected-access