carconnectivity-connector-skoda 0.4a8__py3-none-any.whl → 0.4.1__py3-none-any.whl

{carconnectivity_connector_skoda-0.4a8.dist-info → carconnectivity_connector_skoda-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.4a8
+Version: 0.4.1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -37,7 +37,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.4a11
+Requires-Dist: carconnectivity>=0.4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_skoda-0.4a8.dist-info → carconnectivity_connector_skoda-0.4.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=yk7F-aY3-bSpr2Y78fjZ3DV9CNQcGrOzYh8bBvw_wKI,508
-carconnectivity_connectors/skoda/capability.py,sha256=vbAKK8KKre-CndLF6_5qyWLpfa4KZHk1U-hpb6nCL5w,4225
+carconnectivity_connectors/skoda/_version.py,sha256=yF2DwGUoQKNnLhAbpZX8kCQKjw77EZzhRk7_OTftets,511
+carconnectivity_connectors/skoda/capability.py,sha256=wH563-XUb_TnT8di1qDjnj-cY-cNHcAT6z7mx21LhSQ,4770
 carconnectivity_connectors/skoda/charging.py,sha256=CoUOYHHUPPPldKQvv0h-qrUsoEtstR3iUx-l0IU5rNM,6798
 carconnectivity_connectors/skoda/climatization.py,sha256=Jut468SkxjPBDTqroWFvDifVPfJBxGjsFed5pc4kZkg,1768
 carconnectivity_connectors/skoda/command_impl.py,sha256=vgno5Qb5To0hCHOEBWSG8UOwCY9kT5fz1e2y0b6zF7U,3047
-carconnectivity_connectors/skoda/connector.py,sha256=cwI-7AAwzKODZgyZtk2qL-HxBdEpEvHE2riVLTePXw4,128467
+carconnectivity_connectors/skoda/connector.py,sha256=TKbdKWSgY-lBQbxqjGmxaJy7Zq_lZ2icFIvLfMENa3w,129771
 carconnectivity_connectors/skoda/error.py,sha256=ffxzvjmci7vtp9Q1K4DR1kBF0kTJxN5Gluci3kDBkEI,2459
 carconnectivity_connectors/skoda/mqtt_client.py,sha256=RkZ43NG1Z_TUmc2hUZS0yYUfwewzfut63zZUhQR1xug,39101
 carconnectivity_connectors/skoda/vehicle.py,sha256=TeY3qKWbBfxFxt6UzSDrB-YZ4L8GURAvINzBiFm9Y9E,3819
@@ -16,8 +16,8 @@ carconnectivity_connectors/skoda/auth/session_manager.py,sha256=Uf1vujuDBYUCAXhY
 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=2Gywhyki52IxIZXV6DhWhzrBLn2293LlUMhK1Rxnw9w,1376
-carconnectivity_connector_skoda-0.4a8.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_skoda-0.4a8.dist-info/METADATA,sha256=FgmLzGc6cUEeulykyeFr7dxJGD0gfGzesmGqZiznnIY,5366
-carconnectivity_connector_skoda-0.4a8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-carconnectivity_connector_skoda-0.4a8.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.4a8.dist-info/RECORD,,
+carconnectivity_connector_skoda-0.4.1.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.4.1.dist-info/METADATA,sha256=W_S_e-mJ-MSSuh-U3DKmTUahRfUnkFC9nphAbgUUPg0,5363
+carconnectivity_connector_skoda-0.4.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+carconnectivity_connector_skoda-0.4.1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.4.1.dist-info/RECORD,,

carconnectivity_connectors/skoda/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4a8'
-__version_tuple__ = version_tuple = (0, 4)
+__version__ = version = '0.4.1'
+__version_tuple__ = version_tuple = (0, 4, 1)

carconnectivity_connectors/skoda/capability.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from enum import IntEnum
 
 from carconnectivity.objects import GenericObject
-from carconnectivity.attributes import StringAttribute
+from carconnectivity.attributes import StringAttribute, GenericAttribute
 
 if TYPE_CHECKING:
     from typing import Dict, Optional
@@ -77,7 +77,7 @@ class Capabilities(GenericObject):
         """
         return self.__capabilities.get(capability_id)
 
-    def has_capability(self, capability_id: str) -> bool:
+    def has_capability(self, capability_id: str, check_status_ok=False) -> bool:
         """
         Check if the Capabilities contains a capability with the specified ID.
 
@@ -87,7 +87,14 @@ class Capabilities(GenericObject):
         Returns:
             bool: True if the capability exists, otherwise False.
         """
-        return capability_id in self.__capabilities
+        if check_status_ok:
+            if capability_id in self.__capabilities and self.__capabilities[capability_id].enabled:
+                capability: Capability = self.__capabilities[capability_id]
+                if capability.status.enabled and capability.status.value is not None and len(capability.status.value) > 0:
+                    return False
+                return True
+            return False
+        return capability_id in self.__capabilities and self.__capabilities[capability_id].enabled
 
 
 class Capability(GenericObject):
@@ -103,7 +110,7 @@ class Capability(GenericObject):
         super().__init__(object_id=capability_id, parent=capabilities)
         self.delay_notifications = True
         self.capability_id = StringAttribute("id", self, capability_id, tags={'connector_custom'})
-        self.statuses = list[Capability.Status]
+        self.status = GenericAttribute("status", self, value=[], tags={'connector_custom'})
         self.enabled = True
         self.delay_notifications = False
 

carconnectivity_connectors/skoda/connector.py

@@ -373,15 +373,15 @@ class Connector(BaseConnector):
                 vehicle_to_update = self.fetch_vehicle_status(vehicle_to_update)
                 vehicle_to_update = self.fetch_driving_range(vehicle_to_update)
                 if vehicle_to_update.capabilities is not None and vehicle_to_update.capabilities.enabled:
-                    if vehicle_to_update.capabilities.has_capability('READINESS'):
+                    if vehicle_to_update.capabilities.has_capability('READINESS', check_status_ok=True):
                         vehicle_to_update = self.fetch_connection_status(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('PARKING_POSITION'):
+                    if vehicle_to_update.capabilities.has_capability('PARKING_POSITION', check_status_ok=True):
                         vehicle_to_update = self.fetch_position(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('CHARGING') and isinstance(vehicle_to_update, SkodaElectricVehicle):
+                    if vehicle_to_update.capabilities.has_capability('CHARGING', check_status_ok=True) and isinstance(vehicle_to_update, SkodaElectricVehicle):
                         vehicle_to_update = self.fetch_charging(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('AIR_CONDITIONING'):
+                    if vehicle_to_update.capabilities.has_capability('AIR_CONDITIONING', check_status_ok=True):
                         vehicle_to_update = self.fetch_air_conditioning(vehicle_to_update)
-                    if vehicle_to_update.capabilities.has_capability('VEHICLE_HEALTH_INSPECTION'):
+                    if vehicle_to_update.capabilities.has_capability('VEHICLE_HEALTH_INSPECTION', check_status_ok=True):
                         vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
                 vehicle_to_update = self.decide_state(vehicle_to_update)
         self.car_connectivity.transaction_end()
@@ -1034,6 +1034,20 @@ class Connector(BaseConnector):
                             else:
                                 capability = Capability(capability_id=capability_id, capabilities=vehicle.capabilities)
                                 vehicle.capabilities.add_capability(capability_id, capability)
+                            if 'statuses' in capability_dict and capability_dict['statuses'] is not None:
+                                statuses = capability_dict['statuses']
+                                if isinstance(statuses, list):
+                                    for status in statuses:
+                                        if status in [item.name for item in Capability.Status]:
+                                            capability.status.value.append(Capability.Status[status])
+                                        else:
+                                            LOG_API.warning('Capability status unkown %s', status)
+                                            capability.status.value.append(Capability.Status.UNKNOWN)
+                                else:
+                                    LOG_API.warning('Capability status not a list in %s', statuses)
+                            else:
+                                capability.status.value.clear()
+                            log_extra_keys(LOG_API, 'capability', capability_dict, {'id', 'statuses'})
                         else:
                             raise APIError('Could not parse capability, id missing')
                     for capability_id in vehicle.capabilities.capabilities.keys() - found_capabilities:
@@ -1043,7 +1057,7 @@ class Connector(BaseConnector):
             else:
                 vehicle.capabilities.clear_capabilities()
 
-            if vehicle.capabilities.has_capability('VEHICLE_WAKE_UP_TRIGGER'):
+            if vehicle.capabilities.has_capability('VEHICLE_WAKE_UP_TRIGGER', check_status_ok=True):
                 if vehicle.commands is not None and vehicle.commands.commands is not None \
                         and not vehicle.commands.contains_command('wake-sleep'):
                     wake_sleep_command = WakeSleepCommand(parent=vehicle.commands)
@@ -1052,7 +1066,8 @@ class Connector(BaseConnector):
                     vehicle.commands.add_command(wake_sleep_command)
 
             # Add HONK_AND_FLASH command if necessary capabilities are available
-            if vehicle.capabilities.has_capability('HONK_AND_FLASH') and vehicle.capabilities.has_capability('PARKING_POSITION'):
+            if vehicle.capabilities.has_capability('HONK_AND_FLASH', check_status_ok=True) \
+                    and vehicle.capabilities.has_capability('PARKING_POSITION', check_status_ok=True):
                 if vehicle.commands is not None and vehicle.commands.commands is not None \
                         and not vehicle.commands.contains_command('honk-flash'):
                     honk_flash_command = HonkAndFlashCommand(parent=vehicle.commands)
@@ -1061,7 +1076,7 @@ class Connector(BaseConnector):
                     vehicle.commands.add_command(honk_flash_command)
 
             # Add lock and unlock command
-            if vehicle.capabilities.has_capability('ACCESS'):
+            if vehicle.capabilities.has_capability('ACCESS', check_status_ok=True):
                 if vehicle.doors is not None and vehicle.doors.commands is not None and vehicle.doors.commands.commands is not None \
                         and not vehicle.doors.commands.contains_command('lock-unlock'):
                     lock_unlock_command = LockUnlockCommand(parent=vehicle.doors.commands)