carconnectivity-connector-seatcupra 0.1a11__py3-none-any.whl → 0.1a12__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.1a11.dist-info → carconnectivity_connector_seatcupra-0.1a12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a11
+Version: 0.1a12
 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.dist-info → carconnectivity_connector_seatcupra-0.1a12.dist-info}/RECORD

@@ -1,10 +1,10 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=8hC_LLpTTiKrt81VVDKjTD0LIQ0Qtf_-ak-wISSul2I,509
+carconnectivity_connectors/seatcupra/_version.py,sha256=P5HzP2QWt9JgX2cjp9oYZxzRbLpLn0PHY12_Tr5maGE,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=fmn62rMBt7IKRv-fLU0UpjMLSADCK_DzAeRP9ry_IwY,100546
+carconnectivity_connectors/seatcupra/connector.py,sha256=GZLdactSC5vOKE3OvXekcwaAmYtRfoo8G7x0iBJJB7s,101388
 carconnectivity_connectors/seatcupra/vehicle.py,sha256=kiFVbJgq5VQOzf-vSli_2NsMgY0x4pwvJsjPWLGdr1g,3404
 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.1a11.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.1a11.dist-info/METADATA,sha256=Kdviy1kwi2S9KrNRWfyf-GGfsPdBYcD5dBOkCQh6WRw,5641
-carconnectivity_connector_seatcupra-0.1a11.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-carconnectivity_connector_seatcupra-0.1a11.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.1a11.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.1a12.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.1a12.dist-info/METADATA,sha256=QwGVdp8CkV8qlNFb_NLHqRUdd9xdhh0kiCKxYAEQkQ8,5641
+carconnectivity_connector_seatcupra-0.1a12.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+carconnectivity_connector_seatcupra-0.1a12.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.1a12.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.1a11'
+__version__ = version = '0.1a12'
 __version_tuple__ = version_tuple = (0, 1)

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:
@@ -994,7 +1009,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: