Run poetry update

Author: nanomad

poetry.lock

@@ -16,7 +16,7 @@ classifiers = [
 
 requires-python = '>=3.12,<4.0'
 dependencies = [
-    "saic-ismart-client-ng (>=0.8.0,<0.9.0)",
+    "saic-ismart-client-ng (>=0.8.1,<0.9.0)",
     'httpx (>=0.28.1,<0.29.0)',
     'gmqtt (>=0.7.0,<0.8.0)',
     'inflection (>=0.5.1,<0.6.0)',

pyproject.toml

@@ -28,29 +28,29 @@ def __init__(self, msg: str) -> None:
 class AbrpApiListener(ABC):
     @abstractmethod
     async def on_request(
-        self,
-        path: str,
-        body: str | None = None,
-        headers: dict[str, str] | None = None,
+            self,
+            path: str,
+            body: str | None = None,
+            headers: dict[str, str] | None = None,
     ) -> None:
         pass
 
     @abstractmethod
     async def on_response(
-        self,
-        path: str,
-        body: str | None = None,
-        headers: dict[str, str] | None = None,
+            self,
+            path: str,
+            body: str | None = None,
+            headers: dict[str, str] | None = None,
     ) -> None:
         pass
 
 
 class AbrpApi:
     def __init__(
-        self,
-        abrp_api_key: str | None,
-        abrp_user_token: str | None,
-        listener: AbrpApiListener | None = None,
+            self,
+            abrp_api_key: str | None,
+            abrp_user_token: str | None,
+            listener: AbrpApiListener | None = None,
     ) -> None:
         self.abrp_api_key = abrp_api_key
         self.abrp_user_token = abrp_user_token
@@ -64,18 +64,18 @@ def __init__(
         )
 
     async def update_abrp(
-        self,
-        vehicle_status: VehicleStatusResp | None,
-        charge_info: ChrgMgmtDataResp | None,
+            self,
+            vehicle_status: VehicleStatusResp | None,
+            charge_info: ChrgMgmtDataResp | None,
     ) -> tuple[bool, str]:
         charge_mgmt_data = None if charge_info is None else charge_info.chrgMgmtData
         charge_status = None if charge_info is None else charge_info.rvsChargeStatus
 
         if (
-            self.abrp_api_key is not None
-            and self.abrp_user_token is not None
-            and vehicle_status is not None
-            and charge_mgmt_data is not None
+                self.abrp_api_key is not None
+                and self.abrp_user_token is not None
+                and vehicle_status is not None
+                and charge_mgmt_data is not None
         ):
             # Request
             tlm_send_url = f"{self.__base_uri}tlm/send"
@@ -91,19 +91,18 @@ async def update_abrp(
                 )
 
             # Skip invalid current values reported by the API
+            decoded_current = charge_mgmt_data.decoded_current
             is_valid_current = (
-                charge_mgmt_data.bmsPackCrntV != 1
-                and (raw_current := charge_mgmt_data.bmsPackCrnt) is not None
-                and value_in_range(raw_current, 0, 65535)
+                    charge_mgmt_data.bmsPackCrntV != 1
+                    and (raw_current := charge_mgmt_data.bmsPackCrnt) is not None
+                    and value_in_range(raw_current, 0, 65535)
+                    and decoded_current is not None
             )
             if is_valid_current:
                 is_charging = (
-                    charge_status is not None
-                    and charge_status.chargingGunState
-                    and is_valid_current
-                    and (decoded_current := charge_mgmt_data.decoded_current)
-                    is not None
-                    and decoded_current < 0.0
+                        charge_status is not None
+                        and charge_status.chargingGunState
+                        and decoded_current < 0.0
                 )
                 data.update(
                     {
@@ -154,15 +153,15 @@ async def update_abrp(
 
     @staticmethod
     def __extract_basic_vehicle_status(
-        basic_vehicle_status: BasicVehicleStatus,
+            basic_vehicle_status: BasicVehicleStatus,
     ) -> dict[str, Any]:
         data: dict[str, Any] = {
             "is_parked": basic_vehicle_status.is_parked,
         }
 
         exterior_temperature = basic_vehicle_status.exteriorTemperature
         if exterior_temperature is not None and value_in_range(
-            exterior_temperature, -127, 127
+                exterior_temperature, -127, 127
         ):
             data["ext_temp"] = exterior_temperature
         mileage = basic_vehicle_status.mileage
@@ -206,7 +205,7 @@ def __extract_gps_position(gps_position: GpsPosition) -> dict[str, Any]:
             data["elevation"] = altitude
 
         if (raw_lat := position.latitude) is not None and (
-            raw_lon := position.longitude
+                raw_lon := position.longitude
         ) is not None:
             lat_degrees = raw_lat / 1000000.0
             lon_degrees = raw_lon / 1000000.0
@@ -222,16 +221,16 @@ def __extract_gps_position(gps_position: GpsPosition) -> dict[str, Any]:
         return data
 
     def __extract_electric_range(
-        self,
-        basic_vehicle_status: BasicVehicleStatus | None,
-        charge_status: RvsChargeStatus | None,
+            self,
+            basic_vehicle_status: BasicVehicleStatus | None,
+            charge_status: RvsChargeStatus | None,
     ) -> dict[str, Any]:
         data = {}
 
         range_elec_vehicle = 0.0
         if (
-            basic_vehicle_status
-            and (fuel_range := basic_vehicle_status.fuelRangeElec) is not None
+                basic_vehicle_status
+                and (fuel_range := basic_vehicle_status.fuelRangeElec) is not None
         ):
             range_elec_vehicle = self.__parse_electric_range(raw_value=fuel_range)
 

src/integrations/abrp/api.py

@@ -102,8 +102,13 @@ async def run(self) -> None:
             name="Check for new messages",
             max_instances=1,
         )
+        LOG.info("Connecting to MQTT Broker")
         await self.publisher.connect()
+
+        LOG.info("Starting scheduler")
         self.__scheduler.start()
+
+        LOG.info("Entering main loop")
         await self.__main_loop()
 
     async def setup_vehicle(
@@ -225,7 +230,7 @@ def get_charging_station(self, vin: str) -> ChargingStation | None:
     async def __main_loop(self) -> None:
         tasks = []
         for key, vh in self.vehicle_handlers.items():
-            LOG.debug(f"Starting process for car {key}")
+            LOG.info(f"Starting process for car {key}")
             task = asyncio.create_task(
                 vh.handle_vehicle(), name=f"handle_vehicle_{key}"
             )