From 46dfeb476f63745e9d4d2d770946558f08b047a3 Mon Sep 17 00:00:00 2001 From: Martin Rinas Date: Mon, 8 Jul 2024 12:45:15 +0200 Subject: [PATCH] detect and fix invalid cached vehicle (#1673) --- packages/modules/vehicles/evcc/api.py | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/packages/modules/vehicles/evcc/api.py b/packages/modules/vehicles/evcc/api.py index 278c3f762f..3cb4e7727a 100644 --- a/packages/modules/vehicles/evcc/api.py +++ b/packages/modules/vehicles/evcc/api.py @@ -17,6 +17,7 @@ gRPCRetryTime = 5 gRPCRetryCount = 5 gRPCRetryResponse = 'must retry' +gRPCVehicleNoLongerValid = 'vehicle not available' def write_vehicle_id_mqtt(topic: str, vehicle_id: int, config: EVCCVehicleSocConfiguration): @@ -44,6 +45,19 @@ def create_vehicle(config: EVCCVehicleSocConfiguration, stub: vehicle_pb2_grpc.V return response.vehicle_id +def create_and_save_vehicle_id( + stub: vehicle_pb2_grpc.VehicleStub, + config: EVCCVehicleSocConfiguration, + vehicle: int) -> int: + vehicle_to_fetch = create_vehicle(config, stub) + log.debug("Vehicle client received: " + str(vehicle_to_fetch)) + + # saving vehicle id in config + topic = "openWB/set/vehicle/" + str(vehicle) + "/soc_module/config" + write_vehicle_id_mqtt(topic, vehicle_to_fetch, config) + return vehicle_to_fetch + + def fetch_soc( evcc_config: EVCCVehicleSocConfiguration, vehicle_update_data: VehicleUpdateData, @@ -54,12 +68,13 @@ def fetch_soc( stub = vehicle_pb2_grpc.VehicleStub(channel) if not evcc_config.vehicle_id: # create and fetch vehicle id if not included in config - vehicle_to_fetch = create_vehicle(evcc_config, stub) - log.debug("Vehicle client received: " + str(vehicle_to_fetch)) + create_and_save_vehicle_id(stub, evcc_config, vehicle) +# vehicle_to_fetch = create_vehicle(evcc_config, stub) +# log.debug("Vehicle client received: " + str(vehicle_to_fetch)) # saving vehicle id in config - topic = "openWB/set/vehicle/" + str(vehicle) + "/soc_module/config" - write_vehicle_id_mqtt(topic, vehicle_to_fetch, evcc_config) +# topic = "openWB/set/vehicle/" + str(vehicle) + "/soc_module/config" +# write_vehicle_id_mqtt(topic, vehicle_to_fetch, evcc_config) else: log.debug("Vehicle id found in config: " + str(evcc_config.vehicle_id)) vehicle_to_fetch = evcc_config.vehicle_id @@ -82,6 +97,10 @@ def fetch_soc( time.sleep(gRPCRetryTime) log.debug("retrying now...") RetryCounter += 1 + elif rpc_error.details() == gRPCVehicleNoLongerValid: # vehicle no longer valid + log.debug(f'cached vehicle {vehicle_to_fetch} no longer valid, creating new vehicle') + vehicle_to_fetch = create_and_save_vehicle_id(stub, evcc_config, vehicle) + RetryCounter += 1 else: # some other error, raise exception and exit raise grpc.RpcError(rpc_error)