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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.5a2
+Version: 0.7
 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.7
 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.7.dist-info}/RECORD

@@ -1,12 +1,13 @@
+carconnectivity_connector_skoda-0.7.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=pz35JP40uhhjvpunO5XmeQhmrllFsoC46JzXGE2quqw,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=wDCI3Bka5pXlbyI4yVFS353TgFGyiBHBkERpP2g0A9w,3230
+carconnectivity_connectors/skoda/connector.py,sha256=Lgg-_ySEgtvjGEFNTa5215ZJa8OYVEyGFolgPhV8mMA,146134
 carconnectivity_connectors/skoda/error.py,sha256=ffxzvjmci7vtp9Q1K4DR1kBF0kTJxN5Gluci3kDBkEI,2459
-carconnectivity_connectors/skoda/mqtt_client.py,sha256=RkZ43NG1Z_TUmc2hUZS0yYUfwewzfut63zZUhQR1xug,39101
+carconnectivity_connectors/skoda/mqtt_client.py,sha256=D9_e_Bz842ULYKlRWd4JmosalhTtYr9DtCuvWrT3WQw,39126
 carconnectivity_connectors/skoda/vehicle.py,sha256=q5gwe-_yPfE_-aEc17UQ-Q0Z46IN7PCpNG5jLw5PZl0,3981
 carconnectivity_connectors/skoda/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/skoda/auth/auth_util.py,sha256=dGLUbUre0HBsTg_Ii5vW34f8DLrCykYJYCyzEvUBBEE,4434
@@ -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.7.dist-info/METADATA,sha256=l43xSHbtcW1miuJdp7el4wdFpyaGKc_vaggWQI5eNH4,5378
+carconnectivity_connector_skoda-0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+carconnectivity_connector_skoda-0.7.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.7.dist-info/RECORD,,

{carconnectivity_connector_skoda-0.5a2.dist-info → carconnectivity_connector_skoda-0.7.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.7'
+__version_tuple__ = version_tuple = (0, 7)

carconnectivity_connectors/skoda/command_impl.py

@@ -33,14 +33,18 @@ 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))
             parser.add_argument('--spin', dest='spin', help='Spin to be used instead of spin from config or .netrc', type=str, required=False,
                                 default=None)
             try:
-                args = parser.parse_args(new_value.split(sep=' '))
+                args = parser.parse_args(new_value.strip().split(sep=' '))
             except argparse.ArgumentError as e:
                 raise SetterError(f'Invalid format for SpinCommand: {e.message} {parser.format_usage()}') from e
 

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):
@@ -400,13 +404,16 @@ class Connector(BaseConnector):
             SkodaVehicle: The Skoda vehicle object with the updated state.
         """
         if vehicle is not None:
-            if vehicle.in_motion is not None and vehicle.in_motion.enabled and vehicle.in_motion.value:
+            if vehicle.connection_state is not None and vehicle.connection_state.enabled \
+                    and vehicle.connection_state.value == GenericVehicle.ConnectionState.OFFLINE:
+                vehicle.state._set_value(GenericVehicle.State.OFFLINE)
+            elif vehicle.in_motion is not None and vehicle.in_motion.enabled and vehicle.in_motion.value:
                 vehicle.state._set_value(GenericVehicle.State.IGNITION_ON)  # pylint: disable=protected-access
             elif vehicle.position is not None and vehicle.position.enabled and vehicle.position.position_type is not None \
                     and vehicle.position.position_type.enabled and vehicle.position.position_type.value == Position.PositionType.PARKING:
                 vehicle.state._set_value(GenericVehicle.State.PARKED)  # pylint: disable=protected-access
             else:
-                vehicle.state._set_value(None)  # pylint: disable=protected-access
+                vehicle.state._set_value(GenericVehicle.State.UNKNOWN)  # pylint: disable=protected-access
         return vehicle
 
     def fetch_charging(self, vehicle: SkodaElectricVehicle, no_cache: bool = False) -> SkodaElectricVehicle:
@@ -494,10 +501,12 @@ class Connector(BaseConnector):
                                 cruising_range_in_km: float = data['status']['battery']['remainingCruisingRangeInMeters'] / 1000
                                 # pylint: disable-next=protected-access
                                 drive.range._set_value(value=cruising_range_in_km, measured=captured_at, unit=Length.KM)
+                                drive.range.precision = 1
                             if 'stateOfChargeInPercent' in data['status']['battery'] \
                                     and data['status']['battery']['stateOfChargeInPercent'] is not None:
                                 # pylint: disable-next=protected-access
                                 drive.level._set_value(value=data['status']['battery']['stateOfChargeInPercent'], measured=captured_at)
+                                drive.level.precision = 1
                             log_extra_keys(LOG_API, 'status', data['status']['battery'],  {'remainingCruisingRangeInMeters',
                                                                                            'stateOfChargeInPercent'})
                             break
@@ -699,7 +708,9 @@ class Connector(BaseConnector):
                             else:
                                 longitude = None
                             vehicle.position.latitude._set_value(latitude)  # pylint: disable=protected-access
+                            vehicle.position.latitude.precision = 0.000001
                             vehicle.position.longitude._set_value(longitude)  # pylint: disable=protected-access
+                            vehicle.position.longitude.precision = 0.000001
                             vehicle.position.position_type._set_value(Position.PositionType.PARKING)  # pylint: disable=protected-access
                         else:
                             vehicle.position.latitude._set_value(None)  # pylint: disable=protected-access
@@ -752,6 +763,7 @@ class Connector(BaseConnector):
                 raise APIError('Could not fetch maintenance, capturedAt missing')
             if 'mileageInKm' in data and data['mileageInKm'] is not None:
                 vehicle.odometer._set_value(value=data['mileageInKm'], measured=captured_at, unit=Length.KM)  # pylint: disable=protected-access
+                vehicle.odometer.precision = 1
             else:
                 vehicle.odometer._set_value(None)  # pylint: disable=protected-access
             if 'inspectionDueInDays' in data and data['inspectionDueInDays'] is not None:
@@ -1270,6 +1282,7 @@ class Connector(BaseConnector):
             if 'totalRangeInKm' in range_data and range_data['totalRangeInKm'] is not None:
                 # pylint: disable-next=protected-access
                 vehicle.drives.total_range._set_value(value=range_data['totalRangeInKm'], measured=captured_at, unit=Length.KM)
+                vehicle.drives.total_range.precision = 1
             else:
                 vehicle.drives.total_range._set_value(None, measured=captured_at, unit=Length.KM)  # pylint: disable=protected-access
 
@@ -1302,15 +1315,18 @@ class Connector(BaseConnector):
                             and range_data[f'{drive_id}EngineRange']['currentSoCInPercent'] is not None:
                         # pylint: disable-next=protected-access
                         drive.level._set_value(value=range_data[f'{drive_id}EngineRange']['currentSoCInPercent'], measured=captured_at)
+                        drive.level.precision = 1
                     elif 'currentFuelLevelInPercent' in range_data[f'{drive_id}EngineRange'] \
                             and range_data[f'{drive_id}EngineRange']['currentFuelLevelInPercent'] is not None:
                         # pylint: disable-next=protected-access
                         drive.level._set_value(value=range_data[f'{drive_id}EngineRange']['currentFuelLevelInPercent'], measured=captured_at)
+                        drive.level.precision = 1
                     else:
                         drive.level._set_value(None, measured=captured_at)  # pylint: disable=protected-access
                     if 'remainingRangeInKm' in range_data[f'{drive_id}EngineRange'] and range_data[f'{drive_id}EngineRange']['remainingRangeInKm'] is not None:
                         # pylint: disable-next=protected-access
                         drive.range._set_value(value=range_data[f'{drive_id}EngineRange']['remainingRangeInKm'], measured=captured_at, unit=Length.KM)
+                        drive.range.precision = 1
                     else:
                         drive.range._set_value(None, measured=captured_at, unit=Length.KM)  # pylint: disable=protected-access
 
@@ -1464,7 +1480,7 @@ class Connector(BaseConnector):
                     elif not allow_http_error or (allowed_errors is not None and status_response.status_code not in allowed_errors):
                         raise RetrievalError(f'Could not fetch data even after re-authorization. Status Code was: {status_response.status_code}')
                 elif not allow_http_error or (allowed_errors is not None and status_response.status_code not in allowed_errors):
-                    raise RetrievalError(f'Could not fetch data. Status Code was: {status_response.status_code}')
+                    raise RetrievalError(f'Could not fetch data for {url}. Status Code was: {status_response.status_code}')
             except requests.exceptions.ConnectionError as connection_error:
                 raise RetrievalError(f'Connection error: {connection_error}.'
                                      ' If this happens frequently, please check if other applications communicate with the Skoda server.') from connection_error

carconnectivity_connectors/skoda/mqtt_client.py

@@ -480,7 +480,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                     old_charging_state: Optional[Charging.ChargingState] = charging_state
                                     if 'mode' in data['data'] and data['data']['mode'] is not None \
                                             and vehicle.charging is not None and isinstance(vehicle.charging.settings, SkodaCharging.Settings):
-                                        if data['data']['mode'] in SkodaCharging.SkodaChargeMode:
+                                        if data['data']['mode'] in [item.value for item in SkodaCharging.SkodaChargeMode]:
                                             skoda_charging_mode = SkodaCharging.SkodaChargeMode(data['data']['mode'])
                                         else:
                                             LOG_API.info('Unkown charging mode %s not in %s', data['data']['mode'], str(SkodaCharging.SkodaChargeMode))

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]]]: