carconnectivity-connector-skoda 0.3__tar.gz → 0.4a2__tar.gz

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.3
+Version: 0.4a2
 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.3
+Requires-Dist: carconnectivity>=0.4a4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/pyproject.toml

@@ -14,7 +14,7 @@ authors = [
     { name = "Till Steinbach" }
 ]
 dependencies = [
-    "carconnectivity>=0.3",
+    "carconnectivity>=0.4a4",
     "oauthlib~=3.2.2",
     "requests~=2.32.3",
     "jwt~=1.3.1",

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.3
+Version: 0.4a2
 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.3
+Requires-Dist: carconnectivity>=0.4a4
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/src/carconnectivity_connector_skoda.egg-info/requires.txt

@@ -1,4 +1,4 @@
-carconnectivity>=0.3
+carconnectivity>=0.4a4
 oauthlib~=3.2.2
 requests~=2.32.3
 jwt~=1.3.1

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/src/carconnectivity_connectors/skoda/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3'
-__version_tuple__ = version_tuple = (0, 3)
+__version__ = version = '0.4a2'
+__version_tuple__ = version_tuple = (0, 4)

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/src/carconnectivity_connectors/skoda/climatization.py

@@ -1,12 +1,12 @@
 """
-Module for charging for skoda vehicles.
+Module for climatization for skoda vehicles.
 """
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from carconnectivity.climatization import Climatization
 from carconnectivity.objects import GenericObject
-from carconnectivity.vehicle import ElectricVehicle
+from carconnectivity.vehicle import GenericVehicle
 
 from carconnectivity_connectors.skoda.error import Error
 
@@ -21,13 +21,15 @@ class SkodaClimatization(Climatization):  # pylint: disable=too-many-instance-at
     This class extends the Climatization class and includes an enumeration of various
     charging states specific to Skoda vehicles.
     """
-    def __init__(self, vehicle: ElectricVehicle | None = None, origin: Optional[Climatization] = None) -> None:
+    def __init__(self, vehicle: GenericVehicle | None = None, origin: Optional[Climatization] = None) -> None:
         if origin is not None:
             super().__init__(origin=origin)
-            self.settings: Climatization.Settings = SkodaClimatization.Settings(origin=origin.settings)
+            if not isinstance(self.settings, SkodaClimatization.Settings):
+                self.settings: Climatization.Settings = SkodaClimatization.Settings(parent=self, origin=origin.settings)
+            self.settings.parent = self
         else:
             super().__init__(vehicle=vehicle)
-            self.settings: Climatization.Settings = SkodaClimatization.Settings(origin=self.settings)
+            self.settings: Climatization.Settings = SkodaClimatization.Settings(parent=self)
         self.errors: Dict[str, Error] = {}
 
     class Settings(Climatization.Settings):
@@ -36,6 +38,6 @@ class SkodaClimatization(Climatization):  # pylint: disable=too-many-instance-at
         """
         def __init__(self, parent: Optional[GenericObject] = None, origin: Optional[Climatization.Settings] = None) -> None:
             if origin is not None:
-                super().__init__(origin=origin)
+                super().__init__(parent=parent, origin=origin)
             else:
                 super().__init__(parent=parent)

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/src/carconnectivity_connectors/skoda/connector.py

@@ -345,6 +345,8 @@ class Connector(BaseConnector):
                         vehicle_to_update = self.fetch_charging(vehicle_to_update)
                     if vehicle_to_update.capabilities.has_capability('AIR_CONDITIONING'):
                         vehicle_to_update = self.fetch_air_conditioning(vehicle_to_update)
+                    if vehicle_to_update.capabilities.has_capability('VEHICLE_HEALTH_INSPECTION'):
+                        vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
 
     def fetch_charging(self, vehicle: SkodaElectricVehicle, no_cache: bool = False) -> SkodaElectricVehicle:
         """
@@ -608,6 +610,53 @@ class Connector(BaseConnector):
                 vehicle.position.position_type._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
+    def fetch_maintenance(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
+        """
+        Fetches the maintenance information for a given Skoda vehicle.
+
+        Args:
+            vehicle (SkodaVehicle): The vehicle object for which maintenance information is to be fetched.
+            no_cache (bool, optional): If True, bypasses the cache and fetches fresh data. Defaults to False.
+
+        Returns:
+            SkodaVehicle: The vehicle object with updated maintenance information.
+
+        Raises:
+            APIError: If the VIN is missing or if the 'capturedAt' field is missing in the fetched data.
+            ValueError: If the vehicle has no charging object.
+        """
+        vin = vehicle.vin.value
+        if vin is None:
+            raise APIError('VIN is missing')
+        if vehicle.position is None:
+            raise ValueError('Vehicle has no charging object')
+        url = f'https://mysmob.api.connect.skoda-auto.cz/api/v3/vehicle-maintenance/vehicles/{vin}/report'
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        #{'capturedAt': '2025-02-24T19:54:32.728Z', 'inspectionDueInDays': 620, 'mileageInKm': 2512}
+        if data is not None:
+            if 'capturedAt' in data and data['capturedAt'] is not None:
+                captured_at: datetime = robust_time_parse(data['capturedAt'])
+            else:
+                raise APIError('Could not fetch maintenance, capturedAt missing')
+            if 'mileageInKm' in data and data['mileageInKm'] is not None:
+                vehicle.odometer._set_value(value=data['mileageInKm'], measured=captured_at, unit=Length.KM)  # pylint: disable=protected-access
+            else:
+                vehicle.odometer._set_value(None)  # pylint: disable=protected-access
+            if 'inspectionDueInDays' in data and data['inspectionDueInDays'] is not None:
+                inspection_due: timedelta = timedelta(days=data['inspectionDueInDays'])
+                inspection_date: datetime = captured_at + inspection_due
+                inspection_date = inspection_date.replace(hour=0, minute=0, second=0, microsecond=0)
+                # pylint: disable-next=protected-access
+                vehicle.maintenance.inspection_due_at._set_value(value=inspection_date, measured=captured_at)
+            else:
+                vehicle.maintenance.inspection_due_at._set_value(None)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, 'maintenance', data,  {'capturedAt', 'mileageInKm', 'inspectionDueInDays'})
+
+        #url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/vehicle-health-report/warning-lights/{vin}'
+        #data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        #{'capturedAt': '2025-02-24T15:32:35.032Z', 'mileageInKm': 2512, 'warningLights': [{'category': 'ASSISTANCE', 'defects': []}, {'category': 'COMFORT', 'defects': []}, {'category': 'BRAKE', 'defects': []}, {'category': 'ELECTRIC_ENGINE', 'defects': []}, {'category': 'LIGHTING', 'defects': []}, {'category': 'TIRE', 'defects': []}, {'category': 'OTHER', 'defects': []}]}
+        return vehicle
+
     def fetch_air_conditioning(self, vehicle: SkodaVehicle, no_cache: bool = False) -> SkodaVehicle:
         """
         Fetches the air conditioning data for a given Skoda vehicle and updates the vehicle object with the retrieved data.

{carconnectivity_connector_skoda-0.3 → carconnectivity_connector_skoda-0.4a2}/src/carconnectivity_connectors/skoda/vehicle.py

@@ -7,6 +7,7 @@ from carconnectivity.charging import Charging
 
 from carconnectivity_connectors.skoda.capability import Capabilities
 from carconnectivity_connectors.skoda.charging import SkodaCharging
+from carconnectivity_connectors.skoda.climatization import SkodaClimatization
 
 SUPPORT_IMAGES = False
 try:
@@ -36,6 +37,7 @@ class SkodaVehicle(GenericVehicle):  # pylint: disable=too-many-instance-attribu
 
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)
+            self.climatization = SkodaClimatization(vehicle=self, origin=self.climatization)
             self.capabilities = Capabilities(vehicle=self)
             if SUPPORT_IMAGES:
                 self._car_images: Dict[str, Image.Image] = {}