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

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

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

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

@@ -1,9 +1,9 @@
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=ydJdzW-btPcfSrfx2Va0JEeRefzQRak0BrHC2KuWcaU,409
+carconnectivity_connectors/skoda/_version.py,sha256=LeuZd6pXKHm5v3Vw2uukD5XI4CMyRN-RUKKU0F28l_o,409
 carconnectivity_connectors/skoda/capability.py,sha256=JlNEaisVYF8qWv0wNDHTaas36uIpTIQ3NVR69wesiYQ,4513
 carconnectivity_connectors/skoda/charging.py,sha256=oDHxZxrfTMvtYCJxmGfKFeWVMH4ceQ5HTKRAspnsunU,3312
 carconnectivity_connectors/skoda/connector.py,sha256=Z7CZclSC8lg0Rc5Zf2Vp9ATgXxACq_aTpxJxfe2EEsw,69140
-carconnectivity_connectors/skoda/mqtt_client.py,sha256=oFyuMWchYSdu_St4VzcGsCUzsgUzYdA2_gmzbilgqL8,32105
+carconnectivity_connectors/skoda/mqtt_client.py,sha256=PagzfwuNzokoxAQRsTR5VG81PecfCqmXUvwzVjKq6ps,32827
 carconnectivity_connectors/skoda/vehicle.py,sha256=H3GRDNimMghFwFi--y9BsgoSK3pMibNf_l6SsDN6gvQ,2759
 carconnectivity_connectors/skoda/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/skoda/auth/auth_util.py,sha256=dGLUbUre0HBsTg_Ii5vW34f8DLrCykYJYCyzEvUBBEE,4434
@@ -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.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_connector_skoda-0.1a16.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.1a16.dist-info/METADATA,sha256=t59NIBY3db87uD_rdDN7DYKgG0eudYsAmA1n0t4j6SY,5327
+carconnectivity_connector_skoda-0.1a16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+carconnectivity_connector_skoda-0.1a16.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.1a16.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.1a14'
+__version__ = version = '0.1a16'
 __version_tuple__ = version_tuple = (0, 1)

carconnectivity_connectors/skoda/mqtt_client.py

@@ -21,18 +21,26 @@ from carconnectivity.drive import ElectricDrive
 from carconnectivity.util import robust_time_parse, log_extra_keys
 from carconnectivity.charging import Charging
 from carconnectivity.climatization import Climatization
+from carconnectivity.units import Speed, Power
 
 from carconnectivity_connectors.skoda.vehicle import SkodaVehicle, SkodaElectricVehicle
 from carconnectivity_connectors.skoda.charging import SkodaCharging, mapping_skoda_charging_state
 
 
 if TYPE_CHECKING:
-    from typing import Set, Dict, Any, Optional
+    from typing import Set, Dict, Any, Optional, List
     from datetime import datetime
 
+    from paho.mqtt.client import MQTTMessage, DisconnectFlags, ConnectFlags
+    from paho.mqtt.reasoncodes import ReasonCode
+    from paho.mqtt.properties import Properties
+
+    from carconnectivity.attributes import GenericAttribute
+
     from carconnectivity_connectors.skoda.connector import Connector
 
 
+
 LOG: logging.Logger = logging.getLogger("carconnectivity.connectors.skoda.mqtt")
 LOG_API: logging.Logger = logging.getLogger("carconnectivity.connectors.skoda-api-debug")
 
@@ -72,7 +80,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         """
         return super().connect(*args, host='mqtt.messagehub.de', port=8883, keepalive=60, **kwargs)
 
-    def _on_pre_connect_callback(self, client, userdata) -> None:
+    def _on_pre_connect_callback(self, client: Client, userdata: Any) -> None:
         """
         Callback function that is called before the MQTT client connects to the broker.
 
@@ -94,7 +102,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             # 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
 
-    def _on_carconnectivity_vehicle_enabled(self, element, flags):
+    def _on_carconnectivity_vehicle_enabled(self, element: GenericAttribute, flags: Observable.ObserverEvent) -> None:
         """
         Handles the event when a vehicle is enabled or disabled in the car connectivity system.
 
@@ -252,7 +260,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                 self.subscribed_topics.remove(topic)
                 LOG.debug('Unsubscribed from topic %s', topic)
 
-    def _on_connect_callback(self, mqttc, obj, flags, reason_code, properties) -> None:
+    def _on_connect_callback(self, client: Client, obj: Any, flags: ConnectFlags, reason_code: ReasonCode, properties: Optional[Properties]) -> None:
         """
         Callback function that is called when the MQTT client connects to the broker.
 
@@ -293,7 +301,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             - 159: Connection rate exceeded.
             - Other: Generic connection error.
         """
-        del mqttc  # unused
+        del client  # unused
         del obj  # unused
         del flags  # unused
         del properties
@@ -351,8 +359,8 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         else:
             LOG.error('Could not connect (%s)', reason_code)
 
-    def _on_disconnect_callback(self, client, userdata, flags, reason_code, properties) -> None:
-        """
+    def _on_disconnect_callback(self, client: Client, userdata, flags: DisconnectFlags, reason_code: ReasonCode, properties: Optional[Properties]) -> None:
+        """["Client", Any, DisconnectFlags, ReasonCode, Union[Properties, None]
         Callback function that is called when the MQTT client disconnects.
 
         This function handles the disconnection of the MQTT client and logs the appropriate
@@ -391,9 +399,9 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         elif reason_code == 160:
             LOG.error('Client disconnected: Maximum connect time')
         else:
-            LOG.error('Client unexpectedly disconnected (%d: %s), trying to reconnect', reason_code, reason_code)
+            LOG.error('Client unexpectedly disconnected (%d: %s), trying to reconnect', reason_code.value, reason_code.getName())
 
-    def _on_subscribe_callback(self, mqttc, obj, mid, reason_codes, properties) -> None:
+    def _on_subscribe_callback(self, client: Client, obj: Any, mid: int, reason_codes: List[ReasonCode], properties: Optional[Properties]) -> None:
         """
         Callback function for MQTT subscription.
 
@@ -410,15 +418,15 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         Returns:
             None
         """
-        del mqttc  # unused
+        del client  # unused
         del obj  # unused
         del properties  # unused
         if any(x in [0, 1, 2] for x in reason_codes):
             LOG.debug('sucessfully subscribed to topic of mid %d', mid)
         else:
-            LOG.error('Subscribe was not successfull (%s)', ', '.join(reason_codes))
+            LOG.error('Subscribe was not successfull (%s)', ', '.join([reason_code.getName() for reason_code in reason_codes]))
 
-    def _on_message_callback(self, mqttc, obj, msg) -> None:  # noqa: C901
+    def _on_message_callback(self, client: Client, obj: Any, msg: MQTTMessage) -> None:  # noqa: C901
         """
         Callback function for handling incoming MQTT messages.
 
@@ -434,7 +442,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         Returns:
             None
         """
-        del mqttc  # unused
+        del client  # unused
         del obj  # unused
         if len(msg.payload) == 0:
             LOG_API.debug('MQTT topic %s: ignoring empty message', msg.topic)
@@ -474,9 +482,9 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                             # pylint: disable-next=protected-access
                                             vehicle.charging.type._set_value(value=Charging.ChargingType.OFF, measured=measured_at)
                                             # pylint: disable-next=protected-access
-                                            vehicle.charging.rate._set_value(value=0, measured=measured_at)
+                                            vehicle.charging.rate._set_value(value=0, measured=measured_at, unit=Speed.KMH)
                                             # pylint: disable-next=protected-access
-                                            vehicle.charging.power._set_value(value=0, measured=measured_at)
+                                            vehicle.charging.power._set_value(value=0, measured=measured_at, unit=Power.KW)
                                     if 'soc' in data['data'] and data['data']['soc'] is not None:
                                         electric_drive.level._set_value(measured=measured_at, value=data['data']['soc'])  # pylint: disable=protected-access
                                     if 'chargedRange' in data['data'] and data['data']['chargedRange'] is not None: