carconnectivity-connector-skoda 0.6__tar.gz → 0.7.1__tar.gz

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/CHANGELOG.md

@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 - No unreleased changes so far
 
+## [0.7.1] - 2025-04-18
+### Fixed
+- Fixed problem where driving range was not fetched when measurements capability had an expired license. Now it will be also fetched when charging license is active.
+
+## [0.7] - 2025-04-17
+### Fixed
+- Bug in mode attribute that caused the connector to crash
+
+### Changed
+- Updated dependencies
+- stripping of leading and trailing spaces in commands
+
+### Added
+- Precision for all attributes is now used when displaying values
+
 ## [0.6] - 2025-04-02
 ### Fixed
 - Only fetch range when measurement capability is available (fix for older cars)
@@ -51,7 +66,9 @@ All notable changes to this project will be documented in this file.
 Initial release, let's go and give this to the public to try out...
 The API is not yet implemented completely but most functions already work
 
-[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/compare/v0.6...HEAD
+[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/compare/v0.7.1...HEAD
+[0.7.1]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.7.1
+[0.7]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.7
 [0.6]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.6
 [0.5]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.5
 [0.4.1]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.4.1

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.6
+Version: 0.7.1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -37,10 +37,10 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.6
+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: pyjwt~=2.10
 Requires-Dist: paho-mqtt~=2.1.0
 Dynamic: license-file
 

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/doc/Config.md

@@ -19,7 +19,8 @@ These are the valid options for the MySkoda Connector
                     "spin": 1234, //S-Pin used for some special commands like locking/unlocking
                     "netrc": "~/.netr", // netrc file if to be used for passwords
                     "api_log_level": "debug", // Show debug information regarding the API
-                    "max_age": 300 //Cache requests to the server vor MAX_AGE seconds
+                    "max_age": 300, //Cache requests to the server vor MAX_AGE seconds
+                    "hide_vins": ["19XFB2F90CE040211", "1G2ZH35N074252067"] // Don't fetch these vins
                 }
             }
         ],

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/pyproject.toml

@@ -14,10 +14,10 @@ authors = [
     { name = "Till Steinbach" }
 ]
 dependencies = [
-    "carconnectivity>=0.6",
+    "carconnectivity>=0.7",
     "oauthlib~=3.2.2",
     "requests~=2.32.3",
-    "jwt~=1.3.1",
+    "pyjwt~=2.10",
     "paho-mqtt~=2.1.0",
 ]
 readme = "README.md"
@@ -44,4 +44,4 @@ max-line-length = 160
 ignore-patterns= "_version.py"
 
 [tool.bandit]
-targets = "carconnectivity_cli"
+targets = "carconnectivity_cli"

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.6
+Version: 0.7.1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -37,10 +37,10 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.6
+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: pyjwt~=2.10
 Requires-Dist: paho-mqtt~=2.1.0
 Dynamic: license-file
 

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/src/carconnectivity_connector_skoda.egg-info/requires.txt

@@ -1,5 +1,5 @@
-carconnectivity>=0.6
+carconnectivity>=0.7
 oauthlib~=3.2.2
 requests~=2.32.3
-jwt~=1.3.1
+pyjwt~=2.10
 paho-mqtt~=2.1.0

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/src/carconnectivity_connectors/skoda/_version.py

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

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/src/carconnectivity_connectors/skoda/auth/openid_session.py

@@ -7,7 +7,7 @@ import time
 from datetime import datetime, timezone
 import logging
 import requests
-from jwt import JWT
+import jwt
 
 from oauthlib.common import UNICODE_ASCII_CHARACTER_SET, generate_nonce, generate_token
 from oauthlib.oauth2.rfc6749.parameters import parse_authorization_code_response, parse_token_response, prepare_grant_uri
@@ -153,8 +153,7 @@ class OpenIDSession(requests.Session):
                     new_token['expires_in'] = self._token['expires_in']
                 else:
                     if 'id_token' in new_token:
-                        jwt_instance = JWT()
-                        meta_data = jwt_instance.decode(new_token['id_token'], do_verify=False)
+                        meta_data = jwt.decode(new_token['id_token'], do_verify=False)
                         if 'exp' in meta_data:
                             new_token['expires_at'] = meta_data['exp']
                             expires_at = datetime.fromtimestamp(meta_data['exp'], tz=timezone.utc)

{carconnectivity_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/src/carconnectivity_connectors/skoda/command_impl.py

@@ -44,7 +44,7 @@ class SpinCommand(GenericCommand):
             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_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/src/carconnectivity_connectors/skoda/connector.py

@@ -378,7 +378,8 @@ class Connector(BaseConnector):
             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)
                 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):
+                    if vehicle_to_update.capabilities.has_capability('MEASUREMENTS', check_status_ok=True) or \
+                            vehicle_to_update.capabilities.has_capability('CHARGING', 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)
@@ -404,13 +405,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:
@@ -498,10 +502,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
@@ -703,7 +709,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
@@ -756,6 +764,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:
@@ -1274,6 +1283,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
 
@@ -1306,15 +1316,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
 
@@ -1468,7 +1481,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_connector_skoda-0.6 → carconnectivity_connector_skoda-0.7.1}/src/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))