carconnectivity-connector-seatcupra 0.1a12__py3-none-any.whl → 0.1a14__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.1a12.dist-info → carconnectivity_connector_seatcupra-0.1a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a12
+Version: 0.1a14
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_seatcupra-0.1a12.dist-info → carconnectivity_connector_seatcupra-0.1a14.dist-info}/RECORD

@@ -1,11 +1,11 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=P5HzP2QWt9JgX2cjp9oYZxzRbLpLn0PHY12_Tr5maGE,509
+carconnectivity_connectors/seatcupra/_version.py,sha256=uxem9Z0JbrrSqB5GMvuMAyGSfBZfrJvSAu8udDrjXQg,509
 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=GZLdactSC5vOKE3OvXekcwaAmYtRfoo8G7x0iBJJB7s,101388
-carconnectivity_connectors/seatcupra/vehicle.py,sha256=kiFVbJgq5VQOzf-vSli_2NsMgY0x4pwvJsjPWLGdr1g,3404
+carconnectivity_connectors/seatcupra/connector.py,sha256=edw4PSE8HqxSeG6_eOSKl55hNF1aZt-_pnOiVxzQBl0,100885
+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=qq9TEeWjaZZKT8dLn4uvCf_tvogtdXG1qC95sSJsqwk,12894
@@ -14,8 +14,8 @@ carconnectivity_connectors/seatcupra/auth/session_manager.py,sha256=ZIDvC848T3fy
 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.1a12.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.1a12.dist-info/METADATA,sha256=QwGVdp8CkV8qlNFb_NLHqRUdd9xdhh0kiCKxYAEQkQ8,5641
-carconnectivity_connector_seatcupra-0.1a12.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-carconnectivity_connector_seatcupra-0.1a12.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.1a12.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.1a14.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.1a14.dist-info/METADATA,sha256=Sn7852ULtuZqRoHEFQjCgjmDXxAptyYZcq6I2mhkg8M,5641
+carconnectivity_connector_seatcupra-0.1a14.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+carconnectivity_connector_seatcupra-0.1a14.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.1a14.dist-info/RECORD,,

{carconnectivity_connector_seatcupra-0.1a12.dist-info → carconnectivity_connector_seatcupra-0.1a14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+Generator: setuptools (75.8.2)
 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.1a12'
+__version__ = version = '0.1a14'
 __version_tuple__ = version_tuple = (0, 1)

carconnectivity_connectors/seatcupra/connector.py

@@ -461,10 +461,10 @@ class Connector(BaseConnector):
                 else:
                     vehicle.connection_state._set_value(GenericVehicle.ConnectionState.UNKNOWN)  # pylint: disable=protected-access
                     LOG_API.info('Unknown connection state %s', vehicle_connection_data['connection']['mode'])
-                log_extra_keys(LOG_API, f'/api/v2/vehicles/{vin}/connection', vehicle_connection_data, {'connection'})
                 log_extra_keys(LOG_API, f'/api/v2/vehicles/{vin}/connection', vehicle_connection_data['connection'], {'mode'})
             else:
                 vehicle.connection_state._set_value(None)  # pylint: disable=protected-access
+            log_extra_keys(LOG_API, f'/api/v2/vehicles/{vin}/connection', vehicle_connection_data, {'connection'})
         else:
             vehicle.connection_state._set_value(None)  # pylint: disable=protected-access
 
@@ -910,12 +910,12 @@ class Connector(BaseConnector):
             if data is not None:
                 if 'charging' in data and data['charging'] is not None:
                     if 'state' in data['charging'] and data['charging']['state'] is not None:
-                        if data['charging']['state'] in SeatCupraCharging.SeatCupraChargingState:
+                        if data['charging']['state'] in [item.value for item in SeatCupraCharging.SeatCupraChargingState]:
                             volkswagen_charging_state = SeatCupraCharging.SeatCupraChargingState(data['charging']['state'])
                             charging_state: Charging.ChargingState = mapping_seatcupra_charging_state[volkswagen_charging_state]
                         else:
                             LOG_API.info('Unkown charging state %s not in %s', data['charging']['state'],
-                                        str(SeatCupraCharging.SeatCupraChargingState))
+                                         str(SeatCupraCharging.SeatCupraChargingState))
                             charging_state = Charging.ChargingState.UNKNOWN
                         vehicle.charging.state._set_value(value=charging_state)  # pylint: disable=protected-access
                     else:
@@ -937,8 +937,11 @@ class Connector(BaseConnector):
                             plug_power_state: ChargingConnector.ExternalPower = \
                                 ChargingConnector.ExternalPower(data['plug']['externalPower'])
                         else:
-                            LOG_API.info('Unknown plug power state %s', data['plug']['externalPower'])
-                            plug_power_state = ChargingConnector.ExternalPower.UNKNOWN
+                            if data['plug']['externalPower'] == 'ready':
+                                plug_power_state = ChargingConnector.ExternalPower.AVAILABLE
+                            else:
+                                LOG_API.info('Unknown plug power state %s', data['plug']['externalPower'])
+                                plug_power_state = ChargingConnector.ExternalPower.UNKNOWN
                         vehicle.charging.connector.external_power._set_value(value=plug_power_state)  # pylint: disable=protected-access
                     else:
                         vehicle.charging.connector.external_power._set_value(None)  # pylint: disable=protected-access
@@ -1120,19 +1123,10 @@ class Connector(BaseConnector):
         try:
             if command_arguments['command'] == ChargingStartStopCommand.Command.START:
                 url = f'https://ola.prod.code.seat.cloud.vwgroup.com/vehicles/{vin}/charging/requests/start'
-                if isinstance(vehicle, SeatCupraElectricVehicle) and vehicle.charging is not None and vehicle.charging.settings is not None \
-                        and vehicle.charging.settings.maximum_current is not None and vehicle.charging.settings.maximum_current.enabled \
-                        and vehicle.charging.settings.maximum_current.value is not None:
-                    if vehicle.charging.settings.maximum_current.value <= 6:
-                        command_dict['maxChargeCurrentAC'] = 'reduced'
-                    else:
-                        command_dict['maxChargeCurrentAC'] = 'maximum'
-                else:
-                    command_dict['maxChargeCurrentAC'] = 'maximum'
-                command_response: requests.Response = self.session.post(url, json=command_dict, allow_redirects=True)
+                command_response: requests.Response = self.session.post(url, 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)
+                command_response: requests.Response = self.session.post(url, allow_redirects=True)
             else:
                 raise CommandError(f'Unknown command {command_arguments["command"]}')
 

carconnectivity_connectors/seatcupra/vehicle.py

@@ -47,7 +47,6 @@ class SeatCupraVehicle(GenericVehicle):  # pylint: disable=too-many-instance-att
                 self._car_images: Dict[str, Image.Image] = {}
 
 
-
 class SeatCupraElectricVehicle(ElectricVehicle, SeatCupraVehicle):
     """
     Represents a Seat/Cupra electric vehicle.