carconnectivity-connector-seatcupra 0.3__py3-none-any.whl → 0.4.1__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.3.dist-info → carconnectivity_connector_seatcupra-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-seatcupra
-Version: 0.3
+Version: 0.4.1
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License
@@ -37,10 +37,10 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.6
+Requires-Dist: carconnectivity>=0.7
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
-Requires-Dist: jwt~=1.3.1
+Requires-Dist: pyjwt~=2.10
 Dynamic: license-file
 
 

{carconnectivity_connector_seatcupra-0.3.dist-info → carconnectivity_connector_seatcupra-0.4.1.dist-info}/RECORD

@@ -1,21 +1,21 @@
-carconnectivity_connector_seatcupra-0.3.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.4.1.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=hptOGIBLOnpzA-fkbjoP65wPqWhg_6jCYYIUObQw6xc,506
+carconnectivity_connectors/seatcupra/_version.py,sha256=yF2DwGUoQKNnLhAbpZX8kCQKjw77EZzhRk7_OTftets,511
 carconnectivity_connectors/seatcupra/capability.py,sha256=936V06hOX8AuAMxL_S9wVyVa36Xw1bo9081X0xf5f94,5064
 carconnectivity_connectors/seatcupra/charging.py,sha256=mayvseay5x2r2qjWqol0ijlgoBL2L2A0A96T44FOiHg,4076
 carconnectivity_connectors/seatcupra/climatization.py,sha256=0xxWlxrheAPzkVT8WRQtbm6ExZmVdgW7lUdOXyS_qWY,1695
-carconnectivity_connectors/seatcupra/command_impl.py,sha256=wUmf4IRo4HxzeiS6LKfQzUZBwPO6Gm8GQmVJM9sH1Tk,3226
-carconnectivity_connectors/seatcupra/connector.py,sha256=5bLClhgEyL1R12Ooa3UanRNx0Ke5yrvYp_5qF82hnD4,130762
+carconnectivity_connectors/seatcupra/command_impl.py,sha256=5kIzMWhabUTtLVcrWQuu2Xp78NnF96G3Fr-nt9h6IA0,3234
+carconnectivity_connectors/seatcupra/connector.py,sha256=N8LhUSgy6zK4rjtLuLgI1xPwYqPmFzqaZ4gczaXy2tE,131556
 carconnectivity_connectors/seatcupra/vehicle.py,sha256=LHkAlVD_C8xOX81wCGFZbZqyhctpKx-CN0T3NZJ2jFk,3946
 carconnectivity_connectors/seatcupra/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/seatcupra/auth/auth_util.py,sha256=Y81h8fGOMSMgPtE4wI_TI9WgE_s43uaPjRLBBINhj4g,4433
 carconnectivity_connectors/seatcupra/auth/my_cupra_session.py,sha256=VF_9U8fESLkndVaPn2W1ZxZwNr9-ndeaegeTVT5FyYk,13904
-carconnectivity_connectors/seatcupra/auth/openid_session.py,sha256=pGdTSt2zMtPWD4EY8MoZTj8lT6_krfa1Xt3Fyh877FA,16972
+carconnectivity_connectors/seatcupra/auth/openid_session.py,sha256=TWcM2htpvEZ3UMgnLaizHR8_knmoAoIbWWJFvtwZSGg,16909
 carconnectivity_connectors/seatcupra/auth/session_manager.py,sha256=ZIDvC848T3fy6PgGqCl8A2SzaNhu2YG19Xam5kgp7SA,5635
 carconnectivity_connectors/seatcupra/auth/vw_web_session.py,sha256=CcI6m68IyRs6WsMDu-IsW3Dj85vyGiMmxvFqNETMHO0,10929
 carconnectivity_connectors/seatcupra/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
 carconnectivity_connectors/seatcupra/ui/connector_ui.py,sha256=UXDWnMAyTrm0UReTP2WamorrPE5kAJ5oxOjCp-MrZ-c,1414
-carconnectivity_connector_seatcupra-0.3.dist-info/METADATA,sha256=TAUEL6c8a4npLNiH2ltogQLIBT6D4LysUhLU3wxbHc0,5491
-carconnectivity_connector_seatcupra-0.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-carconnectivity_connector_seatcupra-0.3.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.3.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.4.1.dist-info/METADATA,sha256=d9HfYwoW_xuUPhOwIAHzgHy6VaQce2QWnYD6p40NYU8,5494
+carconnectivity_connector_seatcupra-0.4.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+carconnectivity_connector_seatcupra-0.4.1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.4.1.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.3'
-__version_tuple__ = version_tuple = (0, 3)
+__version__ = version = '0.4.1'
+__version_tuple__ = version_tuple = (0, 4, 1)

carconnectivity_connectors/seatcupra/auth/openid_session.py

@@ -6,7 +6,7 @@ from enum import Enum, auto
 import time
 import logging
 import requests
-from jwt import JWT
+import jwt
 from datetime import datetime, timezone
 
 from oauthlib.common import UNICODE_ASCII_CHARACTER_SET, generate_nonce, generate_token
@@ -151,8 +151,7 @@ class OpenIDSession(requests.Session):
                     new_token['expires_in'] = self._token['expires_in']
                 else:
                     if 'id_token' in new_token:
-                        jwt_instance = JWT()
-                        meta_data = jwt_instance.decode(new_token['id_token'], do_verify=False)
+                        meta_data = jwt.decode(new_token['id_token'], do_verify=False)
                         if 'exp' in meta_data:
                             new_token['expires_at'] = meta_data['exp']
                             expires_at = datetime.fromtimestamp(meta_data['exp'], tz=timezone.utc)

carconnectivity_connectors/seatcupra/command_impl.py

@@ -44,7 +44,7 @@ class SpinCommand(GenericCommand):
             parser.add_argument('--spin', dest='spin', help='Spin to be used instead of spin from config or .netrc', type=str, required=False,
                                 default=None)
             try:
-                args = parser.parse_args(new_value.split(sep=' '))
+                args = parser.parse_args(new_value.strip().split(sep=' '))
             except argparse.ArgumentError as e:
                 raise SetterError(f'Invalid format for SpinCommand: {e.message} {parser.format_usage()}') from e
 

carconnectivity_connectors/seatcupra/connector.py

@@ -316,7 +316,7 @@ class Connector(BaseConnector):
                     and vehicle.position.position_type.enabled and vehicle.position.position_type.value == Position.PositionType.PARKING:
                 vehicle.state._set_value(GenericVehicle.State.PARKED)  # pylint: disable=protected-access
             else:
-                vehicle.state._set_value(None)  # pylint: disable=protected-access
+                vehicle.state._set_value(GenericVehicle.State.UNKNOWN)  # pylint: disable=protected-access
 
     def fetch_vehicles(self) -> None:
         """
@@ -669,11 +669,13 @@ class Connector(BaseConnector):
                         if 'levelPct' in vehicle_status_data['engines'][drive_id] and vehicle_status_data['engines'][drive_id]['levelPct'] is not None:
                             # pylint: disable-next=protected-access
                             drive.level._set_value(value=vehicle_status_data['engines'][drive_id]['levelPct'])
+                            drive.level.precision = 1
                         else:
                             drive.level._set_value(None)  # pylint: disable=protected-access
                         if 'rangeKm' in vehicle_status_data['engines'][drive_id] and vehicle_status_data['engines'][drive_id]['rangeKm'] is not None:
                             # pylint: disable-next=protected-access
                             drive.range._set_value(value=vehicle_status_data['engines'][drive_id]['rangeKm'], unit=Length.KM)
+                            drive.range.precision = 1
                             total_range += vehicle_status_data['engines'][drive_id]['rangeKm']
                         else:
                             drive.range._set_value(None, unit=Length.KM)  # pylint: disable=protected-access
@@ -681,6 +683,7 @@ class Connector(BaseConnector):
                                                                                                      'levelPct',
                                                                                                      'rangeKm'})
                 vehicle.drives.total_range._set_value(total_range, unit=Length.KM)  # pylint: disable=protected-access
+                vehicle.drives.total_range.precision = 1
             else:
                 vehicle.drives.enabled = False
             if len(vehicle.drives.drives) > 0:
@@ -816,7 +819,9 @@ class Connector(BaseConnector):
             else:
                 longitude = None
             vehicle.position.latitude._set_value(latitude)  # pylint: disable=protected-access
+            vehicle.position.latitude.precision = 0.000001
             vehicle.position.longitude._set_value(longitude)  # pylint: disable=protected-access
+            vehicle.position.longitude.precision = 0.000001
             vehicle.position.position_type._set_value(Position.PositionType.PARKING)  # pylint: disable=protected-access
             log_extra_keys(LOG_API, 'parkingposition', data,  {'lat', 'lon'})
         else:
@@ -847,6 +852,7 @@ class Connector(BaseConnector):
         if data is not None:
             if 'mileageKm' in data and data['mileageKm'] is not None:
                 vehicle.odometer._set_value(data['mileageKm'], unit=Length.KM)  # pylint: disable=protected-access
+                vehicle.odometer.precision = 1
             else:
                 vehicle.odometer._set_value(None)  # pylint: disable=protected-access
             log_extra_keys(LOG_API, f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/mileage', data,  {'mileageKm'})
@@ -869,22 +875,26 @@ class Connector(BaseConnector):
                             if 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'electricRangeKm' \
                                     and 'value' in range_dict and range_dict['value'] is not None:
                                 drive.range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
+                                drive.range.precision = 1
                                 break
                     elif drive.type.enabled and drive.type.value == GenericDrive.Type.GASOLINE:
                         for range_dict in data['ranges']:
                             if 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'gasolineRangeKm' \
                                     and 'value' in range_dict and range_dict['value'] is not None:
                                 drive.range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
+                                drive.range.precision = 1
                                 break
                     elif drive.type.enabled and drive.type.value == GenericDrive.Type.DIESEL:
                         for range_dict in data['ranges']:
                             if 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'dieselRangeKm' \
                                     and 'value' in range_dict and range_dict['value'] is not None:
                                 drive.range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
+                                drive.range.precision = 1
                             elif 'rangeName' in range_dict and range_dict['rangeName'] is not None and range_dict['rangeName'] == 'adBlueKm' \
                                     and 'value' in range_dict and range_dict['value'] is not None:
                                 if isinstance(drive, DieselDrive):
                                     drive.adblue_range._set_value(range_dict['value'], unit=Length.KM)  # pylint: disable=protected-access
+                                    drive.adblue_range.precision = 1
             log_extra_keys(LOG_API, f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/ranges', data,  {'ranges'})
         return vehicle
 
@@ -905,6 +915,7 @@ class Connector(BaseConnector):
                 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
+                vehicle.maintenance.inspection_due_after.precision = 1
             else:
                 vehicle.maintenance.inspection_due_after._set_value(None)  # pylint: disable=protected-access
             if 'oilServiceDueDays' in data and data['oilServiceDueDays'] is not None:
@@ -917,11 +928,13 @@ class Connector(BaseConnector):
                 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
+                vehicle.maintenance.oil_service_due_after.precision = 1
             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
+            vehicle.odometer.precision = 1
         return vehicle
 
     def fetch_climatisation(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
@@ -1330,7 +1343,7 @@ class Connector(BaseConnector):
                     elif not allow_http_error or (allowed_errors is not None and status_response.status_code not in allowed_errors):
                         raise RetrievalError(f'Could not fetch data even after re-authorization. Status Code was: {status_response.status_code}')
                 elif not allow_http_error or (allowed_errors is not None and status_response.status_code not in allowed_errors):
-                    raise RetrievalError(f'Could not fetch data. Status Code was: {status_response.status_code}')
+                    raise RetrievalError(f'Could not fetch data for {url}. Status Code was: {status_response.status_code}')
             except requests.exceptions.ConnectionError as connection_error:
                 raise RetrievalError(f'Connection error: {connection_error}.'
                                      ' If this happens frequently, please check if other applications communicate with the Seat/Cupra server.') from connection_error