carconnectivity-connector-seatcupra 0.1a14__py3-none-any.whl → 0.1a16__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.1a14.dist-info → carconnectivity_connector_seatcupra-0.1a16.dist-info}/METADATA

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

{carconnectivity_connector_seatcupra-0.1a14.dist-info → carconnectivity_connector_seatcupra-0.1a16.dist-info}/RECORD

@@ -1,10 +1,10 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=uxem9Z0JbrrSqB5GMvuMAyGSfBZfrJvSAu8udDrjXQg,509
+carconnectivity_connectors/seatcupra/_version.py,sha256=Q2vMRbSVvIsvGRGZpDL_EO13NrfM1hiyRO4RK2N2B04,509
 carconnectivity_connectors/seatcupra/capability.py,sha256=Oe9tC_u69bj6VmOuNJ21RKoETe2j3QyZCoz-VgcZPQ0,4523
 carconnectivity_connectors/seatcupra/charging.py,sha256=BJe_5GEB0JkP78tpU6kyKpwuwjDZHvm-kt3PTlpQHeU,3336
 carconnectivity_connectors/seatcupra/climatization.py,sha256=0xxWlxrheAPzkVT8WRQtbm6ExZmVdgW7lUdOXyS_qWY,1695
-carconnectivity_connectors/seatcupra/command_impl.py,sha256=mtw8ZwJLmf79fPDZ1N3ImLfB8Gt9JPbzjMuIo2y5v3M,2879
-carconnectivity_connectors/seatcupra/connector.py,sha256=edw4PSE8HqxSeG6_eOSKl55hNF1aZt-_pnOiVxzQBl0,100885
+carconnectivity_connectors/seatcupra/command_impl.py,sha256=LmBOCWGZPfJCG_4-5449xvO6NAvnPDsAWEBKlsG4WoI,3051
+carconnectivity_connectors/seatcupra/connector.py,sha256=BeiW5YQtmNckm-CsYU_fd2KT2LmdOzB6druVG-QNUNE,101715
 carconnectivity_connectors/seatcupra/vehicle.py,sha256=s0G-HqG5qcwStDxD3649KgLMa3lKPZ4TOGWRJEuQzsQ,3403
 carconnectivity_connectors/seatcupra/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/seatcupra/auth/auth_util.py,sha256=Y81h8fGOMSMgPtE4wI_TI9WgE_s43uaPjRLBBINhj4g,4433
@@ -14,8 +14,8 @@ carconnectivity_connectors/seatcupra/auth/session_manager.py,sha256=ZIDvC848T3fy
 carconnectivity_connectors/seatcupra/auth/vw_web_session.py,sha256=CcI6m68IyRs6WsMDu-IsW3Dj85vyGiMmxvFqNETMHO0,10929
 carconnectivity_connectors/seatcupra/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
 carconnectivity_connectors/seatcupra/ui/connector_ui.py,sha256=SNYnlcGJpbWhuLiIHD2l6H9IfSiMz3IgmvXsdossDnE,1412
-carconnectivity_connector_seatcupra-0.1a14.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.1a14.dist-info/METADATA,sha256=Sn7852ULtuZqRoHEFQjCgjmDXxAptyYZcq6I2mhkg8M,5641
-carconnectivity_connector_seatcupra-0.1a14.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-carconnectivity_connector_seatcupra-0.1a14.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.1a14.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.1a16.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.1a16.dist-info/METADATA,sha256=HCIYpy1TCxYmcQGaceTHYYog1OtZqs4a71o-Gr-fpjA,5642
+carconnectivity_connector_seatcupra-0.1a16.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+carconnectivity_connector_seatcupra-0.1a16.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.1a16.dist-info/RECORD,,

carconnectivity_connectors/seatcupra/_version.py

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

carconnectivity_connectors/seatcupra/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_connectors/seatcupra/connector.py

@@ -6,6 +6,7 @@ import threading
 
 import json
 import os
+import traceback
 import logging
 import netrc
 from datetime import datetime, timezone, timedelta
@@ -77,15 +78,10 @@ class Connector(BaseConnector):
 
         self.connected: BooleanAttribute = BooleanAttribute(name="connected", parent=self, tags={'connector_custom'})
         self.interval: DurationAttribute = DurationAttribute(name="interval", parent=self, tags={'connector_custom'})
-
-        def __check_interval(attribute: GenericAttribute, value: Any) -> Any:
-            del attribute
-            if value is not None and value < timedelta(seconds=180):
-                raise ValueError('Intervall must be at least 180 seconds')
-            return value
-
+        self.interval.minimum = timedelta(seconds=180)
         self.interval._is_changeable = True  # pylint: disable=protected-access
-        self.interval._add_on_set_hook(__check_interval)  # pylint: disable=protected-access
+
+        self._healthy = False
 
         self.commands: Commands = Commands(parent=self)
 
@@ -171,6 +167,7 @@ class Connector(BaseConnector):
         self._background_thread = threading.Thread(target=self._background_loop, daemon=False)
         self._background_thread.name = 'carconnectivity.connectors.seatcupra-background'
         self._background_thread.start()
+        self._healthy = True
 
     def _background_loop(self) -> None:
         self._stop_event.clear()
@@ -206,6 +203,10 @@ class Connector(BaseConnector):
             except TemporaryAuthenticationError as err:
                 LOG.error('Temporary authentification error during update (%s). Will try again after configured interval of %ss', str(err), interval)
                 self._stop_event.wait(interval)
+            except Exception as err:
+                LOG.critical('Critical error during update: %s', traceback.format_exc())
+                self._healthy = False
+                raise err
             else:
                 self._stop_event.wait(interval)
 
@@ -285,6 +286,7 @@ class Connector(BaseConnector):
                     vehicle_to_update = self.fetch_parking_position(vehicle_to_update)
                 if vehicle_to_update.capabilities.has_capability('vehicleHealthInspection'):
                     vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
+        self.car_connectivity.transaction_end()
 
     def fetch_vehicles(self) -> None:
         """
@@ -861,6 +863,9 @@ class Connector(BaseConnector):
                 vehicle.climatization.settings.target_temperature._set_value(value=target_temperature,  # pylint: disable=protected-access
                                                                              measured=captured_at,
                                                                              unit=Temperature.C)
+                vehicle.climatization.settings.target_temperature.precision = 0.5
+                vehicle.climatization.settings.target_temperature.minimum = 16.0
+                vehicle.climatization.settings.target_temperature.maximum = 29.5
             elif 'targetTemperatureInFahrenheit' in data and data['targetTemperatureInFahrenheit'] is not None:
                 # pylint: disable-next=protected-access
                 vehicle.climatization.settings.target_temperature._add_on_set_hook(self.__on_air_conditioning_settings_change)
@@ -870,6 +875,9 @@ class Connector(BaseConnector):
                 vehicle.climatization.settings.target_temperature._set_value(value=target_temperature,  # pylint: disable=protected-access
                                                                              measured=captured_at,
                                                                              unit=Temperature.F)
+                vehicle.climatization.settings.target_temperature.precision = 0.5
+                vehicle.climatization.settings.target_temperature.minimum = 61.0
+                vehicle.climatization.settings.target_temperature.maximum = 85.5
             else:
                 vehicle.climatization.settings.target_temperature._set_value(None)  # pylint: disable=protected-access
             if 'climatisationWithoutExternalPower' in data and data['climatisationWithoutExternalPower'] is not None:
@@ -1162,12 +1170,15 @@ class Connector(BaseConnector):
             url = f'https://ola.prod.code.seat.cloud.vwgroup.com/v2/vehicles/{vin}/climatisation/start'
             if vehicle.climatization.settings is None:
                 raise CommandError('Could not control climatisation, there are no climatisation settings for the vehicle available.')
+            precision: float = 0.5
             if 'target_temperature' in command_arguments:
                 # Round target temperature to nearest 0.5
-                command_dict['targetTemperature'] = round(command_arguments['target_temperature'] * 2) / 2
+                command_dict['targetTemperature'] = round(command_arguments['target_temperature'] / precision) * precision
             elif vehicle.climatization.settings.target_temperature is not None and vehicle.climatization.settings.target_temperature.enabled \
                     and vehicle.climatization.settings.target_temperature.value is not None:
                 temperature_value = vehicle.climatization.settings.target_temperature.value
+                if vehicle.climatization.settings.target_temperature.precision is not None:
+                    precision = vehicle.climatization.settings.target_temperature.precision
                 if vehicle.climatization.settings.target_temperature.unit == Temperature.C:
                     command_dict['targetTemperatureUnit'] = 'celsius'
                 elif vehicle.climatization.settings.target_temperature.unit == Temperature.F:
@@ -1175,7 +1186,7 @@ class Connector(BaseConnector):
                 else:
                     command_dict['targetTemperatureUnit'] = 'celsius'
                 if temperature_value is not None:
-                    command_dict['targetTemperature'] = round(temperature_value * 2) / 2
+                    command_dict['targetTemperature'] = round(temperature_value / precision) * precision
             if 'target_temperature_unit' in command_arguments:
                 if command_arguments['target_temperature_unit'] == Temperature.C:
                     command_dict['targetTemperatureUnit'] = 'celsius'
@@ -1442,3 +1453,6 @@ class Connector(BaseConnector):
 
     def get_type(self) -> str:
         return "carconnectivity-connector-seatcupra"
+
+    def is_healthy(self) -> bool:
+        return self._healthy and super().is_healthy()