hyundai-kia-connect-api 3.10.0__tar.gz → 3.10.7__tar.gz

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.10.0
+Version: 3.10.7
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/fuatakgun/hyundai_kia_connect_api
 Author: Fuat Akgun

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/README.rst

@@ -102,4 +102,4 @@ Example of getting trip info of the current month and day (vm is VehicleManager
                 vm.update_day_trip_info(vehicle.id, day.yyyymmdd)
                 if vehicle.day_trip_info is not None:
                     for trip in reversed(vehicle.day_trip_info.trip_list):  # show oldest first
-                        print(f"{day.yyyymmdd},{trip.hhmmss},{trip.drive_time},{trip.idle_time},{trip.distance},{trip.avg_speed},{trip.max_speed}")
+                        print(f"{day.yyyymmdd},{trip.hhmmss},{trip.drive_time},{trip.idle_time},{trip.distance},{trip.avg_speed},{trip.max_speed}")

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/HyundaiBlueLinkAPIUSA.py

@@ -16,12 +16,14 @@ from .const import (
     SEAT_STATUS,
     DISTANCE_UNITS,
     TEMPERATURE_UNITS,
+    ENGINE_TYPES,
 )
-from .utils import get_child_value
+from .utils import get_child_value, get_float
 from .ApiImpl import ApiImpl, ClimateRequestOptions
 from .Token import Token
 from .Vehicle import Vehicle
 
+
 CIPHERS = "DEFAULT@SECLEVEL=1"
 
 _LOGGER = logging.getLogger(__name__)
@@ -256,6 +258,9 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
         vehicle.washer_fluid_warning_is_on = get_child_value(
             state, "vehicleStatus.washerFluidStatus"
         )
+        vehicle.brake_fluid_warning_is_on = get_child_value(
+            state, "vehicleStatus.breakOilStatus"
+        )
         vehicle.smart_key_battery_warning_is_on = get_child_value(
             state, "vehicleStatus.smartKeyBatteryWarning"
         )
@@ -420,8 +425,8 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
         if state["vehicleStatus"] is not None:
             vehicle_location_result = None
             if vehicle.odometer:
-                if vehicle.odometer < get_child_value(
-                    state["vehicleDetails"], "odometer"
+                if vehicle.odometer < get_float(
+                    get_child_value(state["vehicleDetails"], "odometer")
                 ):
                     vehicle_location_result = self._get_vehicle_location(token, vehicle)
                 else:
@@ -467,10 +472,16 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
         result = []
         for entry in response["enrolledVehicleDetails"]:
             entry = entry["vehicleDetails"]
+            entry_engine_type = None
+            if entry["evStatus"] == "N":
+                entry_engine_type = ENGINE_TYPES.ICE
+            elif entry["evStatus"] == "E":
+                entry_engine_type = ENGINE_TYPES.EV
             vehicle: Vehicle = Vehicle(
                 id=entry["regid"],
                 name=entry["nickName"],
                 VIN=entry["vin"],
+                engine_type=entry_engine_type,
                 model=entry["modelCode"],
                 registration_date=["enrollmentDate"],
                 timezone=self.data_timezone,
@@ -508,8 +519,10 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
         self, token: Token, vehicle: Vehicle, options: ClimateRequestOptions
     ) -> str:
         _LOGGER.debug(f"{DOMAIN} - Start engine..")
-
-        url = self.API_URL + "rcs/rsc/start"
+        if vehicle.engine_type == ENGINE_TYPES.EV:
+            url = self.API_URL + "evc/fatc/start"
+        else:
+            url = self.API_URL + "rcs/rsc/start"
 
         headers = self._get_vehicle_headers(token, vehicle)
         _LOGGER.debug(f"{DOMAIN} - Start engine headers: {headers}")
@@ -533,22 +546,30 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
         if options.rear_right_seat is None:
             options.rear_right_seat = 0
 
-        data = {
-            "Ims": 0,
-            "airCtrl": int(options.climate),
-            "airTemp": {"unit": 1, "value": options.set_temp},
-            "defrost": options.defrost,
-            "heating1": int(options.heating),
-            "igniOnDuration": options.duration,
-            "seatHeaterVentInfo": {
-                "drvSeatHeatState": options.front_left_seat,
-                "astSeatHeatState": options.front_right_seat,
-                "rlSeatHeatState": options.rear_left_seat,
-                "rrSeatHeatState": options.rear_right_seat,
-            },
-            "username": token.username,
-            "vin": vehicle.id,
-        }
+        if vehicle.engine_type == ENGINE_TYPES.EV:
+            data = {
+                "airCtrl": int(options.climate),
+                "airTemp": {"value": str(options.set_temp), "unit": 1},
+                "defrost": options.defrost,
+                "heating1": int(options.heating),
+            }
+        else:
+            data = {
+                "Ims": 0,
+                "airCtrl": int(options.climate),
+                "airTemp": {"unit": 1, "value": options.set_temp},
+                "defrost": options.defrost,
+                "heating1": int(options.heating),
+                "igniOnDuration": options.duration,
+                "seatHeaterVentInfo": {
+                    "drvSeatHeatState": options.front_left_seat,
+                    "astSeatHeatState": options.front_right_seat,
+                    "rlSeatHeatState": options.rear_left_seat,
+                    "rrSeatHeatState": options.rear_right_seat,
+                },
+                "username": token.username,
+                "vin": vehicle.id,
+            }
         _LOGGER.debug(f"{DOMAIN} - Start engine data: {data}")
 
         response = self.sessions.post(url, json=data, headers=headers)
@@ -560,7 +581,10 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
     def stop_climate(self, token: Token, vehicle: Vehicle) -> None:
         _LOGGER.debug(f"{DOMAIN} - Stop engine..")
 
-        url = self.API_URL + "rcs/rsc/stop"
+        if vehicle.engine_type == ENGINE_TYPES.EV:
+            url = self.API_URL + "evc/fatc/stop"
+        else:
+            url = self.API_URL + "rcs/rsc/stop"
 
         headers = self._get_vehicle_headers(token, vehicle)
 

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/KiaUvoAPIUSA.py

@@ -302,6 +302,9 @@ class KiaUvoAPIUSA(ApiImpl):
         vehicle.washer_fluid_warning_is_on = get_child_value(
             state, "lastVehicleInfo.vehicleStatusRpt.vehicleStatus.washerFluidStatus"
         )
+        vehicle.brake_fluid_warning_is_on = get_child_value(
+            state, "lastVehicleInfo.vehicleStatusRpt.vehicleStatus.breakOilStatus"
+        )
         vehicle.smart_key_battery_warning_is_on = get_child_value(
             state,
             "lastVehicleInfo.vehicleStatusRpt.vehicleStatus.smartKeyBatteryWarning",

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/KiaUvoApiAU.py

@@ -623,6 +623,9 @@ class KiaUvoApiAU(ApiImpl):
         vehicle.washer_fluid_warning_is_on = get_child_value(
             state, "status.washerFluidStatus"
         )
+        vehicle.brake_fluid_warning_is_on = get_child_value(
+            state, "status.breakOilStatus"
+        )
         vehicle.fuel_level = get_child_value(state, "status.fuelLevel")
         vehicle.fuel_level_is_low = get_child_value(state, "status.lowFuelLight")
         vehicle.air_control_is_on = get_child_value(state, "status.airCtrlOn")

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/KiaUvoApiCA.py

@@ -276,6 +276,9 @@ class KiaUvoApiCA(ApiImpl):
         vehicle.washer_fluid_warning_is_on = get_child_value(
             state, "status.washerFluidStatus"
         )
+        vehicle.brake_fluid_warning_is_on = get_child_value(
+            state, "status.breakOilStatus"
+        )
         vehicle.tire_pressure_rear_left_warning_is_on = bool(
             get_child_value(state, "status.tirePressureLamp.tirePressureLampRL")
         )

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/KiaUvoApiCN.py

@@ -617,6 +617,9 @@ class KiaUvoApiCN(ApiImpl):
         vehicle.washer_fluid_warning_is_on = get_child_value(
             state, "status.washerFluidStatus"
         )
+        vehicle.brake_fluid_warning_is_on = get_child_value(
+            state, "status.breakOilStatus"
+        )
         vehicle.fuel_level = get_child_value(state, "status.fuelLevel")
         vehicle.fuel_level_is_low = get_child_value(state, "status.lowFuelLight")
         vehicle.air_control_is_on = get_child_value(state, "status.airCtrlOn")

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/KiaUvoApiEU.py

@@ -707,6 +707,9 @@ class KiaUvoApiEU(ApiImpl):
         vehicle.washer_fluid_warning_is_on = get_child_value(
             state, "vehicleStatus.washerFluidStatus"
         )
+        vehicle.brake_fluid_warning_is_on = get_child_value(
+            state, "vehicleStatus.breakOilStatus"
+        )
         vehicle.fuel_level = get_child_value(state, "vehicleStatus.fuelLevel")
         vehicle.fuel_level_is_low = get_child_value(state, "vehicleStatus.lowFuelLight")
         vehicle.air_control_is_on = get_child_value(state, "vehicleStatus.airCtrlOn")
@@ -779,6 +782,7 @@ class KiaUvoApiEU(ApiImpl):
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Lock Action Response: {response}")
         _check_response_for_errors(response)
+        token.device_id = self._get_device_id(self._get_stamp())
         return response["msgId"]
 
     def charge_port_action(
@@ -793,6 +797,7 @@ class KiaUvoApiEU(ApiImpl):
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Charge Port Action Response: {response}")
         _check_response_for_errors(response)
+        token.device_id = self._get_device_id(self._get_stamp())
         return response["msgId"]
 
     def start_climate(
@@ -833,6 +838,7 @@ class KiaUvoApiEU(ApiImpl):
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Start Climate Action Response: {response}")
         _check_response_for_errors(response)
+        token.device_id = self._get_device_id(self._get_stamp())
         return response["msgId"]
 
     def stop_climate(self, token: Token, vehicle: Vehicle) -> str:
@@ -854,6 +860,7 @@ class KiaUvoApiEU(ApiImpl):
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Stop Climate Action Response: {response}")
         _check_response_for_errors(response)
+        token.device_id = self._get_device_id(self._get_stamp())
         return response["msgId"]
 
     def start_charge(self, token: Token, vehicle: Vehicle) -> str:
@@ -866,6 +873,7 @@ class KiaUvoApiEU(ApiImpl):
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Start Charge Action Response: {response}")
         _check_response_for_errors(response)
+        token.device_id = self._get_device_id(self._get_stamp())
         return response["msgId"]
 
     def stop_charge(self, token: Token, vehicle: Vehicle) -> str:
@@ -878,6 +886,7 @@ class KiaUvoApiEU(ApiImpl):
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Stop Charge Action Response: {response}")
         _check_response_for_errors(response)
+        token.device_id = self._get_device_id(self._get_stamp())
         return response["msgId"]
 
     def _get_charge_limits(self, token: Token, vehicle: Vehicle) -> dict:
@@ -1032,22 +1041,23 @@ class KiaUvoApiEU(ApiImpl):
         response30d = response30d.json()
         _LOGGER.debug(f"{DOMAIN} - get_driving_info response30d {response30d}")
         _check_response_for_errors(response30d)
-        if get_child_value(responseAlltime, "resMsg.drivingInfoDetail.0"):
-            drivingInfo = responseAlltime["resMsg"]["drivingInfoDetail"][0]
+        if get_child_value(responseAlltime, "resMsg.drivingInfo.0"):
+            drivingInfo = responseAlltime["resMsg"]["drivingInfo"][0]
 
             drivingInfo["dailyStats"] = []
-            for day in response30d["resMsg"]["drivingInfoDetail"]:
-                processedDay = DailyDrivingStats(
-                    date=dt.datetime.strptime(day["drivingDate"], "%Y%m%d"),
-                    total_consumed=day["totalPwrCsp"],
-                    engine_consumption=day["motorPwrCsp"],
-                    climate_consumption=day["climatePwrCsp"],
-                    onboard_electronics_consumption=day["eDPwrCsp"],
-                    battery_care_consumption=day["batteryMgPwrCsp"],
-                    regenerated_energy=day["regenPwr"],
-                    distance=day["calculativeOdo"],
-                )
-                drivingInfo["dailyStats"].append(processedDay)
+            if get_child_value(response30d, "resMsg.drivingInfoDetail.0"):
+                for day in response30d["resMsg"]["drivingInfoDetail"]:
+                    processedDay = DailyDrivingStats(
+                        date=dt.datetime.strptime(day["drivingDate"], "%Y%m%d"),
+                        total_consumed=day["totalPwrCsp"],
+                        engine_consumption=day["motorPwrCsp"],
+                        climate_consumption=day["climatePwrCsp"],
+                        onboard_electronics_consumption=day["eDPwrCsp"],
+                        battery_care_consumption=day["batteryMgPwrCsp"],
+                        regenerated_energy=day["regenPwr"],
+                        distance=day["calculativeOdo"],
+                    )
+                    drivingInfo["dailyStats"].append(processedDay)
 
             for drivingInfoItem in response30d["resMsg"]["drivingInfo"]:
                 if drivingInfoItem["drivingPeriod"] == 0:

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/Vehicle.py

@@ -5,6 +5,7 @@ import datetime
 import typing
 from dataclasses import dataclass, field
 
+from .utils import get_float
 from .const import *
 
 _LOGGER = logging.getLogger(__name__)
@@ -301,11 +302,16 @@ class Vehicle:
     def odometer(self):
         return self._odometer
 
+    @property
+    def odometer_unit(self):
+        return self._odometer_unit
+
     @odometer.setter
     def odometer(self, value):
-        self._odometer_value = value[0]
+        float_value = get_float(value[0])
+        self._odometer_value = float_value
         self._odometer_unit = value[1]
-        self._odometer = value[0]
+        self._odometer = float_value
 
     @property
     def air_temperature(self):

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api/utils.py

@@ -15,6 +15,21 @@ def get_child_value(data, key):
     return value
 
 
+def get_float(value):
+    if value is None:
+        return None
+    if isinstance(value, float):
+        return value
+    if isinstance(value, int):
+        return float(value)
+    if isinstance(value, str):
+        try:
+            return float(value)
+        except ValueError:
+            return value  # original fallback
+    return value  # original fallback
+
+
 def get_hex_temp_into_index(value):
     if value is not None:
         value = value.replace("H", "")

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/hyundai_kia_connect_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai-kia-connect-api
-Version: 3.10.0
+Version: 3.10.7
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/fuatakgun/hyundai_kia_connect_api
 Author: Fuat Akgun

{hyundai_kia_connect_api-3.10.0 → hyundai_kia_connect_api-3.10.7}/setup.py

@@ -44,6 +44,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/fuatakgun/hyundai_kia_connect_api",
-    version="3.10.0",
+    version="3.10.7",
     zip_safe=False,
 )