carconnectivity-connector-skoda 0.8.1a2__py3-none-any.whl → 0.8.1a3__py3-none-any.whl

{carconnectivity_connector_skoda-0.8.1a2.dist-info → carconnectivity_connector_skoda-0.8.1a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.8.1a2
+Version: 0.8.1a3
 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.1
+Requires-Dist: carconnectivity>=0.8.1
 Requires-Dist: oauthlib~=3.3.1
-Requires-Dist: requests~=2.32.3
+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.1a2.dist-info → carconnectivity_connector_skoda-0.8.1a3.dist-info}/RECORD

@@ -1,23 +1,23 @@
-carconnectivity_connector_skoda-0.8.1a2.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.8.1a3.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=Ibs3SgeMz7wL4ZBm-CcZ7sZlb-UQTKJR4otjC1PXrFk,712
+carconnectivity_connectors/skoda/_version.py,sha256=EWYRAoLa3l60H6fP1alJLJWiiEVoVX2B_DgKklYl7ZA,712
 carconnectivity_connectors/skoda/capability.py,sha256=TC8-yC23UUrf0faePdbZL0802DHXbtGDcSlt3vj5ltg,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=wDCI3Bka5pXlbyI4yVFS353TgFGyiBHBkERpP2g0A9w,3230
 carconnectivity_connectors/skoda/connector.py,sha256=y25ZY1jCH-8IXSK847Stu4GbRK6j35xwZJKU9C7TSSU,147301
 carconnectivity_connectors/skoda/error.py,sha256=ffxzvjmci7vtp9Q1K4DR1kBF0kTJxN5Gluci3kDBkEI,2459
-carconnectivity_connectors/skoda/mqtt_client.py,sha256=QQv_XcvgMWn541_jiwl1Q6_iIm1cscZtVQjs0_qHFiw,39466
+carconnectivity_connectors/skoda/mqtt_client.py,sha256=f4fRFeI1VUCGm9ZzGj_vnctiSIiMAoolYLAwKx4apqA,40086
 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
-carconnectivity_connectors/skoda/auth/my_skoda_session.py,sha256=lSh23SFJs8opjmPwHTv-KNIKDep_WY4aItSP4Zq7bT8,10396
+carconnectivity_connectors/skoda/auth/my_skoda_session.py,sha256=j1iJc7qLQT4mOOML0NHLidj_WEE4gfTvHBZQTDjKd6o,10770
 carconnectivity_connectors/skoda/auth/openid_session.py,sha256=Csn0kYxe_qo10ZHJlBtNV5kl6U4PTTxsC7FK-xfxGhY,17061
 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=lLjwoakRaU0S80hAVwVi4JA1wtHycGHcoM2-7S9qsqI,1386
-carconnectivity_connector_skoda-0.8.1a2.dist-info/METADATA,sha256=fcQT0wJ4dja-Vic-FbPmzWK-ScwEWK_JUoDJCSJ3gnw,5385
-carconnectivity_connector_skoda-0.8.1a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-carconnectivity_connector_skoda-0.8.1a2.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.8.1a2.dist-info/RECORD,,
+carconnectivity_connector_skoda-0.8.1a3.dist-info/METADATA,sha256=Xh4pdok2AmOaxHIbXq8moiEFHBMdGmsmSR8Zaqp1L5U,5436
+carconnectivity_connector_skoda-0.8.1a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+carconnectivity_connector_skoda-0.8.1a3.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.8.1a3.dist-info/RECORD,,

carconnectivity_connectors/skoda/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.8.1a2'
-__version_tuple__ = version_tuple = (0, 8, 1, 'a2')
+__version__ = version = '0.8.1a3'
+__version_tuple__ = version_tuple = (0, 8, 1, 'a3')
 
 __commit_id__ = commit_id = None

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_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
 
@@ -100,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
@@ -344,7 +349,12 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             if self._retry_refresh_login_once == True:
                 self._retry_refresh_login_once = False
                 LOG.info('trying a relogin once to resolve the error')
-                self._skoda_connector.session.login()
+                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: