carconnectivity-connector-skoda 0.5a2__py3-none-any.whl → 0.6__py3-none-any.whl

{carconnectivity_connector_skoda-0.5a2.dist-info → carconnectivity_connector_skoda-0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.5a2
+Version: 0.6
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -37,11 +37,12 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.5a4
+Requires-Dist: carconnectivity>=0.6
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1
 Requires-Dist: paho-mqtt~=2.1.0
+Dynamic: license-file
 
 
 

{carconnectivity_connector_skoda-0.5a2.dist-info → carconnectivity_connector_skoda-0.6.dist-info}/RECORD

@@ -1,10 +1,11 @@
+carconnectivity_connector_skoda-0.6.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=FnsAkPBiQBLIp2akvad-n95m_ffJpDdufPzILnmfCFo,508
+carconnectivity_connectors/skoda/_version.py,sha256=G_QL3w-CuhuwBbKEJ8sRu9z-JXqi9Z6ikIDJgV_9mtw,506
 carconnectivity_connectors/skoda/capability.py,sha256=wH563-XUb_TnT8di1qDjnj-cY-cNHcAT6z7mx21LhSQ,4770
 carconnectivity_connectors/skoda/charging.py,sha256=7DPNiTWFhxiiEFKVnbIIU2TCmkpmcMWx_zsHXGXFpAQ,6856
 carconnectivity_connectors/skoda/climatization.py,sha256=Jut468SkxjPBDTqroWFvDifVPfJBxGjsFed5pc4kZkg,1768
-carconnectivity_connectors/skoda/command_impl.py,sha256=vgno5Qb5To0hCHOEBWSG8UOwCY9kT5fz1e2y0b6zF7U,3047
-carconnectivity_connectors/skoda/connector.py,sha256=wp3GXooqn1-O-TR4PxUdNR846EKrghBPCp3lN_5_UeE,144975
+carconnectivity_connectors/skoda/command_impl.py,sha256=dWFoKR_G6j-p0wgqdeVbF3r68FO_jAmgzgPWxW9zvyY,3222
+carconnectivity_connectors/skoda/connector.py,sha256=Q1pUXD27XkoHF7mnYm86uSh8VF4OzurjJ55lJR9mY4I,145317
 carconnectivity_connectors/skoda/error.py,sha256=ffxzvjmci7vtp9Q1K4DR1kBF0kTJxN5Gluci3kDBkEI,2459
 carconnectivity_connectors/skoda/mqtt_client.py,sha256=RkZ43NG1Z_TUmc2hUZS0yYUfwewzfut63zZUhQR1xug,39101
 carconnectivity_connectors/skoda/vehicle.py,sha256=q5gwe-_yPfE_-aEc17UQ-Q0Z46IN7PCpNG5jLw5PZl0,3981
@@ -15,9 +16,8 @@ carconnectivity_connectors/skoda/auth/openid_session.py,sha256=5JfR-gS1uKpE8DD-s
 carconnectivity_connectors/skoda/auth/session_manager.py,sha256=Uf1vujuDBYUCAXhYToOsZkgbTtfmY3Qe0ICTfwomBpI,2899
 carconnectivity_connectors/skoda/auth/skoda_web_session.py,sha256=tapjCRRPBu3tHrDoKmtuAlQhgxktib3oWTB8MHEzZTY,10816
 carconnectivity_connectors/skoda/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
-carconnectivity_connectors/skoda/ui/connector_ui.py,sha256=2Gywhyki52IxIZXV6DhWhzrBLn2293LlUMhK1Rxnw9w,1376
-carconnectivity_connector_skoda-0.5a2.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_skoda-0.5a2.dist-info/METADATA,sha256=9poMLd4wkqQ22Sj1NQCFVeMIPBYD7bIUMQ8qkHB5e1U,5360
-carconnectivity_connector_skoda-0.5a2.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-carconnectivity_connector_skoda-0.5a2.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.5a2.dist-info/RECORD,,
+carconnectivity_connectors/skoda/ui/connector_ui.py,sha256=lLjwoakRaU0S80hAVwVi4JA1wtHycGHcoM2-7S9qsqI,1386
+carconnectivity_connector_skoda-0.6.dist-info/METADATA,sha256=gBl4hXksq1yvNoa71CaDj2pu2VAujatHB5nxUM5kTnU,5378
+carconnectivity_connector_skoda-0.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+carconnectivity_connector_skoda-0.6.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.6.dist-info/RECORD,,

{carconnectivity_connector_skoda-0.5a2.dist-info → carconnectivity_connector_skoda-0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

carconnectivity_connectors/skoda/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5a2'
-__version_tuple__ = version_tuple = (0, 5)
+__version__ = version = '0.6'
+__version_tuple__ = version_tuple = (0, 6)

carconnectivity_connectors/skoda/command_impl.py

@@ -33,7 +33,11 @@ class SpinCommand(GenericCommand):
     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):
+        if isinstance(new_value, SpinCommand.Command):
+            newvalue_dict = {}
+            newvalue_dict['command'] = new_value
+            new_value = newvalue_dict
+        elif 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,
                                 choices=list(SpinCommand.Command))

carconnectivity_connectors/skoda/connector.py

@@ -328,6 +328,9 @@ class Connector(BaseConnector):
             if 'vehicles' in data and data['vehicles'] is not None:
                 for vehicle_dict in data['vehicles']:
                     if 'vin' in vehicle_dict and vehicle_dict['vin'] is not None:
+                        if vehicle_dict['vin'] in self.active_config['hide_vins']:
+                            LOG.info('Vehicle %s filtered out due to configuration', vehicle_dict['vin'])
+                            continue
                         seen_vehicle_vins.add(vehicle_dict['vin'])
                         vehicle: Optional[SkodaVehicle] = garage.get_vehicle(vehicle_dict['vin'])  # pyright: ignore[reportAssignmentType]
                         if not vehicle:
@@ -374,8 +377,9 @@ class Connector(BaseConnector):
             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(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('MEASUREMENTS', check_status_ok=True):
+                        vehicle_to_update = self.fetch_driving_range(vehicle_to_update)
                     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', check_status_ok=True):

carconnectivity_connectors/skoda/ui/connector_ui.py

@@ -19,8 +19,8 @@ class ConnectorUI(BaseConnectorUI):
     A user interface class for the Skoda connector in the Car Connectivity application.
     """
     def __init__(self, connector: BaseConnector):
-        blueprint: Optional[flask.Blueprint] = flask.Blueprint(name='skoda', import_name='carconnectivity-connector-skoda', url_prefix='/skoda',
-                                                                    template_folder=os.path.dirname(__file__) + '/templates')
+        blueprint: Optional[flask.Blueprint] = flask.Blueprint(name=connector.id, import_name='carconnectivity-connector-skoda', url_prefix=f'/{connector.id}',
+                                                               template_folder=os.path.dirname(__file__) + '/templates')
         super().__init__(connector, blueprint=blueprint)
 
     def get_nav_items(self) -> List[Dict[Literal['text', 'url', 'sublinks', 'divider'], Union[str, List]]]: