carconnectivity-connector-skoda 0.1a19__tar.gz → 0.1a21__tar.gz

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/Makefile

@@ -6,7 +6,7 @@ test:
 
 lint:
 	@echo "\n${BLUE}Running Pylint against source and test files...${NC}\n"
-	@pylint ./examples ./src ./tests
+	@pylint ./src
 	@echo "\n${BLUE}Running Flake8 against source and test files...${NC}\n"
 	@flake8
 	@echo "\n${BLUE}Running Bandit against source files...${NC}\n"

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.1a19
+Version: 0.1a21
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/doc/Config.md

@@ -10,11 +10,13 @@ These are the valid options for the MySkoda Connector
         "connectors": [
             {
                 "type": "skoda", // Definition for the MySkoda Connector
+                "disabled": false, // You can disable connectors without removing them from the config completely
                 "config": {
                     "log_level": "error", // set the connectos log level
                     "interval": 300, // Interval in which the server is checked in seconds
                     "username": "test@test.de", // Username of your Volkswagen Account
                     "password": "testpassword123", // Username of your Volkswagen Account
+                    "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

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-skoda
-Version: 0.1a19
+Version: 0.1a21
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/src/carconnectivity_connectors/skoda/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1a19'
+__version__ = version = '0.1a21'
 __version_tuple__ = version_tuple = (0, 1)

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/src/carconnectivity_connectors/skoda/charging.py

@@ -69,7 +69,7 @@ class SkodaCharging(Charging):  # pylint: disable=too-many-instance-attributes
         CONNECT_CABLE = 'connectCable'
         READY_FOR_CHARGING = 'readyForCharging'
         NOT_READY_FOR_CHARGING = 'notReadyForCharging'
-        CONSERVATION = 'conservation'
+        CONSERVING = 'conserving'
         CHARGE_PURPOSE_REACHED_NOT_CONSERVATION_CHARGING = 'chargePurposeReachedAndNotConservationCharging'
         CHARGE_PURPOSE_REACHED_CONSERVATION = 'chargePurposeReachedAndConservation'
         CHARGING = 'charging'
@@ -126,7 +126,7 @@ mapping_skoda_charging_state: Dict[SkodaCharging.SkodaChargingState, Charging.Ch
     SkodaCharging.SkodaChargingState.CONNECT_CABLE: Charging.ChargingState.OFF,
     SkodaCharging.SkodaChargingState.READY_FOR_CHARGING: Charging.ChargingState.READY_FOR_CHARGING,
     SkodaCharging.SkodaChargingState.NOT_READY_FOR_CHARGING: Charging.ChargingState.OFF,
-    SkodaCharging.SkodaChargingState.CONSERVATION: Charging.ChargingState.CONSERVATION,
+    SkodaCharging.SkodaChargingState.CONSERVING: Charging.ChargingState.CONSERVATION,
     SkodaCharging.SkodaChargingState.CHARGE_PURPOSE_REACHED_NOT_CONSERVATION_CHARGING: Charging.ChargingState.READY_FOR_CHARGING,
     SkodaCharging.SkodaChargingState.CHARGE_PURPOSE_REACHED_CONSERVATION: Charging.ChargingState.CONSERVATION,
     SkodaCharging.SkodaChargingState.CHARGING: Charging.ChargingState.CHARGING,

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/src/carconnectivity_connectors/skoda/connector.py

@@ -27,7 +27,7 @@ from carconnectivity.charging import Charging
 from carconnectivity.position import Position
 from carconnectivity.climatization import Climatization
 from carconnectivity.charging_connector import ChargingConnector
-from carconnectivity.command_impl import ClimatizationStartStopCommand
+from carconnectivity.command_impl import ClimatizationStartStopCommand, ChargingStartStopCommand
 
 from carconnectivity_connectors.base.connector import BaseConnector
 from carconnectivity_connectors.skoda.auth.session_manager import SessionManager, SessionUser, Service
@@ -75,20 +75,20 @@ class Connector(BaseConnector):
         # Configure logging
         if 'log_level' in config and config['log_level'] is not None:
             config['log_level'] = config['log_level'].upper()
-            if config['log_level'] in logging.getLevelNamesMapping():
+            if config['log_level'] in logging._nameToLevel:
                 LOG.setLevel(config['log_level'])
                 self.log_level._set_value(config['log_level'])  # pylint: disable=protected-access
                 logging.getLogger('requests').setLevel(config['log_level'])
                 logging.getLogger('urllib3').setLevel(config['log_level'])
                 logging.getLogger('oauthlib').setLevel(config['log_level'])
             else:
-                raise ConfigurationError(f'Invalid log level: "{config["log_level"]}" not in {list(logging.getLevelNamesMapping().keys())}')
+                raise ConfigurationError(f'Invalid log level: "{config["log_level"]}" not in {list(logging._nameToLevel.keys())}')
         if 'api_log_level' in config and config['api_log_level'] is not None:
             config['api_log_level'] = config['api_log_level'].upper()
-            if config['api_log_level'] in logging.getLevelNamesMapping():
+            if config['api_log_level'] in logging._nameToLevel:
                 LOG_API.setLevel(config['api_log_level'])
             else:
-                raise ConfigurationError(f'Invalid log level: "{config["log_level"]}" not in {list(logging.getLevelNamesMapping().keys())}')
+                raise ConfigurationError(f'Invalid log level: "{config["log_level"]}" not in {list(logging._nameToLevel.keys())}')
         LOG.info("Loading skoda connector with config %s", config_remove_credentials(self.config))
 
         username: Optional[str] = None
@@ -287,7 +287,12 @@ class Connector(BaseConnector):
                         else:
                             vehicle.license_plate._set_value(None)  # pylint: disable=protected-access
 
-                        log_extra_keys(LOG_API, 'vehicles', vehicle_dict,  {'vin', 'licensePlate'})
+                        if 'name' in vehicle_dict and vehicle_dict['name'] is not None:
+                            vehicle.name._set_value(vehicle_dict['name'])  # pylint: disable=protected-access
+                        else:
+                            vehicle.name._set_value(None)  # pylint: disable=protected-access
+
+                        log_extra_keys(LOG_API, 'vehicles', vehicle_dict,  {'vin', 'licensePlate', 'name'})
 
                         vehicle = self.fetch_vehicle_details(vehicle)
                     else:
@@ -343,6 +348,10 @@ class Connector(BaseConnector):
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}'
         data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if data is not None:
+            start_stop_command: ChargingStartStopCommand = ChargingStartStopCommand(parent=vehicle.charging.commands)
+            start_stop_command._add_on_set_hook(self.__on_charging_start_stop)  # pylint: disable=protected-access
+            start_stop_command.enabled = True
+            vehicle.charging.commands.add_command(start_stop_command)
             if 'carCapturedTimestamp' in data and data['carCapturedTimestamp'] is not None:
                 captured_at: datetime = robust_time_parse(data['carCapturedTimestamp'])
             else:
@@ -1000,7 +1009,10 @@ class Connector(BaseConnector):
         url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/vehicle-status/{vin}'
         vehicle_status_data: Dict[str, Any] | None = self._fetch_data(url=url, session=self.session, no_cache=no_cache)
         if vehicle_status_data:
-            captured_at: datetime = robust_time_parse(vehicle_status_data['carCapturedTimestamp'])
+            if 'carCapturedTimestamp' in vehicle_status_data and vehicle_status_data['carCapturedTimestamp'] is not None:
+                captured_at: Optional[datetime] = robust_time_parse(vehicle_status_data['carCapturedTimestamp'])
+            else:
+                captured_at: Optional[datetime] = None
             if 'overall' in vehicle_status_data and vehicle_status_data['overall'] is not None:
                 if 'doorsLocked' in vehicle_status_data['overall'] and vehicle_status_data['overall']['doorsLocked'] is not None \
                         and vehicle.doors is not None:
@@ -1421,11 +1433,24 @@ class Connector(BaseConnector):
                         raise SetterError(f'Unknown temperature unit {command_arguments['target_temperature_unit']}')
                 else:
                     command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
+            elif start_stop_command.parent is not None and (climatization := start_stop_command.parent.parent) is not None \
+                    and isinstance(climatization, Climatization) and climatization.settings is not None \
+                    and climatization.settings.target_temperature is not None and climatization.settings.target_temperature.enabled \
+                    and climatization.settings.target_temperature.value is not None:  # pylint: disable=too-many-boolean-expressions
+                # Round target temperature to nearest 0.5
+                command_dict['targetTemperature']['temperatureValue'] = round(climatization.settings.target_temperature.value * 2) / 2
+                if climatization.settings.target_temperature.unit == Temperature.C:
+                    command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
+                elif climatization.settings.target_temperature.unit == Temperature.F:
+                    command_dict['targetTemperature']['unitInCar'] = 'FAHRENHEIT'
+                elif climatization.settings.target_temperature.unit == Temperature.K:
+                    command_dict['targetTemperature']['unitInCar'] = 'KELVIN'
+                else:
+                    raise SetterError(f'Unknown temperature unit {climatization.settings.target_temperature.unit}')
             else:
                 command_dict['targetTemperature']['temperatureValue'] = 25.0
                 command_dict['targetTemperature']['unitInCar'] = 'CELSIUS'
             url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/start'
-            print(json.dumps(command_dict))
             settings_response: requests.Response = self.session.post(url, data=json.dumps(command_dict), allow_redirects=True)
         elif command_arguments['command'] == ClimatizationStartStopCommand.Command.STOP:
             url = f'https://mysmob.api.connect.skoda-auto.cz/api/v2/air-conditioning/{vin}/stop'
@@ -1437,3 +1462,30 @@ class Connector(BaseConnector):
             LOG.error('Could not start/stop air conditioning (%s: %s)', settings_response.status_code, settings_response.text)
             raise SetterError(f'Could not start/stop air conditioning ({settings_response.status_code}: {settings_response.text})')
         return command_arguments
+
+    def __on_charging_start_stop(self, start_stop_command: ChargingStartStopCommand, command_arguments: Union[str, Dict[str, Any]]) \
+            -> Union[str, Dict[str, Any]]:
+        if start_stop_command.parent is None or start_stop_command.parent.parent is None \
+                or start_stop_command.parent.parent.parent is None or not isinstance(start_stop_command.parent.parent.parent, SkodaVehicle):
+            raise SetterError('Object hierarchy is not as expected')
+        if not isinstance(command_arguments, dict):
+            raise SetterError('Command arguments are not a dictionary')
+        vehicle: SkodaVehicle = start_stop_command.parent.parent.parent
+        vin: Optional[str] = vehicle.vin.value
+        if vin is None:
+            raise SetterError('VIN in object hierarchy missing')
+        if 'command' not in command_arguments:
+            raise SetterError('Command argument missing')
+        if command_arguments['command'] == ChargingStartStopCommand.Command.START:
+            url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}/start'
+            settings_response: requests.Response = self.session.post(url, allow_redirects=True)
+        elif command_arguments['command'] == ChargingStartStopCommand.Command.STOP:
+            url = f'https://mysmob.api.connect.skoda-auto.cz/api/v1/charging/{vin}/stop'
+            settings_response: requests.Response = self.session.post(url, allow_redirects=True)
+        else:
+            raise SetterError(f'Unknown command {command_arguments["command"]}')
+
+        if settings_response.status_code != requests.codes['accepted']:
+            LOG.error('Could not start/stop charging (%s: %s)', settings_response.status_code, settings_response.text)
+            raise SetterError(f'Could not start/stop charging ({settings_response.status_code}: {settings_response.text})')
+        return command_arguments

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/src/carconnectivity_connectors/skoda/mqtt_client.py

@@ -530,7 +530,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                 try:
                                     self._skoda_connector.fetch_air_conditioning(vehicle, no_cache=True)
                                 except CarConnectivityError as e:
-                                    LOG.error('Error while fetching charging: %s', e)
+                                    LOG.error('Error while fetching air conditioning: %s', e)
                     elif 'name' in data and data['name'] == 'climatisation-completed':
                         if 'data' in data and data['data'] is not None:
                             vehicle: Optional[GenericVehicle] = self._skoda_connector.car_connectivity.garage.get_vehicle(vin)
@@ -628,7 +628,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                             elif data['status'] == 'IN_PROGRESS':
                                 LOG.debug('Received %s operation request for vehicle %s from user %s', operation_request, vin, user_id)
                                 return
-                if operation_request == 'charging/start-stop-charging' \
+                elif operation_request == 'charging/start-stop-charging' \
                         or operation_request == 'charging/update-battery-support' \
                         or operation_request == 'charging/update-auto-unlock-plug' \
                         or operation_request == 'charging/update-care-mode' \
@@ -645,6 +645,9 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
                                 except CarConnectivityError as e:
                                     LOG.error('Error while fetching charging: %s', e)
                                 return
+                            elif data['status'] == 'IN_PROGRESS':
+                                LOG.debug('Received %s operation request for vehicle %s from user %s', operation_request, vin, user_id)
+                                return
                 LOG_API.info('Received unknown operation request %s for vehicle %s from user %s: %s', operation_request, vin, user_id, msg.payload)
                 return
         LOG_API.info('I don\'t understand message %s: %s', msg.topic, msg.payload)

{carconnectivity_connector_skoda-0.1a19 → carconnectivity_connector_skoda-0.1a21}/src/carconnectivity_connectors/skoda/vehicle.py

@@ -27,6 +27,7 @@ class SkodaVehicle(GenericVehicle):  # pylint: disable=too-many-instance-attribu
         else:
             super().__init__(vin=vin, garage=garage, managing_connector=managing_connector)
             self.capabilities = Capabilities(vehicle=self)
+        self.manufacturer._set_value(value='Škoda')  # pylint: disable=protected-access
 
     def __str__(self) -> str:
         return_string: str = f'\t{self.capabilities}\n'