carconnectivity-connector-seatcupra 0.1.2a1__py3-none-any.whl → 0.2a1__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.1.2a1.dist-info → carconnectivity_connector_seatcupra-0.2a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1.2a1
+Version: 0.2a1
 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.4
+Requires-Dist: carconnectivity>=0.5a1
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.1.2a1.dist-info → carconnectivity_connector_seatcupra-0.2a1.dist-info}/RECORD

@@ -1,21 +1,21 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=VzTjVbsUC2B6Y5R_ncX3UCI-1y_cf0-27tYAHy1JsEY,513
+carconnectivity_connectors/seatcupra/_version.py,sha256=nv-ayVPlh7g8avzeIuoqWWMLTrpQh-Tk42DRZnMODN4,508
 carconnectivity_connectors/seatcupra/capability.py,sha256=936V06hOX8AuAMxL_S9wVyVa36Xw1bo9081X0xf5f94,5064
 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=LmBOCWGZPfJCG_4-5449xvO6NAvnPDsAWEBKlsG4WoI,3051
-carconnectivity_connectors/seatcupra/connector.py,sha256=llxFhVdpnL5MxmHbOej1wMio5tareY3zha0qaFhnPgs,107680
+carconnectivity_connectors/seatcupra/connector.py,sha256=N2uFvzuxRj1se3157TWtQ80WSkjwh7w462D4E8c4ZlM,110344
 carconnectivity_connectors/seatcupra/vehicle.py,sha256=s0G-HqG5qcwStDxD3649KgLMa3lKPZ4TOGWRJEuQzsQ,3403
 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=SXO_77diYSmHN3KNSccDASk95Ko8uK5WWKSjIJNHrUA,13558
+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/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=SNYnlcGJpbWhuLiIHD2l6H9IfSiMz3IgmvXsdossDnE,1412
-carconnectivity_connector_seatcupra-0.1.2a1.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.1.2a1.dist-info/METADATA,sha256=ii6XPx0SHu1N2SEXwPeDC-Pei__53Le9BlV08yKzRUw,5473
-carconnectivity_connector_seatcupra-0.1.2a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-carconnectivity_connector_seatcupra-0.1.2a1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.1.2a1.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.2a1.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.2a1.dist-info/METADATA,sha256=-evGY15ib_P4dy75Cnjmm-Q_u8GOqFK6Nk_XGHNMbAs,5473
+carconnectivity_connector_seatcupra-0.2a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+carconnectivity_connector_seatcupra-0.2a1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.2a1.dist-info/RECORD,,

{carconnectivity_connector_seatcupra-0.1.2a1.dist-info → carconnectivity_connector_seatcupra-0.2a1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

carconnectivity_connectors/seatcupra/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.2a1'
-__version_tuple__ = version_tuple = (0, 1, 2)
+__version__ = version = '0.2a1'
+__version_tuple__ = version_tuple = (0, 2)

carconnectivity_connectors/seatcupra/auth/my_cupra_session.py

@@ -46,6 +46,7 @@ class MyCupraSession(VWWebSession):
 
             self.headers = CaseInsensitiveDict({
                 'accept': '*/*',
+                'connection': 'keep-alive',
                 'content-type': 'application/json',
                 'user-agent': 'SEATApp/2.5.0 (com.seat.myseat.ola; build:202410171614; iOS 15.8.3) Alamofire/5.7.0 Mobile',
                 'accept-language': 'de-de',
@@ -62,6 +63,7 @@ class MyCupraSession(VWWebSession):
 
             self.headers = CaseInsensitiveDict({
                 'accept': '*/*',
+                'connection': 'keep-alive',
                 'content-type': 'application/json',
                 'user-agent': 'CUPRAApp%20-%20Store/20220503 CFNetwork/1333.0.4 Darwin/21.5.0',
                 'accept-language': 'de-de',
@@ -220,12 +222,19 @@ class MyCupraSession(VWWebSession):
         if headers is None:
             headers = dict(self.headers)
 
-        body: Dict[str, str] = {
-            'client_id': self.client_id,
-            'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
-            'grant_type': 'refresh_token',
-            'refresh_token': self.refresh_token
-        }
+        if self.is_seat:
+            body: Dict[str, str] = {
+                'client_id': self.client_id,
+                'grant_type': 'refresh_token',
+                'refresh_token': self.refresh_token
+            }
+        else:
+            body: Dict[str, str] = {
+                'client_id': self.client_id,
+                'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
+                'grant_type': 'refresh_token',
+                'refresh_token': self.refresh_token
+            }
 
         headers['content-type'] = 'application/x-www-form-urlencoded; charset=utf-8'
 

carconnectivity_connectors/seatcupra/connector.py

@@ -20,7 +20,7 @@ from carconnectivity.units import Length, Current
 from carconnectivity.doors import Doors
 from carconnectivity.windows import Windows
 from carconnectivity.lights import Lights
-from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive
+from carconnectivity.drive import GenericDrive, ElectricDrive, CombustionDrive, DieselDrive
 from carconnectivity.vehicle import GenericVehicle, ElectricVehicle
 from carconnectivity.attributes import BooleanAttribute, DurationAttribute, GenericAttribute, TemperatureAttribute, EnumAttribute
 from carconnectivity.units import Temperature
@@ -288,6 +288,7 @@ class Connector(BaseConnector):
                 vehicle_to_update = self.fetch_vehicle_status(vehicle_to_update)
                 vehicle_to_update = self.fetch_vehicle_mycar_status(vehicle_to_update)
                 vehicle_to_update = self.fetch_mileage(vehicle_to_update)
+                vehicle_to_update = self.fetch_ranges(vehicle_to_update)
                 if vehicle_to_update.capabilities.has_capability('climatisation', check_status_ok=True):
                     vehicle_to_update = self.fetch_climatisation(vehicle_to_update)
                 if vehicle_to_update.capabilities.has_capability('charging', check_status_ok=True):
@@ -414,7 +415,7 @@ class Connector(BaseConnector):
                                                 capability.parameters[parameter] = value
                                     else:
                                         raise APIError('Could not fetch capabilities, capability ID missing')
-                                    log_extra_keys(LOG_API, 'capability', capability_dict,  {'id', 'expirationDate', 'editable', 'parameters'})
+                                    log_extra_keys(LOG_API, 'capability', capability_dict,  {'id', 'expirationDate', 'editable', 'parameters', 'status'})
 
                                 for capability_id in vehicle.capabilities.capabilities.keys() - found_capabilities:
                                     vehicle.capabilities.remove_capability(capability_id)
@@ -646,6 +647,8 @@ class Connector(BaseConnector):
                         else:
                             if engine_type == GenericDrive.Type.ELECTRIC:
                                 drive = ElectricDrive(drive_id=drive_id, drives=vehicle.drives)
+                            elif engine_type == GenericDrive.Type.DIESEL:
+                                drive = DieselDrive(drive_id=drive_id, drives=vehicle.drives)
                             elif engine_type in [GenericDrive.Type.FUEL,
                                                  GenericDrive.Type.GASOLINE,
                                                  GenericDrive.Type.PETROL,
@@ -845,6 +848,36 @@ class Connector(BaseConnector):
             vehicle.odometer._set_value(None)  # pylint: disable=protected-access
         return vehicle
 
+    def fetch_ranges(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}/ranges'
+        # {'ranges': [{'rangeName': 'gasolineRangeKm', 'value': 100.0}, {'rangeName': 'electricRangeKm', 'value': 28.0}]}
+        data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
+        if data is not None:
+            if 'ranges' in data and data['ranges'] is not None:
+                for drive in vehicle.drives.drives.values():
+                    if drive.type.enabled and drive.type.value == GenericDrive.Type.ELECTRIC:
+                        for range_dict in data['ranges']:
+                            if 'electricRangeKm' in range_dict and range_dict['electricRangeKm'] is not None:
+                                drive.range._set_value(range_dict['electricRangeKm'], unit=Length.KM)  # pylint: disable=protected-access
+                                break
+                    elif drive.type.enabled and drive.type.value == GenericDrive.Type.GASOLINE:
+                        for range_dict in data['ranges']:
+                            if 'gasolineRangeKm' in range_dict and range_dict['gasolineRangeKm'] is not None:
+                                drive.range._set_value(range_dict['gasolineRangeKm'], unit=Length.KM)  # pylint: disable=protected-access
+                                break
+                    elif drive.type.enabled and drive.type.value == GenericDrive.Type.DIESEL:
+                        for range_dict in data['ranges']:
+                            if 'dieselRangeKm' in range_dict and range_dict['dieselRangeKm'] is not None:
+                                drive.range._set_value(range_dict['dieselRangeKm'], unit=Length.KM)  # pylint: disable=protected-access
+                            elif 'adBlueKm' in range_dict and range_dict['adBlueKm'] is not None:
+                                if isinstance(drive, DieselDrive):
+                                    drive.adblue_range._set_value(range_dict['adBlueKm'], unit=Length.KM)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/ranges', data,  {'ranges'})
+        return vehicle
+
     def fetch_maintenance(self, vehicle: SeatCupraVehicle, no_cache: bool = False) -> SeatCupraVehicle:
         vin = vehicle.vin.value
         if vin is None: