carconnectivity-connector-skoda 0.7.3__py3-none-any.whl → 0.8.1a1__py3-none-any.whl

{carconnectivity_connector_skoda-0.7.3.dist-info → carconnectivity_connector_skoda-0.8.1a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.7.3
+Version: 0.8.1a1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.7.3.dist-info → carconnectivity_connector_skoda-0.8.1a1.dist-info}/RECORD

@@ -1,23 +1,23 @@
-carconnectivity_connector_skoda-0.7.3.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.8.1a1.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=HuvheJ09dqzSRYh_uHb_Af7PEi7XiVW5Tk0cjtnAa6I,511
-carconnectivity_connectors/skoda/capability.py,sha256=wH563-XUb_TnT8di1qDjnj-cY-cNHcAT6z7mx21LhSQ,4770
+carconnectivity_connectors/skoda/_version.py,sha256=EnyZ6UT9V1Ty-kXYVwQOtic6_yoBT3hqMFktE52aRgs,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=c-PavWSf1TNO5v773nmiP8vnxikRF6GdTl-hIO-_shA,146247
+carconnectivity_connectors/skoda/connector.py,sha256=y25ZY1jCH-8IXSK847Stu4GbRK6j35xwZJKU9C7TSSU,147301
 carconnectivity_connectors/skoda/error.py,sha256=ffxzvjmci7vtp9Q1K4DR1kBF0kTJxN5Gluci3kDBkEI,2459
-carconnectivity_connectors/skoda/mqtt_client.py,sha256=D9_e_Bz842ULYKlRWd4JmosalhTtYr9DtCuvWrT3WQw,39126
+carconnectivity_connectors/skoda/mqtt_client.py,sha256=QQv_XcvgMWn541_jiwl1Q6_iIm1cscZtVQjs0_qHFiw,39466
 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/openid_session.py,sha256=jlRBN6A1Z-U_YrgdD-X1itRG-aelnMGPQe_dg_XOmCs,16789
+carconnectivity_connectors/skoda/auth/openid_session.py,sha256=SFDnKbPZ8qkABlguRNO_pLki4G6tM3Be4nwhFnt8SPw,17062
 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.7.3.dist-info/METADATA,sha256=NJ-AVssOQtHcSlCA_OxjEYHaHLsEYdAFEa6lrwg_RvM,5383
-carconnectivity_connector_skoda-0.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-carconnectivity_connector_skoda-0.7.3.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.7.3.dist-info/RECORD,,
+carconnectivity_connector_skoda-0.8.1a1.dist-info/METADATA,sha256=cjtjHqb_74tcL-p8AjA0AWnmUuiEoYm6T3md2n-Dg0k,5385
+carconnectivity_connector_skoda-0.8.1a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+carconnectivity_connector_skoda-0.8.1a1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.8.1a1.dist-info/RECORD,,

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.3'
-__version_tuple__ = version_tuple = (0, 7, 3)
+__version__ = version = '0.8.1a1'
+__version_tuple__ = version_tuple = (0, 8, 1, 'a1')
+
+__commit_id__ = commit_id = None

carconnectivity_connectors/skoda/auth/openid_session.py

@@ -1,4 +1,4 @@
-"""Implements a session class that handles OpenID authentication."""
+ """Implements a session class that handles OpenID authentication."""
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
@@ -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_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_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_connectors/skoda/mqtt_client.py

@@ -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:
         """
@@ -321,6 +323,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 +341,10 @@ 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')
+                self._skoda_connector.session.login()
         elif reason_code == 135:
             LOG.error('Could not connect (%s): Not authorized', reason_code)
         elif reason_code == 136: