carconnectivity-connector-skoda 0.4a8__tar.gz → 0.5a1__tar.gz

carconnectivity_connector_skoda-0.5a1/CHANGELOG.md

@@ -0,0 +1,45 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [Unreleased]
+- No unreleased changes so far
+
+## [0.4.1] - 2025-03-04
+### Fixed
+- Fixed potential http error when parking position was fetched but due to error not available
+
+## [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
+- Added tags to attributes
+- Added support for webui via carconnectivity-plugin-webui
+
+## [0.2] - 2025-02-02
+### Added
+- Wake Sleep command
+
+## [0.1] - 2025-01-25
+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.4.1...HEAD
+[0.4.1]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.4.1
+[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.4a8 → carconnectivity_connector_skoda-0.5a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.4a8
+Version: 0.5a1
 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.4a11
+Requires-Dist: carconnectivity>=0.5a4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1
@@ -45,7 +45,7 @@ Requires-Dist: paho-mqtt~=2.1.0
 
 
 
-# CarConnectivity Connector for Volkswagen Vehicles
+# CarConnectivity Connector for Skoda Vehicles
 [![GitHub sourcecode](https://img.shields.io/badge/Source-GitHub-green)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/tillsteinbach/CarConnectivity-connector-skoda)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/latest)
 [![GitHub](https://img.shields.io/github/license/tillsteinbach/CarConnectivity-connector-skoda)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/blob/master/LICENSE)

{carconnectivity_connector_skoda-0.4a8 → carconnectivity_connector_skoda-0.5a1}/README.md

@@ -1,6 +1,6 @@
 
 
-# CarConnectivity Connector for Volkswagen Vehicles
+# CarConnectivity Connector for Skoda Vehicles
 [![GitHub sourcecode](https://img.shields.io/badge/Source-GitHub-green)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/tillsteinbach/CarConnectivity-connector-skoda)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/latest)
 [![GitHub](https://img.shields.io/github/license/tillsteinbach/CarConnectivity-connector-skoda)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/blob/master/LICENSE)

{carconnectivity_connector_skoda-0.4a8 → carconnectivity_connector_skoda-0.5a1}/pyproject.toml

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

{carconnectivity_connector_skoda-0.4a8 → carconnectivity_connector_skoda-0.5a1}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.4a8
+Version: 0.5a1
 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.4a11
+Requires-Dist: carconnectivity>=0.5a4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1
@@ -45,7 +45,7 @@ Requires-Dist: paho-mqtt~=2.1.0
 
 
 
-# CarConnectivity Connector for Volkswagen Vehicles
+# CarConnectivity Connector for Skoda Vehicles
 [![GitHub sourcecode](https://img.shields.io/badge/Source-GitHub-green)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/tillsteinbach/CarConnectivity-connector-skoda)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/latest)
 [![GitHub](https://img.shields.io/github/license/tillsteinbach/CarConnectivity-connector-skoda)](https://github.com/tillsteinbach/CarConnectivity-connector-skoda/blob/master/LICENSE)

{carconnectivity_connector_skoda-0.4a8 → carconnectivity_connector_skoda-0.5a1}/src/carconnectivity_connector_skoda.egg-info/requires.txt

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

{carconnectivity_connector_skoda-0.4a8 → carconnectivity_connector_skoda-0.5a1}/src/carconnectivity_connectors/skoda/_version.py

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

{carconnectivity_connector_skoda-0.4a8 → carconnectivity_connector_skoda-0.5a1}/src/carconnectivity_connectors/skoda/capability.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from enum import IntEnum
 
 from carconnectivity.objects import GenericObject
-from carconnectivity.attributes import StringAttribute
+from carconnectivity.attributes import StringAttribute, GenericAttribute
 
 if TYPE_CHECKING:
     from typing import Dict, Optional
@@ -77,7 +77,7 @@ class Capabilities(GenericObject):
         """
         return self.__capabilities.get(capability_id)
 
-    def has_capability(self, capability_id: str) -> bool:
+    def has_capability(self, capability_id: str, check_status_ok=False) -> bool:
         """
         Check if the Capabilities contains a capability with the specified ID.
 
@@ -87,7 +87,14 @@ class Capabilities(GenericObject):
         Returns:
             bool: True if the capability exists, otherwise False.
         """
-        return capability_id in self.__capabilities
+        if check_status_ok:
+            if capability_id in self.__capabilities and self.__capabilities[capability_id].enabled:
+                capability: Capability = self.__capabilities[capability_id]
+                if capability.status.enabled and capability.status.value is not None and len(capability.status.value) > 0:
+                    return False
+                return True
+            return False
+        return capability_id in self.__capabilities and self.__capabilities[capability_id].enabled
 
 
 class Capability(GenericObject):
@@ -103,7 +110,7 @@ class Capability(GenericObject):
         super().__init__(object_id=capability_id, parent=capabilities)
         self.delay_notifications = True
         self.capability_id = StringAttribute("id", self, capability_id, tags={'connector_custom'})
-        self.statuses = list[Capability.Status]
+        self.status = GenericAttribute("status", self, value=[], tags={'connector_custom'})
         self.enabled = True
         self.delay_notifications = False
 

{carconnectivity_connector_skoda-0.4a8 → carconnectivity_connector_skoda-0.5a1}/src/carconnectivity_connectors/skoda/connector.py

@@ -29,8 +29,10 @@ 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.command_impl import ClimatizationStartStopCommand, ChargingStartStopCommand, HonkAndFlashCommand, LockUnlockCommand, WakeSleepCommand, \
+    WindowHeatingStartStopCommand
 from carconnectivity.enums import ConnectionState
+from carconnectivity.window_heating import WindowHeatings
 
 from carconnectivity_connectors.base.connector import BaseConnector
 from carconnectivity_connectors.skoda.auth.session_manager import SessionManager, SessionUser, Service
@@ -373,15 +375,15 @@ 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'):
+                    if vehicle_to_update.capabilities.has_capability('READINESS', check_status_ok=True):
                         vehicle_to_update = self.fetch_connection_status(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('PARKING_POSITION'):
+                    if vehicle_to_update.capabilities.has_capability('PARKING_POSITION', check_status_ok=True):
                         vehicle_to_update = self.fetch_position(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('CHARGING') and isinstance(vehicle_to_update, SkodaElectricVehicle):
+                    if vehicle_to_update.capabilities.has_capability('CHARGING', check_status_ok=True) and isinstance(vehicle_to_update, SkodaElectricVehicle):
                         vehicle_to_update = self.fetch_charging(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('AIR_CONDITIONING'):
+                    if vehicle_to_update.capabilities.has_capability('AIR_CONDITIONING', check_status_ok=True):
                         vehicle_to_update = self.fetch_air_conditioning(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('VEHICLE_HEALTH_INSPECTION'):
+                    if vehicle_to_update.capabilities.has_capability('VEHICLE_HEALTH_INSPECTION', check_status_ok=True):
                         vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
                 vehicle_to_update = self.decide_state(vehicle_to_update)
         self.car_connectivity.transaction_end()
@@ -646,7 +648,7 @@ class Connector(BaseConnector):
                 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'})
+            log_extra_keys(LOG_API, 'connection status', data,  {'unreachable', 'inMotion'})
         return vehicle
 
     def fetch_position(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
@@ -701,6 +703,10 @@ class Connector(BaseConnector):
                 vehicle.position.latitude._set_value(None)  # pylint: disable=protected-access
                 vehicle.position.longitude._set_value(None)  # pylint: disable=protected-access
                 vehicle.position.position_type._set_value(None)  # pylint: disable=protected-access
+        else:
+            vehicle.position.latitude._set_value(None)  # pylint: disable=protected-access
+            vehicle.position.longitude._set_value(None)  # pylint: disable=protected-access
+            vehicle.position.position_type._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
     def fetch_maintenance(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
@@ -969,7 +975,44 @@ class Connector(BaseConnector):
                     # pylint: disable-next=protected-access
                     vehicle.charging.connector.lock_state._set_value(value=None, measured=captured_at)
             if 'windowHeatingState' in data and data['windowHeatingState'] is not None:
-                pass
+                heating_on: bool = False
+                all_heating_invalid: bool = True
+                for window_id, state in data['windowHeatingState'].items():
+                    if window_id != 'unspecified':
+                        if window_id in vehicle.window_heatings.windows:
+                            window: WindowHeatings.WindowHeating = vehicle.window_heatings.windows[window_id]
+                        else:
+                            window = WindowHeatings.WindowHeating(window_id=window_id, window_heatings=vehicle.window_heatings)
+                            vehicle.window_heatings.windows[window_id] = window
+                        
+                        if state.lower() in [item.value for item in WindowHeatings.HeatingState]:
+                            window_heating_state: WindowHeatings.HeatingState = WindowHeatings.HeatingState(state.lower())
+                            if window_heating_state == WindowHeatings.HeatingState.ON:
+                                heating_on = True
+                            if window_heating_state in [WindowHeatings.HeatingState.ON,
+                                                        WindowHeatings.HeatingState.OFF]:
+                                all_heating_invalid = False
+                            window.heating_state._set_value(window_heating_state, measured=captured_at)  # pylint: disable=protected-access
+                        else:
+                            LOG_API.info('Unknown window heating state %s not in %s', state.lower(), str(WindowHeatings.HeatingState))
+                            # pylint: disable-next=protected-access
+                            window.heating_state._set_value(WindowHeatings.HeatingState.UNKNOWN, measured=captured_at)
+                if all_heating_invalid:
+                    # pylint: disable-next=protected-access
+                    vehicle.window_heatings.heating_state._set_value(WindowHeatings.HeatingState.INVALID, measured=captured_at)
+                else:
+                    if heating_on:
+                        # pylint: disable-next=protected-access
+                        vehicle.window_heatings.heating_state._set_value(WindowHeatings.HeatingState.ON, measured=captured_at)
+                    else:
+                        # pylint: disable-next=protected-access
+                        vehicle.window_heatings.heating_state._set_value(WindowHeatings.HeatingState.OFF, measured=captured_at)
+                if vehicle.window_heatings is not None and vehicle.window_heatings.commands is not None \
+                        and not vehicle.window_heatings.commands.contains_command('start-stop'):
+                    start_stop_command = WindowHeatingStartStopCommand(parent=vehicle.window_heatings.commands)
+                    start_stop_command._add_on_set_hook(self.__on_window_heating_start_stop)  # pylint: disable=protected-access
+                    start_stop_command.enabled = True
+                    vehicle.window_heatings.commands.add_command(start_stop_command)
             if 'errors' in data and data['errors'] is not None:
                 found_errors: Set[str] = set()
                 if not isinstance(vehicle.climatization, SkodaClimatization):
@@ -998,7 +1041,7 @@ class Connector(BaseConnector):
             log_extra_keys(LOG_API, 'air-condition', data,  {'carCapturedTimestamp', 'state', 'estimatedDateTimeToReachTargetTemperature',
                                                              'targetTemperature', 'outsideTemperature', 'chargerConnectionState',
                                                              'chargerLockState', 'airConditioningAtUnlock', 'steeringWheelPosition',
-                                                             'windowHeatingEnabled', 'seatHeatingActivated', 'errors'})
+                                                             'windowHeatingEnabled', 'seatHeatingActivated', 'windowHeatingState', 'errors'})
         return vehicle
 
     def fetch_vehicle_details(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
@@ -1034,6 +1077,20 @@ class Connector(BaseConnector):
                             else:
                                 capability = Capability(capability_id=capability_id, capabilities=vehicle.capabilities)
                                 vehicle.capabilities.add_capability(capability_id, capability)
+                            if 'statuses' in capability_dict and capability_dict['statuses'] is not None:
+                                statuses = capability_dict['statuses']
+                                if isinstance(statuses, list):
+                                    for status in statuses:
+                                        if status in [item.name for item in Capability.Status]:
+                                            capability.status.value.append(Capability.Status[status])
+                                        else:
+                                            LOG_API.warning('Capability status unkown %s', status)
+                                            capability.status.value.append(Capability.Status.UNKNOWN)
+                                else:
+                                    LOG_API.warning('Capability status not a list in %s', statuses)
+                            else:
+                                capability.status.value.clear()
+                            log_extra_keys(LOG_API, 'capability', capability_dict, {'id', 'statuses'})
                         else:
                             raise APIError('Could not parse capability, id missing')
                     for capability_id in vehicle.capabilities.capabilities.keys() - found_capabilities:
@@ -1043,7 +1100,7 @@ class Connector(BaseConnector):
             else:
                 vehicle.capabilities.clear_capabilities()
 
-            if vehicle.capabilities.has_capability('VEHICLE_WAKE_UP_TRIGGER'):
+            if vehicle.capabilities.has_capability('VEHICLE_WAKE_UP_TRIGGER', check_status_ok=True):
                 if vehicle.commands is not None and vehicle.commands.commands is not None \
                         and not vehicle.commands.contains_command('wake-sleep'):
                     wake_sleep_command = WakeSleepCommand(parent=vehicle.commands)
@@ -1052,7 +1109,8 @@ class Connector(BaseConnector):
                     vehicle.commands.add_command(wake_sleep_command)
 
             # Add HONK_AND_FLASH command if necessary capabilities are available
-            if vehicle.capabilities.has_capability('HONK_AND_FLASH') and vehicle.capabilities.has_capability('PARKING_POSITION'):
+            if vehicle.capabilities.has_capability('HONK_AND_FLASH', check_status_ok=True) \
+                    and vehicle.capabilities.has_capability('PARKING_POSITION', check_status_ok=True):
                 if vehicle.commands is not None and vehicle.commands.commands is not None \
                         and not vehicle.commands.contains_command('honk-flash'):
                     honk_flash_command = HonkAndFlashCommand(parent=vehicle.commands)
@@ -1061,7 +1119,7 @@ class Connector(BaseConnector):
                     vehicle.commands.add_command(honk_flash_command)
 
             # Add lock and unlock command
-            if vehicle.capabilities.has_capability('ACCESS'):
+            if vehicle.capabilities.has_capability('ACCESS', check_status_ok=True):
                 if vehicle.doors is not None and vehicle.doors.commands is not None and vehicle.doors.commands.commands is not None \
                         and not vehicle.doors.commands.contains_command('lock-unlock'):
                     lock_unlock_command = LockUnlockCommand(parent=vehicle.doors.commands)
@@ -1167,6 +1225,8 @@ class Connector(BaseConnector):
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/vehicle-status/{vin}/driving-range'
         range_data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if range_data:
+            if 'carCapturedTimestamp' not in range_data or range_data['carCapturedTimestamp'] is None:
+                raise APIError('Could not fetch driving range, carCapturedTimestamp missing')
             captured_at: datetime = robust_time_parse(range_data['carCapturedTimestamp'])
             # Check vehicle type and if it does not match the current vehicle type, create a new vehicle object using copy constructor
             if 'carType' in range_data and range_data['carType'] is not None:
@@ -1791,5 +1851,43 @@ class Connector(BaseConnector):
             raise CommandError(f'Retrying failed: {retry_error}') from retry_error
         return command_arguments
 
+    def __on_window_heating_start_stop(self, start_stop_command: WindowHeatingStartStopCommand, command_arguments: Union[str, Dict[str, Any]]) \
+            -> Union[str, Dict[str, Any]]:
+        if start_stop_command.parent is None or start_stop_command.parent.parent is None \
+                or start_stop_command.parent.parent.parent is None or not isinstance(start_stop_command.parent.parent.parent, SkodaVehicle):
+            raise CommandError('Object hierarchy is not as expected')
+        if not isinstance(command_arguments, dict):
+            raise CommandError('Command arguments are not a dictionary')
+        vehicle: SkodaVehicle = start_stop_command.parent.parent.parent
+        vin: Optional[str] = vehicle.vin.value
+        if vin is None:
+            raise CommandError('VIN in object hierarchy missing')
+        if 'command' not in command_arguments:
+            raise CommandError('Command argument missing')
+        try:
+            if command_arguments['command'] == WindowHeatingStartStopCommand.Command.START:
+                url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/start-window-heating'
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
+            elif command_arguments['command'] == WindowHeatingStartStopCommand.Command.STOP:
+                url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/stop-window-heating'
+                
+                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 window heating (%s: %s)', command_response.status_code, command_response.text)
+                raise CommandError(f'Could not start/stop window heating ({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 get_name(self) -> str:
         return "Skoda Connector"

carconnectivity_connector_skoda-0.4a8/CHANGELOG.md

@@ -1,25 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-## [Unreleased]
-- No unreleased changes so far
-
-## [0.3] - 2025-02-19
-### Added
-- Added support for images
-- Added tags to attributes
-- Added support for webui via carconnectivity-plugin-webui
-
-## [0.2] - 2025-02-02
-### Added
-- Wake Sleep command
-
-## [0.1] - 2025-01-25
-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
-[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