carconnectivity-connector-seatcupra 0.1a11__tar.gz → 0.1a13__tar.gz

{carconnectivity_connector_seatcupra-0.1a11 → carconnectivity_connector_seatcupra-0.1a13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a11
+Version: 0.1a13
 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.4a4
+Requires-Dist: carconnectivity>=0.4a6
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.1a11 → carconnectivity_connector_seatcupra-0.1a13}/pyproject.toml

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

{carconnectivity_connector_seatcupra-0.1a11 → carconnectivity_connector_seatcupra-0.1a13}/src/carconnectivity_connector_seatcupra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a11
+Version: 0.1a13
 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.4a4
+Requires-Dist: carconnectivity>=0.4a6
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.1a11 → carconnectivity_connector_seatcupra-0.1a13}/src/carconnectivity_connector_seatcupra.egg-info/requires.txt

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

{carconnectivity_connector_seatcupra-0.1a11 → carconnectivity_connector_seatcupra-0.1a13}/src/carconnectivity_connectors/seatcupra/_version.py

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

{carconnectivity_connector_seatcupra-0.1a11 → carconnectivity_connector_seatcupra-0.1a13}/src/carconnectivity_connectors/seatcupra/connector.py

@@ -77,6 +77,16 @@ 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._is_changeable = True  # pylint: disable=protected-access
+        self.interval._add_on_set_hook(__check_interval)  # pylint: disable=protected-access
+
         self.commands: Commands = Commands(parent=self)
 
         LOG.info("Loading seatcupra connector with config %s", config_remove_credentials(config))
@@ -159,6 +169,7 @@ class Connector(BaseConnector):
 
     def startup(self) -> None:
         self._background_thread = threading.Thread(target=self._background_loop, daemon=False)
+        self._background_thread.name = 'carconnectivity.connectors.seatcupra-background'
         self._background_thread.start()
 
     def _background_loop(self) -> None:
@@ -226,10 +237,10 @@ 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()
         self.persist()
-        self.session.close()
         BaseConnector.shutdown(self)
 
     def fetch_all(self) -> None:
@@ -524,6 +535,10 @@ class Connector(BaseConnector):
                 else:
                     vehicle.doors.open_state._set_value(Doors.OpenState.OPEN, measured=captured_at)  # pylint: disable=protected-access
             seen_window_ids: set[str] = set()
+            if 'sunRoof' in vehicle_status_data and vehicle_status_data['sunRoof'] is not None \
+                    and 'windows' in vehicle_status_data and vehicle_status_data['windows'] is not None:
+                vehicle_status_data['windows']['sunRoof'] = vehicle_status_data['sunRoof']
+
             if 'windows' in vehicle_status_data and vehicle_status_data['windows'] is not None:
                 all_windows_closed = True
                 for window_id, window_status in vehicle_status_data['windows'].items():
@@ -550,7 +565,7 @@ class Connector(BaseConnector):
             for window_id in vehicle.windows.windows.keys() - seen_window_ids:
                 vehicle.windows.windows[window_id].enabled = False
             log_extra_keys(LOG_API, f'/api/v2/vehicle-status/{vin}', vehicle_status_data, {'updatedAt', 'locked', 'lights', 'hood', 'trunk', 'doors',
-                                                                                           'windows'})
+                                                                                           'windows', 'sunRoof'})
         return vehicle
 
     def fetch_vehicle_mycar_status(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
@@ -922,8 +937,11 @@ class Connector(BaseConnector):
                             plug_power_state: ChargingConnector.ExternalPower = \
                                 ChargingConnector.ExternalPower(data['plug']['externalPower'])
                         else:
-                            LOG_API.info('Unknown plug power state %s', data['plug']['externalPower'])
-                            plug_power_state = ChargingConnector.ExternalPower.UNKNOWN
+                            if data['plug']['externalPower'] == 'ready':
+                                plug_power_state = ChargingConnector.ExternalPower.AVAILABLE
+                            else:
+                                LOG_API.info('Unknown plug power state %s', data['plug']['externalPower'])
+                                plug_power_state = ChargingConnector.ExternalPower.UNKNOWN
                         vehicle.charging.connector.external_power._set_value(value=plug_power_state)  # pylint: disable=protected-access
                     else:
                         vehicle.charging.connector.external_power._set_value(None)  # pylint: disable=protected-access
@@ -994,7 +1012,7 @@ class Connector(BaseConnector):
                     if img is None or self.active_config['max_age'] is None \
                             or (cache_date is not None and cache_date < (datetime.utcnow() - timedelta(seconds=self.active_config['max_age']))):
                         try:
-                            image_download_response = requests.get(image_url, stream=True, timeout=180)
+                            image_download_response = requests.get(image_url, stream=True, timeout=10)
                             if image_download_response.status_code == requests.codes['ok']:
                                 img = Image.open(image_download_response.raw)  # pyright: ignore[reportPossiblyUnboundVariable]
                                 if self.session.cache is not None:
@@ -1105,19 +1123,10 @@ class Connector(BaseConnector):
         try:
             if command_arguments['command'] == ChargingStartStopCommand.Command.START:
                 url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/requests/start'
-                if isinstance(vehicle, SeatCupraElectricVehicle) and vehicle.charging is not None and vehicle.charging.settings is not None \
-                        and vehicle.charging.settings.maximum_current is not None and vehicle.charging.settings.maximum_current.enabled \
-                        and vehicle.charging.settings.maximum_current.value is not None:
-                    if vehicle.charging.settings.maximum_current.value <= 6:
-                        command_dict['maxChargeCurrentAC'] = 'reduced'
-                    else:
-                        command_dict['maxChargeCurrentAC'] = 'maximum'
-                else:
-                    command_dict['maxChargeCurrentAC'] = 'maximum'
-                command_response: requests.Response = self.session.post(url, json=command_dict, allow_redirects=True)
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
             elif command_arguments['command'] == ChargingStartStopCommand.Command.STOP:
                 url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/requests/stop'
-                command_response: requests.Response = self.session.post(url, data='{}', allow_redirects=True)
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
             else:
                 raise CommandError(f'Unknown command {command_arguments["command"]}')
 

{carconnectivity_connector_seatcupra-0.1a11 → carconnectivity_connector_seatcupra-0.1a13}/src/carconnectivity_connectors/seatcupra/vehicle.py

@@ -47,7 +47,6 @@ class SeatCupraVehicle(GenericVehicle):  # pylint: disable=too-many-instance-att
                 self._car_images: Dict[str, Image.Image] = {}
 
 
-
 class SeatCupraElectricVehicle(ElectricVehicle, SeatCupraVehicle):
     """
     Represents a Seat/Cupra electric vehicle.