carconnectivity-connector-seatcupra 0.1a5__py3-none-any.whl → 0.1a6__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.1a5.dist-info → carconnectivity_connector_seatcupra-0.1a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a5
+Version: 0.1a6
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License
@@ -37,7 +37,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.4a3
+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_seatcupra-0.1a5.dist-info → carconnectivity_connector_seatcupra-0.1a6.dist-info}/RECORD

@@ -1,10 +1,10 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=3vWvGIvcurJ1u-UTyD0NkVyWEC9cDflcmq5cu0o_AiM,508
+carconnectivity_connectors/seatcupra/_version.py,sha256=Hqe2m1dzf7-6SjKo8Gr6gXy8XAO0Guujh7xUPL78VzY,508
 carconnectivity_connectors/seatcupra/capability.py,sha256=Oe9tC_u69bj6VmOuNJ21RKoETe2j3QyZCoz-VgcZPQ0,4523
 carconnectivity_connectors/seatcupra/charging.py,sha256=BJe_5GEB0JkP78tpU6kyKpwuwjDZHvm-kt3PTlpQHeU,3336
 carconnectivity_connectors/seatcupra/climatization.py,sha256=0xxWlxrheAPzkVT8WRQtbm6ExZmVdgW7lUdOXyS_qWY,1695
 carconnectivity_connectors/seatcupra/command_impl.py,sha256=mtw8ZwJLmf79fPDZ1N3ImLfB8Gt9JPbzjMuIo2y5v3M,2879
-carconnectivity_connectors/seatcupra/connector.py,sha256=7O_sQCfz5doQxcrVGW0_2e9I4HkOhL-WAx87CjQSkg0,90129
+carconnectivity_connectors/seatcupra/connector.py,sha256=S6E7YlS8j39MPhV04ghOekevs53eEsZTlLyn7beeiMM,92982
 carconnectivity_connectors/seatcupra/vehicle.py,sha256=kiFVbJgq5VQOzf-vSli_2NsMgY0x4pwvJsjPWLGdr1g,3404
 carconnectivity_connectors/seatcupra/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/seatcupra/auth/auth_util.py,sha256=Y81h8fGOMSMgPtE4wI_TI9WgE_s43uaPjRLBBINhj4g,4433
@@ -14,8 +14,8 @@ carconnectivity_connectors/seatcupra/auth/session_manager.py,sha256=NizIuY-pvkVB
 carconnectivity_connectors/seatcupra/auth/vw_web_session.py,sha256=hgsCdXugVnSgvLta4hBNtoNgMhAA83paAYO2fUOOFyM,10657
 carconnectivity_connectors/seatcupra/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
 carconnectivity_connectors/seatcupra/ui/connector_ui.py,sha256=SNYnlcGJpbWhuLiIHD2l6H9IfSiMz3IgmvXsdossDnE,1412
-carconnectivity_connector_seatcupra-0.1a5.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.1a5.dist-info/METADATA,sha256=BIc37cr52KvMOs_dhmOQVOpQZZ6tX-BeEaeWxfP311Q,5386
-carconnectivity_connector_seatcupra-0.1a5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-carconnectivity_connector_seatcupra-0.1a5.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.1a5.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.1a6.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.1a6.dist-info/METADATA,sha256=gIbtmwE_VYMO2tDtu9jTTvXeNYAuBpyV3PUAdAt85W4,5386
+carconnectivity_connector_seatcupra-0.1a6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+carconnectivity_connector_seatcupra-0.1a6.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.1a6.dist-info/RECORD,,

carconnectivity_connectors/seatcupra/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1a5'
+__version__ = version = '0.1a6'
 __version_tuple__ = version_tuple = (0, 1)

carconnectivity_connectors/seatcupra/connector.py

@@ -259,6 +259,8 @@ class Connector(BaseConnector):
                     vehicle_to_update = self.fetch_charging(vehicle_to_update)
                 if vehicle_to_update.capabilities.has_capability('parkingPosition'):
                     vehicle_to_update = self.fetch_parking_position(vehicle_to_update)
+                if vehicle_to_update.capabilities.has_capability('vehicleHealthInspection'):
+                    vehicle_to_update = self.fetch_maintenance(vehicle_to_update)
 
     def fetch_vehicles(self) -> None:
         """
@@ -737,6 +739,42 @@ class Connector(BaseConnector):
             vehicle.odometer._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
+    def fetch_maintenance(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
+        vin = vehicle.vin.value
+        if vin is None:
+            raise APIError('VIN is missing')
+        url = f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/maintenance'
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        if data is not None:
+            if 'inspectionDueDays' in data and data['inspectionDueDays'] is not None:
+                inspection_due: timedelta = timedelta(days=data['inspectionDueDays'])
+                inspection_date: datetime = datetime.now(tz=timezone.utc) + 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)
+            else:
+                vehicle.maintenance.inspection_due_at._set_value(None)  # pylint: disable=protected-access
+            if 'inspectionDueKm' in data and data['inspectionDueKm'] is not None:
+                vehicle.maintenance.inspection_due_after._set_value(data['inspectionDueKm'], unit=Length.KM)  # pylint: disable=protected-access
+            else:
+                vehicle.maintenance.inspection_due_after._set_value(None)  # pylint: disable=protected-access
+            if 'oilServiceDueDays' in data and data['oilServiceDueDays'] is not None:
+                oil_service_due: timedelta = timedelta(days=data['oilServiceDueDays'])
+                oil_service_date: datetime = datetime.now(tz=timezone.utc) + oil_service_due
+                oil_service_date = oil_service_date.replace(hour=0, minute=0, second=0, microsecond=0)
+                # pylint: disable-next=protected-access
+                vehicle.maintenance.oil_service_due_at._set_value(value=oil_service_date)
+            else:
+                vehicle.maintenance.oil_service_due_at._set_value(None)  # pylint: disable=protected-access
+            if 'oilServiceDueKm' in data and data['oilServiceDueKm'] is not None:
+                vehicle.maintenance.oil_service_due_after._set_value(data['oilServiceDueKm'], unit=Length.KM)  # pylint: disable=protected-access
+            else:
+                vehicle.maintenance.oil_service_due_after._set_value(None)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, f'/v1/vehicles/{vin}/maintenance', data,  {'inspectionDueDays', 'inspectionDueKm', 'oilServiceDueDays', 'oilServiceDueKm'})
+        else:
+            vehicle.odometer._set_value(None)  # pylint: disable=protected-access
+        return vehicle
+
     def fetch_climatisation(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
         """
         Fetches the mileage of the given vehicle and updates its mileage attributes.
@@ -1062,7 +1100,7 @@ class Connector(BaseConnector):
                     command_dict['maxChargeCurrentAC'] = 'maximum'
             else:
                 command_dict['maxChargeCurrentAC'] = 'maximum'
-            command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
+            command_response: requests.Response = self.session.post(url, json=command_dict, allow_redirects=True)
         elif command_arguments['command'] == ChargingStartStopCommand.Command.STOP:
             url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/requests/stop'
             command_response: requests.Response = self.session.post(url, data='{}', allow_redirects=True)
@@ -1134,7 +1172,7 @@ class Connector(BaseConnector):
         if self.active_config['spin'] is None:
             raise CommandError('S-PIN is missing, please add S-PIN to your configuration or .netrc file')
         if 'spin' in command_arguments:
-            command_dict['currentSpin'] = command_arguments['spin']
+            command_dict['spin'] = command_arguments['spin']
         else:
             if self.active_config['spin'] is None or self.active_config['spin'] == '':
                 raise CommandError('S-PIN is missing, please add S-PIN to your configuration or .netrc file')