carconnectivity-connector-skoda 0.1a13__py3-none-any.whl → 0.1a14__py3-none-any.whl

{carconnectivity_connector_skoda-0.1a13.dist-info → carconnectivity_connector_skoda-0.1a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.1a13
+Version: 0.1a14
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.1a13.dist-info → carconnectivity_connector_skoda-0.1a14.dist-info}/RECORD

@@ -1,8 +1,8 @@
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=87o_kQQRIfRYZbD8Vrp3tNP9bKGf1QZJgBdyeWeQUXI,409
+carconnectivity_connectors/skoda/_version.py,sha256=ydJdzW-btPcfSrfx2Va0JEeRefzQRak0BrHC2KuWcaU,409
 carconnectivity_connectors/skoda/capability.py,sha256=JlNEaisVYF8qWv0wNDHTaas36uIpTIQ3NVR69wesiYQ,4513
 carconnectivity_connectors/skoda/charging.py,sha256=oDHxZxrfTMvtYCJxmGfKFeWVMH4ceQ5HTKRAspnsunU,3312
-carconnectivity_connectors/skoda/connector.py,sha256=q2tnF8Q99vJUBSSqW8YngdpYvWW5tD69bVoMgQMNyz8,66387
+carconnectivity_connectors/skoda/connector.py,sha256=Z7CZclSC8lg0Rc5Zf2Vp9ATgXxACq_aTpxJxfe2EEsw,69140
 carconnectivity_connectors/skoda/mqtt_client.py,sha256=oFyuMWchYSdu_St4VzcGsCUzsgUzYdA2_gmzbilgqL8,32105
 carconnectivity_connectors/skoda/vehicle.py,sha256=H3GRDNimMghFwFi--y9BsgoSK3pMibNf_l6SsDN6gvQ,2759
 carconnectivity_connectors/skoda/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,8 +12,8 @@ carconnectivity_connectors/skoda/auth/openid_session.py,sha256=LusWi2FZZIL3buodG
 carconnectivity_connectors/skoda/auth/session_manager.py,sha256=Uf1vujuDBYUCAXhYToOsZkgbTtfmY3Qe0ICTfwomBpI,2899
 carconnectivity_connectors/skoda/auth/skoda_web_session.py,sha256=cjzMkzx473Sh-4RgZAQULeRRcxB1MboddldCVM_y5LE,10640
 carconnectivity_connectors/skoda/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
-carconnectivity_connector_skoda-0.1a13.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_skoda-0.1a13.dist-info/METADATA,sha256=Q4WodCT8EOJN6H_iS6-b0t2Jl6csXoOUnyF8dyZ15as,5327
-carconnectivity_connector_skoda-0.1a13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-carconnectivity_connector_skoda-0.1a13.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.1a13.dist-info/RECORD,,
+carconnectivity_connector_skoda-0.1a14.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.1a14.dist-info/METADATA,sha256=65N4TiZujxrtbetLvzRlpY7Jntm3cQRqn4MNpjWkXyY,5327
+carconnectivity_connector_skoda-0.1a14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+carconnectivity_connector_skoda-0.1a14.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.1a14.dist-info/RECORD,,

carconnectivity_connectors/skoda/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1a13'
+__version__ = version = '0.1a14'
 __version_tuple__ = version_tuple = (0, 1)

carconnectivity_connectors/skoda/connector.py

@@ -1,4 +1,4 @@
-"""Module implements the connector to interact with the Skoda API."""
+"""Module implements the connector to interact with the Skoda API."""  # pylint: disable=too-many-lines
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
@@ -180,6 +180,9 @@ class Connector(BaseConnector):
             except RetrievalError as err:
                 LOG.error('Retrieval error during update (%s). Will try again after configured interval of %ss', str(err), interval)
                 self._stop_event.wait(interval)
+            except APIError as err:
+                LOG.error('API error during update (%s). Will try again after configured interval of %ss', str(err), interval)
+                self._stop_event.wait(interval)
             except APICompatibilityError as err:
                 LOG.error('API compatability error during update (%s). Will try again after configured interval of %ss', str(err), interval)
                 self._stop_event.wait(interval)
@@ -368,10 +371,39 @@ class Connector(BaseConnector):
                     vehicle.charging.estimated_date_reached._set_value(value=estimated_date_reached, measured=captured_at)
                 else:
                     vehicle.charging.estimated_date_reached._set_value(None, measured=captured_at)  # pylint: disable=protected-access
+                if 'chargeType' in data['status'] and data['status']['chargeType'] is not None:
+                    if data['status']['chargeType'] in [item.name for item in Charging.ChargingType]:
+                        charge_type: Charging.ChargingType = Charging.ChargingType[data['status']['chargeType']]
+                    else:
+                        LOG_API.info('Unknown charge type %s not in %s', data['status']['chargeType'], str(Charging.ChargingType))
+                        charge_type = Charging.ChargingType.UNKNOWN
+                    # pylint: disable-next=protected-access
+                    vehicle.charging.type._set_value(value=charge_type, measured=captured_at)
+                else:
+                    # pylint: disable-next=protected-access
+                    vehicle.charging.type._set_value(None, measured=captured_at)
+                if 'battery' in data['status'] and data['status']['battery'] is not None:
+                    for drive in vehicle.drives.drives.values():
+                        # Assume first electric drive is the right one
+                        if isinstance(drive, ElectricDrive):
+                            if 'remainingCruisingRangeInMeters' in data['status']['battery'] \
+                                    and data['status']['battery']['remainingCruisingRangeInMeters'] is not None:
+                                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)
+                            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)
+                            log_extra_keys(LOG_API, 'status', data['status']['battery'],  {'remainingCruisingRangeInMeters',
+                                                                                           'stateOfChargeInPercent'})
+                            break
                 log_extra_keys(LOG_API, 'status', data['status'],  {'chargingRateInKilometersPerHour',
                                                                     'chargePowerInKw',
                                                                     'remainingTimeToFullyChargedInMinutes',
-                                                                    'state'})
+                                                                    'state',
+                                                                    'chargeType',
+                                                                    'battery'})
             log_extra_keys(LOG_API, 'charging data', data,  {'carCapturedTimestamp', 'status'})
         return vehicle