carconnectivity-connector-skoda 0.1a10__tar.gz → 0.1a12__tar.gz

{carconnectivity_connector_skoda-0.1a10 → carconnectivity_connector_skoda-0.1a12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.1a10
+Version: 0.1a12
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.1a10 → carconnectivity_connector_skoda-0.1a12}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.1a10
+Version: 0.1a12
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.1a10 → carconnectivity_connector_skoda-0.1a12}/src/carconnectivity_connectors/skoda/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1a10'
+__version__ = version = '0.1a12'
 __version_tuple__ = version_tuple = (0, 1)

{carconnectivity_connector_skoda-0.1a10 → carconnectivity_connector_skoda-0.1a12}/src/carconnectivity_connectors/skoda/connector.py

@@ -302,7 +302,7 @@ class Connector(BaseConnector):
         for vin in set(garage.list_vehicle_vins()):
             vehicle_to_update: Optional[GenericVehicle] = garage.get_vehicle(vin)
             if vehicle_to_update is not None and isinstance(vehicle_to_update, SkodaVehicle) and vehicle_to_update.is_managed_by_connector(self):
-                vehicle_to_update = self.fetch_vehicle_status_second_api(vehicle_to_update)
+                #vehicle_to_update = self.fetch_vehicle_status_second_api(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('PARKING_POSITION'):
@@ -312,7 +312,7 @@ class Connector(BaseConnector):
                     if vehicle_to_update.capabilities.has_capability('AIR_CONDITIONING'):
                         vehicle_to_update = self.fetch_air_conditioning(vehicle_to_update)
 
-    def fetch_charging(self, vehicle: SkodaElectricVehicle) -> SkodaElectricVehicle:
+    def fetch_charging(self, vehicle: SkodaElectricVehicle, no_cache: bool = False) -> SkodaElectricVehicle:
         """
         Fetches the charging information for a given Skoda electric vehicle.
 
@@ -329,7 +329,7 @@ class Connector(BaseConnector):
         if vehicle.charging is None:
             raise ValueError('Vehicle has no charging object')
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}'
-        data: Dict[str, Any] | None = self._fetch_data(url, session=self.session)
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if data is not None:
             if 'carCapturedTimestamp' in data and data['carCapturedTimestamp'] is not None:
                 captured_at: datetime = robust_time_parse(data['carCapturedTimestamp'])
@@ -361,6 +361,7 @@ class Connector(BaseConnector):
                 if 'remainingTimeToFullyChargedInMinutes' in data['status'] and data['status']['remainingTimeToFullyChargedInMinutes'] is not None:
                     remaining_duration: timedelta = timedelta(minutes=data['status']['remainingTimeToFullyChargedInMinutes'])
                     estimated_date_reached: datetime = captured_at + remaining_duration
+                    estimated_date_reached = estimated_date_reached.replace(second=0, microsecond=0)
                     # pylint: disable-next=protected-access
                     vehicle.charging.estimated_date_reached._set_value(value=estimated_date_reached, measured=captured_at)
                 else:
@@ -372,7 +373,7 @@ class Connector(BaseConnector):
             log_extra_keys(LOG_API, 'charging data', data,  {'carCapturedTimestamp', 'status'})
         return vehicle
 
-    def fetch_position(self, vehicle: SkodaVehicle) -> SkodaVehicle:
+    def fetch_position(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
         """
         Fetches the position of the given Skoda vehicle and updates its position attributes.
 
@@ -392,7 +393,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, session=self.session)
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if data is not None:
             if 'positions' in data and data['positions'] is not None:
                 for position_dict in data['positions']:
@@ -426,7 +427,7 @@ class Connector(BaseConnector):
                 vehicle.position.position_type._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
-    def fetch_air_conditioning(self, vehicle: SkodaVehicle) -> SkodaVehicle:
+    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.
 
@@ -451,7 +452,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/v2/air-conditioning/{vin}'
-        data: Dict[str, Any] | None = self._fetch_data(url, session=self.session)
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if data is not None:
             if 'carCapturedTimestamp' in data and data['carCapturedTimestamp'] is not None:
                 captured_at: datetime = robust_time_parse(data['carCapturedTimestamp'])
@@ -529,7 +530,7 @@ class Connector(BaseConnector):
                                                              'targetTemperature', 'outsideTemperature'})
         return vehicle
 
-    def fetch_vehicle_details(self, vehicle: SkodaVehicle) -> SkodaVehicle:
+    def fetch_vehicle_details(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
         """
         Fetches the details of a vehicle from the Skoda API.
 
@@ -544,7 +545,7 @@ class Connector(BaseConnector):
             raise APIError('VIN is missing')
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/garage/vehicles/{vin}?' \
             'connectivityGenerations=MOD1&connectivityGenerations=MOD2&connectivityGenerations=MOD3&connectivityGenerations=MOD4'
-        vehicle_data: Dict[str, Any] | None = self._fetch_data(url, self.session)
+        vehicle_data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if vehicle_data:
             if 'softwareVersion' in vehicle_data and vehicle_data['softwareVersion'] is not None:
                 vehicle.software.version._set_value(vehicle_data['softwareVersion'])  # pylint: disable=protected-access
@@ -582,7 +583,7 @@ class Connector(BaseConnector):
             log_extra_keys(LOG_API, 'api/v2/garage/vehicles/VIN', vehicle_data, {'softwareVersion'})
         return vehicle
 
-    def fetch_driving_range(self, vehicle: SkodaVehicle) -> SkodaVehicle:
+    def fetch_driving_range(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
         """
         Fetches the driving range data for a given Skoda vehicle and updates the vehicle object accordingly.
 
@@ -605,7 +606,7 @@ class Connector(BaseConnector):
         if vin is None:
             raise APIError('VIN is missing')
         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, self.session)
+        range_data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if range_data:
             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
@@ -692,7 +693,7 @@ class Connector(BaseConnector):
                                                                                                'secondaryEngineRange'})
         return vehicle
 
-    def fetch_vehicle_status_second_api(self, vehicle: SkodaVehicle) -> SkodaVehicle:
+    def fetch_vehicle_status_second_api(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
         """
         Fetches the status of a vehicle from other Skoda API.
 
@@ -706,7 +707,7 @@ class Connector(BaseConnector):
         if vin is None:
             raise APIError('VIN is missing')
         url = f'https://api.connect.skoda-auto.cz/api/v2/vehicle-status/{vin}'
-        vehicle_status_data: Dict[str, Any] | None = self._fetch_data(url, self.session)
+        vehicle_status_data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if vehicle_status_data:
             if 'remote' in vehicle_status_data and vehicle_status_data['remote'] is not None:
                 vehicle_status_data = vehicle_status_data['remote']
@@ -881,10 +882,11 @@ class Connector(BaseConnector):
         """
         self._elapsed.append(elapsed)
 
-    def _fetch_data(self, url, session, force=False, allow_empty=False, allow_http_error=False, allowed_errors=None) -> Optional[Dict[str, Any]]:  # noqa: C901
+    def _fetch_data(self, url, session, no_cache=False, allow_empty=False, allow_http_error=False,
+                    allowed_errors=None) -> Optional[Dict[str, Any]]:  # noqa: C901
         data: Optional[Dict[str, Any]] = None
         cache_date: Optional[datetime] = None
-        if not force and (self.max_age is not None and session.cache is not None and url in session.cache):
+        if not no_cache and (self.max_age is not None and session.cache is not None and url in session.cache):
             data, cache_date_string = session.cache[url]
             cache_date = datetime.fromisoformat(cache_date_string)
         if data is None or self.max_age is None \

{carconnectivity_connector_skoda-0.1a10 → carconnectivity_connector_skoda-0.1a12}/src/carconnectivity_connectors/skoda/mqtt_client.py

@@ -7,6 +7,7 @@ import logging
 import uuid
 import ssl
 import json
+import threading
 from datetime import timedelta, timezone
 
 from paho.mqtt.client import Client
@@ -57,6 +58,8 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         self.on_subscribe = self._on_subscribe_callback
         self.subscribed_topics: Set[str] = set()
 
+        self.delayed_access_function_timers: Dict[str, threading.Timer] = {}
+
         self.tls_set(cert_reqs=ssl.CERT_NONE)
 
     def connect(self, *args, **kwargs) -> MQTTErrorCode:
@@ -437,7 +440,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             return
 
         # service_events
-        match = re.match(r'^(?P<user_id>[0-9a-fA-F-]+)/(?P<vin>[A-Z0-9]+)/service-event/(?P<service_event>[a-zA-Z0-9-_]+)$', msg.topic)
+        match = re.match(r'^(?P<user_id>[0-9a-fA-F-]+)/(?P<vin>[A-Z0-9]+)/service-event/(?P<service_event>[a-zA-Z0-9-_/]+)$', msg.topic)
         if match:
             user_id: str = match.group('user_id')
             vin: str = match.group('vin')
@@ -481,7 +484,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                     # If charging state changed, fetch charging again
                                     if old_charging_state != charging_state:
                                         try:
-                                            self._skoda_connector.fetch_charging(vehicle)
+                                            self._skoda_connector.fetch_charging(vehicle, no_cache=True)
                                         except CarConnectivityError as e:
                                             LOG.error('Error while fetching charging: %s', e)
                                 if 'timeToFinish' in data['data'] and data['data']['timeToFinish'] is not None \
@@ -489,6 +492,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                     try:
                                         remaining_duration: Optional[timedelta] = timedelta(minutes=int(data['data']['timeToFinish']))
                                         estimated_date_reached: Optional[datetime] = measured_at + remaining_duration
+                                        estimated_date_reached = estimated_date_reached.replace(second=0, microsecond=0)
                                     except ValueError:
                                         estimated_date_reached: Optional[datetime] = None
                                     # pylint: disable-next=protected-access
@@ -507,12 +511,54 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                             vehicle: Optional[GenericVehicle] = self._skoda_connector.car_connectivity.garage.get_vehicle(vin)
                             if isinstance(vehicle, SkodaVehicle):
                                 try:
-                                    self._skoda_connector.fetch_air_conditioning(vehicle)
+                                    self._skoda_connector.fetch_air_conditioning(vehicle, no_cache=True)
                                 except CarConnectivityError as e:
                                     LOG.error('Error while fetching charging: %s', e)
                     LOG_API.info('Received event name %s service event %s for vehicle %s from user %s: %s', data['name'],
                                  service_event, vin, user_id, msg.payload)
                     return
+                elif service_event == 'vehicle-status/access':
+                    if 'name' in data and data['name'] == 'change-access':
+                        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, SkodaVehicle):
+                                def delayed_access_function(vehicle: SkodaVehicle):
+                                    """
+                                    Function to be executed after a delay of two seconds.
+                                    """
+                                    vin = vehicle.id
+                                    self.delayed_access_function_timers.pop(vin)
+                                    if vehicle.capabilities is not None and vehicle.capabilities.enabled \
+                                            and vehicle.capabilities.has_capability('CHARGING') and isinstance(vehicle, SkodaElectricVehicle):
+                                        try:
+                                            self._skoda_connector.fetch_charging(vehicle, no_cache=True)
+                                        except CarConnectivityError as e:
+                                            LOG.error('Error while fetching charging: %s', e)
+                                    if vehicle.capabilities is not None and vehicle.capabilities.enabled \
+                                            and vehicle.capabilities.has_capability('PARKING_POSITION'):
+                                        try:
+                                            self._skoda_connector.fetch_position(vehicle, no_cache=True)
+                                        except CarConnectivityError as e:
+                                            LOG.error('Error while fetching position: %s', e)
+                                    if vehicle.capabilities is not None and vehicle.capabilities.enabled \
+                                            and vehicle.capabilities.has_capability('AIR_CONDITIONING'):
+                                        try:
+                                            self._skoda_connector.fetch_air_conditioning(vehicle, no_cache=True)
+                                        except CarConnectivityError as e:
+                                            LOG.error('Error while fetching air conditioning: %s', e)
+                                    #try:
+                                    #    self._skoda_connector.fetch_vehicle_status_second_api(vehicle, no_cache=True)
+                                    #except CarConnectivityError as e:
+                                    #    LOG.error('Error while fetching status second API: %s', e)
+
+                                if vin in self.delayed_access_function_timers:
+                                    self.delayed_access_function_timers[vin].cancel()
+                                self.delayed_access_function_timers[vin] = threading.Timer(2.0, delayed_access_function, kwargs={'vehicle': vehicle})
+                                self.delayed_access_function_timers[vin].start()
+
+                    LOG_API.info('Received event name %s service event %s for vehicle %s from user %s: %s', data['name'],
+                                 service_event, vin, user_id, msg.payload)
+                    return
             LOG_API.info('Received unknown service event %s for vehicle %s from user %s: %s', service_event, vin, user_id, msg.payload)
             return
         # service_events
@@ -530,7 +576,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                             if data['status'] == 'COMPLETED_SUCCESS':
                                 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)
+                                    self._skoda_connector.fetch_air_conditioning(vehicle, no_cache=True)
                                 except CarConnectivityError as e:
                                     LOG.error('Error while fetching air-conditioning: %s', e)
                                 return