carconnectivity-connector-skoda 0.7.1a1__tar.gz → 0.8.1__tar.gz

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/.github/workflows/build.yml

@@ -22,12 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/.github/workflows/build_and_publish.yml

@@ -15,11 +15,11 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
       - name: Install dependencies

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/.github/workflows/codeql-analysis.yml

@@ -26,11 +26,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -41,7 +41,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -55,4 +55,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/CHANGELOG.md

@@ -5,6 +5,35 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 - No unreleased changes so far
 
+## [0.8.1] - 2025-11-02
+### Fixed
+- Relogin when MQTT client receives a bad username or password error
+
+### Added
+- Warning when connector detects suspicious token expiry
+
+### Changed
+- Updated some dependencies
+
+## [0.8] - 2025-06-27
+### Added
+- Support for adblue range
+
+## [0.7.3] - 2025-06-20
+### Fixed
+- Fixes bug that registers hooks several times, causing multiple calls to the servers
+
+### Changed
+- Updated dependencies
+
+## [0.7.2] - 2025-04-19
+### Fixed
+- Fix for problems introduced with PyJWT
+
+## [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
@@ -62,7 +91,12 @@ 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.7...HEAD
+[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/compare/v0.8.1...HEAD
+[0.8.1]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.8.1
+[0.8]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.8
+[0.7.3]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.7.3
+[0.7.2]: https://github.com/tillsteinbach/CarConnectivity-connector-skoda/releases/tag/v0.7.2
+[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

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.7.1a1
+Version: 0.8.1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -33,13 +33,14 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.7
-Requires-Dist: oauthlib~=3.2.2
-Requires-Dist: requests~=2.32.3
+Requires-Dist: carconnectivity>=0.8.1
+Requires-Dist: oauthlib~=3.3.1
+Requires-Dist: requests~=2.32.5
 Requires-Dist: pyjwt~=2.10
 Requires-Dist: paho-mqtt~=2.1.0
 Dynamic: license-file

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/pyproject.toml

@@ -14,9 +14,9 @@ authors = [
     { name = "Till Steinbach" }
 ]
 dependencies = [
-    "carconnectivity>=0.7",
-    "oauthlib~=3.2.2",
-    "requests~=2.32.3",
+    "carconnectivity>=0.8.1",
+    "oauthlib~=3.3.1",
+    "requests~=2.32.5",
     "pyjwt~=2.10",
     "paho-mqtt~=2.1.0",
 ]
@@ -31,6 +31,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries"
 ]
 

carconnectivity_connector_skoda-0.8.1/setup_requirements.txt

@@ -0,0 +1,6 @@
+flake8~=7.3.0
+pylint~=4.0.2
+bandit~=1.8.6
+
+# For UI only
+Flask~=3.1.2

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.7.1a1
+Version: 0.8.1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -33,13 +33,14 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.7
-Requires-Dist: oauthlib~=3.2.2
-Requires-Dist: requests~=2.32.3
+Requires-Dist: carconnectivity>=0.8.1
+Requires-Dist: oauthlib~=3.3.1
+Requires-Dist: requests~=2.32.5
 Requires-Dist: pyjwt~=2.10
 Requires-Dist: paho-mqtt~=2.1.0
 Dynamic: license-file

carconnectivity_connector_skoda-0.8.1/src/carconnectivity_connector_skoda.egg-info/requires.txt

@@ -0,0 +1,5 @@
+carconnectivity>=0.8.1
+oauthlib~=3.3.1
+requests~=2.32.5
+pyjwt~=2.10
+paho-mqtt~=2.1.0

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

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.7.1a1'
-__version_tuple__ = version_tuple = (0, 7, 1)
+__version__ = version = '0.8.1'
+__version_tuple__ = version_tuple = (0, 8, 1)
+
+__commit_id__ = commit_id = 'g5123c7f6f'

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/src/carconnectivity_connectors/skoda/auth/my_skoda_session.py

@@ -15,6 +15,7 @@ from urllib.parse import parse_qsl, urlparse
 
 import requests
 from requests.models import CaseInsensitiveDict
+from requests.exceptions import ReadTimeout, ConnectionError
 
 from oauthlib.common import add_params_to_uri, generate_nonce, to_unicode
 from oauthlib.oauth2 import InsecureTransportError
@@ -58,17 +59,22 @@ class MySkodaSession(SkodaWebSession):
     def login(self):
         super(MySkodaSession, self).login()
 
-        verifier = "".join(random.choices(string.ascii_uppercase + string.digits, k=16))
-        verifier_hash = hashlib.sha256(verifier.encode("utf-8")).digest()
-        code_challenge = base64.b64encode(verifier_hash).decode("utf-8").replace("+", "-").replace("/", "_").rstrip("=")
-        # retrieve authorization URL
-        authorization_url = self.authorization_url(url='https://identity.vwgroup.io/oidc/v1/authorize', prompt='login', code_challenge=code_challenge,
-                                                   code_challenge_method='s256')
-        # perform web authentication
-        response = self.do_web_auth(authorization_url)
-        # fetch tokens from web authentication response
-        self.fetch_tokens('https://mysmob.api.connect.skoda-auto.cz/api/v1/authentication/exchange-authorization-code?tokenType=CONNECT',
-                          authorization_response=response, verifier=verifier)
+        try:
+            verifier = "".join(random.choices(string.ascii_uppercase + string.digits, k=16))
+            verifier_hash = hashlib.sha256(verifier.encode("utf-8")).digest()
+            code_challenge = base64.b64encode(verifier_hash).decode("utf-8").replace("+", "-").replace("/", "_").rstrip("=")
+            # retrieve authorization URL
+            authorization_url = self.authorization_url(url='https://identity.vwgroup.io/oidc/v1/authorize', prompt='login', code_challenge=code_challenge,
+                                                       code_challenge_method='s256')
+            # perform web authentication
+            response = self.do_web_auth(authorization_url)
+            # fetch tokens from web authentication response
+            self.fetch_tokens('https://mysmob.api.connect.skoda-auto.cz/api/v1/authentication/exchange-authorization-code?tokenType=CONNECT',
+                              authorization_response=response, verifier=verifier)
+        except ReadTimeout as exc:
+            raise TemporaryAuthenticationError('Login timed out (Read timeout)') from exc
+        except ConnectionError as exc:
+            raise TemporaryAuthenticationError('Login failed due to connection error') from exc
 
     def refresh(self) -> None:
         # refresh tokens from refresh endpoint
@@ -118,7 +124,7 @@ class MySkodaSession(SkodaWebSession):
             token_response = self.post(token_url, headers=request_headers, data=body, allow_redirects=False,
                                             access_type=AccessType.NONE)  # pyright: ignore reportCallIssue
             if token_response.status_code != requests.codes['ok']:
-                raise TemporaryAuthenticationError(f'Token could not be fetched due to temporary WeConnect failure: {token_response.status_code}')
+                raise TemporaryAuthenticationError(f'Token could not be fetched due to temporary MySkoda failure: {token_response.status_code}')
             # parse token from response body
             token = self.parse_from_body(token_response.text)
             return token
@@ -132,7 +138,7 @@ class MySkodaSession(SkodaWebSession):
             # Tokens are in body of response in json format
             token = json.loads(token_response)
         except json.decoder.JSONDecodeError as err:
-            raise TemporaryAuthenticationError('Token could not be refreshed due to temporary WeConnect failure: json could not be decoded') from err
+            raise TemporaryAuthenticationError('Token could not be refreshed due to temporary MySkoda failure: json could not be decoded') from err
         found_tokens: Set[str] = set()
         # Fix token keys, we want access_token instead of accessToken
         if 'accessToken' in token:

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

@@ -153,7 +153,7 @@ class OpenIDSession(requests.Session):
                     new_token['expires_in'] = self._token['expires_in']
                 else:
                     if 'id_token' in new_token:
-                        meta_data = jwt.decode(new_token['id_token'], do_verify=False)
+                        meta_data = jwt.decode(new_token['id_token'], options={"verify_signature": False})
                         if 'exp' in meta_data:
                             new_token['expires_at'] = meta_data['exp']
                             expires_at = datetime.fromtimestamp(meta_data['exp'], tz=timezone.utc)
@@ -165,6 +165,10 @@ class OpenIDSession(requests.Session):
             # If expires_in is set and expires_at is not set we calculate expires_at from expires_in using the current time
             if 'expires_in' in new_token and 'expires_at' not in new_token:
                 new_token['expires_at'] = time.time() + int(new_token.get('expires_in'))
+        if new_token['expires_in'] > 3600:
+            LOG.warning('unexpected Token expires_in > 3600s (%d)', new_token['expires_in'])
+        if new_token['expires_at'] > (time.time() + 3600):
+            LOG.warning('unexpected Token expires_at after more than 3600s')
         self._token = new_token
 
     @property

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/src/carconnectivity_connectors/skoda/capability.py

@@ -132,7 +132,7 @@ class Capability(GenericObject):
         LOCATION_DATA_DISABLED = 1013
         LICENSE_INACTIVE = 2001
         LICENSE_EXPIRED = 2002
-        MISSING_LICENSE = 2003
+        LICENSE_MISSING = 2003
         USER_NOT_VERIFIED = 3001
         TERMS_AND_CONDITIONS_NOT_ACCEPTED = 3002
         INSUFFICIENT_RIGHTS = 3003

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/src/carconnectivity_connectors/skoda/connector.py

@@ -22,7 +22,7 @@ from carconnectivity.units import Length, Speed, Power, Temperature
 from carconnectivity.doors import Doors
 from carconnectivity.windows import Windows
 from carconnectivity.lights import Lights
-from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive
+from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive, DieselDrive
 from carconnectivity.attributes import BooleanAttribute, DurationAttribute, TemperatureAttribute, EnumAttribute, LevelAttribute, \
     CurrentAttribute
 from carconnectivity.charging import Charging
@@ -407,7 +407,7 @@ class Connector(BaseConnector):
         if vehicle is not None:
             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)
+                vehicle.state._set_value(GenericVehicle.State.OFFLINE)  # pylint: disable=protected-access
             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 \
@@ -1301,10 +1301,11 @@ class Connector(BaseConnector):
                     else:
                         if engine_type == GenericDrive.Type.ELECTRIC:
                             drive = ElectricDrive(drive_id=drive_id, drives=vehicle.drives)
+                        elif engine_type == GenericDrive.Type.DIESEL:
+                            drive = DieselDrive(drive_id=drive_id, drives=vehicle.drives)
                         elif engine_type in [GenericDrive.Type.FUEL,
                                              GenericDrive.Type.GASOLINE,
                                              GenericDrive.Type.PETROL,
-                                             GenericDrive.Type.DIESEL,
                                              GenericDrive.Type.CNG,
                                              GenericDrive.Type.LPG]:
                             drive = CombustionDrive(drive_id=drive_id, drives=vehicle.drives)
@@ -1335,9 +1336,22 @@ class Connector(BaseConnector):
                                                                                                              'currentSoCInPercent',
                                                                                                              'currentFuelLevelInPercent',
                                                                                                              'remainingRangeInKm'})
+            if 'adBlueRange' in range_data and range_data['adBlueRange'] is not None:
+                # pylint: disable-next=protected-access
+                for drive in vehicle.drives.drives.values():
+                    if isinstance(drive, DieselDrive):
+                        # pylint: disable-next=protected-access
+                        drive.adblue_range._set_value(value=range_data['adBlueRange'], measured=captured_at, unit=Length.KM)
+                        drive.adblue_range.precision = 1
+            else:
+                for drive in vehicle.drives.drives.values():
+                    if isinstance(drive, DieselDrive):
+                        # pylint: disable-next=protected-access
+                        drive.adblue_range._set_value(value=None, measured=captured_at, unit=Length.KM)
             log_extra_keys(LOG_API, '/api/v2/vehicle-status/{vin}/driving-range', range_data, {'carCapturedTimestamp',
                                                                                                'carType',
                                                                                                'totalRangeInKm',
+                                                                                               'adBlueRange',
                                                                                                'primaryEngineRange',
                                                                                                'secondaryEngineRange'})
         return vehicle

{carconnectivity_connector_skoda-0.7.1a1 → carconnectivity_connector_skoda-0.8.1}/src/carconnectivity_connectors/skoda/mqtt_client.py

@@ -13,7 +13,7 @@ from datetime import timedelta, timezone
 from paho.mqtt.client import Client
 from paho.mqtt.enums import MQTTProtocolVersion, CallbackAPIVersion, MQTTErrorCode
 
-from carconnectivity.errors import CarConnectivityError
+from carconnectivity.errors import CarConnectivityError, TemporaryAuthenticationError
 from carconnectivity.observable import Observable
 from carconnectivity.vehicle import GenericVehicle
 
@@ -70,6 +70,8 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         self.delayed_access_function_timers: Dict[str, threading.Timer] = {}
 
         self.tls_set(cert_reqs=ssl.CERT_NONE)
+        
+        self._retry_refresh_login_once = True
 
     def connect(self, *args, **kwargs) -> MQTTErrorCode:
         """
@@ -98,7 +100,12 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         del userdata
 
         if self._skoda_connector.session.expired or self._skoda_connector.session.access_token is None:
-            self._skoda_connector.session.refresh()
+            try:
+                self._skoda_connector.session.refresh()
+            except ConnectionError as exc:
+                LOG.error('Token refresh failed due to connection error: %s', exc)
+            except TemporaryAuthenticationError as exc:
+                LOG.error('Token refresh failed due to temporary MySkoda error: %s', exc)
         if not self._skoda_connector.session.expired and self._skoda_connector.session.access_token is not None:
             # pylint: disable-next=attribute-defined-outside-init # this is a false positive, password has a setter in super class
             self._password = self._skoda_connector.session.access_token  # This is a bit hacky but if password attribute is used here there is an Exception
@@ -321,6 +328,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             self._skoda_connector.car_connectivity.garage.add_observer(observer=self._on_carconnectivity_vehicle_enabled,
                                                                        flag=observer_flags,
                                                                        priority=Observable.ObserverPriority.USER_MID)
+            self._retry_refresh_login_once = True
             self._subscribe_vehicles()
 
         # Handle different reason codes
@@ -338,6 +346,15 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             LOG.error('Could not connect (%s): Client identifier not valid', reason_code)
         elif reason_code == 134:
             LOG.error('Could not connect (%s): Bad user name or password', reason_code)
+            if self._retry_refresh_login_once == True:
+                self._retry_refresh_login_once = False
+                LOG.info('trying a relogin once to resolve the error')
+                try:
+                    self._skoda_connector.session.login()
+                except TemporaryAuthenticationError as exc:
+                    LOG.error('Login failed due to temporary MySkoda error: %s', exc)
+                except ConnectionError as exc:
+                    LOG.error('Login failed due to connection error: %s', exc)
         elif reason_code == 135:
             LOG.error('Could not connect (%s): Not authorized', reason_code)
         elif reason_code == 136:

carconnectivity_connector_skoda-0.7.1a1/setup_requirements.txt

@@ -1,6 +0,0 @@
-flake8~=7.2.0
-pylint~=3.3.6
-bandit~=1.8.3
-
-# For UI only
-Flask~=3.1.0

carconnectivity_connector_skoda-0.7.1a1/src/carconnectivity_connector_skoda.egg-info/requires.txt

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