carconnectivity-connector-seatcupra 0.2a5__tar.gz → 0.4__tar.gz

carconnectivity_connector_seatcupra-0.4/CHANGELOG.md

@@ -0,0 +1,54 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [Unreleased]
+- No unreleased changes so far
+
+## [0.4] - 2025-04-17
+### Fixed
+- Bug in mode attribute that caused the connector to crash
+
+### Changed
+- Updated dependencies
+- stripping of leading and trailing spaces in commands
+
+### Added
+- Precision for all attributes is now used when displaying values
+
+## [0.3] - 2025-04-02
+### Fixed
+- Problem where the connector reported an error on commands that executed successfully
+- Allowes to have multiple instances of this connector running
+
+### Changed
+- Updated dependencies
+
+## [0.2] - 2025-03-20
+### Added
+- Support for window heating attributes
+- Support for window heating command
+- Support for changing charging settings
+- Support for adblue range
+
+## [0.1.2] - 2025-03-07
+### Fixed
+- Fixed bug during refreshing tokens due to connection being reset on server side and client session timing out.
+
+## [0.1.1] - 2025-03-04
+### Fixed
+- Fixed potential http error when parking position was fetched but due to error not available
+
+### Added
+- Added connection state and vehicle state to the public API
+
+## [0.1] - 2025-03-02
+Initial release, let's go and give this to the public to try out...
+
+[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/compare/v0.4...HEAD
+[0.4]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.4
+[0.3]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.3
+[0.2]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.2
+[0.1.2]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1.2
+[0.1.1]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1.1
+[0.1]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-seatcupra
-Version: 0.2a5
+Version: 0.4
 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.5a4
+Requires-Dist: carconnectivity>=0.7
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/doc/Config.md

@@ -19,7 +19,8 @@ These are the valid options for the Seat Cupra Connector
                     "spin": 1234, //S-Pin used for some special commands like locking/unlocking
                     "netrc": "~/.netr", // netrc file if to be used for passwords
                     "api_log_level": "debug", // Show debug information regarding the API
-                    "max_age": 300 //Cache requests to the server vor MAX_AGE seconds
+                    "max_age": 300, //Cache requests to the server vor MAX_AGE seconds
+                    "hide_vins": ["19XFB2F90CE040211", "1G2ZH35N074252067"] // Don't fetch these vins
                 }
             }
         ],

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/pyproject.toml

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

carconnectivity_connector_seatcupra-0.4/setup_requirements.txt

@@ -0,0 +1,6 @@
+flake8~=7.2.0
+pylint~=3.3.6
+bandit~=1.8.3
+
+# For UI only
+Flask~=3.1.0

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/src/carconnectivity_connector_seatcupra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-seatcupra
-Version: 0.2a5
+Version: 0.4
 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.5a4
+Requires-Dist: carconnectivity>=0.7
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
 Requires-Dist: jwt~=1.3.1

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/src/carconnectivity_connector_seatcupra.egg-info/requires.txt

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

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/src/carconnectivity_connectors/seatcupra/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2a5'
-__version_tuple__ = version_tuple = (0, 2, 'a5')
+__version__ = version = '0.4'
+__version_tuple__ = version_tuple = (0, 4)

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/src/carconnectivity_connectors/seatcupra/command_impl.py

@@ -33,14 +33,18 @@ class SpinCommand(GenericCommand):
     def value(self, new_value: Optional[Union[str, Dict]]) -> None:
         # Execute early hooks before parsing the value
         new_value = self._execute_on_set_hook(new_value, early_hook=True)
-        if isinstance(new_value, str):
+        if isinstance(new_value, SpinCommand.Command):
+            newvalue_dict = {}
+            newvalue_dict['command'] = new_value
+            new_value = newvalue_dict
+        elif isinstance(new_value, str):
             parser = ThrowingArgumentParser(prog='', add_help=False, exit_on_error=False)
             parser.add_argument('command', help='Command to execute', type=SpinCommand.Command,
                                 choices=list(SpinCommand.Command))
             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_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/src/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:
         """
@@ -336,6 +336,9 @@ class Connector(BaseConnector):
             if 'vehicles' in data and data['vehicles'] is not None:
                 for vehicle_dict in data['vehicles']:
                     if 'vin' in vehicle_dict and vehicle_dict['vin'] is not None:
+                        if vehicle_dict['vin'] in self.active_config['hide_vins']:
+                            LOG.info('Vehicle %s filtered out due to configuration', vehicle_dict['vin'])
+                            continue
                         vin: str = vehicle_dict['vin']
                         seen_vehicle_vins.add(vin)
                         vehicle: Optional[GenericVehicle] = garage.get_vehicle(vin)  # pyright: ignore[reportAssignmentType]
@@ -666,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
@@ -678,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:
@@ -813,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:
@@ -844,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'})
@@ -866,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
 
@@ -902,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:
@@ -914,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:
@@ -1327,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
@@ -1516,7 +1532,7 @@ class Connector(BaseConnector):
 
             try:
                 command_response: requests.Response = self.session.post(url, data='{}', allow_redirects=True)
-                if command_response.status_code not in (requests.codes['ok'], requests.codes['no_content']):
+                if command_response.status_code not in (requests.codes['ok'], requests.codes['no_content'], requests.codes['created']):
                     LOG.error('Could not execute wake command (%s: %s)', command_response.status_code, command_response.text)
                     raise CommandError(f'Could not execute wake command ({command_response.status_code}: {command_response.text})')
             except requests.exceptions.ConnectionError as connection_error:
@@ -1565,7 +1581,7 @@ class Connector(BaseConnector):
             url = f'https://ola.prod.code.seat.cloud.vwgroup.com/v1/vehicles/{vin}/honk-and-flash'
             try:
                 command_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
-                if command_response.status_code not in (requests.codes['ok'], requests.codes['no_content']):
+                if command_response.status_code not in (requests.codes['ok'], requests.codes['no_content'], requests.codes['created']):
                     LOG.error('Could not execute honk or flash command (%s: %s)', command_response.status_code, command_response.text)
                     raise CommandError(f'Could not execute honk or flash command ({command_response.status_code}: {command_response.text})')
             except requests.exceptions.ConnectionError as connection_error:

{carconnectivity_connector_seatcupra-0.2a5 → carconnectivity_connector_seatcupra-0.4}/src/carconnectivity_connectors/seatcupra/ui/connector_ui.py

@@ -19,8 +19,8 @@ class ConnectorUI(BaseConnectorUI):
     A user interface class for the Seat/Cupra connector in the Car Connectivity application.
     """
     def __init__(self, connector: BaseConnector):
-        blueprint: Optional[flask.Blueprint] = flask.Blueprint(name='seatcupra', import_name='carconnectivity-connector-seatcupra', url_prefix='/seatcupra',
-                                                                    template_folder=os.path.dirname(__file__) + '/templates')
+        blueprint: Optional[flask.Blueprint] = flask.Blueprint(name=connector.id, import_name='carconnectivity-connector-seatcupra', url_prefix=f'/{connector.id}',
+                                                               template_folder=os.path.dirname(__file__) + '/templates')
         super().__init__(connector, blueprint=blueprint)
 
     def get_nav_items(self) -> List[Dict[Literal['text', 'url', 'sublinks', 'divider'], Union[str, List]]]:

carconnectivity_connector_seatcupra-0.2a5/CHANGELOG.md

@@ -1,25 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-## [Unreleased]
-- No unreleased changes so far
-
-## [0.1.2] - 2025-03-07
-### Fixed
-- Fixed bug during refreshing tokens due to connection being reset on server side and client session timing out.
-
-## [0.1.1] - 2025-03-04
-### Fixed
-- Fixed potential http error when parking position was fetched but due to error not available
-
-### Added
-- Added connection state and vehicle state to the public API
-
-## [0.1] - 2025-03-02
-Initial release, let's go and give this to the public to try out...
-
-[unreleased]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/compare/v0.1.2...HEAD
-[0.1.2]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1.2
-[0.1.1]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1.1
-[0.1]: https://github.com/tillsteinbach/CarConnectivity-connector-seatcupra/releases/tag/v0.1

carconnectivity_connector_seatcupra-0.2a5/setup_requirements.txt

@@ -1,6 +0,0 @@
-flake8~=7.1.2
-pylint~=3.3.4
-bandit~=1.8.3
-
-# For UI only
-Flask~=3.1.0